From faf2d12872e6a15b8b3fad9f5f283a71eb57b9c6 Mon Sep 17 00:00:00 2001 From: CSE-Shaco Date: Fri, 9 Jan 2026 06:40:48 +0900 Subject: [PATCH] Refactor: Update JWT token handling and adjust S3 configuration --- .github/workflows/ci.yml | 2 +- .../global/config/jwt/TokenProvider.java | 3 ++- .../inha/gdgoc/global/config/s3/S3Config.java | 27 +++++++++---------- src/main/resources/application-local.yml | 4 +-- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbd455a..66d4a3d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: temurin - java-version: 17 + java-version: 21 - uses: gradle/actions/setup-gradle@v3 if: ${{ !env.ACT }} diff --git a/src/main/java/inha/gdgoc/global/config/jwt/TokenProvider.java b/src/main/java/inha/gdgoc/global/config/jwt/TokenProvider.java index 124a9e8..999ef79 100644 --- a/src/main/java/inha/gdgoc/global/config/jwt/TokenProvider.java +++ b/src/main/java/inha/gdgoc/global/config/jwt/TokenProvider.java @@ -106,6 +106,7 @@ private String makeToken(Date expiry, User user, LoginType loginType) { private Claims getClaims(String token) { return Jwts.parser() .setSigningKey(Base64.getEncoder().encodeToString(jwtProperties.getSecretKey().getBytes())) + .build() .parseClaimsJws(token) .getBody(); } @@ -124,4 +125,4 @@ public CustomUserDetails(Long userId, String username, String password, Collecti this.team = team; } } -} \ No newline at end of file +} diff --git a/src/main/java/inha/gdgoc/global/config/s3/S3Config.java b/src/main/java/inha/gdgoc/global/config/s3/S3Config.java index fef0a06..14d27a0 100644 --- a/src/main/java/inha/gdgoc/global/config/s3/S3Config.java +++ b/src/main/java/inha/gdgoc/global/config/s3/S3Config.java @@ -11,21 +11,18 @@ @Configuration public class S3Config { - @Bean - public Region awsRegion(@Value("${cloud.aws.region.static}") String region) { - return Region.of(region); - } + @Bean + public Region awsRegion(@Value("${spring.cloud.aws.region.static}") String region) { + return Region.of(region); + } - @Bean - public AwsCredentialsProvider awsCredentialsProvider() { - return DefaultCredentialsProvider.create(); - } + @Bean + public AwsCredentialsProvider awsCredentialsProvider() { + return DefaultCredentialsProvider.create(); + } - @Bean - public S3Client s3Client(Region region, AwsCredentialsProvider provider) { - return S3Client.builder() - .region(region) - .credentialsProvider(provider) - .build(); - } + @Bean + public S3Client s3Client(Region region, AwsCredentialsProvider provider) { + return S3Client.builder().region(region).credentialsProvider(provider).build(); + } } diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index d43d8f1..319903a 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -10,8 +10,8 @@ spring: jackson: time-zone: Asia/Seoul datasource: - url: jdbc:postgresql://localhost:5432/gdgoc - username: postgres + url: "jdbc:postgresql://localhost:5432/gdgoc" + username: "postgres" password: servlet: multipart: