zmdms-utils 0.0.90 → 0.0.92

package/dist/es/auth.d.ts

@@ -5,5 +5,6 @@ declare function getToken(): string | null;
 declare function setToken(token: string): void;
 declare function removeToken(): void;
 declare function parseToken(token?: string): unknown;
+declare function getPreToken(token?: string): string;
 
-export { getToken, parseToken, removeToken, setToken };
+export { getPreToken, getToken, parseToken, removeToken, setToken };

package/dist/es/auth.js

@@ -45,5 +45,26 @@ function parseToken(token) {
     // 没有token
     return null;
 }
+function getPreToken(token) {
+    try {
+        var tokenResult = token || getToken();
+        if (!tokenResult) {
+            return "";
+        }
+        var tokenType = window.localStorage.getItem("system-token-type") || "bearer";
+        // 统一转为小写进行比较
+        var normalizedTokenType = tokenType.toLowerCase();
+        // 检查 token 是否已包含前缀（不区分大小写）
+        if (tokenResult.toLowerCase().startsWith(normalizedTokenType + " ")) {
+            return tokenResult;
+        }
+        // 添加前缀（全部小写）
+        return "".concat(normalizedTokenType, " ").concat(tokenResult);
+    }
+    catch (err) {
+        console.error("获取token失败", err);
+        return "";
+    }
+}
 
-export { getToken, parseToken, removeToken, setToken };
+export { getPreToken, getToken, parseToken, removeToken, setToken };

package/dist/es/common.js

@@ -75,7 +75,13 @@ function parseQueryParams(url) {
         if (queryString) {
             var searchList = queryString.split("&");
             for (var i = 0; i < searchList.length; i++) {
-                var _a = searchList[i].split("="), key = _a[0], value = _a[1];
+                // const [key, value] = searchList[i].split("=");
+                // 支持参数?params=xxxxx==&key=value 这种模式的
+                var splitIndex = searchList[i].indexOf("=");
+                var _a = [
+                    searchList[i].substring(0, splitIndex),
+                    searchList[i].substring(splitIndex + 1),
+                ], key = _a[0], value = _a[1];
                 var val = decodeURIComponent(value);
                 if (val.startsWith("{")) {
                     try {

package/dist/es/file.js

@@ -1,4 +1,4 @@
-import { getToken } from './auth.js';
+import { getPreToken } from './auth.js';
 import { dangerouslyXss, specialString, getFileExtension, isImageExtension } from './common.js';
 import { BASIC_KEY, TOKEN_KEY, FILE_SERVICE, FILE_PRVIEW_SERVICE_URL } from './constants.js';
 import { Crypto } from './crypto.js';
@@ -397,12 +397,7 @@ function createDeleteFileLink(options) {
 function getBasicInfo(baseURL, token) {
     var _a;
     // 如果token有前缀，那么不需要处理 如果token没有前缀 添加bearer前缀
-    var newToken = token || getToken();
-    if (newToken &&
-        !newToken.startsWith("Bearer ") &&
-        !newToken.startsWith("bearer ")) {
-        newToken = "bearer ".concat(newToken);
-    }
+    var newToken = getPreToken(token);
     return {
         token: newToken,
         apiBaseURL: ((_a = baseURL === null || baseURL === void 0 ? void 0 : baseURL.endsWith) === null || _a === void 0 ? void 0 : _a.call(baseURL, "/"))

package/dist/es/request.js

@@ -1,6 +1,6 @@
 import { __rest, __assign } from './_virtual/_tslib.js';
 import axios from 'axios';
-import { removeToken, getToken } from './auth.js';
+import { removeToken, getPreToken } from './auth.js';
 import { TOKEN_KEY } from './constants.js';
 
 var defaultOptions = {
@@ -242,8 +242,8 @@ var AxiosRequest = /** @class */ (function () {
             newOptions.headers = {};
         }
         if (isAuth) {
-            var token = getToken();
-            newOptions.headers[this.tokenKey] = "bearer ".concat(token);
+            var token = getPreToken();
+            newOptions.headers[this.tokenKey] = token;
         }
         // 遍历params，将undefined值 转为null值
         if (newOptions.data) {

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export { initMicroApp } from './es/microAppCreator.js';
 export { getMicroUrl, isQiankun } from './es/qiankunUtils.js';
 export { initGlobalError, initMainApp } from './es/mainApp.js';
-export { getToken, parseToken, removeToken, setToken } from './es/auth.js';
+export { getPreToken, getToken, parseToken, removeToken, setToken } from './es/auth.js';
 export { AxiosRequest, IOptions, IOtherOptions } from './es/request.js';
 export { getBaseUrl } from './es/baseUrl.js';
 export { Crypto, md5 } from './es/crypto.js';

package/dist/index.js

@@ -1,7 +1,7 @@
 export { initMicroApp } from './es/microAppCreator.js';
 export { getMicroUrl, isQiankun } from './es/qiankunUtils.js';
 export { initGlobalError, initMainApp } from './es/mainApp.js';
-export { getToken, parseToken, removeToken, setToken } from './es/auth.js';
+export { getPreToken, getToken, parseToken, removeToken, setToken } from './es/auth.js';
 export { AxiosRequest } from './es/request.js';
 export { getBaseUrl } from './es/baseUrl.js';
 export { Crypto, md5 } from './es/crypto.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-utils",
-  "version": "0.0.90",
+  "version": "0.0.92",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/auth.ts

@@ -45,3 +45,25 @@ export function parseToken(token?: string) {
   // 没有token
   return null;
 }
+
+export function getPreToken(token?: string) {
+  try {
+    const tokenResult = token || getToken();
+    if (!tokenResult) {
+      return "";
+    }
+    const tokenType =
+      window.localStorage.getItem("system-token-type") || "bearer";
+    // 统一转为小写进行比较
+    const normalizedTokenType = tokenType.toLowerCase();
+    // 检查 token 是否已包含前缀（不区分大小写）
+    if (tokenResult.toLowerCase().startsWith(normalizedTokenType + " ")) {
+      return tokenResult;
+    }
+    // 添加前缀（全部小写）
+    return `${normalizedTokenType} ${tokenResult}`;
+  } catch (err) {
+    console.error("获取token失败", err);
+    return "";
+  }
+}

package/src/common.ts

@@ -25,7 +25,7 @@ export const emitter = mitt();
 export function addThousedSeparator(
   n: any,
   digit: number = 3,
-  symbol: string = ","
+  symbol: string = ",",
 ) {
   if (n != null) {
     let _n = n.toString();
@@ -80,7 +80,14 @@ export function parseQueryParams(url: string): { [key: string]: string } {
     if (queryString) {
       const searchList = queryString.split("&");
       for (let i = 0; i < searchList.length; i++) {
-        const [key, value] = searchList[i].split("=");
+        // const [key, value] = searchList[i].split("=");
+        // 支持参数?params=xxxxx==&key=value 这种模式的
+        const splitIndex = searchList[i].indexOf("=");
+        const [key, value] = [
+          searchList[i].substring(0, splitIndex),
+          searchList[i].substring(splitIndex + 1),
+        ];
+
         let val: any = decodeURIComponent(value);
         if (val.startsWith("{")) {
           try {

package/src/file.ts

@@ -1,7 +1,7 @@
 /**
  * 附件相关接口
  */
-import { getToken } from "./auth";
+import { getPreToken } from "./auth";
 import {
   dangerouslyXss,
   specialString,
@@ -486,14 +486,7 @@ export function createDeleteFileLink(options: IOptions) {
  */
 function getBasicInfo(baseURL: string, token?: string) {
   // 如果token有前缀，那么不需要处理 如果token没有前缀 添加bearer前缀
-  let newToken = token || getToken();
-  if (
-    newToken &&
-    !newToken.startsWith("Bearer ") &&
-    !newToken.startsWith("bearer ")
-  ) {
-    newToken = `bearer ${newToken}`;
-  }
+  let newToken = getPreToken(token);
   return {
     token: newToken,
     apiBaseURL: baseURL?.endsWith?.("/")

package/src/index.ts

@@ -1,7 +1,13 @@
 export { initMicroApp } from "./microAppCreator";
 export { isQiankun, getMicroUrl } from "./qiankunUtils";
 export { initMainApp, initGlobalError } from "./mainApp";
-export { getToken, setToken, removeToken, parseToken } from "./auth";
+export {
+  getToken,
+  setToken,
+  removeToken,
+  parseToken,
+  getPreToken,
+} from "./auth";
 export { AxiosRequest, type IOtherOptions, type IOptions } from "./request";
 export { getBaseUrl } from "./baseUrl";
 export { Crypto, md5, Base64 } from "./crypto";

package/src/request.ts

@@ -5,7 +5,7 @@ import axios, {
   InternalAxiosRequestConfig,
   AxiosInstance,
 } from "axios";
-import { getToken, removeToken } from "./auth";
+import { getPreToken, removeToken } from "./auth";
 import { Crypto } from "./crypto";
 import { TOKEN_KEY } from "./constants";
 
@@ -99,7 +99,7 @@ export class AxiosRequest {
       },
       (error) => {
         return Promise.reject(error);
-      }
+      },
     );
   }
 
@@ -121,7 +121,7 @@ export class AxiosRequest {
         // 统一处理响应异常
         this.responseError(error);
         return Promise.reject(error);
-      }
+      },
     );
   }
 
@@ -228,7 +228,7 @@ export class AxiosRequest {
           3.5,
           () => {
             this.isNotFound = false;
-          }
+          },
         );
       }
       return;
@@ -255,7 +255,7 @@ export class AxiosRequest {
         `,
           () => {
             this.isTimeout = false;
-          }
+          },
         );
       }
       return;
@@ -264,7 +264,7 @@ export class AxiosRequest {
     if (error?.config?.isErrorMessage) {
       // 详细信息 再开发模式开启 之后上到别的环境会去掉
       this.modalConfirm?.(
-        `${error?.response?.data?.msg || error?.msg || "服务器异常"}`
+        `${error?.response?.data?.msg || error?.msg || "服务器异常"}`,
       );
       // 接口地址: ${error?.config?.url}
       // 响应状态码: ${error?.response?.status}
@@ -294,8 +294,8 @@ export class AxiosRequest {
       newOptions.headers = {};
     }
     if (isAuth) {
-      const token = getToken();
-      newOptions.headers[this.tokenKey] = `bearer ${token}`;
+      const token = getPreToken();
+      newOptions.headers[this.tokenKey] = token;
     }
 
     // 遍历params，将undefined值 转为null值
@@ -335,12 +335,12 @@ export class AxiosRequest {
     if (newOptions.isCrypto === true || newOptions.isCrypto === "aes") {
       if (newOptions.data) {
         newOptions.data = this.crypto?.encrypt?.(
-          JSON.stringify(newOptions.data)
+          JSON.stringify(newOptions.data),
         );
       }
       if (newOptions.params) {
         newOptions.params = this.crypto?.encrypt?.(
-          JSON.stringify(newOptions.params)
+          JSON.stringify(newOptions.params),
         );
       }
     }
@@ -348,12 +348,12 @@ export class AxiosRequest {
     if (newOptions.isCrypto === "des") {
       if (newOptions.data) {
         newOptions.data = this.crypto?.encrypt_des?.(
-          JSON.stringify(newOptions.data)
+          JSON.stringify(newOptions.data),
         );
       }
       if (newOptions.params) {
         newOptions.params = this.crypto?.encrypt_des?.(
-          JSON.stringify(newOptions.params)
+          JSON.stringify(newOptions.params),
         );
       }
     }
@@ -419,7 +419,7 @@ export interface IOtherOptions {
   messageWarning?: (
     msg: string,
     duration: number,
-    callback?: () => void
+    callback?: () => void,
   ) => void;
   modalConfirm?: (msg: string, callback?: () => void) => void;
   /** @deprecated 租户ID，只有登录接口 需要 传递。 */
@@ -443,7 +443,7 @@ export interface IOtherOptions {
   /** 拦截器自定义 */
   interceptorsRequestHandle?: () => void;
   interceptorsRequestConfig?: (
-    config: InternalAxiosRequestConfig<any>
+    config: InternalAxiosRequestConfig<any>,
   ) => InternalAxiosRequestConfig<any>;
   /** 响应器自定义 */
   interceptorsResponseHandle?: () => void;