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)