Merge pull request '임시 패워스드 컬럼 삭제' (#56) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/56
This commit is contained in:
@@ -276,8 +276,8 @@ public class GlobalExceptionHandler {
|
|||||||
String codeName = "";
|
String codeName = "";
|
||||||
|
|
||||||
switch (e.getField()) {
|
switch (e.getField()) {
|
||||||
case USER_ID -> {
|
case EMPLOYEE_NO -> {
|
||||||
codeName = "DUPLICATE_DATA";
|
codeName = "DUPLICATE_EMPLOYEEID";
|
||||||
}
|
}
|
||||||
default -> {
|
default -> {
|
||||||
codeName = "DUPLICATE_DATA";
|
codeName = "DUPLICATE_DATA";
|
||||||
|
|||||||
@@ -33,14 +33,4 @@ public class AuthService {
|
|||||||
public String getUserStatus(SignInRequest request) {
|
public String getUserStatus(SignInRequest request) {
|
||||||
return membersCoreService.getUserStatus(request);
|
return membersCoreService.getUserStatus(request);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 임시 패스워드 비교
|
|
||||||
*
|
|
||||||
* @param request
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
public boolean isTempPasswordValid(SignInRequest request) {
|
|
||||||
return membersCoreService.isTempPasswordValid(request);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -147,21 +147,6 @@ public class MembersCoreService {
|
|||||||
return memberEntity.getStatus();
|
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());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 최초 로그인 저장 마지막 로그인 저장
|
* 최초 로그인 저장 마지막 로그인 저장
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -15,8 +15,14 @@ import lombok.NoArgsConstructor;
|
|||||||
@Table(name = "tb_audit_log")
|
@Table(name = "tb_audit_log")
|
||||||
public class AuditLogEntity extends CommonCreateEntity {
|
public class AuditLogEntity extends CommonCreateEntity {
|
||||||
@Id
|
@Id
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
@GeneratedValue(
|
||||||
@Column(name = "audit_log_uid")
|
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;
|
private Long id;
|
||||||
|
|
||||||
@Column(name = "user_uid")
|
@Column(name = "user_uid")
|
||||||
|
|||||||
@@ -16,8 +16,14 @@ import lombok.NoArgsConstructor;
|
|||||||
@Table(name = "tb_error_log")
|
@Table(name = "tb_error_log")
|
||||||
public class ErrorLogEntity extends CommonCreateEntity {
|
public class ErrorLogEntity extends CommonCreateEntity {
|
||||||
@Id
|
@Id
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
@GeneratedValue(
|
||||||
@Column(name = "error_log_uid")
|
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;
|
private Long id;
|
||||||
|
|
||||||
@Column(name = "request_id")
|
@Column(name = "request_id")
|
||||||
|
|||||||
@@ -54,11 +54,6 @@ public class MemberEntity {
|
|||||||
@Column(name = "name", nullable = false, length = 100)
|
@Column(name = "name", nullable = false, length = 100)
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
@Size(max = 255)
|
|
||||||
@NotNull
|
|
||||||
@Column(name = "temp_password", nullable = false)
|
|
||||||
private String tempPassword;
|
|
||||||
|
|
||||||
@Size(max = 255)
|
@Size(max = 255)
|
||||||
@NotNull
|
@NotNull
|
||||||
@Column(name = "password", nullable = false)
|
@Column(name = "password", nullable = false)
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ spring:
|
|||||||
format_sql: true # ⚠️ 선택 - SQL 포맷팅 (가독성)
|
format_sql: true # ⚠️ 선택 - SQL 포맷팅 (가독성)
|
||||||
|
|
||||||
datasource:
|
datasource:
|
||||||
url: jdbc:postgresql://192.168.2.127:15432/kamco_cds
|
#url: jdbc:postgresql://192.168.2.127:15432/kamco_cds
|
||||||
#url: jdbc:postgresql://localhost:15432/kamco_cds
|
url: jdbc:postgresql://localhost:15432/kamco_cds
|
||||||
username: kamco_cds
|
username: kamco_cds
|
||||||
password: kamco_cds_Q!W@E#R$
|
password: kamco_cds_Q!W@E#R$
|
||||||
hikari:
|
hikari:
|
||||||
|
|||||||
Reference in New Issue
Block a user