@infly/libs 2.0.36 → 2.0.38

package/module/Permission.js

@@ -9,12 +9,10 @@ import TokenService from "./TokenService";
  * @param {Object} config.router 路由实例
  * @param {Object} config.store Vuex store 实例
  * @param {Object} config.NProgress NProgress 实例
- * @param {Function} config.getToken 获取 token 的函数
  * @param {Function} config.getUserInfo 获取用户信息的函数
  * @param {Function} config.resetToken 重置 token 的函数
  * @param {Function} config.showMessage 显示消息的函数
- * @param {Function} config.getTitle 获取页面标题的函数
- * * @returns {void}
+ * @returns {void}
  */
 export function initPermission({
   whiteList = ["/login", "/404", "/403", "/error/401", "/error/404"],
@@ -32,14 +30,14 @@ export function initPermission({
   resetToken,
   showMessage
 }) {
-  const { title: projectTitle, projectConfig } = settings || {};
-  const { initRoutePath = "/" } = projectConfig || {};
+  const { title: projectTitle } = settings || {};
   const { dispatch } = store || {};
+  // 转为 Set，将白名单查找从 O(n) 优化为 O(1)
+  const whiteSet = new Set(whiteList);
 
+  // afterEach 已统一调用 NProgress.done()，此处无需重复
   const redirectToLogin = (to, next) => {
     next(`/login?redirect=${to.path}`);
-    NProgress.done();
-    return;
   };
 
   const handleGetUserInfo = () => {
@@ -58,24 +56,20 @@ export function initPermission({
     }
   };
 
+  // 降级链：优先调用自定义 showMessage，其次 Message，最后 console
   const handleShowMessage = (message, type = "error") => {
     if (Uts.isFunction(showMessage)) {
       showMessage(message);
-    }
-
-    if (Uts.isFunction(Message)) {
+    } else if (Uts.isFunction(Message)) {
       Message[type](message);
+    } else {
+      console.log(message);
     }
-
-    console.log(message);
   };
 
   const handlePageTitle = (path) => {
     const title = projectTitle || "后台管理系统";
-    if (path) {
-      return `${path} - ${title}`;
-    }
-    return `${title}`;
+    return path ? `${path} - ${title}` : title;
   };
 
   NProgress.configure({ showSpinner: false });
@@ -84,8 +78,6 @@ export function initPermission({
   const handleUrlTokenParam = async (to, next, accessTokenKey, accessToken) => {
     if (!to.query[accessTokenKey]) return false;
 
-    const newQuery = { ...to.query };
-
     // 优先从地址栏获取token, 更新存储token值
     if (accessToken && Uts.isFunction(dispatch)) {
       try {
@@ -95,7 +87,8 @@ export function initPermission({
       }
     }
 
-    delete newQuery[accessTokenKey];
+    // 用解构 rest 移除 token 参数，避免修改原对象
+    const { [accessTokenKey]: _, ...newQuery } = to.query;
     next({ path: to.path, query: newQuery, replace: true });
     return true;
   };
@@ -115,23 +108,38 @@ export function initPermission({
 
   // 辅助函数：处理已认证用户的路由
   const handleAuthenticatedRoute = async (to, next, permission) => {
-    // 已登录用户访问登录页，重定向到首页
+    // 已登录用户访问登录页
     if (to.path === "/login") {
-      return next({ path: "/" });
+      const { PMRedirectPath } = (await handleGetUserInfo()) || {};
+      const redirectPath = to.query.redirect;
+
+      if (redirectPath) {
+        // 查找 redirect 路由对应的权限
+        const matched = router.resolve(redirectPath)?.route;
+        const redirectPermission = matched?.meta?.permission;
+        // 无需权限 或 有权限，则走 redirect
+        if (!redirectPermission || checkPermission(redirectPermission)) {
+          return next({ path: redirectPath });
+        }
+      }
+
+      // 否则跳到第一个有权限的页面
+      return next({ path: PMRedirectPath || "/" });
     }
 
     try {
       // 获取用户信息
-      const { PMRedirectPath } = await handleGetUserInfo();
-
-      // 如果是进入初始化配置的path:""重定向路由且没权限（PMRedirectPath !== initRoutePath），则重定向到指定有权限的第一条菜单路由
-      if (initRoutePath && to.path === initRoutePath && PMRedirectPath !== initRoutePath) {
-        return next({ path: PMRedirectPath || "/" });
-      }
-
-      // 检查页面权限
-      if (permission && !checkPermission(permission) && !whiteList.includes(to.path)) {
-        return next({ path: "/error/403" });
+      const { PMRedirectPath } = (await handleGetUserInfo()) || {};
+
+      // 合并权限检查，避免重复调用 checkPermission
+      if (permission && !checkPermission(permission)) {
+        // 有兜底路径时优先跳转，否则跳 403
+        if (PMRedirectPath) {
+          return next({ path: PMRedirectPath });
+        }
+        if (!whiteSet.has(to.path)) {
+          return next({ path: "/error/403" });
+        }
       }
 
       next();
@@ -154,14 +162,13 @@ export function initPermission({
       const Token = TokenService.getToken();
       const accessTokenKey = TokenService.getUrlTokenKey();
       const accessToken = TokenService.getUrlToken();
-      const { meta = {} } = to || {};
-      const { permission } = meta || {};
+      const { permission } = to.meta || {};
 
       // 设置页面标题
-      document.title = handlePageTitle(to.meta.title);
+      document.title = handlePageTitle(to.meta?.title);
 
       // 缓存页面路径（非白名单页面）
-      if (!whiteList.includes(to.path) && pagePathCacheKey) {
+      if (pagePathCacheKey && !whiteSet.has(to.path)) {
         localStorage.setItem(pagePathCacheKey, window.location.href);
       }
 
@@ -171,7 +178,7 @@ export function initPermission({
       }
 
       // 2. 检查白名单路径
-      if (whiteList.includes(to.path)) {
+      if (whiteSet.has(to.path)) {
         return next();
       }
 

package/module/REST.js

@@ -1,18 +1,71 @@
 import axios from "axios";
 import Uts from "./Uts.js";
 import TokenService from "./TokenService.js";
+import { resolveInternalServiceURL } from "./cjs/request-url-rules.cjs";
 
 const baseURL = process.env.VUE_APP_BASE_API;
 const { env } = Uts.getEnv() || {};
 const isTestEnv = Uts.contain(["localhost", "infly-test"], env);
-const isProdAPI = Uts.contain(["https://api.sutpay.com"], baseURL);
+
+// 若接口地址是 localhost/127.0.0.1，则自动替换为当前页面访问主机。
+// 协议、端口、路径保持不变，便于局域网联调时免改环境变量。
+function remapLocalhostToCurrentHost(url) {
+  const normalized = Uts.normalizeEnvUrl(url);
+  if (!normalized) {
+    return normalized;
+  }
+
+  if (typeof window === "undefined" || !window.location || !window.location.hostname) {
+    return normalized;
+  }
+
+  try {
+    const parsed = new URL(normalized);
+    const isLocalHost = ["localhost", "127.0.0.1"].includes(parsed.hostname);
+    if (!isLocalHost) {
+      return normalized;
+    }
+
+    parsed.hostname = window.location.hostname;
+    return parsed.toString();
+  } catch (e) {
+    return normalized;
+  }
+}
+
+// 解析 axios 最终使用的 baseURL。
+// 优先级：config.baseURL > process.env.VUE_APP_BASE_API，再执行 localhost 主机替换。
+function resolveServiceBaseURL(customBaseURL) {
+  const targetBaseURL = Uts.normalizeEnvUrl(customBaseURL || baseURL);
+  return remapLocalhostToCurrentHost(targetBaseURL);
+}
+
+/**
+ * 对任意通知函数加去重包装
+ * @param {Function} fn - 原始通知函数，接受字符串或 { message, type, ... }
+ * @param {Number} ttl - 去重时间窗（ms），默认 500
+ * @returns {Function} 去重后的通知函数
+ */
+export function createNotifyDedup(fn, ttl = 500) {
+  const recentMsgs = new Set();
+  return function dedupedNotify(msgOrOptions) {
+    const message = typeof msgOrOptions === "string" ? msgOrOptions : msgOrOptions?.message;
+    if (message && recentMsgs.has(message)) return;
+    if (message) {
+      recentMsgs.add(message);
+      setTimeout(() => recentMsgs.delete(message), ttl);
+    }
+    return fn(msgOrOptions);
+  };
+}
 
 /**
  * 创建封装的 axios 实例
  * @param {Object} config 配置项
- * @param {Function|String} config.getToken 获取 token 的函数或值
+ * @param {String} config.getTokenFunc 获取 token 的 TokenService 方法名，默认 "getToken"
  * @param {Function} config.onLogout 登出回调
- * @param {Function} config.onNotify 通知回调
+ * @param {Object} config.notify  Message-like 对象（如 ElementUI Message），传入后自动应用去重并构建 onNotify
+ * @param {Function} config.onNotify 自定义通知回调；若传入 Message-like 对象也可自动识别
  * @returns {AxiosInstance}
  */
 export function createService(config) {
@@ -22,10 +75,32 @@ export function createService(config) {
     serviceField = defaultField,
     logoutAction = "user/logout", // 退出登录的action方法
     onLogout,
-    onNotify,
-    getTokenFunc = "getToken"
+    notify,
+    onNotify: rawOnNotify,
+    getTokenFunc = "getToken",
+    internalServiceURLRules = []
   } = config || {};
-  const service = axios.create({ baseURL: customBaseURL || baseURL });
+  // 统一在 REST 内部处理 baseURL，避免业务项目重复实现主机替换逻辑。
+  const resolvedBaseURL = resolveServiceBaseURL(customBaseURL);
+  const isProdAPI = Uts.contain(["https://api.sutpay.com"], resolvedBaseURL);
+  const service = axios.create({ baseURL: resolvedBaseURL });
+
+  // 统一处理 notify 与 onNotify：
+  // - 优先使用显式传入的 notify
+  // - 若 onNotify 是 Message-like 对象（带 .error/.success 等类型方法），也当作 notify 处理
+  // 两种写法都自动应用去重，拦截器与调用方 .catch() 共用同一个去重包装
+  const notifyTarget = notify || (rawOnNotify && typeof rawOnNotify["error"] === "function" ? rawOnNotify : null);
+  let onNotify = notifyTarget ? null : rawOnNotify;
+
+  if (notifyTarget) {
+    ["success", "warning", "info", "error"].forEach((type) => {
+      if (typeof notifyTarget[type] === "function") {
+        notifyTarget[type] = createNotifyDedup(notifyTarget[type].bind(notifyTarget));
+      }
+    });
+    onNotify = ({ message, type = "error", duration }) =>
+      notifyTarget[type]?.(message) ?? notifyTarget({ message, type, duration });
+  }
 
   /**
    * 发送通知
@@ -61,9 +136,10 @@ export function createService(config) {
         });
       }
 
-      // 鼓励金接口特殊处理
-      if (customBaseURL) {
-        config.url = config.url.replace("https://auth.sutpay.cn/", customBaseURL);
+      const internalServiceURL = resolveInternalServiceURL(config.url, internalServiceURLRules);
+      if (internalServiceURL) {
+        config.url = internalServiceURL.url;
+        config.baseURL = resolveServiceBaseURL(internalServiceURL.baseURL);
       }
 
       if (serviceField !== defaultField) {
@@ -83,54 +159,41 @@ export function createService(config) {
 
   service.interceptors.response.use(
     (response) => {
-      return response.data || {};
+      const { data } = response || {};
+      return Uts.transArrayBufferToObj(data);
     },
     (error) => {
       const { response, request } = error || {};
       const { status, data } = response || {};
+      const { error: bufferError } = Uts.transArrayBufferToObj(data) ?? {};
       const { error: dataError, detail, message } = data || {};
+      const errorMsg = bufferError || dataError || detail || message || `请求失败(${status})`;
 
       // 添加标识，表示错误已被拦截器处理
       error.handledByInterceptor = true;
 
-      // HTTP 状态码错误处理映射
-      const STATUS_HANDLERS = {
-        401: { message: "登录信息已过期，请重新登录", action: () => handleLogout() },
-        403: { message: "您没有权限访问，请联系管理员" },
-        500: { message: "服务器内部错误，请联系开发人员" },
-        502: { message: "网关错误，请稍后重试或联系开发人员" },
-        503: { message: "服务暂时不可用，请稍后重试" },
-        504: { message: "网关超时，请稍后重试或联系开发人员" }
+      // HTTP 状态码 → 固定提示语映射（400 直接用后端返回的 errorMsg）
+      const STATUS_MESSAGES = {
+        400: errorMsg,
+        401: "登录信息已过期，请重新登录",
+        403: "您没有权限访问，请联系管理员",
+        500: errorMsg || "服务器内部错误，请联系开发人员",
+        502: "网关错误，请稍后重试或联系开发人员",
+        503: "服务暂时不可用，请稍后重试",
+        504: "网关超时，请稍后重试或联系开发人员"
       };
 
-      // 处理特定状态码
-      const handler = STATUS_HANDLERS[status];
-      if (handler) {
-        handleNotify({
-          message: handler.message,
-          type: "error"
-        });
-        handler.action?.();
-      } else if (response) {
-        // 其他 HTTP 错误响应，优先使用后端返回的错误信息
-        const errorMsg = dataError || detail || message || `请求失败(${status})`;
-        handleNotify({
-          message: errorMsg,
-          type: "error"
-        });
-      } else if (request) {
-        // 请求已发送但无响应（网络问题）
-        handleNotify({
-          message: "网络请求失败，请检查网络连接",
-          type: "error"
-        });
-      } else {
-        // 请求配置错误
-        handleNotify({
-          message: error.message || "请求配置错误",
-          type: "error"
-        });
-      }
+      // 按优先级确定最终提示语，合并为一次 handleNotify 调用
+      const notifyMsg =
+        STATUS_MESSAGES[status] ??
+        (response ? errorMsg : null) ??
+        (request ? "网络请求失败，请检查网络连接" : null) ??
+        (error.message || "请求配置错误");
+
+      handleNotify({ message: notifyMsg, type: "error" });
+
+      // 401 副作用：自动登出（不受弹窗逻辑影响）
+      if (status === 401) handleLogout();
 
       return Promise.reject(error);
     }

package/module/Uts.js

@@ -7,6 +7,12 @@
 // const _history = createHashHistory();
 // console.log(_history);
 
+const { deepMerge: deepMergeImpl } = require("./cjs/deep-merge.cjs");
+const {
+  mergePageConfig: mergePageConfigImpl,
+  resolvePlatformPageConfig: resolvePlatformPageConfigImpl
+} = require("./cjs/page-config.cjs");
+
 let _getItem = Storage.prototype.getItem;
 // import Uts from "./Uts";
 let $state = {
@@ -81,6 +87,15 @@ let Uts = {
   ce(text) {
     global.console && global.console.error && global.console.error(text);
   },
+  /**
+   * 规范化环境变量中的 URL 字符串
+   * 例如去除首尾空格和包裹引号："'http://xx/'" -> "http://xx/"
+   */
+  normalizeEnvUrl(url = "") {
+    return String(url)
+      .trim()
+      .replace(/^['"]|['"]$/g, "");
+  },
   /**
      * set class 动态设置类名
      * @module condition
@@ -534,7 +549,7 @@ Filter.formatDate(1655740800000,'Y-m-d')
 Uts.join()
 ''
 	 */
-  join(arr = [], symbol = ".") {
+  join(arr = [], symbol = ",") {
     if (Uts.notEmptyArray(arr)) {
       return arr.join(symbol);
     } else {
@@ -1295,11 +1310,15 @@ Uts.getEnv()
   getEnv(string) {
     let config = {};
     let host = string || location.host;
-    const projectConfig =
-      {
-        [process.env.VUE_APP_PROJECT_NAME]: { reqModule: "admin" },
-        ["postal-benefits-platform-level"]: { reqModule: "management" }
-      }[process.env.VUE_APP_PROJECT_NAME] || {};
+    const projectName = process.env.VUE_APP_PROJECT_NAME;
+    const projectConfigs = {
+      "postal-benefits-platform-level": { reqModule: "management" }
+      // 可继续添加其它项目配置
+    };
+    const projectConfig = {
+      projectName,
+      ...(projectConfigs[projectName] || { reqModule: "admin" })
+    };
 
     config.rootDomain = (host.match(Uts.FINDDOMAINEXP) && host.match(Uts.FINDDOMAINEXP)[0]) || null;
     config.env = "";
@@ -1683,35 +1702,13 @@ console.log(o1)
    * @returns {Object} 合并后的目标对象
    */
   deepMerge(target, source, overwrite = false) {
-    if (!source || typeof source !== "object") return target;
-    if (!target || typeof target !== "object") return source;
-
-    Object.keys(source).forEach((key) => {
-      const sourceValue = source[key];
-      const targetValue = target[key];
-
-      if (Array.isArray(sourceValue)) {
-        // 处理数组：如果不覆盖且目标已存在，保持原数组
-        if (!overwrite && targetValue !== undefined) {
-          return;
-        }
-        target[key] = [...sourceValue];
-      } else if (sourceValue && typeof sourceValue === "object") {
-        // 处理对象：递归合并
-        if (!target[key] || typeof target[key] !== "object") {
-          target[key] = {};
-        }
-        Uts.deepMerge(target[key], sourceValue, overwrite);
-      } else {
-        // 处理基本类型：如果不覆盖且目标已存在，跳过
-        if (!overwrite && targetValue !== undefined) {
-          return;
-        }
-        target[key] = sourceValue;
-      }
-    });
-
-    return target;
+    return deepMergeImpl(target, source, overwrite);
+  },
+  mergePageConfig(...sources) {
+    return mergePageConfigImpl(...sources);
+  },
+  resolvePlatformPageConfig(pageConfig, platform, options) {
+    return resolvePlatformPageConfigImpl(pageConfig, platform, options);
   },
   /**
 	 * 转换字符串为小写
@@ -3917,6 +3914,21 @@ false
   isNull(value) {
     return value === null;
   },
+  /**
+   * 判断接口字段是否有实际返回值；0 和 false 是有效值，仅排除 undefined、null、空字符串。
+   * @module checkType
+   * @todo Uts.isPresentValue
+   * @param {*} value 要检查的值
+   * @return {Boolean}
+   * @example
+   * Uts.isPresentValue(0)
+      true
+      Uts.isPresentValue('')
+      false
+   */
+  isPresentValue(value) {
+    return value !== undefined && value !== null && value !== "";
+  },
   /**
 	 * 检查数值是否为NaN
 	 * @module checkType
@@ -3925,9 +3937,9 @@ false
 	 * @return {Boolean}
 	 * @example
 	 * Uts.isNaN({})
-false
-Uts.isNaN(NaN)
-true
+      false
+      Uts.isNaN(NaN)
+      true
 	 */
   isNaN(value) {
     return value !== value;
@@ -3940,9 +3952,9 @@ true
 	 * @return {Boolean}     true or false
 	 * @example
 	 * Uts.isString('w')
-true
-Uts.isString(1)
-false
+      true
+      Uts.isString(1)
+      false
 	 */
   isString(value) {
     return typeof value === "string";
@@ -3955,9 +3967,9 @@ false
 	 * @return {Boolean}     true or false
 	 * @example
 	 * Uts.isDate({})
-false
-Uts.isDate(new Date())
-true
+      false
+      Uts.isDate(new Date())
+      true
 	 */
   isDate(value) {
     return value && value.constructor === Date;
@@ -3971,9 +3983,9 @@ true
 	 * @return {Boolean}     true or false
 	 * @example
 	 * Uts.isWaitingObject({})
-false
-Uts.isWaitingObject(new Waiting())
-true
+      false
+      Uts.isWaitingObject(new Waiting())
+      true
 	 */
   isWaitingObject(obj) {
     return obj && (obj instanceof Waiting || obj.endpoint || Uts.isFunction(obj.then));
@@ -3986,9 +3998,9 @@ true
 	 * @return {Boolean}
 	 * @example
 	 * Uts.isError({})
-false
-Uts.isError(new Error())
-true
+      false
+      Uts.isError(new Error())
+      true
 	 */
   isError: function (obj) {
     return obj && obj instanceof Error;
@@ -6352,10 +6364,10 @@ Uts.getParentByPath(item,treeData,{ pathFieldName: "__path", treeChildProp: "chi
    * @returns
    */
   getPMBySettings: function (code, settings) {
-    const { permissionsCodeKey } = settings || {};
+    const { permissionsCodeKey, notVerifyPMCodes } = settings || {};
     const permissionCodes = Uts.storage.get(permissionsCodeKey) || [];
 
-    return Uts.contain(permissionCodes, code);
+    return Uts.contain(permissionCodes, code) || Uts.contain(notVerifyPMCodes, code);
   },
   /**
    * 过滤路由权限
@@ -7227,6 +7239,32 @@ Uts.getSecondDomain('http://www.baidu.com')
     return path.split(".").reduce(function (acc, part) {
       return acc ? acc[part] : undefined;
     }, obj);
+  },
+  transArrayBufferToObj(data) {
+    if (!(data instanceof ArrayBuffer)) {
+      return data;
+    }
+
+    try {
+      const jsonStr = new TextDecoder().decode(data);
+      return JSON.parse(jsonStr);
+    } catch {
+      return data;
+    }
+  },
+  /**
+   * 将字符串按分隔符转换为数组
+   * @param {String|Array} value - 输入值
+   * @returns {Array} - 转换后的数组
+   */
+  convertToArray(value) {
+    if (Array.isArray(value)) {
+      return value;
+    }
+    return String(value)
+      .split(/[,\s\uFF0C]+/)
+      .map((s) => s.trim())
+      .filter(Boolean);
   }
 };
 

package/module/cjs/deep-merge.cjs

@@ -0,0 +1,38 @@
+/**
+ * 深度合并对象
+ * @param {Object} target - 目标对象
+ * @param {Object} source - 源对象
+ * @param {boolean} overwrite - 是否覆盖已存在的属性，默认 false
+ * @returns {Object} 合并后的目标对象
+ */
+function deepMerge(target, source, overwrite = false) {
+  if (!source || typeof source !== "object") return target;
+  if (!target || typeof target !== "object") return source;
+
+  Object.keys(source).forEach((key) => {
+    const sourceValue = source[key];
+    const targetValue = target[key];
+
+    if (Array.isArray(sourceValue)) {
+      if (!overwrite && targetValue !== undefined) {
+        return;
+      }
+      target[key] = [...sourceValue];
+    } else if (sourceValue && typeof sourceValue === "object") {
+      if (!target[key] || typeof target[key] !== "object") {
+        target[key] = {};
+      }
+      deepMerge(target[key], sourceValue, overwrite);
+    } else if (!overwrite && targetValue !== undefined) {
+      return;
+    } else {
+      target[key] = sourceValue;
+    }
+  });
+
+  return target;
+}
+
+module.exports = {
+  deepMerge
+};