Skip to content

Commit 62d0f0c

Browse files
committed
fix: 중복 문제 수정
1 parent ef66a27 commit 62d0f0c

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

.github/workflows/gradle.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,19 +103,13 @@ jobs:
103103
Environment=JWT_ACCESS_TOKEN_EXPIRATION=600000
104104
Environment=JWT_REFRESH_TOKEN_EXPIRATION=604800000
105105
Environment=KAKAO_API_KEY=${{ secrets.KAKAO_API_KEY }}
106-
Environment=KAKAO_CLIENT_ID=${{ secrets.KAKAO_CLIENT_ID }}
107-
Environment=KAKAO_CLIENT_SECRET=${{ secrets.KAKAO_CLIENT_SECRET }}
108-
Environment=KAKAO_REDIRECT_URI=https://locationcheckgo.netlify.app/auth/callback/kakao
109-
Environment=GOOGLE_CLIENT_ID=${{ secrets.GOOGLE_CLIENT_ID }}
110-
Environment=GOOGLE_CLIENT_SECRET=${{ secrets.GOOGLE_CLIENT_SECRET }}
111-
Environment=GOOGLE_REDIRECT_URI=https://locationcheckgo.netlify.app/auth/callback/google
112106
Environment=SPRING_MAIL_HOST=${{ secrets.MAIL_HOST }}
113107
Environment=SPRING_MAIL_PORT=${{ secrets.MAIL_PORT }}
114108
Environment=SPRING_MAIL_USERNAME=${{ secrets.MAIL_USERNAME }}
115109
Environment=SPRING_MAIL_PASSWORD=${{ secrets.MAIL_PASSWORD }}
116110
Environment=SERVER_PORT=8443
117111
Environment=SERVER_ADDRESS=0.0.0.0
118-
Environment=SPRING_PROFILES_ACTIVE=secret
112+
Environment=SPRING_PROFILES_ACTIVE=default
119113
Environment=LOGGING_LEVEL_ROOT=INFO
120114
Environment=LOGGING_LEVEL_COM_SWYP=DEBUG
121115
Environment=LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_SECURITY=DEBUG
@@ -136,7 +130,8 @@ jobs:
136130
-Dlogging.pattern.console='%%d{yyyy-MM-dd HH:mm:ss} [%%p] - %%m%%n' \
137131
-Dlogging.pattern.file='%%d{yyyy-MM-dd HH:mm:ss} [%%p] - %%m%%n' \
138132
-jar Location-based-target-authentication-0.0.1-SNAPSHOT.jar \
139-
--spring.profiles.active=${SPRING_PROFILES_ACTIVE} \
133+
--spring.config.import=optional:application-local.properties,application-secret.properties
134+
--spring.profiles.active=default \
140135
--server.port=${SERVER_PORT} \
141136
--server.address=${SERVER_ADDRESS} \
142137
--server.ssl.enabled=false \

Location-based-target-authentication/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ out/
3838

3939
# API Keys
4040
src/main/resources/application-local.properties
41+
src/main/resources/application-secret.properties
4142

4243
.DS_Store
4344
.idea/

Location-based-target-authentication/src/main/resources/application-secret.properties

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ kakao.redirect.url.local=http://localhost:8080/auth/callback/kakao
88
google.redirect.url=https://locationcheckgo.netlify.app/auth/callback/google
99
google.redirect.url.local=http://localhost:8443/api/auth/google/callback
1010

11-
# Google OAuth2
12-
google.client.id=1059210361342-hd9ptunp002mrc9or3f7e8m1pnmaq817.apps.googleusercontent.com
13-
google.client.secret=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
14-
google.scope=profile,email
15-
1611
# Spring Security OAuth2
1712
spring.security.oauth2.client.registration.google.client-id=1059210361342-hd9ptunp002mrc9or3f7e8m1pnmaq817.apps.googleusercontent.com
1813
spring.security.oauth2.client.registration.google.client-secret=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

0 commit comments

Comments
 (0)