From 45d62e4860e3157d348c39f3b3ecea50515c6b03 Mon Sep 17 00:00:00 2001
From: iczer <1126263215@qq.com>
Date: Sat, 8 Aug 2020 21:51:18 +0800
Subject: [PATCH] chore: optimize services model;:star2:

---
 .env                                |  3 ++-
 .env.development                    |  6 +-----
 src/layouts/header/HeaderAvatar.vue |  2 +-
 src/mock/user/login.js              |  3 +--
 src/mock/user/routes.js             |  2 +-
 src/pages/login/Login.vue           |  6 ++----
 src/services/api.js                 |  6 ++++--
 src/services/index.js               |  6 ++----
 src/services/user.js                | 13 ++++++++-----
 vue.config.js                       | 12 +++++++++++-
 10 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/.env b/.env
index a776eb8..1383c28 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,6 @@
-VUE_APP_NAME=admin
+VUE_APP_NAME=Admin
 VUE_APP_ROUTES_KEY=admin.routes
 VUE_APP_PERMISSIONS_KEY=admin.permissions
 VUE_APP_ROLES_KEY=admin.roles
 VUE_APP_USER_KEY=admin.user
+VUE_APP_API_BASE_URL=http://api.iczer.com
diff --git a/.env.development b/.env.development
index a776eb8..67b0aee 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1 @@
-VUE_APP_NAME=admin
-VUE_APP_ROUTES_KEY=admin.routes
-VUE_APP_PERMISSIONS_KEY=admin.permissions
-VUE_APP_ROLES_KEY=admin.roles
-VUE_APP_USER_KEY=admin.user
+VUE_APP_API_BASE_URL=http://dev.iczer.com
diff --git a/src/layouts/header/HeaderAvatar.vue b/src/layouts/header/HeaderAvatar.vue
index fe8066f..873c036 100644
--- a/src/layouts/header/HeaderAvatar.vue
+++ b/src/layouts/header/HeaderAvatar.vue
@@ -24,7 +24,7 @@
 
 <script>
 import {mapGetters} from 'vuex'
-import {logout} from '@/services'
+import {logout} from '@/services/user'
 
 export default {
   name: 'HeaderAvatar',
diff --git a/src/mock/user/login.js b/src/mock/user/login.js
index 364310f..8859120 100644
--- a/src/mock/user/login.js
+++ b/src/mock/user/login.js
@@ -7,8 +7,7 @@ const user = Mock.mock({
   address: '@CITY',
   position: '@POSITION'
 })
-
-Mock.mock('/login', 'post', ({body}) => {
+Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/login`, 'post', ({body}) => {
   let result = {}
   const {name, password} = JSON.parse(body)
 
diff --git a/src/mock/user/routes.js b/src/mock/user/routes.js
index 6187527..4214cec 100644
--- a/src/mock/user/routes.js
+++ b/src/mock/user/routes.js
@@ -1,6 +1,6 @@
 import Mock from 'mockjs'
 
-Mock.mock('/routes', 'get', () => {
+Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/routes`, 'get', () => {
   let result = {}
   result.code = 0
   result.data = [{
diff --git a/src/pages/login/Login.vue b/src/pages/login/Login.vue
index 16d371b..b405d35 100644
--- a/src/pages/login/Login.vue
+++ b/src/pages/login/Login.vue
@@ -75,7 +75,7 @@
 
 <script>
 import CommonLayout from '@/layouts/CommonLayout'
-import {login, getRoutesConfig} from '@/services'
+import {login, getRoutesConfig} from '@/services/user'
 import {setAuthorization} from '@/utils/request'
 import {loadRoutes} from '@/utils/routerUtil'
 import {mapMutations} from 'vuex'
@@ -112,9 +112,7 @@ export default {
       this.logging = false
       const loginRes = res.data
       if (loginRes.code >= 0) {
-        const user = loginRes.data.user
-        const permissions = loginRes.data.permissions
-        const roles = loginRes.data.roles
+        const {user, permissions, roles} = loginRes.data
         this.setUser(user)
         this.setPermissions(permissions)
         this.setRoles(roles)
diff --git a/src/services/api.js b/src/services/api.js
index 85136a0..a5d1d40 100644
--- a/src/services/api.js
+++ b/src/services/api.js
@@ -1,5 +1,7 @@
-// const BASE_URL = 'http://localhost:8080' your service base url
-const BASE_URL = '' // mock base url
+//跨域代理前缀
+// const API_PROXY_PREFIX='/api'
+// const BASE_URL = process.env.NODE_ENV === 'production' ? process.env.VUE_APP_API_BASE_URL : API_PROXY_PREFIX
+const BASE_URL = process.env.VUE_APP_API_BASE_URL
 module.exports = {
   LOGIN: `${BASE_URL}/login`,
   ROUTES: `${BASE_URL}/routes`
diff --git a/src/services/index.js b/src/services/index.js
index 5c94249..3dfe985 100644
--- a/src/services/index.js
+++ b/src/services/index.js
@@ -1,7 +1,5 @@
-import {login, logout, getRoutesConfig} from './user'
+import userService from './user'
 
 export {
-  login,
-  logout,
-  getRoutesConfig
+  userService
 }
diff --git a/src/services/user.js b/src/services/user.js
index 04c91c8..1f9d760 100644
--- a/src/services/user.js
+++ b/src/services/user.js
@@ -7,25 +7,28 @@ import {request, METHOD, removeAuthorization} from '@/utils/request'
  * @param password 账户密码
  * @returns {Promise<AxiosResponse<T>>}
  */
-async function login(name, password) {
+export async function login(name, password) {
   return request(LOGIN, METHOD.POST, {
     name: name,
     password: password
   })
 }
 
-async function getRoutesConfig() {
+export async function getRoutesConfig() {
   return request(ROUTES, METHOD.GET)
 }
 
 /**
  * 退出登录
  */
-function logout() {
+export function logout() {
   localStorage.removeItem(process.env.VUE_APP_ROUTES_KEY)
   localStorage.removeItem(process.env.VUE_APP_PERMISSIONS_KEY)
   localStorage.removeItem(process.env.VUE_APP_ROLES_KEY)
   removeAuthorization()
 }
-
-export {login, logout, getRoutesConfig}
+export default {
+  login,
+  logout,
+  getRoutesConfig
+}
diff --git a/vue.config.js b/vue.config.js
index ebfd208..8277792 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,8 +2,18 @@ let path = require('path')
 const ThemeColorReplacer = require('webpack-theme-color-replacer')
 const {getThemeColors, modifyVars} = require('./src/utils/themeUtil')
 const {resolveCss} = require('./src/utils/theme-color-replacer-extend')
-
 module.exports = {
+  devServer: {
+    // proxy: {
+    //   '/api': { //此处要与 /services/api.js 中的 API_PROXY_PREFIX 值保持一致
+    //     target: process.env.VUE_APP_API_BASE_URL,
+    //     changeOrigin: true,
+    //     pathRewrite: {
+    //       '^/api': ''
+    //     }
+    //   }
+    // }
+  },
   pluginOptions: {
     'style-resources-loader': {
       preProcessor: 'less',