From cf7eda004123f2ee07bfa7d05f51f71f9dbb4bcd Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期四, 18 七月 2024 11:48:59 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/WI/Web.V1.0
---
src/utils/request.ts | 57 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 39 insertions(+), 18 deletions(-)
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 3fad42b..2330610 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -5,37 +5,56 @@
import { debounce } from './util';
import { AUTH_URL, MAIN_URL, SECONDARY_URL } from '/@/constants';
import { Local, LoginInfo, Session } from '/@/utils/storage';
+import { LOGIN_URL } from '../api/ai/user';
+import { NO_AUTH_API_LIST } from '../api/ai/chat';
// import JSONbig from 'json-bigint';
//#region ====================== 鍚庣 res.err_code ======================
export const enum ErrorCode {
/** @description 鏉冮檺楠岃瘉澶辫触 */
+ Message = 'MESSAGE',
+ /** @description 鍐呴儴閿欒 */
+ Exception = 'EXCEPTION',
+ /** @description 鏃犳潈浣跨敤 */
Auth = 'AUTH',
}
//#endregion
-const handleNoAuth = debounce(() => {
+const emitNoAuth = () => {
emitter.emit('logout');
emitter.emit('openLoginDlg');
+};
+
+export const handleNormalAuth = () => {
+ const accessSession = Local.get(accessSessionKey);
+ if (!accessSession) {
+ emitter.emit('logout');
+ emitter.emit('openLoginDlg');
+ }
+ return !!accessSession;
+};
+
+const handleNoAuth = debounce(() => {
+ emitNoAuth();
});
-const loginUrl = '/login';
const initRequestInterceptor = (request: AxiosInstance) => {
// 娣诲姞璇锋眰鎷︽埅鍣�
request.interceptors.request.use(
(config) => {
// 鑾峰彇鏈湴鐨� token
const accessSession = Local.get(accessSessionKey);
-
- if (accessSession) {
- // 灏� token 娣诲姞鍒拌姹傛姤鏂囧ご涓�
- config.headers['hswatersession'] = accessSession;
- } else {
- if (config.url !== loginUrl) {
- handleNoAuth(config.url);
-
- throw '鏉冮檺楠岃瘉澶辫触';
+ if (!NO_AUTH_API_LIST.includes(config.url)) {
+ if (accessSession) {
+ // 灏� token 娣诲姞鍒拌姹傛姤鏂囧ご涓�
+ config.headers['hswatersession'] = accessSession;
+ } else {
+ if (config.url !== LOGIN_URL) {
+ handleNoAuth(config.url);
+ throw '鏉冮檺楠岃瘉澶辫触';
+ }
}
}
+
return config;
},
(error) => {
@@ -73,18 +92,20 @@
handleNoAuth();
throw '鏉冮檺楠岃瘉澶辫触';
}
+ break;
+ case ErrorCode.Exception:
+ ElMessage.error('鍐呴儴閿欒锛�');
+ throw '鍐呴儴閿欒';
}
- // const msg = serveData.json_msg ?? '';
-
- // const error = serveData?.err_code ? `${msg ? `銆�${serveData.err_code}銆慲 : serveData.err_code}` : '';
- // const tip = error + msg || '璇锋眰澶辫触';
- // ElMessage.error(tip);
- // const url = res.request.responseURL;
- // throw new Error(url + '\n' + tip);
+
}
return res.data;
},
(error) => {
+ if (typeof error === 'string') {
+ // ElMessage.error(error);
+ return Promise.reject(error);
+ }
// 澶勭悊鍝嶅簲閿欒
if (error.response) {
if (error.response.status === 401) {
--
Gitblit v1.9.3