Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
seohyun-lee committed Aug 20, 2024
2 parents a3161b2 + c7b6a5d commit de58818
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/github-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
echo "${{ secrets.APPLICATION_PROD }}" > ./application.yml
# 환경별 yml 파일 생성(2) - dev
- name: Bake application-dev.yml
- name: Make application-dev.yml
if: contains(github.ref, 'deploy')
run: |
cd ./src/main/resources
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/sws/songpin/global/config/SecurityConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@ public CorsConfigurationSource corsConfigurationSource() {
"https://api.songpin.n-e.kr",
"https://songpin.vercel.app",
"https://songpin.kr",
"https://www.songpin.kr",
"https://dev.songpin.n-e.kr",
"https://prod.songpin.n-e.kr"));
"https://www.songpin.kr"));

configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS"));
configuration.addAllowedHeader("*");
Expand Down

0 comments on commit de58818

Please sign in to comment.