From 95c7bf5d10d5071136ed34cdd8ba669a281de523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Thu, 9 Jan 2020 20:53:06 +0800
Subject: [PATCH] fix: fixed mock server (#541)
---
mock/index.js | 3 ++-
mock/table.js | 2 +-
mock/user.js | 6 +++---
src/api/table.js | 2 +-
src/api/user.js | 6 +++---
vue.config.js | 13 +------------
6 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/mock/index.js b/mock/index.js
index e14f94ed6..90e2ffe9e 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -53,9 +53,10 @@ export function mockXHR() {
// for mock server
const responseFake = (url, type, respond) => {
return {
- url: new RegExp(`/mock${url}`),
+ url: new RegExp(`${process.env.VUE_APP_BASE_API}${url}`),
type: type || 'get',
response(req, res) {
+ console.log('request invoke:' + req.path)
res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond))
}
}
diff --git a/mock/table.js b/mock/table.js
index a072a211b..ba95f7642 100644
--- a/mock/table.js
+++ b/mock/table.js
@@ -13,7 +13,7 @@ const data = Mock.mock({
export default [
{
- url: '/table/list',
+ url: '/vue-admin-template/table/list',
type: 'get',
response: config => {
const items = data.items
diff --git a/mock/user.js b/mock/user.js
index 43f93a04f..f007cd98d 100644
--- a/mock/user.js
+++ b/mock/user.js
@@ -26,7 +26,7 @@ const users = {
export default [
// user login
{
- url: '/user/login',
+ url: '/vue-admin-template/user/login',
type: 'post',
response: config => {
const { username } = config.body
@@ -49,7 +49,7 @@ export default [
// get user info
{
- url: '/user/info\.*',
+ url: '/vue-admin-template/user/info\.*',
type: 'get',
response: config => {
const { token } = config.query
@@ -72,7 +72,7 @@ export default [
// user logout
{
- url: '/user/logout',
+ url: '/vue-admin-template/user/logout',
type: 'post',
response: _ => {
return {
diff --git a/src/api/table.js b/src/api/table.js
index e29c2943a..2752f52e1 100644
--- a/src/api/table.js
+++ b/src/api/table.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
export function getList(params) {
return request({
- url: '/table/list',
+ url: '/vue-admin-template/table/list',
method: 'get',
params
})
diff --git a/src/api/user.js b/src/api/user.js
index de69f7073..8ff4389db 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
export function login(data) {
return request({
- url: '/user/login',
+ url: '/vue-admin-template/user/login',
method: 'post',
data
})
@@ -10,7 +10,7 @@ export function login(data) {
export function getInfo(token) {
return request({
- url: '/user/info',
+ url: '/vue-admin-template/user/info',
method: 'get',
params: { token }
})
@@ -18,7 +18,7 @@ export function getInfo(token) {
export function logout() {
return request({
- url: '/user/logout',
+ url: '/vue-admin-template/user/logout',
method: 'post'
})
}
diff --git a/vue.config.js b/vue.config.js
index 4244cfc8a..f52964a8a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,18 +36,7 @@ module.exports = {
warnings: false,
errors: true
},
- proxy: {
- // change xxx-api/login => mock/login
- // detail: https://cli.vuejs.org/config/#devserver-proxy
- [process.env.VUE_APP_BASE_API]: {
- target: `http://127.0.0.1:${port}/mock`,
- changeOrigin: true,
- pathRewrite: {
- ['^' + process.env.VUE_APP_BASE_API]: ''
- }
- }
- },
- after: require('./mock/mock-server.js')
+ before: require('./mock/mock-server.js')
},
configureWebpack: {
// provide the app's title in webpack's name field, so that