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] 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)