From dede5efab8e2c9116389a697d786414dae61047c Mon Sep 17 00:00:00 2001 From: juno-junho Date: Fri, 1 Dec 2023 18:02:31 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=9C=84?= =?UTF-8?q?=ED=95=9C=20=ED=86=A0=ED=81=B0=20=EB=A7=8C=EB=A3=8C=20=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=ED=83=88=ED=87=B4?= =?UTF-8?q?=20=ED=9B=84=20=EA=B0=80=EC=9E=85=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/spaceclub/user/domain/User.java | 6 +++--- src/main/resources/application-develop.yml | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/spaceclub/user/domain/User.java b/src/main/java/com/spaceclub/user/domain/User.java index 8aa55705..045ea288 100644 --- a/src/main/java/com/spaceclub/user/domain/User.java +++ b/src/main/java/com/spaceclub/user/domain/User.java @@ -47,7 +47,7 @@ public class User { @Enumerated(STRING) private Status status; - @Column(nullable = false, unique = true) + @Column(unique = true) private String oauthUserName; @Enumerated(STRING) @@ -234,7 +234,7 @@ public User changeStatusToRegistered() { } public User changeStatusToDeleted() { - if (!this.status.equals(INACTIVE)){ + if (!this.status.equals(INACTIVE)) { throw new IllegalStateException(USER_CANNOT_WITHDRAW.toString()); } @@ -242,7 +242,7 @@ public User changeStatusToDeleted() { this.id, this.requiredInfo, DELETED, - this.oauthUserName, + null, this.provider, this.email, this.refreshToken, diff --git a/src/main/resources/application-develop.yml b/src/main/resources/application-develop.yml index ff0a3d87..90f1a49b 100644 --- a/src/main/resources/application-develop.yml +++ b/src/main/resources/application-develop.yml @@ -37,8 +37,9 @@ jwt: header: access-token issuer: space-club client-secret: ENC(2qr8v6d7x0P13dZVjQx4XToeeUHUh7tW) - expiry-seconds: 36000000 # 1시간 - refresh-expiry-seconds: 1209600 # 2주 +# expiry-seconds: 36000000 # 1시간 + expiry-seconds: 60000 # 2주 + refresh-expiry-seconds: 90000 # 2주 web: allowed-origins: