Merge pull request #32 from inhooo00/feature/gradle

Refactor: yml 파일 수정
AJD-Archive · Jul 18, 2024 · 1d71f44 · 1d71f44
2 parents d82c6c2 + 1033c32
commit 1d71f44
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/main/java/shop/kkeujeok/kkeujeokbackend/global/oauth/GoogleAuthService.java b/src/main/java/shop/kkeujeok/kkeujeokbackend/global/oauth/GoogleAuthService.java
@@ -22,12 +22,11 @@
 public class GoogleAuthService implements AuthService {
 
     private final String GOOGLE_TOKEN_URL = "https://oauth2.googleapis.com/token";
-    @Value("${client_id}")
+    @Value("${google.client.id}")
     private String google_client_id;
-    @Value("${client_secret}")
+    @Value("${google.client.secret}")
     private String google_client_secret;
-
-    @Value("${GOOGLE_REDIRECT_URI}")
+    @Value("${google.redirect.uri}")
     private String GOOGLE_REDIRECT_URI;
     private static final String JWT_DELIMITER = "\\.";
 

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -34,11 +34,14 @@ token:
       access : ${token.expire.time.access}
       refresh : ${token.expire.time.refresh}
 
-GOOGLE_REDIRECT_URI: ${GOOGLE_REDIRECT_URI}
-client_id: ${GOOGLE_CLIENT_ID}
-client_secret: ${GOOGLE_CLIENT_SECRET}
+google:
+  client:
+    id: ${google.client.id}
+    secret: ${google.client.secret}
+  redirect:
+    uri: ${google.redirect.uri}
 
 oauth:
   kakao:
-    rest-api-key: ${KAKAO_REST_API_KEY}
-    redirect-url: ${KAKAO_REDIRECT_URL}
+    rest-api-key: ${oauth.kakao.rest-api-key}
+    redirect-url: ${oauth.kakao.redirect-url}