From 9cde37d5a6b77caedc3d74d43f9751f304695cd4 Mon Sep 17 00:00:00 2001 From: sohyundoh Date: Sun, 13 Oct 2024 15:29:08 +0900 Subject: [PATCH 1/4] =?UTF-8?q?#536=20[feat]=20cors=20dev=20url=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 --- module-api/src/main/java/com/mile/config/WebConfig.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/module-api/src/main/java/com/mile/config/WebConfig.java b/module-api/src/main/java/com/mile/config/WebConfig.java index 110e5685..6b4b2d1f 100644 --- a/module-api/src/main/java/com/mile/config/WebConfig.java +++ b/module-api/src/main/java/com/mile/config/WebConfig.java @@ -34,6 +34,9 @@ public class WebConfig implements WebMvcConfigurer { @Value("${client.local}") private String clientLocal; + @Value("${client.develop}") + private String clientDevelop; + @Value("${client.deploy}") private String clientDeploy; @@ -52,7 +55,7 @@ public class WebConfig implements WebMvcConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") - .allowedOrigins(clientLocal, clientDeploy, serverLocalSet1, serverLocalSet2, serverDevelop, serverDeploy) + .allowedOrigins(clientLocal, clientDeploy, serverLocalSet1, serverLocalSet2, serverDevelop, serverDeploy, clientDevelop) .allowedMethods("GET", "POST", "DELETE", "PUT", "PATCH", "OPTIONS") .allowCredentials(true) .maxAge(3000); From 762065df5d7bbcdacfc140e88cf63d4cf8e84cbc Mon Sep 17 00:00:00 2001 From: sohyundoh Date: Sat, 19 Oct 2024 11:53:16 +0900 Subject: [PATCH 2/4] =?UTF-8?q?#539=20[feat]=20=ED=86=A0=ED=81=B0=20?= =?UTF-8?q?=EB=A7=8C=EB=A3=8C=20=EA=B8=B0=EA=B0=84=20=EC=97=B0=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mile/common/auth/JwtTokenProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module-api/src/main/java/com/mile/common/auth/JwtTokenProvider.java b/module-api/src/main/java/com/mile/common/auth/JwtTokenProvider.java index db14b227..bc43a43b 100644 --- a/module-api/src/main/java/com/mile/common/auth/JwtTokenProvider.java +++ b/module-api/src/main/java/com/mile/common/auth/JwtTokenProvider.java @@ -35,8 +35,8 @@ public class JwtTokenProvider { private final ObjectMapper objectMapper; private static final String MEMBER_ID = "memberId"; private static final String JOINED_ROLE = "joinedRole"; - private static final Long ACCESS_TOKEN_EXPIRATION_TIME = 4 * 60 * 60 * 1000L; - private static final Long REFRESH_TOKEN_EXPIRATION_TIME = 60 * 60 * 24 * 1000L * 14; + private static final Long ACCESS_TOKEN_EXPIRATION_TIME = 48 * 60 * 60 * 1000L; + private static final Long REFRESH_TOKEN_EXPIRATION_TIME = 60 * 60 * 24 * 1000L * 30; @Value("${jwt.secret}") private String JWT_SECRET; From bc0fea5a03b5967681bf4387e07949a949775047 Mon Sep 17 00:00:00 2001 From: sohyundoh Date: Sat, 19 Oct 2024 11:55:59 +0900 Subject: [PATCH 3/4] =?UTF-8?q?#539=20[feat]=20PresignedUrl=20=EB=A7=8C?= =?UTF-8?q?=EB=A3=8C=EC=8B=9C=EA=B0=84=20=EC=97=B0=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module-external/src/main/java/com/mile/aws/utils/S3Service.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module-external/src/main/java/com/mile/aws/utils/S3Service.java b/module-external/src/main/java/com/mile/aws/utils/S3Service.java index e95e9663..0651b164 100644 --- a/module-external/src/main/java/com/mile/aws/utils/S3Service.java +++ b/module-external/src/main/java/com/mile/aws/utils/S3Service.java @@ -27,7 +27,7 @@ @Component public class S3Service { - private static final Long PRE_SIGNED_URL_EXPIRE_MINUTE = 1L; // 만료시간 2시간 + private static final Long PRE_SIGNED_URL_EXPIRE_MINUTE = 1000L * 60 * 60 * 2; // 만료시간 2시간 private final String bucketName; private final AwsConfig awsConfig; From 0f76e3c64dec115daba7ff8a86af6d5abe653dde Mon Sep 17 00:00:00 2001 From: sohyundoh Date: Sat, 19 Oct 2024 12:29:17 +0900 Subject: [PATCH 4/4] [fix] resolve conflicts for presigned url --- module-external/src/main/java/com/mile/aws/utils/S3Service.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module-external/src/main/java/com/mile/aws/utils/S3Service.java b/module-external/src/main/java/com/mile/aws/utils/S3Service.java index 0651b164..2101e55e 100644 --- a/module-external/src/main/java/com/mile/aws/utils/S3Service.java +++ b/module-external/src/main/java/com/mile/aws/utils/S3Service.java @@ -27,7 +27,7 @@ @Component public class S3Service { - private static final Long PRE_SIGNED_URL_EXPIRE_MINUTE = 1000L * 60 * 60 * 2; // 만료시간 2시간 + private static final Long PRE_SIGNED_URL_EXPIRE_MINUTE = 120L; // 만료시간 2시간 private final String bucketName; private final AwsConfig awsConfig;