From bc2027da0d62df5d1fb0f0fdd650417275df13a3 Mon Sep 17 00:00:00 2001
From: rongxingsun <rongxing_sun@qq.com>
Date: Fri, 24 Aug 2018 17:05:32 +0800
Subject: [PATCH 01/13] =?UTF-8?q?axios=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

axios封装


Former-commit-id: 4dc0646a8509fe9cb6c5218e9dfc864b0af59143 [formerly eaee9b788f359a10ad0b8b199dcdd8c82765855f] [formerly 4dc0646a8509fe9cb6c5218e9dfc864b0af59143 [formerly eaee9b788f359a10ad0b8b199dcdd8c82765855f] [formerly 4dc0646a8509fe9cb6c5218e9dfc864b0af59143 [formerly eaee9b788f359a10ad0b8b199dcdd8c82765855f] [formerly eaee9b788f359a10ad0b8b199dcdd8c82765855f [formerly 0dad01580037e9ada6f7f9201eab7e28bafbadd4 [formerly 97a660059b807afdf8c0c518d4f40be4ce7eceec]]]]]
Former-commit-id: 95e753d1626ce41c1465bac635687ce5989877a5
Former-commit-id: 2e567e9e2bb7d07e9cf52dbfe29b140c24c76b48
Former-commit-id: 37e5cef6e554af37fc7d55785552160ff086c03d [formerly 14edcd31bc67642337f8eddf2ec7cbdec23ecc2c]
Former-commit-id: 08a71cba6653878d9accae5a7ecfcf1122d3515a
Former-commit-id: a1731726720512ae8a5a7fd5973f4c90a62ac448
Former-commit-id: 3838dfd576136f0ac217d9a97d631f9a88191d31
Former-commit-id: fa2416a4c270dce89a33e0486569374c5c7b6a63
Former-commit-id: b03e226c26ea5495e1d7d6a2206b89c8f4e17815
---
 .env                                          |  3 +-
 src/api/components/markdown/index.js          | 16 +++++++
 src/api/demo/business/table/1/index.js        |  9 ++++
 src/api/demo/plugins/mocks/ajax/index.js      |  8 ++++
 src/api/sys/login/index.js                    |  9 ++++
 .../style/theme/theme.scss.REMOVED.git-id     |  2 +-
 src/components/d2-markdown/index.vue          |  3 +-
 .../components/menu-header/index.vue          | 15 +++++-
 src/mock/api/sys/login/index.js               |  2 +-
 src/pages/demo/business/table/1/index.vue     |  3 +-
 src/pages/demo/components/markdown/url.vue    |  2 +-
 src/pages/demo/plugins/mock/ajax.vue          |  3 +-
 src/plugin/axios/index.js                     | 48 +++++++++++++++----
 src/plugin/d2admin/index.js                   |  2 -
 src/store/modules/d2admin/modules/account.js  | 11 ++---
 15 files changed, 111 insertions(+), 25 deletions(-)
 create mode 100644 src/api/components/markdown/index.js
 create mode 100644 src/api/demo/business/table/1/index.js
 create mode 100644 src/api/demo/plugins/mocks/ajax/index.js
 create mode 100644 src/api/sys/login/index.js

diff --git a/.env b/.env
index c6889c1a..27c38a1b 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,5 @@
 # 所有环境
 
 # 页面 title 前缀
-VUE_APP_TITLE=D2Admin
\ No newline at end of file
+VUE_APP_TITLE=D2Admin
+VUE_APP_API=/api/
diff --git a/src/api/components/markdown/index.js b/src/api/components/markdown/index.js
new file mode 100644
index 00000000..63f9ff82
--- /dev/null
+++ b/src/api/components/markdown/index.js
@@ -0,0 +1,16 @@
+import request from '@/plugin/axios'
+
+export function ComponentsMarkdownBase (url) {
+  return request({
+    baseURL: process.env.BASE_URL,
+    url,
+    method: 'get'
+  })
+}
+
+export function ComponentsMarkdownApi (url) {
+  return request({
+    url,
+    method: 'get'
+  })
+}
diff --git a/src/api/demo/business/table/1/index.js b/src/api/demo/business/table/1/index.js
new file mode 100644
index 00000000..4e09ecb9
--- /dev/null
+++ b/src/api/demo/business/table/1/index.js
@@ -0,0 +1,9 @@
+import request from '@/plugin/axios'
+
+export function BusinessTable1List (data) {
+  return request({
+    url: '/demo/business/table/1',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/demo/plugins/mocks/ajax/index.js b/src/api/demo/plugins/mocks/ajax/index.js
new file mode 100644
index 00000000..a7ec00cc
--- /dev/null
+++ b/src/api/demo/plugins/mocks/ajax/index.js
@@ -0,0 +1,8 @@
+import request from '@/plugin/axios'
+
+export function PluginMocksAjax () {
+  return request({
+    url: '/demo/plugins/mock/ajax',
+    method: 'get'
+  })
+}
diff --git a/src/api/sys/login/index.js b/src/api/sys/login/index.js
new file mode 100644
index 00000000..882292e3
--- /dev/null
+++ b/src/api/sys/login/index.js
@@ -0,0 +1,9 @@
+import request from '@/plugin/axios'
+
+export function AccountLogin (data) {
+  return request({
+    url: '/login',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/assets/style/theme/theme.scss.REMOVED.git-id b/src/assets/style/theme/theme.scss.REMOVED.git-id
index 8b5ae210..9ba9d43f 100644
--- a/src/assets/style/theme/theme.scss.REMOVED.git-id
+++ b/src/assets/style/theme/theme.scss.REMOVED.git-id
@@ -1 +1 @@
-87fff7214e7b64123842f1f52b649a8af614eb46
\ No newline at end of file
+bfee5e91a3b150e04d9f24695061f6f3e7c59342
\ No newline at end of file
diff --git a/src/components/d2-markdown/index.vue b/src/components/d2-markdown/index.vue
index f6d733e2..aaf60f50 100644
--- a/src/components/d2-markdown/index.vue
+++ b/src/components/d2-markdown/index.vue
@@ -12,6 +12,7 @@ import marked from 'marked'
 import highlight from 'highlight.js'
 import bandupan from './plugin/baidupan'
 import 'github-markdown-css'
+import { ComponentsMarkdownBase } from '@/api/components/markdown'
 export default {
   name: 'd2-markdown',
   props: {
@@ -63,7 +64,7 @@ export default {
     },
     // 从 url 加载原始数据
     async getReadme (url) {
-      const data = await this.$axios.get(url)
+      const data = await ComponentsMarkdownBase(url)
       return this.marked(data)
     },
     marked (data) {
diff --git a/src/layout/header-aside/components/menu-header/index.vue b/src/layout/header-aside/components/menu-header/index.vue
index acea80cf..940aaf63 100644
--- a/src/layout/header-aside/components/menu-header/index.vue
+++ b/src/layout/header-aside/components/menu-header/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-menu mode="horizontal" @select="handleMenuSelect">
+  <el-menu mode="horizontal" :default-active="active" @select="handleMenuSelect">
     <template v-for="(menu, menuIndex) in header">
       <d2-layout-header-aside-menu-item v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
       <d2-layout-header-aside-menu-sub v-else :menu="menu" :key="menuIndex"/>
@@ -25,6 +25,19 @@ export default {
     ...mapState('d2admin/menu', [
       'header'
     ])
+  },
+  data () {
+    return {
+      active: ''
+    }
+  },
+  watch: {
+    '$route.matched': {
+      handler (val) {
+        this.active = val[val.length - 1].path
+      },
+      immediate: true
+    }
   }
 }
 </script>
diff --git a/src/mock/api/sys/login/index.js b/src/mock/api/sys/login/index.js
index 99222985..aadcdfda 100644
--- a/src/mock/api/sys/login/index.js
+++ b/src/mock/api/sys/login/index.js
@@ -21,7 +21,7 @@ const userDB = [
   }
 ]
 
-Mock.mock('/login', 'post', ({url, type, body}) => {
+Mock.mock('/api/login', 'post', ({url, type, body}) => {
   const bodyObj = JSON.parse(body)
   const user = userDB.find(e => e.username === bodyObj.username && e.password === bodyObj.password)
   if (user) {
diff --git a/src/pages/demo/business/table/1/index.vue b/src/pages/demo/business/table/1/index.vue
index 0bd5cd09..c7e4b5aa 100644
--- a/src/pages/demo/business/table/1/index.vue
+++ b/src/pages/demo/business/table/1/index.vue
@@ -17,6 +17,7 @@
 </template>
 
 <script>
+import { BusinessTable1List } from '@/api/demo/business/table/1'
 export default {
   // name 值和本页的 $route.name 一致才可以缓存页面
   name: 'demo-business-table-1',
@@ -53,7 +54,7 @@ export default {
       this.$notify({
         title: '开始请求模拟表格数据'
       })
-      this.$axios.post('/api/demo/business/table/1', {
+      BusinessTable1List({
         ...form,
         page: this.page
       })
diff --git a/src/pages/demo/components/markdown/url.vue b/src/pages/demo/components/markdown/url.vue
index 94d080be..49461394 100644
--- a/src/pages/demo/components/markdown/url.vue
+++ b/src/pages/demo/components/markdown/url.vue
@@ -1,6 +1,6 @@
 <template>
   <d2-container>
     <template slot="header">异步加载文件</template>
-    <d2-markdown :url="`${$baseUrl}markdown/demo.md`"/>
+    <d2-markdown url="markdown/demo.md"/>
   </d2-container>
 </template>
diff --git a/src/pages/demo/plugins/mock/ajax.vue b/src/pages/demo/plugins/mock/ajax.vue
index f65a694a..30edb9c9 100644
--- a/src/pages/demo/plugins/mock/ajax.vue
+++ b/src/pages/demo/plugins/mock/ajax.vue
@@ -23,6 +23,7 @@
 </template>
 
 <script>
+import { PluginMocksAjax } from '@/api/demo/plugins/mocks/ajax'
 export default {
   data () {
     return {
@@ -37,7 +38,7 @@ export default {
   },
   methods: {
     ajax () {
-      this.$axios.get('/api/demo/plugins/mock/ajax')
+      PluginMocksAjax
         .then(res => {
           this.table.columns = Object.keys(res.list[0]).map(e => ({
             label: e,
diff --git a/src/plugin/axios/index.js b/src/plugin/axios/index.js
index d3ad02df..a48c72f4 100644
--- a/src/plugin/axios/index.js
+++ b/src/plugin/axios/index.js
@@ -1,13 +1,45 @@
 import axios from 'axios'
+import { Message } from 'element-ui'
+import util from '@/libs/util'
 
-axios.interceptors.response.use(res => {
-  return res.data
-}, err => {
-  return Promise.reject(err)
+// create an axios instance
+const service = axios.create({
+  baseURL: process.env.VUE_APP_API,
+  timeout: 5000 // 请求超时时间
 })
 
-export default {
-  install (Vue, options) {
-    Vue.prototype.$axios = axios
+// request interceptor
+service.interceptors.request.use(
+  config => {
+    // Do something before request is sent
+    const token = util.cookies.get('token')
+    if (token && token !== 'undefined') {
+      // 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改
+      config.headers['X-Token'] = token
+    }
+    return config
+  },
+  error => {
+    // Do something with request error
+    console.log(error) // for debug
+    Promise.reject(error)
   }
-}
+)
+
+// respone interceptor
+service.interceptors.response.use(
+  response => {
+    return response.data
+  },
+  error => {
+    console.log('err' + error) // for debug
+    Message({
+      message: error.message,
+      type: 'error',
+      duration: 5 * 1000
+    })
+    return Promise.reject(error)
+  }
+)
+
+export default service
diff --git a/src/plugin/d2admin/index.js b/src/plugin/d2admin/index.js
index dc46fe68..c27d7f42 100644
--- a/src/plugin/d2admin/index.js
+++ b/src/plugin/d2admin/index.js
@@ -8,7 +8,6 @@ import '@/components'
 // svg 图标
 import '@/assets/svg-icons'
 // 功能插件
-import pluginAxios from '@/plugin/axios'
 import pluginError from '@/plugin/error'
 import pluginExport from '@/plugin/export'
 import pluginImport from '@/plugin/import'
@@ -20,7 +19,6 @@ export default {
     // Element
     Vue.use(ElementUI)
     // 插件
-    Vue.use(pluginAxios)
     Vue.use(pluginError)
     Vue.use(pluginExport)
     Vue.use(pluginImport)
diff --git a/src/store/modules/d2admin/modules/account.js b/src/store/modules/d2admin/modules/account.js
index 692788b4..795c9e3b 100644
--- a/src/store/modules/d2admin/modules/account.js
+++ b/src/store/modules/d2admin/modules/account.js
@@ -1,4 +1,5 @@
 import util from '@/libs/util.js'
+import { AccountLogin } from '@/api/sys/login'
 
 export default {
   namespaced: true,
@@ -12,13 +13,9 @@ export default {
      */
     login ({ commit }, { vm, username, password }) {
       // 开始请求登录接口
-      vm.$axios({
-        method: 'post',
-        url: '/login',
-        data: {
-          username,
-          password
-        }
+      AccountLogin({
+        username,
+        password
       })
         .then(res => {
           // 设置 cookie 一定要存 uuid 和 token 两个 cookie

From d7fcbcaa283df334725d1a4f046b1363f550726a Mon Sep 17 00:00:00 2001
From: rongxingsun <rongxing_sun@qq.com>
Date: Fri, 24 Aug 2018 10:01:27 +0000
Subject: [PATCH 02/13] Update index.vue

Former-commit-id: 8004454a874f75694f88d8eebd37cff06828e2e1 [formerly 8004454a874f75694f88d8eebd37cff06828e2e1 [formerly 8004454a874f75694f88d8eebd37cff06828e2e1 [formerly 8004454a874f75694f88d8eebd37cff06828e2e1 [formerly 74344de3508cb42a17ab6d4e194964e8c786cacb [formerly fd859e76f8d42ac7d1e57054a93cd6bb51523d01]]]]]
Former-commit-id: bb3053de99201da3fa6499dda0d90d196e699a2c
Former-commit-id: a90dbd47e259cae5b9479c1d74e0db2dcdc7b559
Former-commit-id: 74d893743fb050944cefac3e9c963c8e9487e768 [formerly 66fcd9f8f5e1642d7930ac1123b750dd4cccc110]
Former-commit-id: 159a54d45f4c9b7c324864986067197d1f6ab81f
Former-commit-id: d68f21e49eda7d15fdf73a9d6c646ca23fd3fbc0
Former-commit-id: d0c008ca0887b9a552312eaa9acfad1ab2788b02
Former-commit-id: d41d1e7848f8d4c495926de44477e59afd196cf8
Former-commit-id: ce98a3bb1e9fac3f3e5df4ee03a071086ca7fded
---
 src/components/d2-markdown/index.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/d2-markdown/index.vue b/src/components/d2-markdown/index.vue
index aaf60f50..00f161b1 100644
--- a/src/components/d2-markdown/index.vue
+++ b/src/components/d2-markdown/index.vue
@@ -21,6 +21,12 @@ export default {
       required: false,
       default: ''
     },
+    // axios的baseurl
+    baseurl: {
+      type: String,
+      required: false,
+      default: process.env.VUE_APP_API
+    }
     source: {
       type: String,
       required: false,
@@ -64,7 +70,7 @@ export default {
     },
     // 从 url 加载原始数据
     async getReadme (url) {
-      const data = await ComponentsMarkdownBase(url)
+      const data = await ComponentsMarkdownBase(url, this.baseurl)
       return this.marked(data)
     },
     marked (data) {

From d7f3a97f0c746ff2f4a95ae6a5e240583ca10521 Mon Sep 17 00:00:00 2001
From: rongxingsun <rongxing_sun@qq.com>
Date: Fri, 24 Aug 2018 11:35:58 +0000
Subject: [PATCH 03/13] Update index.vue

Former-commit-id: 0ec59fa9e3b733759514151b1a90fb2b22c4da9c [formerly 9733055d0d130d8e94cfc697e08ebb2f70f93205] [formerly 0ec59fa9e3b733759514151b1a90fb2b22c4da9c [formerly 9733055d0d130d8e94cfc697e08ebb2f70f93205] [formerly 0ec59fa9e3b733759514151b1a90fb2b22c4da9c [formerly 9733055d0d130d8e94cfc697e08ebb2f70f93205] [formerly 9733055d0d130d8e94cfc697e08ebb2f70f93205 [formerly 0e0e45d28bba2353218141e49aa52805757df6d7 [formerly 1fd149b601e3ba17abb4fc0abc73480fbc1ddb07]]]]]
Former-commit-id: 25b56b18591974b4bc626a1bc900159355e9d4e9
Former-commit-id: 3470882e4ca881ff58f3e7dcbc266f65d9061208
Former-commit-id: 1d78fe0a8c7c17911488e060374a5966f3132e0b [formerly 7f54589e062f5881c12992df678347771207a985]
Former-commit-id: 35ee7ead7617857a4fe0dc1780a4da4461e8c59f
Former-commit-id: de66045e0f24d58b406cc4df331379afb3fbd627
Former-commit-id: b2a07e18bacd0da16909f4aa13c26bec7466e528
Former-commit-id: 0314405d3defb90b10fc77c08209dafd9ea6e0dd
Former-commit-id: 09b70ca29eb75ab17a0c05a1bc8d7b666b214dfb
---
 src/components/d2-markdown/index.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/components/d2-markdown/index.vue b/src/components/d2-markdown/index.vue
index 00f161b1..aaf60f50 100644
--- a/src/components/d2-markdown/index.vue
+++ b/src/components/d2-markdown/index.vue
@@ -21,12 +21,6 @@ export default {
       required: false,
       default: ''
     },
-    // axios的baseurl
-    baseurl: {
-      type: String,
-      required: false,
-      default: process.env.VUE_APP_API
-    }
     source: {
       type: String,
       required: false,
@@ -70,7 +64,7 @@ export default {
     },
     // 从 url 加载原始数据
     async getReadme (url) {
-      const data = await ComponentsMarkdownBase(url, this.baseurl)
+      const data = await ComponentsMarkdownBase(url)
       return this.marked(data)
     },
     marked (data) {

From 1f2d17a7ecc7ceb4e39c7081e2f3c7c630e29039 Mon Sep 17 00:00:00 2001
From: rongxingsun <rongxing_sun@qq.com>
Date: Sun, 26 Aug 2018 10:28:26 +0800
Subject: [PATCH 04/13] axios fix

Former-commit-id: 4e67b101d7613dc5a908a9710a298ab452e3a73e [formerly 4e67b101d7613dc5a908a9710a298ab452e3a73e [formerly 4e67b101d7613dc5a908a9710a298ab452e3a73e [formerly 4e67b101d7613dc5a908a9710a298ab452e3a73e [formerly e18674e079add9386877561fd5ff11e26d8a444d [formerly 9eea4ceea3d3b77eab71336bd5a35f3865865a7a]]]]]
Former-commit-id: 309a390168260b7182beb6cefb1d3fce25f41ad7
Former-commit-id: 2357580897c1c29d440ef3df6f59ccf8ecf6c898
Former-commit-id: 4dec8fba40d4f2d2c38e214281019b42cb937d0f [formerly d5986fb5b1d943e920a5e9f298bcfe2f39db84a6]
Former-commit-id: 2f5e3bf693e575217a377d633480e214609a257b
Former-commit-id: 67a233f1a96a698c8a303437bd350eef012f426a
Former-commit-id: 3529a8cb845e843a7971eaa2ae108e8c4abd7859
Former-commit-id: 75fdfbf8e6258c417b6f187dc4d5a4be1090aa56
Former-commit-id: b089d7b7d80123e876bf9b03d5bf9593fd79f780
---
 package-lock.json.REMOVED.git-id              |  2 +-
 src/api/components/markdown/index.js          |  7 -------
 src/api/sys/http/index.js                     | 17 +++++++++++++++++
 src/pages/demo/plugins/mock/ajax.vue          |  2 +-
 src/plugin/axios/index.js                     | 12 +++++++-----
 src/store/modules/d2admin/modules/releases.js |  4 ++--
 6 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 src/api/sys/http/index.js

diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id
index 8e30f099..e44ada5f 100644
--- a/package-lock.json.REMOVED.git-id
+++ b/package-lock.json.REMOVED.git-id
@@ -1 +1 @@
-208665c165b32daf4021f61c3ad430a972cb9735
\ No newline at end of file
+937f5369a5d9b43eeb3c7fa2991f76724481721c
\ No newline at end of file
diff --git a/src/api/components/markdown/index.js b/src/api/components/markdown/index.js
index 63f9ff82..8769a0b0 100644
--- a/src/api/components/markdown/index.js
+++ b/src/api/components/markdown/index.js
@@ -7,10 +7,3 @@ export function ComponentsMarkdownBase (url) {
     method: 'get'
   })
 }
-
-export function ComponentsMarkdownApi (url) {
-  return request({
-    url,
-    method: 'get'
-  })
-}
diff --git a/src/api/sys/http/index.js b/src/api/sys/http/index.js
new file mode 100644
index 00000000..c2f7eeb4
--- /dev/null
+++ b/src/api/sys/http/index.js
@@ -0,0 +1,17 @@
+import request from '@/plugin/axios'
+
+export function httpGet (url, params = {}) {
+  return request({
+    url,
+    method: 'get',
+    params
+  })
+}
+
+export function httpPost (url, data = {}) {
+  return request({
+    url,
+    method: 'post',
+    data
+  })
+}
diff --git a/src/pages/demo/plugins/mock/ajax.vue b/src/pages/demo/plugins/mock/ajax.vue
index 30edb9c9..eb4eb3fd 100644
--- a/src/pages/demo/plugins/mock/ajax.vue
+++ b/src/pages/demo/plugins/mock/ajax.vue
@@ -38,7 +38,7 @@ export default {
   },
   methods: {
     ajax () {
-      PluginMocksAjax
+      PluginMocksAjax()
         .then(res => {
           this.table.columns = Object.keys(res.list[0]).map(e => ({
             label: e,
diff --git a/src/plugin/axios/index.js b/src/plugin/axios/index.js
index a48c72f4..bc7b0e79 100644
--- a/src/plugin/axios/index.js
+++ b/src/plugin/axios/index.js
@@ -11,11 +11,13 @@ const service = axios.create({
 // request interceptor
 service.interceptors.request.use(
   config => {
-    // Do something before request is sent
-    const token = util.cookies.get('token')
-    if (token && token !== 'undefined') {
-      // 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改
-      config.headers['X-Token'] = token
+    if (!(/^https:\/\/|http:\/\//.test(config.url))) {
+      // Do something before request is sent
+      const token = util.cookies.get('token')
+      if (token && token !== 'undefined') {
+        // 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改
+        config.headers['X-Token'] = token
+      }
     }
     return config
   },
diff --git a/src/store/modules/d2admin/modules/releases.js b/src/store/modules/d2admin/modules/releases.js
index a95671fa..f2ef1717 100644
--- a/src/store/modules/d2admin/modules/releases.js
+++ b/src/store/modules/d2admin/modules/releases.js
@@ -1,4 +1,4 @@
-import axios from 'axios'
+import { httpGet } from '@/api/sys/http'
 import semver from 'semver'
 import util from '@/libs/util.js'
 import setting from '@/setting.js'
@@ -19,7 +19,7 @@ export default {
      * @param {Object} param context
      */
     checkUpdate ({ state, commit }) {
-      axios.get(setting.releases.api)
+      httpGet(setting.releases.api)
         .then(res => {
           let versionGet = res.tag_name
           const update = semver.lt(state.version, versionGet)

From 60786bc15abcd499e096b5790c571744dc167ba1 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 26 Aug 2018 10:53:09 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=A1=E7=8C=AE?=
 =?UTF-8?q?=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 03acd94304b247daf1a936b4d3a5ba2e527a9d15 [formerly 03acd94304b247daf1a936b4d3a5ba2e527a9d15 [formerly 03acd94304b247daf1a936b4d3a5ba2e527a9d15 [formerly 03acd94304b247daf1a936b4d3a5ba2e527a9d15 [formerly 6d92c74ffe6255248e448d3bb5b926d42722e14c [formerly bc100ba9f85ace181d3ac36764a4134294ee2331]]]]]
Former-commit-id: 71416d37e1912fb2d0d7fa7bc9b4dac77d4c0670
Former-commit-id: 7ecfd2887d6ffcac456fa3ef139a69102718dfc6
Former-commit-id: 52be3085eaf4b82662968101c8e466452ac2ff02 [formerly 287368ccfbc9ae4dacc1929f7430517802a8fdbe]
Former-commit-id: 0424cf59e4f4d3cd58dd7c914e8683ee61f2e675
Former-commit-id: 849290bd487b37278aee17c4d6cb2d5de0f4a809
Former-commit-id: a3688ab42b178b69dd8f852b2a0c1f092b31e50c
Former-commit-id: 8fc7e4779989656bb8d2c0d34fd110cad7a0908d
Former-commit-id: d211b1969016adc4e7270efec83ce6acac2bb9b0
---
 docs/zh/collaborator/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/zh/collaborator/README.md b/docs/zh/collaborator/README.md
index ea56aef7..0f8a0d1f 100644
--- a/docs/zh/collaborator/README.md
+++ b/docs/zh/collaborator/README.md
@@ -10,4 +10,5 @@ sidebar: auto
 | <img src="https://avatars1.githubusercontent.com/u/24645480?s=460&v=4" style="width: 30px;"/> | sunhaoxiang | [https://github.com/sunhaoxiang](https://github.com/sunhaoxiang) |
 | <img src="https://avatars2.githubusercontent.com/u/11420885?s=460&v=4" style="width: 30px;"/> | namklaw | [https://github.com/namklaw](https://github.com/namklaw) |
 | <img src="https://avatars2.githubusercontent.com/u/6757507?s=460&v=4" style="width: 30px;"/> | mokeyjay | [https://github.com/mokeyjay](https://github.com/mokeyjay) |
-| <img src="https://avatars2.githubusercontent.com/u/10137653?s=460&v=4" style="width: 30px;"/> | Aysnine | [https://github.com/Aysnine](https://github.com/Aysnine) |
\ No newline at end of file
+| <img src="https://avatars2.githubusercontent.com/u/10137653?s=460&v=4" style="width: 30px;"/> | Aysnine | [https://github.com/Aysnine](https://github.com/Aysnine) |
+| <img src="https://avatars2.githubusercontent.com/u/12825624?s=460&v=4" style="width: 30px;"/> | rongxingsun | [https://github.com/rongxingsun](https://github.com/rongxingsun) |
\ No newline at end of file

From d8163d9060d5d0534c4ecbaea6ab62da67dd84c1 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 26 Aug 2018 22:07:26 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E4=BA=86=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 0638decf143f87f2c1aeff34d43cf338f2a5d4f3 [formerly 0638decf143f87f2c1aeff34d43cf338f2a5d4f3 [formerly 0638decf143f87f2c1aeff34d43cf338f2a5d4f3 [formerly 0638decf143f87f2c1aeff34d43cf338f2a5d4f3 [formerly f770eb4aeb1c550cf684665e4b3bac85220e1186 [formerly 80077c842ace79ce03f3aa708547a40f91710c7a]]]]]
Former-commit-id: 872c061c94f1265a75ad998279f6db06b935f835
Former-commit-id: f9120bb207fe46b72784aea7ccf6eb5d9fbfedd0
Former-commit-id: 4094ab34db6853c334dceaf76e284cfd6343f0c8 [formerly 18b2705f5cbd72b56027f15c635be16f39240824]
Former-commit-id: 846cfa0919115bea7ddbc7bdea368ec3001aa7eb
Former-commit-id: d884e764b35d0f5bb03515a0c5d7edf20c1624f1
Former-commit-id: 05ca8681b9e32f01cafc6f1910ce51a919e9aa06
Former-commit-id: ddeecf9653388372dc41a8fa6293df1e4722b68b
Former-commit-id: 1f603d99fdc273b87a16a7df683e917f22f8fa06
---
 src/plugin/axios/index.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/plugin/axios/index.js b/src/plugin/axios/index.js
index bc7b0e79..ad5dc80f 100644
--- a/src/plugin/axios/index.js
+++ b/src/plugin/axios/index.js
@@ -2,17 +2,17 @@ import axios from 'axios'
 import { Message } from 'element-ui'
 import util from '@/libs/util'
 
-// create an axios instance
+// 创建一个 axios 实例
 const service = axios.create({
   baseURL: process.env.VUE_APP_API,
   timeout: 5000 // 请求超时时间
 })
 
-// request interceptor
+// 请求拦截器
 service.interceptors.request.use(
   config => {
+    // 在请求发送之前做一些处理
     if (!(/^https:\/\/|http:\/\//.test(config.url))) {
-      // Do something before request is sent
       const token = util.cookies.get('token')
       if (token && token !== 'undefined') {
         // 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改
@@ -22,19 +22,20 @@ service.interceptors.request.use(
     return config
   },
   error => {
-    // Do something with request error
-    console.log(error) // for debug
+    // 发送失败
+    console.log(error)
     Promise.reject(error)
   }
 )
 
-// respone interceptor
+// 响应拦截器
 service.interceptors.response.use(
   response => {
     return response.data
   },
   error => {
-    console.log('err' + error) // for debug
+    util.log.danger('>>>>>> Error [ service.interceptors.response ] >>>>>>')
+    console.log(error)
     Message({
       message: error.message,
       type: 'error',

From 3fb34c3517bb902e8ab925a992b4e6d49768cdf9 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 26 Aug 2018 22:16:53 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E7=AE=80=E5=8C=96log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: b567a5884d7486a05dafefa4684e4a070c1b79a0 [formerly 0eb70507cace99d7f975b96ee093faab763f9243] [formerly b567a5884d7486a05dafefa4684e4a070c1b79a0 [formerly 0eb70507cace99d7f975b96ee093faab763f9243] [formerly b567a5884d7486a05dafefa4684e4a070c1b79a0 [formerly 0eb70507cace99d7f975b96ee093faab763f9243] [formerly 0eb70507cace99d7f975b96ee093faab763f9243 [formerly 9a3a99c96ca755180bb1d23418dc6be78ae7edeb [formerly 8bc752a109c90c90f9840190a941eeda7fb7e349]]]]]
Former-commit-id: 82af028bfed70d0110c853053bb852dd3914ba3c
Former-commit-id: a28ad64a09775dae6ac917c07acba696a9a69277
Former-commit-id: 8ef921a405f7610c2adb9aedbd6e261f01370b8b [formerly f84c23341a4685f3a8c04638bc2af24b7bec36f2]
Former-commit-id: 18facece683f42160ee36c7b5d2f0e115d7f8d1f
Former-commit-id: 607ec284d93e5c8c8b1fc10496a21afdb409ab09
Former-commit-id: b45a22f1f6dfaead3c321a956aa2d6fea7ea0572
Former-commit-id: 86037e36790fe979c834ddd27c2d94478d67d3dc
Former-commit-id: 2d92a9136ad31753400e977c494d03f6fb2592e5
---
 src/plugin/axios/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugin/axios/index.js b/src/plugin/axios/index.js
index ad5dc80f..483f1517 100644
--- a/src/plugin/axios/index.js
+++ b/src/plugin/axios/index.js
@@ -34,7 +34,7 @@ service.interceptors.response.use(
     return response.data
   },
   error => {
-    util.log.danger('>>>>>> Error [ service.interceptors.response ] >>>>>>')
+    util.log.danger('>>>>>> Error >>>>>>')
     console.log(error)
     Message({
       message: error.message,

From b6448966e6a43a0441701c779f5a45a1ab910398 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 27 Aug 2018 09:10:30 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: cecb249658d88621883d41111e27cafa8fff1c16 [formerly cecb249658d88621883d41111e27cafa8fff1c16 [formerly cecb249658d88621883d41111e27cafa8fff1c16 [formerly cecb249658d88621883d41111e27cafa8fff1c16 [formerly 0313b6b30ba57c3d746d55bae04ce0155150d983 [formerly c444a9dc9809f2e3c4aaa2263543f39a1d889ad8]]]]]
Former-commit-id: 2c176d51cf5f5c5b733b82c59c914aa1be4c1ea6
Former-commit-id: 96c28290eee4242d69f78109a03f535929d09b18
Former-commit-id: 5eea3eceaac422cf969bb4faac466572d3d92b0a [formerly 5beed5d7fbf4023c37aec42826e39309c76b8663]
Former-commit-id: eae4a65099c92ab9894db31bfbc98030022db2d9
Former-commit-id: 7760cadd99b92c032504897d62bfba3d2c1f5632
Former-commit-id: 942e214e53bee6c3142c6dfa490c972a6abbed8d
Former-commit-id: 1cd6734220f665448f4fd295fe7ca28e9eed361c
Former-commit-id: a0386b7bf1cfdf9aca4cbfee42518a4b485f42ea
---
 src/mock/api/demo/business/table/1/index.js  | 28 ++++++++++++--------
 src/mock/api/demo/plugins/mock/ajax/index.js | 24 ++++++++++-------
 src/mock/api/sys/login/index.js              |  3 ++-
 src/plugin/axios/index.js                    | 13 ++++++++-
 src/store/modules/d2admin/modules/account.js |  6 ++---
 5 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/src/mock/api/demo/business/table/1/index.js b/src/mock/api/demo/business/table/1/index.js
index 7c8d2621..ff02e4c7 100644
--- a/src/mock/api/demo/business/table/1/index.js
+++ b/src/mock/api/demo/business/table/1/index.js
@@ -7,17 +7,23 @@ Mock.mock('/api/demo/business/table/1', ({ body }) => {
   page.total = 1000
   return Mock.mock(
     {
-      page,
-      'list|20': [{
-        'key': '@guid',
-        'value|1': [10, 100, 200, 500],
-        'type': '@boolean',
-        'admin': '@cname',
-        'adminNote': '@cparagraph(0.5)',
-        'dateTimeCreat': '@datetime',
-        'used': '@boolean',
-        'dateTimeUse': '@datetime'
-      }]
+      code: 0,
+      msg: '获取数据成功',
+      data: {
+        page,
+        'list|20': [
+          {
+            'key': '@guid',
+            'value|1': [10, 100, 200, 500],
+            'type': '@boolean',
+            'admin': '@cname',
+            'adminNote': '@cparagraph(0.5)',
+            'dateTimeCreat': '@datetime',
+            'used': '@boolean',
+            'dateTimeUse': '@datetime'
+          }
+        ]
+      }
     }
   )
 })
diff --git a/src/mock/api/demo/plugins/mock/ajax/index.js b/src/mock/api/demo/plugins/mock/ajax/index.js
index fa5a4ce5..0e696322 100644
--- a/src/mock/api/demo/plugins/mock/ajax/index.js
+++ b/src/mock/api/demo/plugins/mock/ajax/index.js
@@ -1,13 +1,19 @@
 import Mock from 'mockjs'
 
 Mock.mock('/api/demo/plugins/mock/ajax', {
-  'list|4-10': [{
-    'id|+1': 1,
-    'name': '@CNAME',
-    'star|1-5': '★',
-    'delFlag|1': [0, 1],
-    'creatDate': '@DATE',
-    'address': '@CITY',
-    'zip': '@ZIP'
-  }]
+  code: 0,
+  msg: '获取数据成功',
+  data: {
+    'list|4-10': [
+      {
+        'id|+1': 1,
+        'name': '@CNAME',
+        'star|1-5': '★',
+        'delFlag|1': [0, 1],
+        'creatDate': '@DATE',
+        'address': '@CITY',
+        'zip': '@ZIP'
+      }
+    ]
+  }
 })
diff --git a/src/mock/api/sys/login/index.js b/src/mock/api/sys/login/index.js
index aadcdfda..36662ce7 100644
--- a/src/mock/api/sys/login/index.js
+++ b/src/mock/api/sys/login/index.js
@@ -36,7 +36,8 @@ Mock.mock('/api/login', 'post', ({url, type, body}) => {
   } else {
     return {
       code: 401,
-      msg: '用户名或密码错误'
+      msg: '用户名或密码错误',
+      data: {}
     }
   }
 })
diff --git a/src/plugin/axios/index.js b/src/plugin/axios/index.js
index 483f1517..64965012 100644
--- a/src/plugin/axios/index.js
+++ b/src/plugin/axios/index.js
@@ -31,7 +31,18 @@ service.interceptors.request.use(
 // 响应拦截器
 service.interceptors.response.use(
   response => {
-    return response.data
+    // dataAxios 是 axios 返回数据中的 data
+    const dataAxios = response.data
+    // 这个状态码是和后端约定的
+    const { code } = dataAxios
+    // 根据 code 进行判断
+    if (code === undefined) {
+      // 如果没有 code 代表这不是后端返回的数据（例如请求 D2Admin 最新版本）
+      return dataAxios
+    } else {
+      // 有 code 代表这是一个后端接口
+      return dataAxios.data
+    }
   },
   error => {
     util.log.danger('>>>>>> Error >>>>>>')
diff --git a/src/store/modules/d2admin/modules/account.js b/src/store/modules/d2admin/modules/account.js
index 795c9e3b..aafbf581 100644
--- a/src/store/modules/d2admin/modules/account.js
+++ b/src/store/modules/d2admin/modules/account.js
@@ -23,11 +23,11 @@ export default {
           // uuid 是用户身份唯一标识 用户注册的时候确定 并且不可改变 不可重复
           // token 代表用户当前登录状态 建议在网络请求中携带 token
           // 如有必要 token 需要定时更新，默认保存一天
-          util.cookies.set('uuid', res.data.uuid)
-          util.cookies.set('token', res.data.token)
+          util.cookies.set('uuid', res.uuid)
+          util.cookies.set('token', res.token)
           // 设置 vuex 用户信息
           commit('d2admin/user/set', {
-            name: res.data.name
+            name: res.name
           }, { root: true })
           // 用户登陆后从持久化数据加载一系列的设置
           commit('load')

From e1257a084f93adea626768d7a86a6030acd6b1a4 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 27 Aug 2018 10:47:01 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=A0=81=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E4=BB=A5=E5=8F=8A=E8=87=AA=E5=8A=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 1befd09802269c61539a27ef2fd4ac86fd6c9b6f [formerly 1befd09802269c61539a27ef2fd4ac86fd6c9b6f [formerly 1befd09802269c61539a27ef2fd4ac86fd6c9b6f [formerly 1befd09802269c61539a27ef2fd4ac86fd6c9b6f [formerly a213ae2d21d86093399baa832146d6c72e7bbe04 [formerly 092ca0610f12674937184af3e325dd1942ea8da5]]]]]
Former-commit-id: be65bfb06d778ba61a1730ec9bf99f4d08c5a815
Former-commit-id: de8047c7fa1b0a4f73b0f8287af0154b895b643a
Former-commit-id: 9b61b9e04a5c6f5f61e248d299799520dcdfba95 [formerly 5e7b6390d23f20f0648b14ed934762068aed9623]
Former-commit-id: 05679a88d3b99e10d9abacb81c500c1ffe7210d5
Former-commit-id: 9c7d82216e4ed70c3621b17c64dbbc239ece84d7
Former-commit-id: 1c8984d4a3b819b4a23eaab0d80df2b8480f8c7a
Former-commit-id: 32635935c307b8af906ad12bd5f18006fc67ce78
Former-commit-id: 37ee780a2e409cfcd8d247b9f44ed80d66dc68db
---
 src/pages/demo/plugins/mock/ajax.vue |  4 ++
 src/plugin/axios/index.js            | 72 ++++++++++++++++++++++++----
 2 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/src/pages/demo/plugins/mock/ajax.vue b/src/pages/demo/plugins/mock/ajax.vue
index eb4eb3fd..27ed91ba 100644
--- a/src/pages/demo/plugins/mock/ajax.vue
+++ b/src/pages/demo/plugins/mock/ajax.vue
@@ -25,6 +25,7 @@
 <script>
 import { PluginMocksAjax } from '@/api/demo/plugins/mocks/ajax'
 export default {
+  name: 'demo-plugins-mock-ajax',
   data () {
     return {
       table: {
@@ -46,6 +47,9 @@ export default {
           }))
           this.table.data = res.list
         })
+        .catch(() => {
+          // 错误情况
+        })
     }
   }
 }
diff --git a/src/plugin/axios/index.js b/src/plugin/axios/index.js
index 64965012..f962602b 100644
--- a/src/plugin/axios/index.js
+++ b/src/plugin/axios/index.js
@@ -1,7 +1,36 @@
+import store from '@/store'
 import axios from 'axios'
 import { Message } from 'element-ui'
 import util from '@/libs/util'
 
+// 创建一个错误
+function errorCreat (msg) {
+  const err = new Error(msg)
+  errorLog(err)
+  throw err
+}
+
+// 记录和显示错误
+function errorLog (err) {
+  // 添加到日志
+  store.dispatch('d2admin/log/add', {
+    type: 'error',
+    err,
+    info: '数据请求异常'
+  })
+  // 打印到控制台
+  if (process.env.NODE_ENV === 'development') {
+    util.log.danger('>>>>>> Error >>>>>>')
+    console.log(err)
+  }
+  // 显示提示
+  Message({
+    message: err.message,
+    type: 'error',
+    duration: 5 * 1000
+  })
+}
+
 // 创建一个 axios 实例
 const service = axios.create({
   baseURL: process.env.VUE_APP_API,
@@ -37,21 +66,44 @@ service.interceptors.response.use(
     const { code } = dataAxios
     // 根据 code 进行判断
     if (code === undefined) {
-      // 如果没有 code 代表这不是后端返回的数据（例如请求 D2Admin 最新版本）
+      // 如果没有 code 代表这不是项目后端开发的接口 比如可能是 D2Admin 请求最新版本
       return dataAxios
     } else {
-      // 有 code 代表这是一个后端接口
-      return dataAxios.data
+      // 有 code 代表这是一个后端接口 可以进行进一步的判断
+      switch (code) {
+        case 0:
+          // [ 示例 ] code === 0 代表没有错误
+          return dataAxios.data
+        case 'xxx':
+          // [ 示例 ] 其它和后台约定的 code
+          util.log.error('code xxx')
+          errorCreat(`${dataAxios.msg}: ${response.config.url}`)
+          break
+        default:
+          // 不是正确的 code
+          errorCreat(`${dataAxios.msg}: ${response.config.url}`)
+          break
+      }
     }
   },
   error => {
-    util.log.danger('>>>>>> Error >>>>>>')
-    console.log(error)
-    Message({
-      message: error.message,
-      type: 'error',
-      duration: 5 * 1000
-    })
+    if (error && error.response) {
+      switch (error.response.status) {
+        case 400: error.message = '请求错误'; break
+        case 401: error.message = '未授权，请登录'; break
+        case 403: error.message = '拒绝访问'; break
+        case 404: error.message = `请求地址出错: ${error.response.config.url}`; break
+        case 408: error.message = '请求超时'; break
+        case 500: error.message = '服务器内部错误'; break
+        case 501: error.message = '服务未实现'; break
+        case 502: error.message = '网关错误'; break
+        case 503: error.message = '服务不可用'; break
+        case 504: error.message = '网关超时'; break
+        case 505: error.message = 'HTTP版本不受支持'; break
+        default: break
+      }
+    }
+    errorLog(error)
     return Promise.reject(error)
   }
 )

From 274f18e0eb1716386217526690a6f0e6b9d2b8b9 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 27 Aug 2018 10:48:46 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: d4b44bcc763ab92ff2255544989ae31d41f8152b [formerly 10bcc9cdd49ee115b547077b88d2b158bf37a5eb] [formerly d4b44bcc763ab92ff2255544989ae31d41f8152b [formerly 10bcc9cdd49ee115b547077b88d2b158bf37a5eb] [formerly d4b44bcc763ab92ff2255544989ae31d41f8152b [formerly 10bcc9cdd49ee115b547077b88d2b158bf37a5eb] [formerly 10bcc9cdd49ee115b547077b88d2b158bf37a5eb [formerly f5e4db4dc9fa44c35bf35f67ad96c6370dfc592d [formerly 1785b00ac90bca8e12ad3998ddd2690c5b02ad80]]]]]
Former-commit-id: 40afddc47a653bf8f2bd03e2a0f0804fc68f4008
Former-commit-id: 1d5f76043f53a622cbadbd0995e8b2196250dc94
Former-commit-id: 15742c11fc7e7e2858494f7f28c0a1bf28b14cfe [formerly e2c7899accfa0870779cff6face7541064e0f300]
Former-commit-id: b9de9d7ec9cb2d79f36b191f3ad5088466c6f692
Former-commit-id: fc608ea7c88a774e0bf64f21353231f35cedc28c
Former-commit-id: f347e4e0abc076c372aab758273166734861af34
Former-commit-id: 63f2a71adebf549962d21b743c12d383f7c943b4
Former-commit-id: f75d1b738079fbb62af1f73c644d715bf16a1d1a
---
 src/plugin/axios/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/plugin/axios/index.js b/src/plugin/axios/index.js
index f962602b..68fd19a4 100644
--- a/src/plugin/axios/index.js
+++ b/src/plugin/axios/index.js
@@ -76,8 +76,7 @@ service.interceptors.response.use(
           return dataAxios.data
         case 'xxx':
           // [ 示例 ] 其它和后台约定的 code
-          util.log.error('code xxx')
-          errorCreat(`${dataAxios.msg}: ${response.config.url}`)
+          errorCreat(`[ code: xxx ] ${dataAxios.msg}: ${response.config.url}`)
           break
         default:
           // 不是正确的 code

From 04470e69abc534a28429bedf2133065aa4fbf3ac Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 27 Aug 2018 13:37:02 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 1285570867011f86a3991c3ae598192951cc3f2f [formerly 1285570867011f86a3991c3ae598192951cc3f2f [formerly 1285570867011f86a3991c3ae598192951cc3f2f [formerly 1285570867011f86a3991c3ae598192951cc3f2f [formerly 293f784fe509a79f276015d3647f954340343066 [formerly 9f69c12174116db35ca32bad96ef5ba11de35397]]]]]
Former-commit-id: 704d15270edf4feeff893ad9b5cc25ae201a093d
Former-commit-id: 81ee93da041be7b177ecd7b327de9cfadb2969f8
Former-commit-id: bd5fe14e21a1385f2c5b309d248442eac481c989 [formerly 727cb0124ab4db83b0c485ba717c49ee2d7dfaf9]
Former-commit-id: 44bb97adb6f9a5ee0f0b298752e8c74a45301c10
Former-commit-id: 64239434f1ef1dd8812ff166ae5d5306ee3e601e
Former-commit-id: 01618dcab298c103dc57748e6ad72ad81af7bb4b
Former-commit-id: 7e4babf533d723455d8b8bca87cc4b2c6c79cbe3
Former-commit-id: 54cf9b9949027aa08465c85960fe1853cc209c50
---
 .env                       |   2 +
 docs/.vuepress/config.js   |   3 +-
 docs/zh/sys-ajax/README.md | 153 +++++++++++++++++++++++++++++++++++++
 3 files changed, 157 insertions(+), 1 deletion(-)
 create mode 100644 docs/zh/sys-ajax/README.md

diff --git a/.env b/.env
index 27c38a1b..701568fd 100644
--- a/.env
+++ b/.env
@@ -2,4 +2,6 @@
 
 # 页面 title 前缀
 VUE_APP_TITLE=D2Admin
+
+# 网络请求公用地址
 VUE_APP_API=/api/
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index 3a087c60..983e8b5d 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -51,8 +51,9 @@ module.exports = {
               { text: '组件', link: '/zh/sys-components/' },
               { text: '插件', link: '/zh/sys-plugins/' },
               { text: 'vuex', link: '/zh/sys-vuex/' },
-              { text: '菜单', link: '/zh/sys-menu/' },
               { text: '路由', link: '/zh/sys-route/' },
+              { text: '菜单', link: '/zh/sys-menu/' },
+              { text: '异步请求', link: '/zh/sys-ajax/' },
               { text: '多页面', link: '/zh/sys-multi-page/' },
               { text: '数据持久化', link: '/zh/sys-db/' },
               { text: 'CSS 实用类', link: '/zh/sys-css/' },
diff --git a/docs/zh/sys-ajax/README.md b/docs/zh/sys-ajax/README.md
new file mode 100644
index 00000000..1a04317e
--- /dev/null
+++ b/docs/zh/sys-ajax/README.md
@@ -0,0 +1,153 @@
+---
+sidebar: auto
+---
+
+# 异步请求
+
+D2Admin 使用 [axios](https://github.com/axios/axios) 作为异步请求工具，并做了一些封装。
+
+| axios | 地址 |
+| --- | --- |
+| Github | [https://github.com/axios/axios](https://github.com/axios/axios) |
+| npm | [https://www.npmjs.com/package/axios](https://www.npmjs.com/package/axios) |
+| 中文文档 | [https://www.kancloud.cn/yunye/axios/234845](https://www.kancloud.cn/yunye/axios/234845) |
+
+## 介绍
+
+Axios 是一个基于 promise 的 HTTP 库，可以用在浏览器和 node.js 中。
+
+* 支持浏览器和node.js
+* 支持promise
+* 能拦截请求和响应
+* 能转换请求和响应数据
+* 能取消请求
+* 自动转换JSON数据
+* 浏览器端支持防止CSRF(跨站请求伪造)
+
+## 浏览器支持
+
+![Chrome](https://raw.github.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png) | ![Firefox](https://raw.github.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png) | ![Safari](https://raw.github.com/alrra/browser-logos/master/src/safari/safari_48x48.png) | ![Opera](https://raw.github.com/alrra/browser-logos/master/src/opera/opera_48x48.png) | ![Edge](https://raw.github.com/alrra/browser-logos/master/src/edge/edge_48x48.png) | ![IE](https://raw.github.com/alrra/browser-logos/master/src/archive/internet-explorer_9-11/internet-explorer_9-11_48x48.png) |
+--- | --- | --- | --- | --- | --- |
+Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ | 11 ✔ |
+
+[![Browser Matrix](https://saucelabs.com/open_sauce/build_matrix/axios.svg)](https://saucelabs.com/u/axios)
+
+## 使用方式
+
+axios 默认的使用方式在这里不做介绍，D2Admin 推荐在您的项目中使用下面的方式获取数据：
+
+### 修改 baseURL
+
+默认的请求地址在 `d2-admin/.env`
+
+```
+VUE_APP_API=/api/
+```
+
+上述设置将在您访问 `/demo/a` 时实际去访问 `/api/demo/a`
+
+如果您希望不同的环境使用不同的请求地址，可以在 `d2-admin/.env.development` 中添加设置（示例）：
+
+```
+VUE_APP_API=/api-dev/
+```
+
+这样您在开发环境和正式环境就有了不同的公共请求地址，在开发环境访问 `/demo/a` 时实际去访问 `/api-dev/demo/a`
+
+### 通用配置
+
+您在开始使用 D2Admin 开发您的项目之前，应该首先修改 `d2-admin/src/plugin/axios/index.js` 下的设置。
+
+默认的设置需要遵循下面的数据返回格式约定：
+
+``` js
+{
+  // 和后台约定的状态码
+  code: 0,
+  // 后台返回请求状态信息
+  msg: '返回信息',
+  // data 内才是真正的返回数据
+  data: {
+    list: [
+      ...
+    ]
+  }
+}
+```
+
+当发生错误（注：这里指的错误不是 http 错误，而是和后台约定好的错误类型）时返回的数据示例：
+
+``` js
+{
+  // 和后台约定的状态码
+  code: 'unlogin',
+  // 后台返回请求状态信息
+  msg: '用户没有登录'
+}
+```
+
+如果针对某个错误（注：这里指的错误不是 http 错误，而是和后台约定好的错误类型）指定处理方法，应该在响应拦截器中加入对应的代码：
+
+``` js
+service.interceptors.response.use(
+  response => {
+    // 成功返回数据，在这里判断和后台约定的状态标识
+  },
+  error => {
+    // 发生 http 错误，在这里判断状态码
+  }
+)
+```
+
+如果需要针对某个 http 错误指定处理方法，应该在响应拦截器中第二个参数中添加对应的代码。
+
+::: tip
+在默认的设置中，如果您的接口没有返回 code 字段，将不会进行状态（非 http 状态，而是和后台约定好的状态类型）判断，直接返回 axios 请求返回的数据。
+:::
+
+### 设计 API
+
+假设您有一个返回数据的 API 接口，想访问它，您首先应该在 `d2-admin/src/api` 文件夹内创建合适的文件目录，例如：`d2-admin/src/api/demo/business/table/1/index.js`，这个文件中应该导出一个或者多个请求：
+
+``` js
+import request from '@/plugin/axios'
+
+export function BusinessTable1List (data) {
+  return request({
+    url: '/demo/business/table/1',
+    method: 'post',
+    data
+  })
+}
+```
+
+### 使用 API 获取数据
+
+在上面的步骤中创建了 API 文件，您应该在页面中这样使用：
+
+``` vue
+<script>
+import { BusinessTable1List } from '@/api/demo/business/table/1'
+export default {
+  methods: {
+    handleSubmit (form) {
+      BusinessTable1List({
+        name: ''
+      })
+        .then(res => {
+          // 返回数据
+        })
+        .catch(err => {
+          // 异常情况
+        })
+    }
+  }
+}
+</script>
+```
+
+而不是在页面中直接调用 axios。
+
+::: tip
+虽然没有强制规定，请注意您的 API 文件夹结构规律性
+:::
\ No newline at end of file

From 217c238cd33decf09f2c75e5c40faf528486bc53 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 27 Aug 2018 13:46:16 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=8D=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=20code=20=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 872d13d03b5e13a8e438ed20ed6cb83abe8c4c3f [formerly aca9e06a67948e7c8792bbda92dcc21e87110ef4] [formerly 872d13d03b5e13a8e438ed20ed6cb83abe8c4c3f [formerly aca9e06a67948e7c8792bbda92dcc21e87110ef4] [formerly 872d13d03b5e13a8e438ed20ed6cb83abe8c4c3f [formerly aca9e06a67948e7c8792bbda92dcc21e87110ef4] [formerly aca9e06a67948e7c8792bbda92dcc21e87110ef4 [formerly 7420261bea715d752f50756c92fe4a4adf59a2da [formerly 288a72c9e033755159a06174fee92b3c81700ccb]]]]]
Former-commit-id: bbf82797ddd7d5b2ac8887f038b9c91ce76ea0ab
Former-commit-id: 33f5cc5aac9fdc46f8932845f6c48aa3343c9d91
Former-commit-id: c3e92e229a2562f19fc37fb99b135745d28f8731 [formerly e9b0f9f1f45491b21ef1ad2cce5d50d964562144]
Former-commit-id: 27d3c0fb61f3f53c6a4f3964d4df5bea3447d07a
Former-commit-id: 76f5e2b8496d8b40aa74331318ee6b6ba8dbfad0
Former-commit-id: b512030c96c9cda686b02df5b199cc00619f8436
Former-commit-id: 8dcdf3eb14f0f17c36f13cea12d6fb693370b5b0
Former-commit-id: be7b74360f0391ea64cd3fa5375a7671b0bc272b
---
 docs/zh/sys-ajax/README.md | 46 +++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/docs/zh/sys-ajax/README.md b/docs/zh/sys-ajax/README.md
index 1a04317e..cda14051 100644
--- a/docs/zh/sys-ajax/README.md
+++ b/docs/zh/sys-ajax/README.md
@@ -36,7 +36,7 @@ Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ | 11 ✔ |
 
 axios 默认的使用方式在这里不做介绍，D2Admin 推荐在您的项目中使用下面的方式获取数据：
 
-### 修改 baseURL
+### 设置接口地址
 
 默认的请求地址在 `d2-admin/.env`
 
@@ -46,6 +46,8 @@ VUE_APP_API=/api/
 
 上述设置将在您访问 `/demo/a` 时实际去访问 `/api/demo/a`
 
+### 区分不同环境设置接口地址
+
 如果您希望不同的环境使用不同的请求地址，可以在 `d2-admin/.env.development` 中添加设置（示例）：
 
 ```
@@ -75,7 +77,19 @@ VUE_APP_API=/api-dev/
 }
 ```
 
-当发生错误（注：这里指的错误不是 http 错误，而是和后台约定好的错误类型）时返回的数据示例：
+在响应拦截器中处理完数据后将会返回：
+
+``` js
+{
+  list: [
+    ...
+  ]
+}
+```
+
+### 业务错误
+
+当发生错误时返回的数据示例：
 
 ``` js
 {
@@ -86,7 +100,7 @@ VUE_APP_API=/api-dev/
 }
 ```
 
-如果针对某个错误（注：这里指的错误不是 http 错误，而是和后台约定好的错误类型）指定处理方法，应该在响应拦截器中加入对应的代码：
+如果针对某个错误指定处理方法，应该在响应拦截器中加入对应的代码：
 
 ``` js
 service.interceptors.response.use(
@@ -99,11 +113,33 @@ service.interceptors.response.use(
 )
 ```
 
+### http 错误
+
 如果需要针对某个 http 错误指定处理方法，应该在响应拦截器中第二个参数中添加对应的代码。
 
-::: tip
+### 不返回 code
+
 在默认的设置中，如果您的接口没有返回 code 字段，将不会进行状态（非 http 状态，而是和后台约定好的状态类型）判断，直接返回 axios 请求返回的数据。
-:::
+
+例如接口返回如下数据：
+
+``` js
+{
+  list: [
+    ...
+  ]
+}
+```
+
+在响应拦截器中判断该接口没有返回 code 字段，将会直接将返回：
+
+``` js
+{
+  list: [
+    ...
+  ]
+}
+```
 
 ### 设计 API
 

From c0d0527f302757caf62b98bc53be0819b0e93c53 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 27 Aug 2018 13:47:11 +0800
Subject: [PATCH 13/13] =?UTF-8?q?http=20=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 2dd211d2d907008d183137f70427aa9e09911d3a [formerly 2dd211d2d907008d183137f70427aa9e09911d3a [formerly 2dd211d2d907008d183137f70427aa9e09911d3a [formerly 2dd211d2d907008d183137f70427aa9e09911d3a [formerly 3513cac69ee4f88639864b6948d2cc92fa905d12 [formerly 9d47a62c0bf21043a3a033ca2986dd7e0e498fde]]]]]
Former-commit-id: 19f33fa3135a4dee8c26877c4c2f0806d3bb12f9
Former-commit-id: 8817aeb5ff39ee8e0f1c0c6bc4e99e15be719d14
Former-commit-id: 4a03ffc59182705c1e32cc39a3b58bd4f99cab3f [formerly c3df7a16c661750c70f9d958b77e41859741cef2]
Former-commit-id: 507e7b5131fd2c7ebb015e2da0c0ed38699b7aaa
Former-commit-id: a3d6f974fee73c06f92f4bc834f21f4b844cc370
Former-commit-id: 10afc53093bf44b398b5f8f7560b9b9cd231d05e
Former-commit-id: 4707b2df138c81c69c09dae73ab0f16c429336de
Former-commit-id: 8fdd5a268b3fb3150b8ac9b50e9c507c2bc2c07e
---
 docs/zh/sys-ajax/README.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/zh/sys-ajax/README.md b/docs/zh/sys-ajax/README.md
index cda14051..6ea7e769 100644
--- a/docs/zh/sys-ajax/README.md
+++ b/docs/zh/sys-ajax/README.md
@@ -106,9 +106,6 @@ VUE_APP_API=/api-dev/
 service.interceptors.response.use(
   response => {
     // 成功返回数据，在这里判断和后台约定的状态标识
-  },
-  error => {
-    // 发生 http 错误，在这里判断状态码
   }
 )
 ```
@@ -117,6 +114,15 @@ service.interceptors.response.use(
 
 如果需要针对某个 http 错误指定处理方法，应该在响应拦截器中第二个参数中添加对应的代码。
 
+``` js
+service.interceptors.response.use(
+  response => {},
+  error => {
+    // 发生 http 错误，在这里判断状态码
+  }
+)
+```
+
 ### 不返回 code
 
 在默认的设置中，如果您的接口没有返回 code 字段，将不会进行状态（非 http 状态，而是和后台约定好的状态类型）判断，直接返回 axios 请求返回的数据。