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 a9ae6cdc..81288652 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 @@ -1,5 +1,6 @@ package app.module.admin.config.adapters.web.interceptor; +import app.module.admin.config.application.util.AdminUtil; import app.module.core.config.adapters.web.interceptor.model.URITopTierVO; import app.module.core.config.application.enums.AppType; import app.module.core.config.application.exception.NoMatchingURIException; @@ -76,16 +77,16 @@ public class AdminURIInterceptor implements HandlerInterceptor { // 활성 프로파일 가져오기 TODO 2차 오픈시 삭제 예정 modelAndView.addObject("activeProfile", activeProfiles); + String roleId = AdminUtil.getLoginUserRole(); if (!CommonUtil.isAjaxRequest(request)) { - URITopTier topTierOutput = topTierPortIn.connect(AppType.ADMIN); + URITopTier topTierOutput = topTierPortIn.connectRoleId(AppType.ADMIN,roleId); modelAndView.addObject("topNode", recursiveMapping(topTierOutput)); if (modelAndView.getModelMap().getAttribute("currentURI") == null) { modelAndView.addObject("currentURI", request.getAttribute("currentURI")); } - modelAndView.addObject( - "menuHierarchy", uriAncestryPortIn.connect(AppType.ADMIN, request.getRequestURI())); + modelAndView.addObject("menuHierarchy", uriAncestryPortIn.connect(AppType.ADMIN, request.getRequestURI())); if (cloudFrontDomain != null && bucketFolder != null) { modelAndView.addObject("S3URL", "https://" + cloudFrontDomain + bucketFolder); diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java index 03310069..c308fcdb 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java @@ -65,17 +65,18 @@ public class AdminAuthSuccessEvent { "security.password.change.notify", adminUser.getRemainPasswordDays())); } - // 로그인 활성화 기록 생성 -// loggedInUserSavePortIn.connect( -// LoggedInUserSaveCmd.builder() -// .loggedInUserId( -// LoggedInUserIdSaveCmd.builder() -// .appType(AppType.ADMIN) -// .id(authentication.getName()) -// .build()) -// .clientIP(CommonUtil.getClientIP(request)) -// .lastLoggedInAt(LocalDateTime.now()) -// .build()); + // 로그인 이력 쌓기 + loggedInUserSavePortIn.connect( + LoggedInUserSaveCmd.builder() + .loggedInUserId( + LoggedInUserIdSaveCmd.builder() + .appType(AppType.ADMIN) + .id(authentication.getName()) + .build()) + .clientIP(CommonUtil.getClientIP(request)) + .lastLoggedInAt(LocalDateTime.now()) + .build()); + } @EventListener diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java b/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java index a883cca1..6b756315 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java @@ -46,6 +46,7 @@ public class AdminDetailsService implements UserDetailsService { adminUser.getPassword(), adminUser.getRoles().stream().map(CoreRole::getId).findFirst().orElse(null), adminUser.getRegionMainCode(), + adminUser.getLastLoginIp(), !accountDisabled, true, isCredentialsNonExpired(adminUser.getPasswordUpdatedAt()), diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java b/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java index 4fabf639..789a447a 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java @@ -10,6 +10,7 @@ public class AdminUser extends User { private Long seq; private String roleId; private String regionMainCode; + private String lastLoginIp; private long remainPasswordDays; public AdminUser( @@ -18,6 +19,7 @@ public class AdminUser extends User { String password, String roleId, String regionMainCode, + String lastLoginIp, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, @@ -35,6 +37,7 @@ public class AdminUser extends User { this.seq = seq; this.roleId = roleId; this.regionMainCode = regionMainCode; + this.lastLoginIp = lastLoginIp; this.remainPasswordDays = remainPasswordDays; } } diff --git a/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java b/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java index 0bb07840..27207001 100644 --- a/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java +++ b/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java @@ -53,4 +53,14 @@ public class AdminUtil { AdminUser user = (AdminUser) authentication.getPrincipal(); return user.getRegionMainCode().isEmpty() ? null : user.getRegionMainCode(); } + + public static String getLoginUserLastIp() { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication == null || !(authentication.getPrincipal() instanceof AdminUser)) { + return null; + } + + AdminUser user = (AdminUser) authentication.getPrincipal(); + return user.getLastLoginIp(); + } } diff --git a/admin/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml b/admin/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml index 30814853..a21fd09b 100644 --- a/admin/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml +++ b/admin/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml @@ -7,13 +7,15 @@ INSERT INTO logged_in_user ( - app_type, id, + app_type, + login_id, clientip, last_logged_in_at ) VALUES ( + nextval('logged_in_user_seq'), #{appType}, #{id}, #{clientIP}, @@ -27,7 +29,7 @@ clientip = #{clientIP}, last_logged_in_at = #{lastLoggedInAt} WHERE app_type = #{appType} - AND id = #{id} + AND login_id = #{id} \ No newline at end of file diff --git a/admin/src/main/resources/templates/common/components.html b/admin/src/main/resources/templates/common/components.html index 9555d4d9..842c3d97 100644 --- a/admin/src/main/resources/templates/common/components.html +++ b/admin/src/main/resources/templates/common/components.html @@ -105,7 +105,7 @@ - 메뉴명 + 메뉴명 @@ -133,7 +133,7 @@

로그인 사용자명님 안녕하세요

- 111.11.111.111 + 111.11.111.111
diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index a0cd3256..55aad8a3 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -32,7 +32,7 @@ -
+