Skip to content

새로운 도메인 cors 설정 추가 #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sejoon00 merged 4 commits into from
Mar 6, 2025
Merged

새로운 도메인 cors 설정 추가 #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e94144
[fix] 도메인 변경으로인한 docker-compose 설정 변경
sejoon00 Mar 6, 2025
d3f75c6
Merge pull request #86 from team-MoPlus/master
sejoon00 Mar 6, 2025
bab91dc
[fix] cors 새로운 도메인으로 수정
sejoon00 Mar 6, 2025
9474c05
Merge remote-tracking branch 'origin/develop' into develop
sejoon00 Mar 6, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/CD-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ jobs:
fi

./gradlew clean build
docker rm -f moplus-server-dev --force
docker rmi moplus-server-dev
docker rm -f pointer-server-dev --force
docker rmi pointer-server-dev
docker-compose -f docker-compose-dev.yml -p pointer-dev up --build -d
4 changes: 2 additions & 2 deletions .github/workflows/CD-prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
fi

./gradlew clean build
docker rm -f moplus-server-prod --force
docker rmi moplus-server-prod
docker rm -f pointer-server-prod --force
docker rmi pointer-server-prod
docker-compose -f docker-compose-prod.yml -p pointer-prod up --build -d

2 changes: 1 addition & 1 deletion docker-compose-prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ volumes:
driver_opts:
type: none
o: bind
device: ../mopl_data/dev_data
device: ../mopl_data/prod_data

networks:
pointer-prod:
Expand Down
21 changes: 14 additions & 7 deletions src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,20 @@ spring:

cors-allowed-origins:
http://localhost:8080,
https://dev.mopl.kr,
http://dev.mopl.kr,
https://prod.mopl.kr,
http://prod.mopl.kr,
https://dev.math-pointer.com,
http://dev.math-pointer.com,
https://prod.math-pointer.com,
http://prod.math-pointer.com,

http://localhost:3000,
http://localhost:5173,
https://www.mopl.kr,
http://www.mopl.kr,
https://mopl-admin.vercel.app,
https://ppp.admin.math-pointer.com,
http://ppp.admin.math-pointer.com,
https://ppp.dev.admin.math-pointer.com,
http://ppp.dev.admin.math-pointer.com,
https://www.math-pointer.com,
http://www.math-pointer.com,
https://www.dev.math-pointer.com
http://www.dev.math-pointer.com