Explorar el Código

fix: fixed mock server (#541)

花裤衩 hace 5 años
padre
commit
95c7bf5d10
Se han modificado 6 ficheros con 11 adiciones y 21 borrados
  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 53
 // for mock server
54 54
 const responseFake = (url, type, respond) => {
55 55
   return {
56
-    url: new RegExp(`/mock${url}`),
56
+    url: new RegExp(`${process.env.VUE_APP_BASE_API}${url}`),
57 57
     type: type || 'get',
58 58
     response(req, res) {
59
+      console.log('request invoke:' + req.path)
59 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 14
 export default [
15 15
   {
16
-    url: '/table/list',
16
+    url: '/vue-admin-template/table/list',
17 17
     type: 'get',
18 18
     response: config => {
19 19
       const items = data.items

+ 3 - 3
mock/user.js

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

+ 1 - 1
src/api/table.js

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

+ 3 - 3
src/api/user.js

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

+ 1 - 12
vue.config.js

@@ -36,18 +36,7 @@ module.exports = {
36 36
       warnings: false,
37 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 41
   configureWebpack: {
53 42
     // provide the app's title in webpack's name field, so that