From 3aa2521b47d116442ea40c40605d88849d23257d Mon Sep 17 00:00:00 2001 From: Suhjung Park <145967352+Imggaggu@users.noreply.github.com> Date: Mon, 12 May 2025 12:32:06 +0900 Subject: [PATCH 1/3] Update deploy.yml --- .github/workflows/deploy.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 949c22b..e969afb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -41,17 +41,10 @@ jobs: run: | scp -o StrictHostKeyChecking=no -i pirocheck.pem backend/pirocheck/build/libs/*.jar ubuntu@${{ secrets.EC2_HOST }}:/home/ubuntu/ - - name: Run jar on EC2 + + - name: Restart Spring Boot on EC2 run: | - ssh -o StrictHostKeyChecking=no -i pirocheck.pem \ - ubuntu@${{ secrets.EC2_HOST }} \ - "fuser -k 8080/tcp || true && \ - cd /home/ubuntu && \ - nohup java -jar pirocheck-0.0.1-SNAPSHOT.jar > log.txt 2>&1 &" - - # - name: Restart Spring Boot on EC2 - # run: | - # ssh -o StrictHostKeyChecking=no -i pirocheck.pem ubuntu@${{ secrets.EC2_HOST }} 'bash ~/restart.sh' + ssh -o StrictHostKeyChecking=no -i pirocheck.pem ubuntu@${{ secrets.EC2_HOST }} 'bash ~/restart.sh' - name: Send Discord notification (Success) From ec1224cd69a849341c08cf6797f1d44960107d87 Mon Sep 17 00:00:00 2001 From: Imggaggu Date: Mon, 12 May 2025 13:49:47 +0900 Subject: [PATCH 2/3] [Fix]back-allowed origins url --- .../src/main/java/backend/pirocheck/config/WebConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java b/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java index a6ae980..f67ed5b 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java @@ -10,7 +10,7 @@ public class WebConfig implements WebMvcConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/api/**") // 백엔드 API 요청에만 CORS 허용 - .allowedOrigins("http://pirocheck.org:3000") // 프론트 배포 URL + .allowedOrigins("http://pirocheck.org") // 프론트 배포 URL .allowedMethods("GET", "POST", "PUT", "DELETE") // 허용할 HTTP 메서드 .allowCredentials(true); // 세션 쿠키 주고받기 허용 } From c5886d75e3beb8a70406725b99472a955cedb9a5 Mon Sep 17 00:00:00 2001 From: Imggaggu Date: Mon, 12 May 2025 14:13:33 +0900 Subject: [PATCH 3/3] [Fix] baseurl for api --- frontend/src/api/api.js | 2 +- frontend/src/api/user.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/api/api.js b/frontend/src/api/api.js index 8278d08..9ba4ee2 100644 --- a/frontend/src/api/api.js +++ b/frontend/src/api/api.js @@ -1,7 +1,7 @@ import axios from "axios"; const api = axios.create({ - baseURL: "http://api.pirocheck.org/api", + baseURL: "http://api.pirocheck.org:8080/api", withCredentials: true, }); diff --git a/frontend/src/api/user.js b/frontend/src/api/user.js index 811264c..12e057a 100644 --- a/frontend/src/api/user.js +++ b/frontend/src/api/user.js @@ -1,5 +1,5 @@ export const loginUser = async ({ name, password }) => { - const res = await fetch("http://api.pirocheck.org/api/login", { + const res = await fetch("http://api.pirocheck.org:8080/api/login", { method: "POST", headers: { "Content-Type": "application/json",