fix: fixed mock server (#2929)

* init * refine * update
4 years ago · c9affcf2ad
parent fbad7f481b
commit c9affcf2ad
10 changed files with 33 additions and 43 deletions
--- a/mock/article.js
+++ b/mock/article.js
@ -29,7 +29,7 @@ for (let i = 0; i < count; i++) {

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

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

  {
-    url: '/article/pv',
+    url: '/vue-element-admin/article/pv',
    type: 'get',
    response: _ => {
      return {
@ -92,7 +92,7 @@ export default [
  },

  {
-    url: '/article/create',
+    url: '/vue-element-admin/article/create',
    type: 'post',
    response: _ => {
      return {
@ -103,7 +103,7 @@ export default [
  },

  {
-    url: '/article/update',
+    url: '/vue-element-admin/article/update',
    type: 'post',
    response: _ => {
      return {
--- a/mock/index.js
+++ b/mock/index.js
@ -57,9 +57,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))
    }
  }
--- a/mock/remote-search.js
+++ b/mock/remote-search.js
@ -13,7 +13,7 @@ NameList.push({ name: 'mock-Pan' })
 export default [
  // username search
  {
-    url: '/search/user',
+    url: '/vue-element-admin/search/user',
    type: 'get',
    response: config => {
      const { name } = config.query
@ -30,7 +30,7 @@ export default [

  // transaction list
  {
-    url: '/transaction/list',
+    url: '/vue-element-admin/transaction/list',
    type: 'get',
    response: _ => {
      return {
--- a/mock/role/index.js
+++ b/mock/role/index.js
@ -38,7 +38,7 @@ const roles = [
 export default [
  // mock get all routes form server
  {
-    url: '/routes',
+    url: '/vue-element-admin/routes',
    type: 'get',
    response: _ => {
      return {
@ -50,7 +50,7 @@ export default [

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

  // add role
  {
-    url: '/role',
+    url: '/vue-element-admin/role',
    type: 'post',
    response: {
      code: 20000,
@ -74,7 +74,7 @@ export default [

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

  // delete role
  {
-    url: '/role/[A-Za-z0-9]',
+    url: '/vue-element-admin/role/[A-Za-z0-9]',
    type: 'delete',
    response: {
      code: 20000,
--- a/mock/user.js
+++ b/mock/user.js
@ -26,7 +26,7 @@ const users = {
 export default [
  // user login
  {
-    url: '/user/login',
+    url: '/vue-element-admin/user/login',
    type: 'post',
    response: config => {
      const { username } = config.body
@ -49,7 +49,7 @@ export default [

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

  // user logout
  {
-    url: '/user/logout',
+    url: '/vue-element-admin/user/logout',
    type: 'post',
    response: _ => {
      return {
--- a/src/api/article.js
+++ b/src/api/article.js
@ -2,7 +2,7 @@ import request from '@/utils/request'

 export function fetchList(query) {
  return request({
-    url: '/article/list',
+    url: '/vue-element-admin/article/list',
    method: 'get',
    params: query
  })
@ -10,7 +10,7 @@ export function fetchList(query) {

 export function fetchArticle(id) {
  return request({
-    url: '/article/detail',
+    url: '/vue-element-admin/article/detail',
    method: 'get',
    params: { id }
  })
@ -18,7 +18,7 @@ export function fetchArticle(id) {

 export function fetchPv(pv) {
  return request({
-    url: '/article/pv',
+    url: '/vue-element-admin/article/pv',
    method: 'get',
    params: { pv }
  })
@ -26,7 +26,7 @@ export function fetchPv(pv) {

 export function createArticle(data) {
  return request({
-    url: '/article/create',
+    url: '/vue-element-admin/article/create',
    method: 'post',
    data
  })
@ -34,7 +34,7 @@ export function createArticle(data) {

 export function updateArticle(data) {
  return request({
-    url: '/article/update',
+    url: '/vue-element-admin/article/update',
    method: 'post',
    data
  })
--- a/src/api/remote-search.js
+++ b/src/api/remote-search.js
@ -2,7 +2,7 @@ import request from '@/utils/request'

 export function searchUser(name) {
  return request({
-    url: '/search/user',
+    url: '/vue-element-admin/search/user',
    method: 'get',
    params: { name }
  })
@ -10,7 +10,7 @@ export function searchUser(name) {

 export function transactionList(query) {
  return request({
-    url: '/transaction/list',
+    url: '/vue-element-admin/transaction/list',
    method: 'get',
    params: query
  })
--- a/src/api/role.js
+++ b/src/api/role.js
@ -2,21 +2,21 @@ import request from '@/utils/request'

 export function getRoutes() {
  return request({
-    url: '/routes',
+    url: '/vue-element-admin/routes',
    method: 'get'
  })
 }

 export function getRoles() {
  return request({
-    url: '/roles',
+    url: '/vue-element-admin/roles',
    method: 'get'
  })
 }

 export function addRole(data) {
  return request({
-    url: '/role',
+    url: '/vue-element-admin/role',
    method: 'post',
    data
  })
@ -24,7 +24,7 @@ export function addRole(data) {

 export function updateRole(id, data) {
  return request({
-    url: `/role/${id}`,
+    url: `/vue-element-admin/role/${id}`,
    method: 'put',
    data
  })
@ -32,7 +32,7 @@ export function updateRole(id, data) {

 export function deleteRole(id) {
  return request({
-    url: `/role/${id}`,
+    url: `/vue-element-admin/role/${id}`,
    method: 'delete'
  })
 }
--- 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-element-admin/user/login',
    method: 'post',
    data
  })
@ -10,7 +10,7 @@ export function login(data) {

 export function getInfo(token) {
  return request({
-    url: '/user/info',
+    url: '/vue-element-admin/user/info',
    method: 'get',
    params: { token }
  })
@ -18,7 +18,7 @@ export function getInfo(token) {

 export function logout() {
  return request({
-    url: '/user/logout',
+    url: '/vue-element-admin/user/logout',
    method: 'post'
  })
 }
--- 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