From 27e6a2c3a21945d8c592f27491ae6caae8d1dca5 Mon Sep 17 00:00:00 2001
From: bum12ark <bum12ark@gmail.com>
Date: Mon, 7 Mar 2022 11:16:17 +0900
Subject: [PATCH] =?UTF-8?q?refactor(owner-vue):=20url=20=EB=A7=A4=ED=95=91?=
 =?UTF-8?q?=20=EB=B6=80=EB=B6=84=20=EB=B3=80=EA=B2=BD=20-=20=EC=A7=80?=
 =?UTF-8?q?=EB=82=9C=EC=A3=BC=EB=AC=B8,=20=EC=A3=BC=EB=AC=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 owner-vue/.env                    | 6 +++++-
 owner-vue/package.json            | 2 +-
 owner-vue/src/api/auth.js         | 4 ++--
 owner-vue/src/api/order.js        | 4 ++--
 owner-vue/src/api/user.js         | 4 ++--
 owner-vue/src/main.js             | 4 ++--
 owner-vue/src/views/LoginUser.vue | 4 ++--
 owner-vue/vue.config.js           | 3 +++
 8 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/owner-vue/.env b/owner-vue/.env
index c7f7a1a..2596d51 100644
--- a/owner-vue/.env
+++ b/owner-vue/.env
@@ -1 +1,5 @@
-VUE_APP_OWNER_SERVICE_BASEURL=http://localhost:8001
\ No newline at end of file
+VUE_APP_OWNER_SERVICE_BASEURL=http://just-pickup.com:8001
+VUE_APP_USER_URL=http://just-pickup.com:8001/user-service
+
+VUE_APP_USER_AUTH_URL=http://just-pickup.com:8001/user-service/auth
+VUE_APP_API_URL=http://just-pickup.com:8001/order-service/api/owner
\ No newline at end of file
diff --git a/owner-vue/package.json b/owner-vue/package.json
index 2b4a234..92af693 100644
--- a/owner-vue/package.json
+++ b/owner-vue/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve",
+    "serve": "vue-cli-service serve --port 8081",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
diff --git a/owner-vue/src/api/auth.js b/owner-vue/src/api/auth.js
index 87c772b..2b10db7 100644
--- a/owner-vue/src/api/auth.js
+++ b/owner-vue/src/api/auth.js
@@ -9,7 +9,7 @@ export default {
       }
     }
 
-    const res = await axios.get("http://localhost:8001/user-service/auth/reissue", config);
+    const res = await axios.get(process.env.VUE_APP_USER_AUTH_URL + "/reissue", config);
 
     const accessToken = res.data.data.accessToken;
     jwt.saveToken(accessToken);
@@ -21,6 +21,6 @@ export default {
   requestCheckAccessToken() {
     axios.defaults.headers.common['Authorization'] =  "Bearer " + jwt.getToken();
 
-    return axios.get("http://localhost:8001/user-service/auth/check/access-token");
+    return axios.get( process.env.VUE_APP_USER_AUTH_URL +"/check/access-token");
   }
 }
\ No newline at end of file
diff --git a/owner-vue/src/api/order.js b/owner-vue/src/api/order.js
index fb44238..aaee3b7 100644
--- a/owner-vue/src/api/order.js
+++ b/owner-vue/src/api/order.js
@@ -9,7 +9,7 @@ export default {
                 page: page
             }
         }
-        return axios.get("http://localhost:8001/order-service/prevOrder", options);
+        return axios.get( process.env.VUE_APP_ORDER_URL + "/order/prev-order", options);
     },
     requestOrder(orderDate, lastOrderId) {
         const options = {
@@ -18,6 +18,6 @@ export default {
                 lastOrderId: lastOrderId
             }
         }
-        return axios.get("http://localhost:8001/order-service/orderMain", options);
+        return axios.get(process.env.VUE_APP_ORDER_URL + "/order/order-main", options);
     }
 }
\ No newline at end of file
diff --git a/owner-vue/src/api/user.js b/owner-vue/src/api/user.js
index 622da40..7dd8da4 100644
--- a/owner-vue/src/api/user.js
+++ b/owner-vue/src/api/user.js
@@ -2,7 +2,7 @@ import jwt from '../common/jwt.js';
 
 export default {
   requestRegisterUser(user) {
-    return axios.post("http://localhost:8001/user-service/store-owner", user);
+    return axios.post(process.env.VUE_APP_USER_URL + "/store-owner", user);
   },
 
   async requestLoginUser(email, password) {
@@ -12,7 +12,7 @@ export default {
     }
 
     try {
-      const response = await axios.post("http://localhost:8001/user-service/login", user);
+      const response = await axios.post( process.env.VUE_APP_USER_URL +"/login", user);
       const data = response.data.data;
 
       jwt.saveToken(data.accessToken);
diff --git a/owner-vue/src/main.js b/owner-vue/src/main.js
index a459994..b2cbbf0 100644
--- a/owner-vue/src/main.js
+++ b/owner-vue/src/main.js
@@ -30,11 +30,11 @@ axios.interceptors.response.use(
           originalRequest.headers.Authorization = "Bearer " + accessToken;
           return axios(originalRequest);
         } catch (reissueError) {
-          window.location.href = "http://localhost:8080";
+          window.location.href = "/";
           alert("권한이 없습니다. 다시 로그인 해주세요");
         }
        }
-      window.location.href = "http://localhost:8080";
+      window.location.href = "/";
       alert("권한이 없습니다. 다시 로그인해주세요.");
     }
     return Promise.reject(error);
diff --git a/owner-vue/src/views/LoginUser.vue b/owner-vue/src/views/LoginUser.vue
index 2496b06..f257c4c 100644
--- a/owner-vue/src/views/LoginUser.vue
+++ b/owner-vue/src/views/LoginUser.vue
@@ -37,8 +37,8 @@ export default {
   name: "LoginUser",
   data: function() {
     return {
-      email: 'owner@gmail.com',
-      password: '1234'
+      email: '',
+      password: ''
     }
   },
   methods: {
diff --git a/owner-vue/vue.config.js b/owner-vue/vue.config.js
index 167eb2e..7169597 100644
--- a/owner-vue/vue.config.js
+++ b/owner-vue/vue.config.js
@@ -2,4 +2,7 @@ module.exports = {
   transpileDependencies: [
     'vuetify'
   ],
+  devServer: {
+    disableHostCheck: true
+  }
 }