diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 63800188..2e7a2434 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -51,7 +51,7 @@ jobs: makeTagAndRelease: needs: test - if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/chore/107') && github.event_name == 'push' + if: github.ref == 'refs/heads/main' && github.event_name == 'push' runs-on: ubuntu-latest outputs: tag_name: ${{ steps.create_tag.outputs.new_tag }} diff --git a/back/src/main/resources/application-prod.yml b/back/src/main/resources/application-prod.yml index 6830ed1f..a24ad2b7 100644 --- a/back/src/main/resources/application-prod.yml +++ b/back/src/main/resources/application-prod.yml @@ -33,11 +33,11 @@ logging: com.back: INFO custom: site: - cookieDomain: ".jobmate.info" # 도메인 설정 - frontUrl: "https://jobmate.info" + cookieDomain: "api.jobmate.info" # 도메인으로 변경 + frontUrl: "http://localhost:3000" # 프론트엔드 도메인으로 변경 backUrl: "https://api.jobmate.info" # HTTPS로 변경 cookie: httpOnly: true secure: true # HTTPS에서는 true로 변경 - sameSite: "Lax" + sameSite: "None" #임시 maxAge: "#{60*60*24}" \ No newline at end of file