Skip to content

Commit c9affcf

Browse files
authored
fix: fixed mock server (PanJiaChen#2929)
* init * refine * update
1 parent fbad7f4 commit c9affcf

10 files changed

+33
-43
lines changed

mock/article.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ for (let i = 0; i < count; i++) {
2929

3030
export default [
3131
{
32-
url: '/article/list',
32+
url: '/vue-element-admin/article/list',
3333
type: 'get',
3434
response: config => {
3535
const { importance, type, title, page = 1, limit = 20, sort } = config.query
@@ -58,7 +58,7 @@ export default [
5858
},
5959

6060
{
61-
url: '/article/detail',
61+
url: '/vue-element-admin/article/detail',
6262
type: 'get',
6363
response: config => {
6464
const { id } = config.query
@@ -74,7 +74,7 @@ export default [
7474
},
7575

7676
{
77-
url: '/article/pv',
77+
url: '/vue-element-admin/article/pv',
7878
type: 'get',
7979
response: _ => {
8080
return {
@@ -92,7 +92,7 @@ export default [
9292
},
9393

9494
{
95-
url: '/article/create',
95+
url: '/vue-element-admin/article/create',
9696
type: 'post',
9797
response: _ => {
9898
return {
@@ -103,7 +103,7 @@ export default [
103103
},
104104

105105
{
106-
url: '/article/update',
106+
url: '/vue-element-admin/article/update',
107107
type: 'post',
108108
response: _ => {
109109
return {

mock/index.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ export function mockXHR() {
5757
// for mock server
5858
const responseFake = (url, type, respond) => {
5959
return {
60-
url: new RegExp(`/mock${url}`),
60+
url: new RegExp(`${process.env.VUE_APP_BASE_API}${url}`),
6161
type: type || 'get',
6262
response(req, res) {
63+
console.log('request invoke:' + req.path)
6364
res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond))
6465
}
6566
}

mock/remote-search.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ NameList.push({ name: 'mock-Pan' })
1313
export default [
1414
// username search
1515
{
16-
url: '/search/user',
16+
url: '/vue-element-admin/search/user',
1717
type: 'get',
1818
response: config => {
1919
const { name } = config.query
@@ -30,7 +30,7 @@ export default [
3030

3131
// transaction list
3232
{
33-
url: '/transaction/list',
33+
url: '/vue-element-admin/transaction/list',
3434
type: 'get',
3535
response: _ => {
3636
return {

mock/role/index.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const roles = [
3838
export default [
3939
// mock get all routes form server
4040
{
41-
url: '/routes',
41+
url: '/vue-element-admin/routes',
4242
type: 'get',
4343
response: _ => {
4444
return {
@@ -50,7 +50,7 @@ export default [
5050

5151
// mock get all roles form server
5252
{
53-
url: '/roles',
53+
url: '/vue-element-admin/roles',
5454
type: 'get',
5555
response: _ => {
5656
return {
@@ -62,7 +62,7 @@ export default [
6262

6363
// add role
6464
{
65-
url: '/role',
65+
url: '/vue-element-admin/role',
6666
type: 'post',
6767
response: {
6868
code: 20000,
@@ -74,7 +74,7 @@ export default [
7474

7575
// update role
7676
{
77-
url: '/role/[A-Za-z0-9]',
77+
url: '/vue-element-admin/role/[A-Za-z0-9]',
7878
type: 'put',
7979
response: {
8080
code: 20000,
@@ -86,7 +86,7 @@ export default [
8686

8787
// delete role
8888
{
89-
url: '/role/[A-Za-z0-9]',
89+
url: '/vue-element-admin/role/[A-Za-z0-9]',
9090
type: 'delete',
9191
response: {
9292
code: 20000,

mock/user.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const users = {
2626
export default [
2727
// user login
2828
{
29-
url: '/user/login',
29+
url: '/vue-element-admin/user/login',
3030
type: 'post',
3131
response: config => {
3232
const { username } = config.body
@@ -49,7 +49,7 @@ export default [
4949

5050
// get user info
5151
{
52-
url: '/user/info\.*',
52+
url: '/vue-element-admin/user/info\.*',
5353
type: 'get',
5454
response: config => {
5555
const { token } = config.query
@@ -72,7 +72,7 @@ export default [
7272

7373
// user logout
7474
{
75-
url: '/user/logout',
75+
url: '/vue-element-admin/user/logout',
7676
type: 'post',
7777
response: _ => {
7878
return {

src/api/article.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,39 @@ import request from '@/utils/request'
22

33
export function fetchList(query) {
44
return request({
5-
url: '/article/list',
5+
url: '/vue-element-admin/article/list',
66
method: 'get',
77
params: query
88
})
99
}
1010

1111
export function fetchArticle(id) {
1212
return request({
13-
url: '/article/detail',
13+
url: '/vue-element-admin/article/detail',
1414
method: 'get',
1515
params: { id }
1616
})
1717
}
1818

1919
export function fetchPv(pv) {
2020
return request({
21-
url: '/article/pv',
21+
url: '/vue-element-admin/article/pv',
2222
method: 'get',
2323
params: { pv }
2424
})
2525
}
2626

2727
export function createArticle(data) {
2828
return request({
29-
url: '/article/create',
29+
url: '/vue-element-admin/article/create',
3030
method: 'post',
3131
data
3232
})
3333
}
3434

3535
export function updateArticle(data) {
3636
return request({
37-
url: '/article/update',
37+
url: '/vue-element-admin/article/update',
3838
method: 'post',
3939
data
4040
})

src/api/remote-search.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import request from '@/utils/request'
22

33
export function searchUser(name) {
44
return request({
5-
url: '/search/user',
5+
url: '/vue-element-admin/search/user',
66
method: 'get',
77
params: { name }
88
})
99
}
1010

1111
export function transactionList(query) {
1212
return request({
13-
url: '/transaction/list',
13+
url: '/vue-element-admin/transaction/list',
1414
method: 'get',
1515
params: query
1616
})

src/api/role.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,37 @@ import request from '@/utils/request'
22

33
export function getRoutes() {
44
return request({
5-
url: '/routes',
5+
url: '/vue-element-admin/routes',
66
method: 'get'
77
})
88
}
99

1010
export function getRoles() {
1111
return request({
12-
url: '/roles',
12+
url: '/vue-element-admin/roles',
1313
method: 'get'
1414
})
1515
}
1616

1717
export function addRole(data) {
1818
return request({
19-
url: '/role',
19+
url: '/vue-element-admin/role',
2020
method: 'post',
2121
data
2222
})
2323
}
2424

2525
export function updateRole(id, data) {
2626
return request({
27-
url: `/role/${id}`,
27+
url: `/vue-element-admin/role/${id}`,
2828
method: 'put',
2929
data
3030
})
3131
}
3232

3333
export function deleteRole(id) {
3434
return request({
35-
url: `/role/${id}`,
35+
url: `/vue-element-admin/role/${id}`,
3636
method: 'delete'
3737
})
3838
}

src/api/user.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@ import request from '@/utils/request'
22

33
export function login(data) {
44
return request({
5-
url: '/user/login',
5+
url: '/vue-element-admin/user/login',
66
method: 'post',
77
data
88
})
99
}
1010

1111
export function getInfo(token) {
1212
return request({
13-
url: '/user/info',
13+
url: '/vue-element-admin/user/info',
1414
method: 'get',
1515
params: { token }
1616
})
1717
}
1818

1919
export function logout() {
2020
return request({
21-
url: '/user/logout',
21+
url: '/vue-element-admin/user/logout',
2222
method: 'post'
2323
})
2424
}

vue.config.js

+1-12
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,7 @@ module.exports = {
3636
warnings: false,
3737
errors: true
3838
},
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')
5140
},
5241
configureWebpack: {
5342
// provide the app's title in webpack's name field, so that

0 commit comments

Comments
 (0)