feat: ✨ 1.12.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "d2-admin",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "scripts": {
     "serve": "vue-cli-service serve --open",
     "start": "npm run serve",

src/api/index.js

@@ -1,14 +1,17 @@
 import { assign, map } from 'lodash'
 import faker from 'faker/locale/zh_CN'
-import { request, mock } from './service'
+import { service, request, serviceForMock, requestForMock, mock } from './service'
 import * as tools from './tools'
 
 const files = require.context('./modules', false, /\.js$/)
 const generators = files.keys().map(key => files(key).default)
 
 export default assign({}, ...map(generators, generator => generator({
+  service,
   request,
-  faker,
+  serviceForMock,
+  requestForMock,
   mock,
+  faker,
   tools
 })))

src/api/modules/sys.user.js

@@ -6,7 +6,7 @@ const users = [
   { username: 'user1', password: 'user1', uuid: 'user1-uuid', name: 'User1' }
 ]
 
-export default ({ request, faker, mock, tools }) => ({
+export default ({ service, request, serviceForMock, requestForMock, mock, faker, tools }) => ({
   /**
    * @description 登录
    * @param {Object} data 登录携带的信息
@@ -22,7 +22,7 @@ export default ({ request, faker, mock, tools }) => ({
           : tools.responseError({}, '账号或密码不正确')
       })
     // 接口请求
-    return request({
+    return requestForMock({
       url: '/login',
       method: 'post',
       data

src/api/service.js

@@ -1,55 +1,26 @@
 import axios from 'axios'
 import Adapter from 'axios-mock-adapter'
-import { Message } from 'element-ui'
 import { get } from 'lodash'
 import util from '@/libs/util'
-import store from '@/store'
+import { errorLog, errorCreate } from './tools'
 
-// 创建一个错误
+/**
-function errorCreate (msg) {
+ * @description 创建请求实例
-  const error = new Error(msg)
+ */
-  errorLog(error)
+function createService () {
-  throw error
+  // 创建一个 axios 实例
-}
+  const service = axios.create()
-
+  // 请求拦截
-// 记录和显示错误
+  service.interceptors.request.use(
-function errorLog (error) {
-  // 添加到日志
-  store.dispatch('d2admin/log/push', {
-    message: '数据请求异常',
-    type: 'danger',
-    meta: {
-      error
-    }
-  })
-  // 打印到控制台
-  if (process.env.NODE_ENV === 'development') {
-    util.log.danger('>>>>>> Error >>>>>>')
-    console.log(error)
-  }
-  // 显示提示
-  Message({
-    message: error.message,
-    type: 'error',
-    duration: 5 * 1000
-  })
-}
-
-// 创建一个 axios 实例
-const service = axios.create()
-
-// 请求拦截器
-service.interceptors.request.use(
     config => config,
     error => {
       // 发送失败
       console.log(error)
       return Promise.reject(error)
     }
-)
+  )
-
+  // 响应拦截
-// 响应拦截器
+  service.interceptors.response.use(
-service.interceptors.response.use(
     response => {
       // dataAxios 是 axios 返回数据中的 data
       const dataAxios = response.data
@@ -96,11 +67,16 @@ service.interceptors.response.use(
       errorLog(error)
       return Promise.reject(error)
     }
-)
+  )
+  return service
+}
 
-export const mock = new Adapter(service)
+/**
-
+ * @description 创建请求方法
-export function request (config) {
+ * @param {Object} service axios 实例
+ */
+function createRequestFunction (service) {
+  return function (config) {
     const token = util.cookies.get('token')
     const configDefault = {
       headers: {
@@ -112,4 +88,16 @@ export function request (config) {
       data: {}
     }
     return service(Object.assign(configDefault, config))
+  }
 }
+
+// 用于真实网络请求的实例和请求方法
+export const service = createService()
+export const request = createRequestFunction(service)
+
+// 用于模拟网络请求的实例和请求方法
+export const serviceForMock = createService()
+export const requestForMock = createRequestFunction(serviceForMock)
+
+// 网络请求数据模拟工具
+export const mock = new Adapter(serviceForMock)

src/api/tools.js

@@ -1,3 +1,7 @@
+import { Message } from 'element-ui'
+import store from '@/store'
+import util from '@/libs/util'
+
 /**
  * @description 安全地解析 json 字符串
  * @param {String} jsonString 需要解析的 json 字符串
@@ -44,3 +48,39 @@ export function responseSuccess (data = {}, msg = '成功') {
 export function responseError (data = {}, msg = '请求失败', code = 500) {
   return response(data, msg, code)
 }
+
+/**
+ * @description 记录和显示错误
+ * @param {Error} error 错误对象
+ */
+export function errorLog (error) {
+  // 添加到日志
+  store.dispatch('d2admin/log/push', {
+    message: '数据请求异常',
+    type: 'danger',
+    meta: {
+      error
+    }
+  })
+  // 打印到控制台
+  if (process.env.NODE_ENV === 'development') {
+    util.log.danger('>>>>>> Error >>>>>>')
+    console.log(error)
+  }
+  // 显示提示
+  Message({
+    message: error.message,
+    type: 'error',
+    duration: 5 * 1000
+  })
+}
+
+/**
+ * @description 创建一个错误
+ * @param {String} msg 错误信息
+ */
+export function errorCreate (msg) {
+  const error = new Error(msg)
+  errorLog(error)
+  throw error
+}