Merge branch 'master' into 즐겨찾기

owner-vue/.env

@@ -1 +1,5 @@
-VUE_APP_OWNER_SERVICE_BASEURL=http://just-pickup.com:8001
+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

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"
   },

owner-vue/src/api/auth.js

@@ -9,7 +9,7 @@ export default {
       }
     }
 
-    const res = await axios.get(process.env.VUE_APP_OWNER_SERVICE_BASEURL+"/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(process.env.VUE_APP_OWNER_SERVICE_BASEURL+"/user-service/auth/check/access-token");
+    return axios.get( process.env.VUE_APP_USER_AUTH_URL +"/check/access-token");
   }
 }

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);
     }
 }

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(process.env.VUE_APP_OWNER_SERVICE_BASEURL+"/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);

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);

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: {