Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Create application-secret.yml
run: echo "${{ secrets.APPLICATION_SECRET }}" > src/main/resources/application-secret.yml
- name: Set secret files
uses: actions/checkout@v4
with:
token: ${{ secrets.SUBMODULE_ACCESS_TOKEN }}
submodules: true

- name: Create application-prod.yml
run: echo "${{ secrets.APPLICATION_PROD }}" > src/main/resources/application-prod.yml

- name: Set up JDK 17
uses: actions/setup-java@v4
with:
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "src/main/resources/secret"]
path = src/main/resources/secret
url = https://github.com/solid-connection/solid-connect-secret
4 changes: 4 additions & 0 deletions src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ spring:
config:
activate:
on-profile: local
import: classpath:/secret/application-secret.yml

jpa:
hibernate:
Expand Down Expand Up @@ -31,3 +32,6 @@ spring:

kakao:
redirect_uri: "http://localhost:8080/auth/kakao"

university:
term: 2024-2-a
22 changes: 21 additions & 1 deletion src/main/resources/application-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,25 @@ spring:
host: localhost
port: 6379

# 빈 생성 성공만을 위한 가짜 데이터
kakao:
redirect_uri: "http://localhost:8080/auth/kakao"
redirect_uri: kakao-redirect-uri-for-test
client_id: kakao-client-id-for-test-012345678910

jwt:
secret: jwt-secret-key-for-test-012345678910

cloud:
aws:
credentials:
access-key: access-key-for-test-012345678910
secret-key: secret-key-for-test-012345678910
region:
static: ap-northeast-2
stack:
auto: false
s3:
bucket: s3-bucket-for-test-012345678910

university:
term: 2099-1
25 changes: 9 additions & 16 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,9 @@
spring:
profiles:
group:
prod:
- prod
- secret
local:
- local
- secret
test:
- test
- secret

tomcat:
threads:
min-spare: 20 # default 10

servlet:
multipart:
max-file-size: 10MB
Expand All @@ -36,10 +25,6 @@ spring:
init:
mode: never

jwt:
secret:
aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee

kakao:
token_url: "https://kauth.kakao.com/oauth/token"
user_info_url: "https://kapi.kakao.com/v2/user/me"
Expand All @@ -48,3 +33,11 @@ view:
count:
scheduling:
delay: 3000

---

spring:
config:
activate:
on-profile: prod
import: classpath:/secret/application-prod.yml
1 change: 1 addition & 0 deletions src/main/resources/secret
Submodule secret added at fd9f77