Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
김현주
2025-06-20 13:04:05 +09:00
5 changed files with 15 additions and 7 deletions

View File

@@ -28,6 +28,8 @@ public class AdminURIInterceptor implements HandlerInterceptor {
private final URICurrentMatchingPortIn uriCurrentMatchingPortIn; private final URICurrentMatchingPortIn uriCurrentMatchingPortIn;
private final URIAncestryPortIn uriAncestryPortIn; private final URIAncestryPortIn uriAncestryPortIn;
private final URITopTierPortIn topTierPortIn; private final URITopTierPortIn topTierPortIn;
@Value("${spring.profiles.active}")
private String activeProfiles;
@Value("${app.aws.s3.domain:null}") @Value("${app.aws.s3.domain:null}")
private String cloudFrontDomain; private String cloudFrontDomain;
@@ -71,6 +73,9 @@ public class AdminURIInterceptor implements HandlerInterceptor {
return; return;
} }
// 활성 프로파일 가져오기 TODO 2차 오픈시 삭제 예정
modelAndView.addObject("activeProfile", activeProfiles);
if (!CommonUtil.isAjaxRequest(request)) { if (!CommonUtil.isAjaxRequest(request)) {
URITopTier topTierOutput = topTierPortIn.connect(AppType.ADMIN); URITopTier topTierOutput = topTierPortIn.connect(AppType.ADMIN);
modelAndView.addObject("topNode", recursiveMapping(topTierOutput)); modelAndView.addObject("topNode", recursiveMapping(topTierOutput));

View File

@@ -9,7 +9,6 @@
<!-- hidden parameters --> <!-- hidden parameters -->
<input name="sort" th:field="*{sort}" type="hidden"/> <input name="sort" th:field="*{sort}" type="hidden"/>
<input name="page" th:field="*{page}" type="hidden"/> <input name="page" th:field="*{page}" type="hidden"/>
<div class="input-group"> <div class="input-group">
<div class="input-label"> <div class="input-label">
<p class="label-txt"> <p class="label-txt">
@@ -94,7 +93,7 @@
<div class="row paging"></div> <div class="row paging"></div>
<div class="component-btns bottom-btn-group"> <div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="btns-row align-right"> <div class="btns-row align-right">
<button type="button" class="btn" onclick="goExcel();"> <button type="button" class="btn" onclick="goExcel();">
<span class="btn-txt">엑셀 다운로드 <i class="ico-download ico-small" aria-hidden="true"></i></span> <span class="btn-txt">엑셀 다운로드 <i class="ico-download ico-small" aria-hidden="true"></i></span>

View File

@@ -172,7 +172,7 @@
const button = document.createElement('button'); const button = document.createElement('button');
button.type = '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-id', node.id || '');
button.setAttribute('data-parent-id', node.parentId || ''); button.setAttribute('data-parent-id', node.parentId || '');
button.setAttribute('data-order-no', node.orderNo || '0'); button.setAttribute('data-order-no', node.orderNo || '0');
@@ -193,7 +193,7 @@
if (node.nodes && node.nodes.length > 0) { if (node.nodes && node.nodes.length > 0) {
const childUl = document.createElement('ul'); const childUl = document.createElement('ul');
childUl.className = depth === 1 ? 'list-twodepth' : 'list-threedepth'; childUl.className = depth === 1 ? 'list-detail' : 'list-detail';
li.appendChild(childUl); li.appendChild(childUl);
node.nodes.forEach(child => renderNode(child, childUl, depth + 1)); node.nodes.forEach(child => renderNode(child, childUl, depth + 1));
} }

View File

@@ -47,13 +47,15 @@ class CreateAdminController {
} }
String createdId = String createdId =
saveAdminPortIn.connect( saveAdminPortIn.apiConnect(
reqVO.getSeq(), reqVO.getSeq(),
reqVO.getId(), reqVO.getId(),
reqVO.getPassword(), reqVO.getPassword(),
reqVO.getName(),
reqVO.getPhone(),
reqVO.getRegionMainCode(), reqVO.getRegionMainCode(),
reqVO.getAccountDisabled(), reqVO.getAccountDisabled(),
reqVO.getRoleIds()); reqVO.getRoleId());
return ResponseEntity.status(HttpStatus.OK).body(new CreateAdminResVO(createdId)); return ResponseEntity.status(HttpStatus.OK).body(new CreateAdminResVO(createdId));
} }

View File

@@ -18,7 +18,9 @@ import lombok.Setter;
public class CreateAdminReqVO { public class CreateAdminReqVO {
private Long seq; private Long seq;
private String id; private String id;
private String name;
private String password; private String password;
private String phone;
@NotBlank(message = "{valid.common.required}") @NotBlank(message = "{valid.common.required}")
@Pattern( @Pattern(
@@ -37,5 +39,5 @@ public class CreateAdminReqVO {
@Schema(description = "계정 잠김", example = "false") @Schema(description = "계정 잠김", example = "false")
private Boolean accountLocked; private Boolean accountLocked;
private List<String> roleIds; private String roleId;
} }