From 9bef810505ca514df7aa2bcb9b054215cf89958a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Fri, 20 Jun 2025 10:02:05 +0900 Subject: [PATCH 1/2] =?UTF-8?q?api=20=EB=AA=A8=EB=93=88=EB=8F=84=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/main/resources/templates/uiCode/uiCodeList.html | 4 ++-- .../createAdmin/adapters/web/CreateAdminController.java | 6 ++++-- .../createAdmin/adapters/web/model/CreateAdminReqVO.java | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/admin/src/main/resources/templates/uiCode/uiCodeList.html b/admin/src/main/resources/templates/uiCode/uiCodeList.html index 33ba12bb..5189521c 100644 --- a/admin/src/main/resources/templates/uiCode/uiCodeList.html +++ b/admin/src/main/resources/templates/uiCode/uiCodeList.html @@ -172,7 +172,7 @@ const button = document.createElement('button'); button.type = 'button'; - button.className = depth === 1 ? 'tit onedepth' : depth === 2 ? 'tit twodepth' : ''; + button.className = 'tit'; button.setAttribute('data-id', node.id || ''); button.setAttribute('data-parent-id', node.parentId || ''); button.setAttribute('data-order-no', node.orderNo || '0'); @@ -193,7 +193,7 @@ if (node.nodes && node.nodes.length > 0) { const childUl = document.createElement('ul'); - childUl.className = depth === 1 ? 'list-twodepth' : 'list-threedepth'; + childUl.className = depth === 1 ? 'list-detail' : 'list-detail'; li.appendChild(childUl); node.nodes.forEach(child => renderNode(child, childUl, depth + 1)); } diff --git a/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java b/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java index 597fa1b9..83a68dc1 100644 --- a/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java +++ b/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java @@ -47,13 +47,15 @@ class CreateAdminController { } String createdId = - saveAdminPortIn.connect( + saveAdminPortIn.apiConnect( reqVO.getSeq(), reqVO.getId(), reqVO.getPassword(), + reqVO.getName(), + reqVO.getPhone(), reqVO.getRegionMainCode(), reqVO.getAccountDisabled(), - reqVO.getRoleIds()); + reqVO.getRoleId()); return ResponseEntity.status(HttpStatus.OK).body(new CreateAdminResVO(createdId)); } diff --git a/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/model/CreateAdminReqVO.java b/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/model/CreateAdminReqVO.java index 47e96576..b472f5e1 100644 --- a/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/model/CreateAdminReqVO.java +++ b/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/model/CreateAdminReqVO.java @@ -18,7 +18,9 @@ import lombok.Setter; public class CreateAdminReqVO { private Long seq; private String id; + private String name; private String password; + private String phone; @NotBlank(message = "{valid.common.required}") @Pattern( @@ -37,5 +39,5 @@ public class CreateAdminReqVO { @Schema(description = "계정 잠김", example = "false") private Boolean accountLocked; - private List roleIds; + private String roleId; } From 79a4f64bd2033f4ae433288a46a1c8c7126fe5fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Fri, 20 Jun 2025 10:37:44 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=201=EC=B0=A8=20?= =?UTF-8?q?=EC=98=A4=ED=94=88=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=B6=84?= =?UTF-8?q?=EA=B8=B0=EC=B2=98=EB=A6=AC=EB=A5=BC=20=EC=9C=84=ED=95=B4=20?= =?UTF-8?q?=ED=99=9C=EC=84=B1=20=ED=94=84=EB=A1=9C=ED=95=84=20=EB=84=A3?= =?UTF-8?q?=EC=96=B4=EC=A3=BC=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/adapters/web/interceptor/AdminURIInterceptor.java | 5 +++++ .../src/main/resources/templates/researcher/researchers.html | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java b/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java index 91c100f5..a9ae6cdc 100644 --- a/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java +++ b/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java @@ -28,6 +28,8 @@ public class AdminURIInterceptor implements HandlerInterceptor { private final URICurrentMatchingPortIn uriCurrentMatchingPortIn; private final URIAncestryPortIn uriAncestryPortIn; private final URITopTierPortIn topTierPortIn; + @Value("${spring.profiles.active}") + private String activeProfiles; @Value("${app.aws.s3.domain:null}") private String cloudFrontDomain; @@ -71,6 +73,9 @@ public class AdminURIInterceptor implements HandlerInterceptor { return; } + // 활성 프로파일 가져오기 TODO 2차 오픈시 삭제 예정 + modelAndView.addObject("activeProfile", activeProfiles); + if (!CommonUtil.isAjaxRequest(request)) { URITopTier topTierOutput = topTierPortIn.connect(AppType.ADMIN); modelAndView.addObject("topNode", recursiveMapping(topTierOutput)); diff --git a/admin/src/main/resources/templates/researcher/researchers.html b/admin/src/main/resources/templates/researcher/researchers.html index 237e38f2..5e034f6e 100644 --- a/admin/src/main/resources/templates/researcher/researchers.html +++ b/admin/src/main/resources/templates/researcher/researchers.html @@ -9,7 +9,6 @@ -

@@ -94,7 +93,7 @@

-
+