diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ac375db23..5b278f8ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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: diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..a7033a673 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src/main/resources/secret"] + path = src/main/resources/secret + url = https://github.com/solid-connection/solid-connect-secret diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index f0baec690..f3d802d74 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -2,6 +2,7 @@ spring: config: activate: on-profile: local + import: classpath:/secret/application-secret.yml jpa: hibernate: @@ -31,3 +32,6 @@ spring: kakao: redirect_uri: "http://localhost:8080/auth/kakao" + +university: + term: 2024-2-a diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index bf25bb62f..8a318555c 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -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 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 22cc4368e..88c17c689 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -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 @@ -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" @@ -48,3 +33,11 @@ view: count: scheduling: delay: 3000 + +--- + +spring: + config: + activate: + on-profile: prod + import: classpath:/secret/application-prod.yml \ No newline at end of file diff --git a/src/main/resources/secret b/src/main/resources/secret new file mode 160000 index 000000000..fd9f77d08 --- /dev/null +++ b/src/main/resources/secret @@ -0,0 +1 @@ +Subproject commit fd9f77d088b63d48d227ae6763ac69b1c8491180