diff --git a/.github/workflows/showpot-dev-cd.yml b/.github/workflows/showpot-dev-cd.yml index d661dc7d..32dbe9da 100644 --- a/.github/workflows/showpot-dev-cd.yml +++ b/.github/workflows/showpot-dev-cd.yml @@ -26,8 +26,9 @@ jobs: - name: Copy Secrets uses: microsoft/variable-substitution@v1 with: - files: ./app/src/main/resources/application-cloud-dev.yml + files: './app/src/main/resources/application-dev.yml, ./app/src/main/resources/application-cloud-dev.yml' env: + token.secret-key: ${{ secrets.TOKEN_SECRET_KEY }} cloud.aws.credentials.accessKey: ${{ secrets.AWS_ACCESS_KEY }} cloud.aws.credentials.secretKey: ${{ secrets.AWS_SECRET_KEY }} cloud.aws.region: ${{ secrets.AWS_REGION }} diff --git a/.github/workflows/showpot-dev-ci.yml b/.github/workflows/showpot-dev-ci.yml index 1e370007..f5209822 100644 --- a/.github/workflows/showpot-dev-ci.yml +++ b/.github/workflows/showpot-dev-ci.yml @@ -26,8 +26,9 @@ jobs: - name: Copy Secrets uses: microsoft/variable-substitution@v1 with: - files: ./app/src/main/resources/application-cloud-dev.yml + files: './app/src/main/resources/application-dev.yml, ./app/src/main/resources/application-cloud-dev.yml' env: + token.secret-key: ${{ secrets.TOKEN_SECRET_KEY }} cloud.aws.credentials.accessKey: ${{ secrets.AWS_ACCESS_KEY }} cloud.aws.credentials.secretKey: ${{ secrets.AWS_SECRET_KEY }} cloud.aws.region: ${{ secrets.AWS_REGION }} diff --git a/app/src/main/resources/application-dev.yml b/app/src/main/resources/application-dev.yml index ba9a3dbf..f1c25f82 100644 --- a/app/src/main/resources/application-dev.yml +++ b/app/src/main/resources/application-dev.yml @@ -20,6 +20,6 @@ spring: port: 6379 token: - secret-key: ahRhwlglftmrkwkfehlaussksmsdjraksrmadmfqjfrjtdlrhdkwnwlflsmswlqdptjgodqhrgkrptkftndlTDmfrjtdlek + secret-key: ${TOKEN_SECRET_KEY} access-token-expiration-seconds: 3600000 # 1hour = 1000(=1s) * 60 * 60 refresh-token-expiration-seconds: 1209600000 # 2weeks = 1000(=1s) * 60 * 60 * 24 * 14