From 1a01ad92a7855d9fd1a2363188dd6a0816e8d434 Mon Sep 17 00:00:00 2001 From: sunghyuki Date: Tue, 27 Feb 2024 00:14:39 +0900 Subject: [PATCH 01/11] chore: aws rds -> aws ec2 docker mysql --- .../collusic-be/src/main/resources/application-prod_db.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/collusic-be/src/main/resources/application-prod_db.yml b/server/collusic-be/src/main/resources/application-prod_db.yml index 6a473cd1..aae3d599 100644 --- a/server/collusic-be/src/main/resources/application-prod_db.yml +++ b/server/collusic-be/src/main/resources/application-prod_db.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: ENC(0UN3QoywTt1aetAUuH2wBmNQ81GfewuEflb08Q7KfEv+AZ82o3C65RruLLWFtOemgsLQ/+xmqmv/O45y/NrUTDv/hOYG+9lC6/4w/TQ6H778gFuUKVxYyh9/k6egITMTRkfcW/VDeJJfWh+KVMBSyAlmrFZRo7nFnsZCjuXRG9W1d2SkNqJJ9Ik044jnVPv2) + url: ENC(gnyYY2my5ZaFbvuc1ShsFN8N/6HyTS1sQ5UD+qe72zTg/xZCwIDJsttUCG56/ZZfmIRoFEy6c0gJgFE1FhmB9lYNO9nGF2bf8F75TJqccuicBum0mkyqp30RmK7tC4VoKmHw97c6MRAyx3Iv7LagNw==) username: ENC(mf26xrSdlsDGLOp2uRVtYQ==) password: ENC(B9/bakG1kuaw3NeCNI4dq6K/zkFiyO7uSWx6IR7jUQA=) @@ -14,5 +14,5 @@ spring: jdbc: batch_size: 10 hibernate: - ddl-auto: validate - generate-ddl: false \ No newline at end of file + ddl-auto: create + generate-ddl: true \ No newline at end of file From 2942026f03c3642cc4023dbc6e7f597f56b5ca6a Mon Sep 17 00:00:00 2001 From: sunghyuki Date: Tue, 27 Feb 2024 23:57:17 +0900 Subject: [PATCH 02/11] =?UTF-8?q?chore:=20docker-compose.yml=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/collusic-be/docker-compose.yml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/server/collusic-be/docker-compose.yml b/server/collusic-be/docker-compose.yml index 224b5fe2..8903b4be 100644 --- a/server/collusic-be/docker-compose.yml +++ b/server/collusic-be/docker-compose.yml @@ -9,6 +9,7 @@ services: app: restart: always + image: kjkun7631/collusic-api build: context: . dockerfile: Dockerfile-dev @@ -20,4 +21,22 @@ services: JASYPT_PASSWORD: ${JASYPT_PASSWORD} depends_on: - redis - command: gradle clean verify spring-boot:run -Dspring-boot.run.profiles=dev \ No newline at end of file + - mysql + command: gradle clean verify spring-boot:run -Dspring-boot.run.profiles=dev + + mysql: + restart: always + image: mysql:8.0 + container_name: mysql + ports: + - "3306:3306" + environment: + MYSQL_ROOT_PASSWORD: root + MYSQL_DATABASE: collusic-new + MYSQL_USER: collusic-new + MYSQL_PASSWORD: collusic-db-secret + volumes: + - mysql-data:/var/lib/mysql + +volumes: + mysql-data: \ No newline at end of file From a44e72a0ba4a9aa41ae7901f0baefd4f5ff2ddb5 Mon Sep 17 00:00:00 2001 From: sunghyuki Date: Wed, 28 Feb 2024 00:35:23 +0900 Subject: [PATCH 03/11] =?UTF-8?q?chore:=20application-dev=5Fdb.yml=20datas?= =?UTF-8?q?ource=20=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collusic-be/src/main/resources/application-dev_db.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/collusic-be/src/main/resources/application-dev_db.yml b/server/collusic-be/src/main/resources/application-dev_db.yml index 859a4f4c..db789f11 100644 --- a/server/collusic-be/src/main/resources/application-dev_db.yml +++ b/server/collusic-be/src/main/resources/application-dev_db.yml @@ -1,9 +1,9 @@ spring: datasource: driver-class-name: org.h2.Driver - url: jdbc:h2:mem:testdb;MODE=MYSQL - username: sa - password: + url: ENC(gnyYY2my5ZaFbvuc1ShsFN8N/6HyTS1sQ5UD+qe72zTg/xZCwIDJsttUCG56/ZZfmIRoFEy6c0gJgFE1FhmB9lYNO9nGF2bf8F75TJqccuicBum0mkyqp30RmK7tC4VoKmHw97c6MRAyx3Iv7LagNw==) + username: ENC(mf26xrSdlsDGLOp2uRVtYQ==) + password: ENC(B9/bakG1kuaw3NeCNI4dq6K/zkFiyO7uSWx6IR7jUQA=) jpa: show-sql: true From 37a86fef37c61e60df0922616b99de96478bb9bf Mon Sep 17 00:00:00 2001 From: sunghyuki Date: Thu, 14 Mar 2024 00:32:18 +0900 Subject: [PATCH 04/11] =?UTF-8?q?feat:=20AWS=20RDS=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20datasource=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20docker-co?= =?UTF-8?q?mpose=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/collusic-be/docker-compose.yml | 21 +------------------ .../main/resources/application-prod_db.yml | 6 +++--- .../collusicbe/config/JasyptTest.java | 1 - 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/server/collusic-be/docker-compose.yml b/server/collusic-be/docker-compose.yml index 8903b4be..224b5fe2 100644 --- a/server/collusic-be/docker-compose.yml +++ b/server/collusic-be/docker-compose.yml @@ -9,7 +9,6 @@ services: app: restart: always - image: kjkun7631/collusic-api build: context: . dockerfile: Dockerfile-dev @@ -21,22 +20,4 @@ services: JASYPT_PASSWORD: ${JASYPT_PASSWORD} depends_on: - redis - - mysql - command: gradle clean verify spring-boot:run -Dspring-boot.run.profiles=dev - - mysql: - restart: always - image: mysql:8.0 - container_name: mysql - ports: - - "3306:3306" - environment: - MYSQL_ROOT_PASSWORD: root - MYSQL_DATABASE: collusic-new - MYSQL_USER: collusic-new - MYSQL_PASSWORD: collusic-db-secret - volumes: - - mysql-data:/var/lib/mysql - -volumes: - mysql-data: \ No newline at end of file + command: gradle clean verify spring-boot:run -Dspring-boot.run.profiles=dev \ No newline at end of file diff --git a/server/collusic-be/src/main/resources/application-prod_db.yml b/server/collusic-be/src/main/resources/application-prod_db.yml index aae3d599..6a473cd1 100644 --- a/server/collusic-be/src/main/resources/application-prod_db.yml +++ b/server/collusic-be/src/main/resources/application-prod_db.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: ENC(gnyYY2my5ZaFbvuc1ShsFN8N/6HyTS1sQ5UD+qe72zTg/xZCwIDJsttUCG56/ZZfmIRoFEy6c0gJgFE1FhmB9lYNO9nGF2bf8F75TJqccuicBum0mkyqp30RmK7tC4VoKmHw97c6MRAyx3Iv7LagNw==) + url: ENC(0UN3QoywTt1aetAUuH2wBmNQ81GfewuEflb08Q7KfEv+AZ82o3C65RruLLWFtOemgsLQ/+xmqmv/O45y/NrUTDv/hOYG+9lC6/4w/TQ6H778gFuUKVxYyh9/k6egITMTRkfcW/VDeJJfWh+KVMBSyAlmrFZRo7nFnsZCjuXRG9W1d2SkNqJJ9Ik044jnVPv2) username: ENC(mf26xrSdlsDGLOp2uRVtYQ==) password: ENC(B9/bakG1kuaw3NeCNI4dq6K/zkFiyO7uSWx6IR7jUQA=) @@ -14,5 +14,5 @@ spring: jdbc: batch_size: 10 hibernate: - ddl-auto: create - generate-ddl: true \ No newline at end of file + ddl-auto: validate + generate-ddl: false \ No newline at end of file diff --git a/server/collusic-be/src/test/java/com/collusic/collusicbe/config/JasyptTest.java b/server/collusic-be/src/test/java/com/collusic/collusicbe/config/JasyptTest.java index 50963d23..b9ee83bc 100644 --- a/server/collusic-be/src/test/java/com/collusic/collusicbe/config/JasyptTest.java +++ b/server/collusic-be/src/test/java/com/collusic/collusicbe/config/JasyptTest.java @@ -39,7 +39,6 @@ public void setUp() { public void decryptTest() { String decryptedText = jasyptStringEncryptor.decrypt(defaultEncryptedText); - assertThat(decryptedText).isEqualTo(defaultRawText); } From b8a449785b556c35003db7f9509fa3f8ca502965 Mon Sep 17 00:00:00 2001 From: sunghyuki Date: Tue, 19 Mar 2024 20:34:50 +0900 Subject: [PATCH 05/11] =?UTF-8?q?fix:=20track=20file=5Furl=20TRACK=5FDIR(?= =?UTF-8?q?=EC=83=81=EC=88=98)=20=EC=95=9E=20prefix=EB=A1=9C=20'/'?= =?UTF-8?q?=EA=B0=80=20=EB=B9=A0=EC=A0=B8=EC=9E=88=EC=96=B4=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=EA=B0=80=20=EC=9E=98=EB=AA=BB=20=EC=A0=80=EC=9E=A5?= =?UTF-8?q?=EB=90=98=EB=8A=94=20=EC=9D=B4=EC=8A=88=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collusicbe/service/S3Service.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/server/collusic-be/src/main/java/com/collusic/collusicbe/service/S3Service.java b/server/collusic-be/src/main/java/com/collusic/collusicbe/service/S3Service.java index 5ed3f652..0be07d72 100644 --- a/server/collusic-be/src/main/java/com/collusic/collusicbe/service/S3Service.java +++ b/server/collusic-be/src/main/java/com/collusic/collusicbe/service/S3Service.java @@ -4,6 +4,11 @@ import com.amazonaws.services.s3.model.CannedAccessControlList; import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.PutObjectRequest; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.time.LocalDateTime; +import java.util.Optional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -11,12 +16,6 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.multipart.MultipartFile; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.time.LocalDateTime; -import java.util.Optional; - @Slf4j @RequiredArgsConstructor @Service @@ -45,7 +44,7 @@ public String upload(String nickname, @ModelAttribute MultipartFile multipartFil objectMetadata.setContentLength(multipartFile.getSize()); s3Client.putObject(new PutObjectRequest(bucket, path.toString(), multipartFile.getInputStream(), objectMetadata) - .withCannedAcl(CannedAccessControlList.PublicRead)); + .withCannedAcl(CannedAccessControlList.PublicRead)); return cloudFrontDomain + path; } @@ -98,7 +97,8 @@ public String getPath(String type) { public String uploadAudioFile(MultipartFile audioFile) throws IOException { StringBuilder path = new StringBuilder(); - path.append(TRACK_DIR) + path.append("/") + .append(TRACK_DIR) .append("/") .append(LocalDateTime.now()) .append("-") @@ -109,8 +109,9 @@ public String uploadAudioFile(MultipartFile audioFile) throws IOException { objectMetadata.setContentLength(audioFile.getSize()); s3Client.putObject(new PutObjectRequest(bucket, path.toString(), audioFile.getInputStream(), objectMetadata) - .withCannedAcl(CannedAccessControlList.PublicRead)); + .withCannedAcl(CannedAccessControlList.PublicRead)); return cloudFrontDomain + path; } + } From efc8147726c95b7682e101badf5dbd995915191e Mon Sep 17 00:00:00 2001 From: sunghyuki Date: Tue, 19 Mar 2024 20:36:58 +0900 Subject: [PATCH 06/11] =?UTF-8?q?fix:=20rds=20url=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/collusic-be/.gitignore | 3 ++- server/collusic-be/src/main/resources/application-prod_db.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/collusic-be/.gitignore b/server/collusic-be/.gitignore index 4791b467..3a02b827 100644 --- a/server/collusic-be/.gitignore +++ b/server/collusic-be/.gitignore @@ -59,4 +59,5 @@ gradle-app.setting ### Gradle Patch ### # Java heap dump -*.hprof \ No newline at end of file +*.hprof +**/out \ No newline at end of file diff --git a/server/collusic-be/src/main/resources/application-prod_db.yml b/server/collusic-be/src/main/resources/application-prod_db.yml index 6a473cd1..856dfa29 100644 --- a/server/collusic-be/src/main/resources/application-prod_db.yml +++ b/server/collusic-be/src/main/resources/application-prod_db.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: ENC(0UN3QoywTt1aetAUuH2wBmNQ81GfewuEflb08Q7KfEv+AZ82o3C65RruLLWFtOemgsLQ/+xmqmv/O45y/NrUTDv/hOYG+9lC6/4w/TQ6H778gFuUKVxYyh9/k6egITMTRkfcW/VDeJJfWh+KVMBSyAlmrFZRo7nFnsZCjuXRG9W1d2SkNqJJ9Ik044jnVPv2) + url: ENC(UGndU3lx2AdAtuUBkeDqoZNFWNVtiLKgCb4VNNobbK9khWEsKypyQgRfyc5gNbyWjCPYowzsLH3b+S4W5b8YR4AvNwmOkhFihe3+gXI4GgWHdjopECQldkFLaJBRR9HFl2Ir6fQydv6ENNImswxwCaBuAYBQJK9AyW1/l0PXE3ETuM+MR9fVj2u8lZdeYntG) username: ENC(mf26xrSdlsDGLOp2uRVtYQ==) password: ENC(B9/bakG1kuaw3NeCNI4dq6K/zkFiyO7uSWx6IR7jUQA=) From c35114fa0dfb174d69275c99ecb0949540bb56c4 Mon Sep 17 00:00:00 2001 From: sunghyuki Date: Tue, 19 Mar 2024 21:06:32 +0900 Subject: [PATCH 07/11] =?UTF-8?q?fix:=20track=20file=5Furl=20TRACK=5FDIR(?= =?UTF-8?q?=EC=83=81=EC=88=98)=20=EC=95=9E=20prefix=EB=A1=9C=20=EB=84=A3?= =?UTF-8?q?=EC=9D=80=20'/'=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/collusic/collusicbe/service/S3Service.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/collusic-be/src/main/java/com/collusic/collusicbe/service/S3Service.java b/server/collusic-be/src/main/java/com/collusic/collusicbe/service/S3Service.java index 0be07d72..15057b0a 100644 --- a/server/collusic-be/src/main/java/com/collusic/collusicbe/service/S3Service.java +++ b/server/collusic-be/src/main/java/com/collusic/collusicbe/service/S3Service.java @@ -97,8 +97,7 @@ public String getPath(String type) { public String uploadAudioFile(MultipartFile audioFile) throws IOException { StringBuilder path = new StringBuilder(); - path.append("/") - .append(TRACK_DIR) + path.append(TRACK_DIR) .append("/") .append(LocalDateTime.now()) .append("-") From 725ff8f424bf531a5e6ae048a160b41e52b6f566 Mon Sep 17 00:00:00 2001 From: sunghyuki Date: Tue, 19 Mar 2024 21:24:18 +0900 Subject: [PATCH 08/11] =?UTF-8?q?fix:=20cloudFrontDomain=EA=B3=BC=20track?= =?UTF-8?q?=20s3=20path=20=EC=82=AC=EC=9D=B4=EC=97=90=20"/"=EA=B0=80=20?= =?UTF-8?q?=EC=97=86=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/collusic/collusicbe/service/S3Service.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/collusic-be/src/main/java/com/collusic/collusicbe/service/S3Service.java b/server/collusic-be/src/main/java/com/collusic/collusicbe/service/S3Service.java index 15057b0a..7b134729 100644 --- a/server/collusic-be/src/main/java/com/collusic/collusicbe/service/S3Service.java +++ b/server/collusic-be/src/main/java/com/collusic/collusicbe/service/S3Service.java @@ -110,7 +110,7 @@ public String uploadAudioFile(MultipartFile audioFile) throws IOException { s3Client.putObject(new PutObjectRequest(bucket, path.toString(), audioFile.getInputStream(), objectMetadata) .withCannedAcl(CannedAccessControlList.PublicRead)); - return cloudFrontDomain + path; + return cloudFrontDomain + "/" + path; } } From ed8a4f7a4191b841d9e161c09209f334c3162dd5 Mon Sep 17 00:00:00 2001 From: sunghyuki Date: Tue, 19 Mar 2024 21:55:15 +0900 Subject: [PATCH 09/11] =?UTF-8?q?test:=20=EC=95=A1=EC=84=B8=EC=8A=A4=20?= =?UTF-8?q?=ED=86=A0=ED=81=B0=20=EB=B0=8F=20=EB=A6=AC=ED=94=84=EB=A0=88?= =?UTF-8?q?=EC=8B=9C=20=ED=86=A0=ED=81=B0=20=EB=A7=8C=EB=A3=8C=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collusicbe/global/util/JWTUtil.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/JWTUtil.java b/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/JWTUtil.java index 9b740cb5..86bf81bf 100644 --- a/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/JWTUtil.java +++ b/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/JWTUtil.java @@ -3,20 +3,27 @@ import com.collusic.collusicbe.global.exception.jwt.ExpiredTokenException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import io.jsonwebtoken.*; -import lombok.extern.slf4j.Slf4j; - +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.ExpiredJwtException; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.MalformedJwtException; +import io.jsonwebtoken.SignatureAlgorithm; +import io.jsonwebtoken.SignatureException; +import io.jsonwebtoken.UnsupportedJwtException; import java.time.Instant; import java.util.Base64; import java.util.HashMap; import java.util.Map; +import lombok.extern.slf4j.Slf4j; @Slf4j public class JWTUtil { - public static final int REFRESH_TIME = 60 * 60 * 24 * 7; + // public static final int REFRESH_TIME = 60 * 60 * 24 * 7; + public static final int REFRESH_TIME = 15; public static final String KEY = "collusic-new"; - private static final int ACCESS_TIME = 60 * 60; +// private static final int ACCESS_TIME = 60 * 60; +private static final int ACCESS_TIME = 15; public static String createAccessToken(String email, String role) { return Jwts.builder() @@ -90,4 +97,5 @@ private static Map jwtHeaders() { headers.put("alg", SignatureAlgorithm.HS256); return headers; } + } \ No newline at end of file From 4418a44e83724d5c9127efe3b9d3f966fbc362e3 Mon Sep 17 00:00:00 2001 From: sunghyuki Date: Tue, 19 Mar 2024 22:12:53 +0900 Subject: [PATCH 10/11] =?UTF-8?q?fix:=20=EB=A6=AC=ED=94=84=EB=A0=88?= =?UTF-8?q?=EC=8B=9C=20=ED=86=A0=ED=81=B0=20=EB=A7=8C=EB=A3=8C=20=EC=8B=9C?= =?UTF-8?q?=20=EB=A6=AC=ED=94=84=EB=A0=88=EC=8B=9C=20=ED=86=A0=ED=81=B0=20?= =?UTF-8?q?=EB=8B=B4=EC=9D=80=20=EC=BF=A0=ED=82=A4=20Expire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collusicbe/global/auth/JWTAuthenticationFilter.java | 1 + .../java/com/collusic/collusicbe/global/util/JWTUtil.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/collusic-be/src/main/java/com/collusic/collusicbe/global/auth/JWTAuthenticationFilter.java b/server/collusic-be/src/main/java/com/collusic/collusicbe/global/auth/JWTAuthenticationFilter.java index 2243e0c6..65e04181 100644 --- a/server/collusic-be/src/main/java/com/collusic/collusicbe/global/auth/JWTAuthenticationFilter.java +++ b/server/collusic-be/src/main/java/com/collusic/collusicbe/global/auth/JWTAuthenticationFilter.java @@ -80,6 +80,7 @@ private void authenticateWithRefreshToken(HttpServletRequest request, HttpServle chain.doFilter(request, response); } catch (ExpiredTokenException | EntityNotFoundException | AbnormalAccessException e) { tokenService.deleteRefreshToken(refreshToken); + CookieUtils.expireCookie(response, "refreshToken"); throw e; } } diff --git a/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/JWTUtil.java b/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/JWTUtil.java index 86bf81bf..cd8bdc2f 100644 --- a/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/JWTUtil.java +++ b/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/JWTUtil.java @@ -22,8 +22,8 @@ public class JWTUtil { // public static final int REFRESH_TIME = 60 * 60 * 24 * 7; public static final int REFRESH_TIME = 15; public static final String KEY = "collusic-new"; -// private static final int ACCESS_TIME = 60 * 60; -private static final int ACCESS_TIME = 15; + // private static final int ACCESS_TIME = 60 * 60; + private static final int ACCESS_TIME = 15; public static String createAccessToken(String email, String role) { return Jwts.builder() From d05b883da34a0e3979e0d2addd7cdc8292d9b562 Mon Sep 17 00:00:00 2001 From: sunghyuki Date: Tue, 19 Mar 2024 22:23:07 +0900 Subject: [PATCH 11/11] =?UTF-8?q?fix:=20=EB=A6=AC=ED=94=84=EB=A0=88?= =?UTF-8?q?=EC=8B=9C=20=ED=86=A0=ED=81=B0=20=EB=B0=8F=20=EC=95=A1=EC=84=B8?= =?UTF-8?q?=EC=8A=A4=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=EC=9E=AC=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/collusic/collusicbe/global/util/JWTUtil.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/JWTUtil.java b/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/JWTUtil.java index cd8bdc2f..008561a8 100644 --- a/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/JWTUtil.java +++ b/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/JWTUtil.java @@ -19,11 +19,9 @@ @Slf4j public class JWTUtil { - // public static final int REFRESH_TIME = 60 * 60 * 24 * 7; - public static final int REFRESH_TIME = 15; + public static final int REFRESH_TIME = 60 * 60 * 24 * 7; public static final String KEY = "collusic-new"; - // private static final int ACCESS_TIME = 60 * 60; - private static final int ACCESS_TIME = 15; + private static final int ACCESS_TIME = 60 * 60; public static String createAccessToken(String email, String role) { return Jwts.builder()