diff --git a/.github/workflows/web-business-publish.yml b/.github/workflows/web-business-publish.yml index 434ad97..d358988 100644 --- a/.github/workflows/web-business-publish.yml +++ b/.github/workflows/web-business-publish.yml @@ -19,7 +19,11 @@ jobs: uses: actions/setup-node@v3 with: node-version: '20.9.0' - + + - name: env setting + run: | + echo "${{ secrets.REACT_ENV_DEVELOPMENT }}" > . + - name: Docker build and push run: | docker build -t ${{ secrets.DOCKER_USERNAME }}/thepopbusinessweb . diff --git a/src/api/adminBaseApi.js b/src/api/adminBaseApi.js index 9ab947b..d15ee5f 100644 --- a/src/api/adminBaseApi.js +++ b/src/api/adminBaseApi.js @@ -9,7 +9,7 @@ import GetTokenFromLocalStorage from "./Common/token"; */ const adminInstance = axios.create({ - baseURL: "http://15.164.236.13:8080/api/v1", + baseURL: `${process.env.REACT_APP_BASE_URL}${process.env.REACT_APP_API_PREFIX}`, }); adminInstance.interceptors.request.use( diff --git a/src/api/userBaseApi.js b/src/api/userBaseApi.js index 39f2732..6de6433 100644 --- a/src/api/userBaseApi.js +++ b/src/api/userBaseApi.js @@ -10,7 +10,7 @@ import GetTokenFromLocalStorage from "./Common/token"; const userInstance = axios.create({ - baseURL: "http://15.164.236.13:8080/api/v1", + baseURL: `${process.env.REACT_APP_BASE_URL}${process.env.REACT_APP_API_PREFIX}`, }); userInstance.interceptors.request.use( diff --git a/src/components/administrator/ChatRoomDetail.jsx b/src/components/administrator/ChatRoomDetail.jsx index f1a628e..c338a96 100644 --- a/src/components/administrator/ChatRoomDetail.jsx +++ b/src/components/administrator/ChatRoomDetail.jsx @@ -34,7 +34,8 @@ const ChatRoomDetail = ({selectedChatRoomId, setModalIsOpen}) => { * @author 이상민 */ useEffect(() => { - const socket = new SockJS(`http://15.164.236.13:8080/ws`); + const baseUrl = `${process.env.REACT_APP_BASE_URL}${process.env.REACT_APP_CHAT_API_PREFIX}`; + const socket = new SockJS(baseUrl); const stomp = Stomp.over(socket); setStompClient(stomp); // 고유한 ID 생성 diff --git a/src/components/business/Chat/ChatRoom.jsx b/src/components/business/Chat/ChatRoom.jsx index bd7c1ea..a7b51e8 100644 --- a/src/components/business/Chat/ChatRoom.jsx +++ b/src/components/business/Chat/ChatRoom.jsx @@ -37,7 +37,8 @@ const ChatRoom= ({selectedChatRoom, setSelectedChatRoom}) => { * @author 이상민 */ useEffect(() => { - const socket = new SockJS(`http://15.164.236.13:8080/ws`); + const baseUrl = `${process.env.REACT_APP_BASE_URL}${process.env.REACT_APP_CHAT_API_PREFIX}` + const socket = new SockJS(baseUrl); const stomp = Stomp.over(socket); setStompClient(stomp); // 고유한 ID 생성 diff --git a/src/components/business/TossPayModal/TossPayModal.js b/src/components/business/TossPayModal/TossPayModal.js index 2da818a..a1f1e43 100644 --- a/src/components/business/TossPayModal/TossPayModal.js +++ b/src/components/business/TossPayModal/TossPayModal.js @@ -56,6 +56,7 @@ function TossPayModal({postId, postType, price, file}) { onClick={async () => { try { const orderId = nanoid() + const baseUrl = `${process.env.REACT_APP_BASE_URL}${process.env.REACT_APP_API_PREFIX}` await confirmTossPay(orderId) await paymentWidget?.requestPayment({ orderId: orderId, @@ -63,8 +64,8 @@ function TossPayModal({postId, postType, price, file}) { customerName: "김토스", customerEmail: "customer123@gmail.com", customerMobilePhone: "01012341234", - successUrl: `${process.env.REACT_APP_BASE_URL}/payments/toss/success`, - failUrl: `${process.env.REACT_APP_BASE_URL}/payments/toss/fail` + successUrl: `${baseUrl}/payments/toss/success`, + failUrl: `${baseUrl}/payments/toss/fail` }) } catch (error) { // todo: 에러 모달창 추가 (예. 필수 항목 동의 체크) diff --git a/src/setupProxy.js b/src/setupProxy.js index 95ec8f2..80b2ac3 100644 --- a/src/setupProxy.js +++ b/src/setupProxy.js @@ -7,17 +7,17 @@ const { createProxyMiddleware } = require("http-proxy-middleware"); module.exports = function (app) { // API Proxy app.use( - "/api/v1", + `${process.env.REACT_APP_API_PREFIX}`, createProxyMiddleware({ - target: "http://15.164.236.13:8080", + target: `${process.env.REACT_APP_BASE_URL}`, changeOrigin: true, }) ); app.use( - "/ws", + `${process.env.REACT_APP_CHAT_API_PREFIX}`, createProxyMiddleware({ - target: "http://15.164.236.13:8080", + target: `${process.env.REACT_APP_BASE_URL}`, ws: true, }) );