From 2ee6f926b01d3a6dfb808ce92fc8a04a0f8f6c66 Mon Sep 17 00:00:00 2001 From: DanielLee <198891672+sanghyeonhd@users.noreply.github.com> Date: Mon, 15 Dec 2025 14:09:48 +0900 Subject: [PATCH 1/4] local settings change --- src/main/resources/application-local.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index f03bc5f3..8ab311f2 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -15,8 +15,8 @@ spring: format_sql: true # ⚠️ 선택 - SQL 포맷팅 (가독성) datasource: - url: jdbc:postgresql://192.168.2.127:15432/kamco_cds - #url: jdbc:postgresql://localhost:15432/kamco_cds + #url: jdbc:postgresql://192.168.2.127:15432/kamco_cds + url: jdbc:postgresql://localhost:15432/kamco_cds username: kamco_cds password: kamco_cds_Q!W@E#R$ hikari: From 038ef0c88eded093bac779268e51208adcffd0af Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Mon, 15 Dec 2025 15:01:07 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EA=B4=80=EB=A6=AC=20id?= =?UTF-8?q?=20generated=20=EB=B0=A9=EC=8B=9D=20SEQUENCE=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(=EC=9D=B4=EB=AF=B8=20=EC=8B=9C=ED=80=80?= =?UTF-8?q?=EC=8A=A4=EB=A1=9C=20=ED=95=98=EA=B3=A0=20=EC=9E=88=EC=97=88?= =?UTF-8?q?=EC=9D=8C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cd/kamcoback/postgres/entity/AuditLogEntity.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/AuditLogEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/AuditLogEntity.java index 5ac909e5..298f7d58 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/AuditLogEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/AuditLogEntity.java @@ -15,8 +15,14 @@ import lombok.NoArgsConstructor; @Table(name = "tb_audit_log") public class AuditLogEntity extends CommonCreateEntity { @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "audit_log_uid") + @GeneratedValue( + strategy = GenerationType.SEQUENCE, + generator = "tb_audit_log_audit_log_uid_seq_gen") + @SequenceGenerator( + name = "tb_audit_log_audit_log_uid_seq_gen", + sequenceName = "tb_audit_log_audit_log_uid_seq", + allocationSize = 1) + @Column(name = "audit_log_uid", nullable = false) private Long id; @Column(name = "user_uid") From 83e0a3f8101a8b0e046af7e46f79f9f2aa0f1d80 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Mon, 15 Dec 2025 15:08:36 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EC=97=90=EB=9F=AC=EB=A1=9C=EA=B7=B8=20id?= =?UTF-8?q?=20generated=20=EB=B0=A9=EC=8B=9D=20SEQUENCE=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(=EC=9D=B4=EB=AF=B8=20=EC=8B=9C=ED=80=80?= =?UTF-8?q?=EC=8A=A4=EB=A1=9C=20=ED=95=98=EA=B3=A0=20=EC=9E=88=EC=97=88?= =?UTF-8?q?=EC=9D=8C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cd/kamcoback/postgres/entity/ErrorLogEntity.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ErrorLogEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ErrorLogEntity.java index 4cdc91e0..bc66111b 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ErrorLogEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ErrorLogEntity.java @@ -16,8 +16,14 @@ import lombok.NoArgsConstructor; @Table(name = "tb_error_log") public class ErrorLogEntity extends CommonCreateEntity { @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "error_log_uid") + @GeneratedValue( + strategy = GenerationType.SEQUENCE, + generator = "tb_error_log_error_log_uid_seq_gen") + @SequenceGenerator( + name = "tb_error_log_error_log_uid_seq_gen", + sequenceName = "tb_error_log_error_log_uid_seq", + allocationSize = 1) + @Column(name = "error_log_uid", nullable = false) private Long id; @Column(name = "request_id") From 9c418b072be69168e920b1883d2254442d3ad1c4 Mon Sep 17 00:00:00 2001 From: teddy Date: Mon, 15 Dec 2025 15:15:40 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=9E=84=EC=8B=9C=20=ED=8C=A8=EC=9B=8C?= =?UTF-8?q?=EC=8A=A4=EB=93=9C=20=EC=BB=AC=EB=9F=BC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kamcoback/config/GlobalExceptionHandler.java | 4 ++-- .../cd/kamcoback/members/service/AuthService.java | 10 ---------- .../postgres/core/MembersCoreService.java | 15 --------------- .../kamcoback/postgres/entity/MemberEntity.java | 5 ----- 4 files changed, 2 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/config/GlobalExceptionHandler.java b/src/main/java/com/kamco/cd/kamcoback/config/GlobalExceptionHandler.java index 3d5105f8..403de33b 100644 --- a/src/main/java/com/kamco/cd/kamcoback/config/GlobalExceptionHandler.java +++ b/src/main/java/com/kamco/cd/kamcoback/config/GlobalExceptionHandler.java @@ -276,8 +276,8 @@ public class GlobalExceptionHandler { String codeName = ""; switch (e.getField()) { - case USER_ID -> { - codeName = "DUPLICATE_DATA"; + case EMPLOYEE_NO -> { + codeName = "DUPLICATE_EMPLOYEEID"; } default -> { codeName = "DUPLICATE_DATA"; diff --git a/src/main/java/com/kamco/cd/kamcoback/members/service/AuthService.java b/src/main/java/com/kamco/cd/kamcoback/members/service/AuthService.java index 7220ae34..287bc99b 100644 --- a/src/main/java/com/kamco/cd/kamcoback/members/service/AuthService.java +++ b/src/main/java/com/kamco/cd/kamcoback/members/service/AuthService.java @@ -33,14 +33,4 @@ public class AuthService { public String getUserStatus(SignInRequest request) { return membersCoreService.getUserStatus(request); } - - /** - * 임시 패스워드 비교 - * - * @param request - * @return - */ - public boolean isTempPasswordValid(SignInRequest request) { - return membersCoreService.isTempPasswordValid(request); - } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MembersCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MembersCoreService.java index 5d3b1111..251f5c02 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MembersCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MembersCoreService.java @@ -147,21 +147,6 @@ public class MembersCoreService { return memberEntity.getStatus(); } - /** - * 임시 패스워드 비교 - * - * @param request - * @return - */ - public boolean isTempPasswordValid(SignInRequest request) { - MemberEntity memberEntity = - membersRepository - .findByUserId(request.getUsername()) - .orElseThrow(MemberNotFoundException::new); - - return memberEntity.getTempPassword().equals(request.getPassword().trim()); - } - /** * 최초 로그인 저장 마지막 로그인 저장 * diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberEntity.java index f0ec2048..6ada3332 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberEntity.java @@ -54,11 +54,6 @@ public class MemberEntity { @Column(name = "name", nullable = false, length = 100) private String name; - @Size(max = 255) - @NotNull - @Column(name = "temp_password", nullable = false) - private String tempPassword; - @Size(max = 255) @NotNull @Column(name = "password", nullable = false)