@utogether/udp-core 2.0.0-beta.26 → 2.0.0-beta.28

package/src/utils/udp/http/index.ts

@@ -1,25 +1,72 @@
 import Axios, { type AxiosInstance, type AxiosRequestConfig } from 'axios';
-import type { SuHttpError, RequestMethods, SuHttpResponse, SuHttpRequestConfig } from './types.d';
+import type { RequestMethods, XHttpRequestConfig } from './types.d';
+// import { NProgress, cookies, errorMessage } from "./index";
 import { NProgress, cookies, errorMessage } from '@utogether/utils';
+
 import { isRef } from 'vue';
 import { has } from 'xe-utils';
 
 const kTOKENKEY = 'authorized-token';
 const defaultConfig: AxiosRequestConfig = {
-  timeout: 180000,
+  timeout: 300000,
   headers: {
     Accept: 'application/json, text/plain, */*',
     'Content-Type': 'application/json',
     'X-Requested-With': 'XMLHttpRequest'
   }
 };
-class SuHttp {
+
+// 存储pending中的请求
+const pendingMap = new Map<string, (message?: string) => void>();
+
+// 生成请求唯一标识
+const getRequestKey = config => {
+  try {
+    const { method, url, params, data } = config;
+    const paramString = params ? JSON.stringify(params) : '';
+    const dataString = data ? JSON.stringify(data) : '';
+    return [method?.toUpperCase(), url, paramString, dataString].filter(Boolean).join('&');
+  } catch (error) {
+    console.warn('Failed to generate request key:', error);
+    return `${config.method || 'GET'}_${config.url || ''}_${Date.now()}`;
+  }
+};
+
+// 添加pending请求
+const addPending = (config: any): void => {
+  const key = getRequestKey(config);
+  console.log(key, pendingMap.has(key));
+  if (pendingMap.has(key)) {
+    const cancel = pendingMap.get(key);
+    if (cancel) {
+      cancel(`Duplicate request canceled: ${key}`);
+    }
+    pendingMap.delete(key);
+  }
+  config.cancelToken = new Axios.CancelToken(cancel => {
+    pendingMap.set(key, cancel);
+  });
+};
+
+// 移除pending请求
+const removePending = config => {
+  const key = getRequestKey(config);
+  if (pendingMap.has(key)) {
+    pendingMap.delete(key);
+  }
+};
+
+class XHttp {
   constructor() {
     this.httpInterceptorsRequest();
     this.httpInterceptorsResponse();
   }
   router = undefined;
-  baseUrl = 'http: //192.168.101.138.8099';
+  baseUrl = null;
+
+  // 服务白名单，判断是否需要token
+  whiteList = [/\/refreshToken$/, /\/login$/];
+
   /** token过期后，暂存待执行的请求 */
   private static requests = [];
 
@@ -34,17 +81,14 @@ class SuHttp {
   setBaseUrl(baseUrl) {
     this.baseUrl = baseUrl;
   }
-  // 初始化配置对象
-  private static initConfig: SuHttpRequestConfig = {};
 
   // 保存当前Axios实例对象
   private static axiosInstance: AxiosInstance = Axios.create(defaultConfig);
 
   /** 重连原始请求 */
-  private static retryOriginalRequest(config: SuHttpRequestConfig) {
+  private static retryOriginalRequest(config: XHttpRequestConfig) {
     return new Promise(resolve => {
-      // @ts-ignore
-      SuHttp.requests.push((token: string) => {
+      XHttp.requests.push((token: string) => {
         config.headers!['Authorization'] = 'Bearer ' + token;
         resolve(config);
       });
@@ -53,37 +97,39 @@ class SuHttp {
 
   // 请求拦截
   private httpInterceptorsRequest(): void {
-    SuHttp.axiosInstance.interceptors.request.use(
+    XHttp.axiosInstance.interceptors.request.use(
       (config: any) => {
         if (has(config, 'loading') && isRef(config.loading)) {
           config.loading.value = true;
         }
+
+        // 重复请求取消前一个
+        !config.url.includes('uath/refreshToken') && addPending(config);
+
         // 开启进度条动画
         NProgress.start();
+
         // 优先判断post/get等方法是否传入回掉，否则执行初始化设置等回掉
         if (typeof config.beforeRequestCallback === 'function') {
           config.beforeRequestCallback(config);
           return config;
         }
-        if (SuHttp.initConfig.beforeRequestCallback) {
-          SuHttp.initConfig.beforeRequestCallback(config);
-          return config;
-        }
-        const whiteList = ['/refreshToken', '/login'];
-        if (whiteList.some(v => config.url.indexOf(v) > -1)) return config;
-        return new Promise(resolve => {
+
+        if (this.whiteList.some(pattern => pattern.test(config.url))) return config;
+
+        return new Promise(async resolve => {
           const token = cookies.get(kTOKENKEY);
           if (token) {
             const data = JSON.parse(token);
             const now = new Date().getTime();
             const expired = data.expires - now <= 0;
             if (expired) {
-              if (!SuHttp.isRefreshing) {
-                SuHttp.isRefreshing = true;
-                // requests.push(() => SuHttp.axiosInstance(config));
-                this.get(this.baseUrl + '/uath/refreshToken', {
-                  refreshToken: data.refreshToken
-                })
+              if (!XHttp.isRefreshing) {
+                XHttp.isRefreshing = true;
+                XHttp.axiosInstance
+                  .get(this.baseUrl + '/uath/refreshToken', {
+                    params: { refreshToken: data.refreshToken }
+                  })
                   .then((res: any) => {
                     if (!res?.access_token) {
                       this.routeToLogin();
@@ -92,19 +138,20 @@ class SuHttp {
                       this.setToken(res);
                       config.headers['Authorization'] = 'Bearer ' + res.access_token;
                       // token 刷新后将数组的方法重新执行
-                      SuHttp.requests.forEach(cb => cb(res.access_token));
-                      SuHttp.requests = []; // 重新请求完清空
+                      XHttp.requests.forEach(cb => cb(res.access_token));
+                      XHttp.requests = []; // 重新请求完清空
                     }
                   })
                   .catch(() => {
                     this.routeToLogin();
                   })
                   .finally(() => {
-                    SuHttp.isRefreshing = false;
+                    XHttp.isRefreshing = false;
                   });
               }
+              // 请求完成，移除pending记录
               // @ts-ignore
-              resolve(SuHttp.retryOriginalRequest(config));
+              resolve(XHttp.retryOriginalRequest(config));
             } else {
               config.headers['Authorization'] = 'Bearer ' + data.accessToken;
               resolve(config);
@@ -129,14 +176,14 @@ class SuHttp {
     const cache = {
       accessToken: access_token,
       refreshToken: refresh_token,
-      expires: Date.now() + expires_in * 1000
+      expires: Date.now() + expires_in
+      // expires: Date.now() + expires_in * 1000
     };
     cookies.set(kTOKENKEY, JSON.stringify(cache));
-    // cookies.set(kTOKENKEY, JSON.stringify(cache), { expires: expires_in });
   }
 
   private routeToLogin() {
-    SuHttp.requests = []; // 重新请求完清空
+    XHttp.requests = []; // 重新请求完清空
     cookies.remove('kCookies_token');
     cookies.remove('authorized-token');
     cookies.remove('loginer');
@@ -145,43 +192,58 @@ class SuHttp {
 
   // 响应拦截
   private httpInterceptorsResponse(): void {
-    const instance = SuHttp.axiosInstance;
+    const instance = XHttp.axiosInstance;
     instance.interceptors.response.use(
-      (response: SuHttpResponse) => {
-        const $config = response.config;
+      (response: any) => {
+        const $config = response.config as XHttpRequestConfig;
+
         if (has($config, 'loading') && isRef($config.loading)) {
           $config.loading.value = false;
         }
+
+        // 请求完成，移除pending记录
+        removePending(response.config);
+
         // 关闭进度条动画
         NProgress.done();
+
         // 优先判断post/get等方法是否传入回掉，否则执行初始化设置等回掉
         if (typeof $config.beforeResponseCallback === 'function') {
           $config.beforeResponseCallback(response);
           return response.data;
         }
-        if (SuHttp.initConfig.beforeResponseCallback) {
-          SuHttp.initConfig.beforeResponseCallback(response);
-          return response.data;
+
+        if (!response.data && response?.msg) {
+          return Promise.reject(response.msg);
         }
+
         return response.data;
       },
-      (error: SuHttpError) => {
-        const $error = error;
-        // @ts-ignore
-        if (has(error.config, 'loading') && isRef(error?.config?.loading)) {
-          // @ts-ignore
-          error.config.loading.value = false;
+      (error: any) => {
+        // 被取消的请求不做错误提示
+        if (Axios.isCancel(error)) {
+          console.warn('请求已取消:', error.message);
+          return Promise.reject(error);
         }
-        $error.isCancelRequest = Axios.isCancel($error);
+
+        // 移除pending记录
+        error.config && removePending(error.config);
+
+        const config = error.config as XHttpRequestConfig;
+
+        if (has(config, 'loading') && isRef(config?.loading)) {
+          config.loading.value = false;
+        }
+
         // 关闭进度条动画
         NProgress.done();
         // 所有的响应异常 区分来源为取消请求/非取消请求
-        return Promise.reject($error);
+        return Promise.reject(error);
       }
     );
   }
 
-  private transformConfigByMethod(params: any, config: SuHttpRequestConfig): SuHttpRequestConfig {
+  private transformConfigByMethod(params: any, config: XHttpRequestConfig): XHttpRequestConfig {
     const { method } = config;
     const methods = ['get'];
     const m = method!.toLocaleLowerCase();
@@ -197,27 +259,27 @@ class SuHttp {
     method: RequestMethods,
     url: string,
     param?: AxiosRequestConfig,
-    axiosConfig?: SuHttpRequestConfig
+    axiosConfig?: XHttpRequestConfig
   ): Promise<T> {
     const config = this.transformConfigByMethod(param, {
       method,
       url,
       ...axiosConfig
-    } as SuHttpRequestConfig);
+    } as XHttpRequestConfig);
     // 单独处理自定义请求/响应回掉
     return new Promise((resolve, reject) => {
-      SuHttp.axiosInstance
+      XHttp.axiosInstance
         .request(config)
         .then((res: any) => {
-          if (res && res?.code === '0') {
-            resolve(res.data);
-          } else if (res.code === '500') {
+          if (res.code === '500') {
             errorMessage(res.msg, { duration: 8000 });
             if (config.method === 'get') {
               resolve(res);
             } else {
               reject(res.msg);
             }
+          } else if (res?.code === '0') {
+            resolve(res.data);
           } else if (res?.code !== '-1') {
             resolve(res);
           } else {
@@ -229,12 +291,13 @@ class SuHttp {
         .catch(e => {
           if (e?.code) {
             if (e?.response?.status === 401) {
-              // @ts-ignore
               return this.router?.push({ path: '/login' });
             }
-            errorMessage(this.getNetworkError(e?.response?.status) || e?.message, { duration: 8000 });
+            if (e.code !== 'ERR_CANCELED') {
+              errorMessage(this.getNetworkError(e?.response?.status) || e?.message, { duration: 8000 });
+            }
           }
-          if (e.config.method === 'get') {
+          if (e.config?.method === 'get') {
             resolve(e);
           } else {
             reject(e);
@@ -246,12 +309,12 @@ class SuHttp {
   getNetworkError = code => {
     if (!code) return null;
     const msgMap = {
-      400: '错误的请求',
-      401: '服务未授权,请重新登录',
-      403: '拒绝访问',
+      400: '请求参数错误',
+      401: '登录已过期,请重新登录',
+      403: '没有权限访问',
       404: '请求错误,未找到该资源',
       408: '请求超时',
-      500: '服务器端出差',
+      500: '服务器内部错误',
       502: '网络超时',
       503: '服务不可用',
       504: '网络超时'
@@ -260,29 +323,25 @@ class SuHttp {
   };
 
   // 单独抽离的post工具函数
-  public post<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P> {
-    // @ts-ignore
+  public post<T, P>(url: string, params?: T, config?: XHttpRequestConfig): Promise<P> {
     return this.request<P>('post', url, params, config);
   }
 
   // 单独抽离的delete工具函数
-  public delete<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P> {
-    // @ts-ignore
+  public delete<T, P>(url: string, params?: T, config?: XHttpRequestConfig): Promise<P> {
     return this.request<P>('delete', url, params, config);
   }
 
   // 单独抽离的put工具函数
-  public put<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P> {
-    // @ts-ignore
+  public put<T, P>(url: string, params?: T, config?: XHttpRequestConfig): Promise<P> {
     return this.request<P>('put', url, params, config);
   }
 
   // 单独抽离的get工具函数
-  public get<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P> {
+  public get<T, P>(url: string, params?: T, config?: XHttpRequestConfig): Promise<P> {
     for (const key in params) {
       if (!params[key]) delete params[key];
     }
-    // @ts-ignore
     return this.request<P>('get', url, params, config);
   }
 
@@ -291,4 +350,4 @@ class SuHttp {
   }
 }
 
-export const http = new SuHttp();
+export const http = new XHttp();

package/src/utils/udp/http/types.d.ts

@@ -2,8 +2,8 @@
  * @Author: wei.li
  * @Date: 2022-03-08 15:17:39
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2023-12-01 13:55:46
- * @Description: SuHttp Axios 类型定义文件
+ * @LastEditTime: 2026-05-18 10:46:33
+ * @Description: XHttp Axios 类型定义文件
  */
 import type { Method, AxiosError, AxiosResponse, AxiosRequestConfig } from 'axios';
 
@@ -15,28 +15,29 @@ export type resultType = {
 
 export type RequestMethods = Extract<Method, 'get' | 'post' | 'put' | 'delete' | 'patch' | 'option' | 'head'>;
 
-export interface SuHttpError extends AxiosError {
+export interface XHttpError extends AxiosError {
   isCancelRequest?: boolean;
 }
 
-export interface SuHttpResponse extends AxiosResponse {
-  config: SuHttpRequestConfig;
+export interface XHttpResponse extends AxiosResponse {
+  config: XHttpRequestConfig;
+  msg: string;
 }
 
-export interface SuHttpRequestConfig extends AxiosRequestConfig {
-  beforeRequestCallback?: (request: SuHttpRequestConfig) => void;
-  beforeResponseCallback?: (response: SuHttpResponse) => void;
-  loading?: any;
+export interface XHttpRequestConfig extends AxiosRequestConfig {
+  beforeRequestCallback?: (request: XHttpRequestConfig) => void;
+  beforeResponseCallback?: (response: XHttpResponse) => void;
+  loading?: boolean;
 }
 
-export default class SuHttp {
+export default class XHttp {
   request<T>(
     method: RequestMethods,
     url: string,
     param?: AxiosRequestConfig,
-    axiosConfig?: SuHttpRequestConfig
+    axiosConfig?: XHttpRequestConfig
   ): Promise<T>;
-  post<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P>;
-  postRouter<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P>;
-  get<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P>;
+  post<T, P>(url: string, params?: T, config?: XHttpRequestConfig): Promise<P>;
+  postRouter<T, P>(url: string, params?: T, config?: XHttpRequestConfig): Promise<P>;
+  get<T, P>(url: string, params?: T, config?: XHttpRequestConfig): Promise<P>;
 }

package/src/views/login/login-view.vue

@@ -91,7 +91,6 @@ import { ref, reactive, onMounted, onBeforeMount, onBeforeUnmount } from 'vue';
 import { useRouter } from 'vue-router';
 import type { FormInstance } from 'element-plus';
 import { storageLocal, cookies, successMessage, delay } from '@utogether/utils';
-import { toDateString } from 'xe-utils';
 import to from 'await-to-js';
 
 import Motion from './utils/motion';
@@ -100,15 +99,12 @@ import TypeIt from '@/components/SuTypeit';
 import { useRenderIcon } from '@/components/ReIcon/src/hooks';
 // import { useTranslationLang } from '@/layout/hooks/useTranslationLang';
 import { useLayout } from '@/layout/hooks/useLayout';
-// import { useNav } from '@/layout/hooks/useNav';
-// import { useDataThemeChange } from '@/layout/hooks/useDataThemeChange';
+
 import { useSystemStoreHook } from '@/store/modules/system';
 
 import { getServiceApi } from '../../api';
-import { getPlatform, getBrower } from '@/utils/browers';
-// import dayIcon from '@/assets/svg/day.svg?component';
-// import darkIcon from '@/assets/svg/dark.svg?component';
-// import globalization from '@/assets/svg/globalization.svg?component';
+import { userMonitor } from '../../api/user';
+
 import Lock from '@iconify-icons/ri/lock-fill';
 import User from '@iconify-icons/ri/user-3-fill';
 
@@ -176,7 +172,7 @@ const onLogin = async (formEl: FormInstance | undefined) => {
           cookies.set('loginer', username);
           await delay(300);
           router.push('/');
-          await insertLoginInfo(username);
+          userMonitor(username);
         })
         .finally(() => {
           loading.value = false;
@@ -204,19 +200,6 @@ const cacheToken = token => {
   expires_in > 0 ? cookies.set(kTOKENKEY, dataString) : cookies.set(kTOKENKEY, dataString);
 };
 
-const insertLoginInfo = username => {
-  const userAgent = navigator.userAgent.toLowerCase();
-  const { browser, browserVersion } = getBrower(userAgent);
-  const obj = {
-    userName: username,
-    loginTime: toDateString(new Date()),
-    browser,
-    browserVersion,
-    operatingSystem: getPlatform(userAgent)
-  };
-  serviceApi.post('/upfm/v1/userMonitor', obj);
-};
-
 /** 使用公共函数，避免`removeEventListener`失效 */
 function onkeypress({ code }: KeyboardEvent) {
   if (['Enter', 'NumpadEnter'].includes(code)) {

package/src/views/organization/department/DepartmentPanel.vue

@@ -113,15 +113,14 @@
 
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n';
-import { reactive, watch, inject } from 'vue';
-import { templateRef } from '@vueuse/core';
+import { reactive, watch, inject, ref } from 'vue';
 import { clone } from 'xe-utils';
 import to from 'await-to-js';
 import { VxeUI } from 'vxe-table';
 import { successMessage, warnMessage } from '@utogether/utils';
 import { useSystemStoreHook } from '../../../store/modules/system';
 import { getServiceApi } from '../../../api';
-import hasAuthority from '../../../utils/authority';
+import { hasAuthority } from '../../../utils/authority';
 
 const data = reactive<IRecord>({
   record: {},
@@ -186,7 +185,7 @@ const handleEdit = dataStatus => {
   data.dialogFormVisible = true;
 };
 
-const xForm = templateRef<any>('xForm', null);
+const xForm = ref<any>('xForm');
 const handleComfirm = () => {
   xForm.value.validate(async valid => {
     if (!valid) {