From 73f34485154d757f324f6e640b5b98b698328def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 23 Jun 2025 17:22:01 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EC=9D=B4=EB=A0=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/AdminAuthSuccessEvent.java | 23 ++++++++++--------- .../security/AdminDetailsService.java | 1 + .../application/security/AdminUser.java | 3 +++ .../config/application/util/AdminUtil.java | 10 ++++++++ .../loggedinuser/LoggedInUserSaveMapper.xml | 6 +++-- .../templates/common/components.html | 2 +- .../ports/application/domain/AdminView.java | 1 + .../mappers/admin/AdminViewMapper.xml | 7 +++++- .../resources/sql/schema/02_create-all.sql | 13 +++++++---- 9 files changed, 46 insertions(+), 20 deletions(-) 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 36bb2b1e..842c3d97 100644 --- a/admin/src/main/resources/templates/common/components.html +++ b/admin/src/main/resources/templates/common/components.html @@ -133,7 +133,7 @@

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

- 111.11.111.111 + 111.11.111.111
diff --git a/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java b/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java index ddc9e4c0..1108a23c 100644 --- a/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java +++ b/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java @@ -24,6 +24,7 @@ public class AdminView implements Serializable { private Boolean accountDisabled; private Integer loginFailCnt; private Boolean accountLocked; + private String lastLoginIp; private LocalDateTime createdAt; private String createdBy; private LocalDateTime updatedAt; diff --git a/core/src/main/resources/mappers/admin/AdminViewMapper.xml b/core/src/main/resources/mappers/admin/AdminViewMapper.xml index 5f7d370a..1aa9d4ab 100644 --- a/core/src/main/resources/mappers/admin/AdminViewMapper.xml +++ b/core/src/main/resources/mappers/admin/AdminViewMapper.xml @@ -18,12 +18,17 @@ a.account_disabled, a.login_fail_cnt, a.account_locked, + liu.clientip as last_login_ip, a.created_at, a.created_by, a.updated_at, a.updated_by FROM admin a - WHERE id = #{id} + LEFT JOIN ( SELECT clientip,login_id + FROM logged_in_user liu + ORDER BY last_logged_in_at desc + LIMIT 1 ) liu on liu.login_id = a.id + WHERE a.id = #{id} AND a.is_deleted = false diff --git a/core/src/main/resources/sql/schema/02_create-all.sql b/core/src/main/resources/sql/schema/02_create-all.sql index 52f6ddbf..cb7296fa 100644 --- a/core/src/main/resources/sql/schema/02_create-all.sql +++ b/core/src/main/resources/sql/schema/02_create-all.sql @@ -831,23 +831,26 @@ COMMENT ON COLUMN operation_log.is_deleted IS '삭제여부'; -- ============================================ -- TABLE : logged_in_user --- DESC : 로그인 사용자 정보 테이블 +-- DESC : 로그인 사용자 이력 테이블 -- ============================================ +CREATE SEQUENCE logged_in_user_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; CREATE TABLE logged_in_user ( + id bigint DEFAULT nextval('logged_in_user_seq') NOT NULL, -- 로그 ID (PK) app_type varchar(255) NOT NULL, -- 앱 타입 (FRONT / ADMIN) - id varchar(255) NOT NULL, -- 로그인 아이디 + login_id varchar(255) NOT NULL, -- 로그인 아이디 last_logged_in_at timestamp(6), -- 마지막 로그인 날짜 clientip varchar(255), -- 접속 아이피 - CONSTRAINT logged_in_user_pkey PRIMARY KEY (app_type, id), + CONSTRAINT logged_in_user_pkey PRIMARY KEY (id), CONSTRAINT logged_in_user_app_type_check CHECK (app_type::text = ANY (ARRAY['FRONT', 'ADMIN'])) ); -COMMENT ON TABLE logged_in_user IS '로그인사용자정보테이블'; +COMMENT ON TABLE logged_in_user IS '로그인사용자이력테이블'; +COMMENT ON COLUMN logged_in_user.id IS '로그 ID'; COMMENT ON COLUMN logged_in_user.app_type IS '앱 타입'; -COMMENT ON COLUMN logged_in_user.id IS '로그인 아이디'; +COMMENT ON COLUMN logged_in_user.login_id IS '로그인 아이디'; COMMENT ON COLUMN logged_in_user.last_logged_in_at IS '마지막 로그인 날짜'; COMMENT ON COLUMN logged_in_user.clientip IS '접속 아이피';