qj-common 4.1.21 → 4.1.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/utils/request.js +6 -4
package/package.json
CHANGED
package/src/utils/request.js
CHANGED
|
@@ -181,7 +181,7 @@ service.interceptors.request.use(
|
|
|
181
181
|
|
|
182
182
|
// Reset Config -- By Joenix
|
|
183
183
|
config = interceptor(config);
|
|
184
|
-
|
|
184
|
+
|
|
185
185
|
if (getLocalStorage('saas-tenantcode')) {
|
|
186
186
|
config.headers['saas-tenantcode'] = getLocalStorage('saas-tenantcode');
|
|
187
187
|
}
|
|
@@ -193,8 +193,10 @@ service.interceptors.request.use(
|
|
|
193
193
|
}else if(getQueryString('saas-token')){
|
|
194
194
|
config.headers['saas-token'] = getQueryString('saas-token');
|
|
195
195
|
console.log('saas-token',getQueryString('saas-token'));
|
|
196
|
+
}else if(getLocalStorage('saasToken')){
|
|
197
|
+
config.headers['saas-token'] = getLocalStorage('saasToken');
|
|
196
198
|
}else if(getLocalStorage('saas-token')){
|
|
197
|
-
|
|
199
|
+
config.headers['saas-token'] = getLocalStorage('saas-token');
|
|
198
200
|
}
|
|
199
201
|
if (getLocalStorage('saas-proappcode')) {
|
|
200
202
|
config.headers['saas-proappcode'] = getLocalStorage('saas-proappcode');
|
|
@@ -280,7 +282,7 @@ service.interceptors.response.use(
|
|
|
280
282
|
window.sessionStorage.setItem('cookieKey', cookieKey);
|
|
281
283
|
let menuCode = window.sessionStorage.getItem('menuCode') ? window.sessionStorage.getItem('menuCode') : '';
|
|
282
284
|
|
|
283
|
-
|
|
285
|
+
|
|
284
286
|
setLocalStorage('saas-tenantcode', tenantcode);
|
|
285
287
|
setLocalStorage('saas-token', token);
|
|
286
288
|
setLocalStorage('saas-proappcode', proappcode);
|
|
@@ -311,7 +313,7 @@ service.interceptors.response.use(
|
|
|
311
313
|
}
|
|
312
314
|
// window.location.href = process.env.API_ROOT + nJson.loginurl
|
|
313
315
|
} else {
|
|
314
|
-
// 如果检查到没有登录，则清除保存的登录cookie
|
|
316
|
+
// 如果检查到没有登录，则清除保存的登录cookie
|
|
315
317
|
if(!window.qs){
|
|
316
318
|
let newDomain = document.domain
|
|
317
319
|
.split('.')
|