diff --git a/.env.staging b/.env.staging index 1953958..07d442a 100644 --- a/.env.staging +++ b/.env.staging @@ -4,10 +4,10 @@ NODE_ENV = production ENV = 'staging' # base api -VUE_APP_BASE_API='https://cz-hjjc.115.langye.net' -VUE_APP_UPLOAD_API='https://cz-hjjc.115.langye.net/api/upload-file' +VUE_APP_BASE_API='' +VUE_APP_UPLOAD_API='/api/upload-file' VUE_APP_PREVIEW=//view.langye.net/preview/onlinePreview -VUE_APP_OUT_OLD=https://cz-hjjc.115.langye.net/oa -VUE_APP_OUT_URL=https://cz-hjjc.115.langye.net/oa +VUE_APP_OUT_OLD = /oa +VUE_APP_OUT_URL = /oa VUE_APP_MODULE_NAME=ht diff --git a/src/main.js b/src/main.js index 63c2965..e192d77 100644 --- a/src/main.js +++ b/src/main.js @@ -61,6 +61,10 @@ import { setToken,getToken } from "@/utils/auth" if(window.top !== window.self) { // 当前页面在iframe中 window._IN_IFRAME = true; + Vue.config.errorHandler = (err, vm, info) => { + parent?._addError(err.message, err.stack) + console.error(err) + } } if (window.__POWERED_BY_WUJIE__) { let instance; diff --git a/src/utils/request.js b/src/utils/request.js index f33fc2a..d3c37f1 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -14,7 +14,7 @@ let loading; const service = axios.create({ baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url // withCredentials: true, // send cookies when cross-domain requests - timeout: 500000 // request timeout + timeout: 50000 // request timeout }) // request interceptor @@ -42,6 +42,7 @@ service.interceptors.request.use( error => { // do something with request error console.log(error) // for debug + parent?._addError(error, 'axios-request', error.config.params||error.config.data) return Promise.reject(error) } ) @@ -86,8 +87,12 @@ service.interceptors.response.use( store.dispatch('user/resetToken').then(() => { location.reload() }) + if (window._IN_IFRAME) { + parent?._logout() + } }) } + parent?._addError(res.msg, `axios-response ${response.config.url}`, response.config.params || response.config.data) return Promise.reject(new Error(res.msg || 'Error')) } else { return res.data @@ -97,10 +102,11 @@ service.interceptors.response.use( loading?.close() console.error('err' + error) // for debug Message({ - message: /Network Error/g.test(error) ? "网络错误" : "系统错误", + message: /Network Error/g.test(error) ? "网络错误" : (/timeout/g.test(error) ? "网络超时" : "系统错误"), type: 'error', duration: 5 * 1000 }) + parent?._addError(error.toString(), `axios-request ${error.config.url}`, error.config.params || error.config.data) return Promise.reject(error) } ) diff --git a/src/views/away/index.vue b/src/views/away/index.vue index 2fcc205..335a5f8 100644 --- a/src/views/away/index.vue +++ b/src/views/away/index.vue @@ -51,7 +51,7 @@