Browse Source

fix: fixed mock server (#541)

花裤衩 5 years ago
parent
commit
95c7bf5d10
6 changed files with 11 additions and 21 deletions
  1. 2 1
      mock/index.js
  2. 1 1
      mock/table.js
  3. 3 3
      mock/user.js
  4. 1 1
      src/api/table.js
  5. 3 3
      src/api/user.js
  6. 1 12
      vue.config.js

+ 2 - 1
mock/index.js

@@ -53,9 +53,10 @@ export function mockXHR() {
53
 // for mock server
53
 // for mock server
54
 const responseFake = (url, type, respond) => {
54
 const responseFake = (url, type, respond) => {
55
   return {
55
   return {
56
-    url: new RegExp(`/mock${url}`),
56
+    url: new RegExp(`${process.env.VUE_APP_BASE_API}${url}`),
57
     type: type || 'get',
57
     type: type || 'get',
58
     response(req, res) {
58
     response(req, res) {
59
+      console.log('request invoke:' + req.path)
59
       res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond))
60
       res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond))
60
     }
61
     }
61
   }
62
   }

+ 1 - 1
mock/table.js

@@ -13,7 +13,7 @@ const data = Mock.mock({
13
 
13
 
14
 export default [
14
 export default [
15
   {
15
   {
16
-    url: '/table/list',
16
+    url: '/vue-admin-template/table/list',
17
     type: 'get',
17
     type: 'get',
18
     response: config => {
18
     response: config => {
19
       const items = data.items
19
       const items = data.items

+ 3 - 3
mock/user.js

@@ -26,7 +26,7 @@ const users = {
26
 export default [
26
 export default [
27
   // user login
27
   // user login
28
   {
28
   {
29
-    url: '/user/login',
29
+    url: '/vue-admin-template/user/login',
30
     type: 'post',
30
     type: 'post',
31
     response: config => {
31
     response: config => {
32
       const { username } = config.body
32
       const { username } = config.body
@@ -49,7 +49,7 @@ export default [
49
 
49
 
50
   // get user info
50
   // get user info
51
   {
51
   {
52
-    url: '/user/info\.*',
52
+    url: '/vue-admin-template/user/info\.*',
53
     type: 'get',
53
     type: 'get',
54
     response: config => {
54
     response: config => {
55
       const { token } = config.query
55
       const { token } = config.query
@@ -72,7 +72,7 @@ export default [
72
 
72
 
73
   // user logout
73
   // user logout
74
   {
74
   {
75
-    url: '/user/logout',
75
+    url: '/vue-admin-template/user/logout',
76
     type: 'post',
76
     type: 'post',
77
     response: _ => {
77
     response: _ => {
78
       return {
78
       return {

+ 1 - 1
src/api/table.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
2
 
2
 
3
 export function getList(params) {
3
 export function getList(params) {
4
   return request({
4
   return request({
5
-    url: '/table/list',
5
+    url: '/vue-admin-template/table/list',
6
     method: 'get',
6
     method: 'get',
7
     params
7
     params
8
   })
8
   })

+ 3 - 3
src/api/user.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
2
 
2
 
3
 export function login(data) {
3
 export function login(data) {
4
   return request({
4
   return request({
5
-    url: '/user/login',
5
+    url: '/vue-admin-template/user/login',
6
     method: 'post',
6
     method: 'post',
7
     data
7
     data
8
   })
8
   })
@@ -10,7 +10,7 @@ export function login(data) {
10
 
10
 
11
 export function getInfo(token) {
11
 export function getInfo(token) {
12
   return request({
12
   return request({
13
-    url: '/user/info',
13
+    url: '/vue-admin-template/user/info',
14
     method: 'get',
14
     method: 'get',
15
     params: { token }
15
     params: { token }
16
   })
16
   })
@@ -18,7 +18,7 @@ export function getInfo(token) {
18
 
18
 
19
 export function logout() {
19
 export function logout() {
20
   return request({
20
   return request({
21
-    url: '/user/logout',
21
+    url: '/vue-admin-template/user/logout',
22
     method: 'post'
22
     method: 'post'
23
   })
23
   })
24
 }
24
 }

+ 1 - 12
vue.config.js

@@ -36,18 +36,7 @@ module.exports = {
36
       warnings: false,
36
       warnings: false,
37
       errors: true
37
       errors: true
38
     },
38
     },
39
-    proxy: {
40
-      // change xxx-api/login => mock/login
41
-      // detail: https://cli.vuejs.org/config/#devserver-proxy
42
-      [process.env.VUE_APP_BASE_API]: {
43
-        target: `http://127.0.0.1:${port}/mock`,
44
-        changeOrigin: true,
45
-        pathRewrite: {
46
-          ['^' + process.env.VUE_APP_BASE_API]: ''
47
-        }
48
-      }
49
-    },
50
-    after: require('./mock/mock-server.js')
39
+    before: require('./mock/mock-server.js')
51
   },
40
   },
52
   configureWebpack: {
41
   configureWebpack: {
53
     // provide the app's title in webpack's name field, so that
42
     // provide the app's title in webpack's name field, so that