From 3809bdca1fefdd4d6a21721468fd17b95d9fd5b3 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 14:46:04 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=88=A8=EA=B9=80=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/main/resources/templates/researcher/detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ -
+
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 '접속 아이피'; From 0eff4f2fe1aa5090ad47aaf4583ed6c57e147399 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 23 Jun 2025 17:29:57 +0900 Subject: [PATCH 5/6] =?UTF-8?q?[FO]=20=EA=B0=9C=EC=9D=B8=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/info/user/user.html | 41 +++++++++++++------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/front/src/main/resources/templates/info/user/user.html b/front/src/main/resources/templates/info/user/user.html index 762c90b3..f7b0c2c6 100644 --- a/front/src/main/resources/templates/info/user/user.html +++ b/front/src/main/resources/templates/info/user/user.html @@ -85,13 +85,13 @@
-
-
@@ -123,8 +123,7 @@
@@ -132,13 +131,13 @@
-
-
@@ -155,24 +154,26 @@ -
- +
-

시/도 선택

+

지역 선택

+
  • option1 + th:text="${item.codeText}" + th:selected="${item.id eq userInfo.regionMainCode ? 'current' : ''}">option1
@@ -185,14 +186,14 @@
+ data-props-default="세부지역 선택" data-props-type="bottomSheet">
-

시/군/구 선택

+

세부지역 선택

@@ -277,6 +278,10 @@