From 2573c1c123a8464c312d27e380ac16d7e0ac2f11 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 23:22:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main.js | 131 ++++++++++++++++++++++---------------------
1 files changed, 67 insertions(+), 64 deletions(-)
diff --git a/src/main.js b/src/main.js
index 8b8170e..9a81a52 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,7 +13,7 @@
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80/"; //鍓嶇鏈湴绔彛
Vue.prototype.HaveJson = (val) => {
- return JSON.parse(JSON.stringify(val))
+ return JSON.parse(JSON.stringify(val))
}
Vue.use(VueAxios, axios)
@@ -23,9 +23,9 @@
Vue.use(qs);
Vue.use(api);
-// const javaApi = 'http://192.168.14.249:8001'
+const javaApi = 'http://localhost:8001'
-const javaApi = 'http://127.0.0.1:8001/'
+// const javaApi = 'http://127.0.0.1:8001/'
@@ -37,71 +37,74 @@
Vue.prototype.$axios = axios
import {
- Message
+ Message
} from 'element-ui';
-axios.interceptors.request.use(function (config) {
- let tk = sessionStorage.getItem("token")
- let token;
- if (tk != undefined && tk != '') {
- token = tk
- }
- if (token) {
- config.headers['token'] = "" + token
- // config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
- // config.headers['Content-Type'] = 'application/json'
- }
- // console.log(config)
- if (config.method === 'post' || config.method === 'put') {
+axios.interceptors.request.use(function(config) {
+ let tk = sessionStorage.getItem("token")
+ let token;
+ if (tk != undefined && tk != '') {
+ token = tk
+ }
+ if (token) {
+ config.headers['token'] = "" + token
+ // config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
+ // config.headers['Content-Type'] = 'application/json'
+ }
+ // console.log(config)
+ if (config.method === 'post' || config.method === 'put') {
- config.data = qs.stringify(config.data)
- }
- if (config.headers['Content-Type'] == 'application/json') {
- config.data = qs.parse(config.data)
- // console.log(config.data)
- }
+ config.data = qs.stringify(config.data)
+ }
+ if (config.headers['Content-Type'] == 'application/json') {
+ config.data = qs.parse(config.data)
+ // console.log(config.data)
+ }
- return config
-}, function (error) {
- return Promise.reject(error)
+ return config
+}, function(error) {
+ return Promise.reject(error)
})
axios.interceptors.response.use(res => {
- return res.data
-}, async function (err) {
- if (JSON.stringify(err).indexOf('timeout of') > -1) {
- Message.error('璇锋眰瓒呮椂锛岃妫�鏌ョ綉缁滆缃�')
- } else if (JSON.stringify(err).indexOf('ERR_CONNECTION_RESET') > -1 || JSON.stringify(err).indexOf(
- 'Network Error') > -1) {
- Message.error('缃戠粶杩炴帴閿欒')
- } else if (err.response.status == "503") {
- Message.error('鏈嶅姟鏈搷搴�')
- } else if (err.response.status == "404") {
- Message.error('璇锋眰澶辫触锛岄摼鎺ュ湴鍧�涓嶅瓨鍦�')
- } else if (err.response.status == "403") {
- Message.error('token涓嶅瓨鍦�')
- } else if (err.response.status == "402") {
- Message.error('鏃犳晥绛惧悕锛岃閲嶆柊鐧诲綍')
- localStorage.removeItem('autoenter')
- window.location.href = '/enter'
- } else if (err.response.status == "401") {
- await axios.post(javaApi + "user/refresh", {
- reToken: sessionStorage.getItem('reToken')
- }).then(res => {
- if (res.data.code == 201) {
- Message.error('璁よ瘉澶辫触锛岄渶瑕侀噸鏂扮櫥褰�')
- localStorage.removeItem('autoenter')
- window.location.href = '/enter'
- return Promise.reject(err)
- }
- sessionStorage.setItem('token', res.data.token)
- sessionStorage.setItem('reToken', res.data.reToken)
- })
- return axios(err.config)
- } else if (err.response.status == "500") {
- Message.error('鏈嶅姟绔嚭鐜伴敊璇�')
- }
- return Promise.reject(err)
+ if(res.config.responseType === 'blob'){
+ return res;
+ }
+ return res.data
+}, async function(err) {
+ if (JSON.stringify(err).indexOf('timeout of') > -1) {
+ Message.error('璇锋眰瓒呮椂锛岃妫�鏌ョ綉缁滆缃�')
+ } else if (JSON.stringify(err).indexOf('ERR_CONNECTION_RESET') > -1 || JSON.stringify(err).indexOf(
+ 'Network Error') > -1) {
+ Message.error('缃戠粶杩炴帴閿欒')
+ } else if (err.response.status == "503") {
+ Message.error('鏈嶅姟鏈搷搴�')
+ } else if (err.response.status == "404") {
+ Message.error('璇锋眰澶辫触锛岄摼鎺ュ湴鍧�涓嶅瓨鍦�')
+ } else if (err.response.status == "403") {
+ Message.error('token涓嶅瓨鍦�')
+ } else if (err.response.status == "402") {
+ Message.error('鏃犳晥绛惧悕锛岃閲嶆柊鐧诲綍')
+ localStorage.removeItem('autoenter')
+ window.location.href = '/enter'
+ } else if (err.response.status == "401") {
+ await axios.post(javaApi + "user/refresh", {
+ reToken: sessionStorage.getItem('reToken')
+ }).then(res => {
+ if (res.data.code == 201) {
+ Message.error('璁よ瘉澶辫触锛岄渶瑕侀噸鏂扮櫥褰�')
+ localStorage.removeItem('autoenter')
+ window.location.href = '/enter'
+ return Promise.reject(err)
+ }
+ sessionStorage.setItem('token', res.data.token)
+ sessionStorage.setItem('reToken', res.data.reToken)
+ })
+ return axios(err.config)
+ } else if (err.response.status == "500") {
+ Message.error('鏈嶅姟绔嚭鐜伴敊璇�')
+ }
+ return Promise.reject(err)
})
// 璺敱鎷︽埅鍣�
@@ -119,7 +122,7 @@
// });
new Vue({
- el: '#app',
- router,
- render: h => h(App)
+ el: '#app',
+ router,
+ render: h => h(App)
});
--
Gitblit v1.9.3