dlt-for-react 2.3.2 → 2.3.4

package/README.md

@@ -13,6 +13,11 @@ npm publish
 > npm install dlt-for-react --save
 
 ##### 版本修改记录
+#### V2.3.4—2026 年 7 月 16 日
+1. 优化 NHFetch 请求头与网关 3.0 token 刷新逻辑，修复代理接口 302 异常
+
+#### V2.3.3—2026 年 7 月 7 日
+1. 优化KyContainerFrame组件的返回按钮文本配置
 
 #### V2.3.2—2026 年 4 月 28 日
 1.去除冗余dva依赖

package/lib/components/KyContainerFrame/index.js

@@ -175,7 +175,7 @@ var KyContainerFrame = function (_React$Component) {
             key: createUuid(),
             onClick: onCancel
           },
-          "\u8FD4\u56DE"
+          cancelText
         ));
       }
       return list;

package/lib/utils/NHFetch.js

@@ -9,14 +9,28 @@ var _typeof2 = require("babel-runtime/helpers/typeof");
 
 var _typeof3 = _interopRequireDefault(_typeof2);
 
+var _promise = require("babel-runtime/core-js/promise");
+
+var _promise2 = _interopRequireDefault(_promise);
+
 var _stringify = require("babel-runtime/core-js/json/stringify");
 
 var _stringify2 = _interopRequireDefault(_stringify);
 
+var _modal = require("antd/lib/modal");
+
+var _modal2 = _interopRequireDefault(_modal);
+
+var _extends2 = require("babel-runtime/helpers/extends");
+
+var _extends3 = _interopRequireDefault(_extends2);
+
 var _message2 = require("antd/lib/message");
 
 var _message3 = _interopRequireDefault(_message2);
 
+require("antd/lib/modal/style");
+
 require("antd/lib/message/style");
 
 require("isomorphic-fetch");
@@ -218,7 +232,145 @@ var getDifferDate = exports.getDifferDate = function getDifferDate(firstDate, se
   return Math.floor(msecNum / parseFloat(1000));
 };
 
+var isGatewayV3 = function isGatewayV3() {
+  return window.gateway_version === "3" || window.gateway_version === 3;
+};
+
+var isRefreshing = false;
+var refreshRequests = [];
+
+var getAuthToken = function getAuthToken() {
+  var token = window.sessionStorage.getItem("access_token");
+  if (token) {
+    return token;
+  }
+  var user = (0, _NHCore.getLoginUser)();
+  return user && user.tokenId ? user.tokenId : "";
+};
+
+var buildRequestHeaders = function buildRequestHeaders(contentType, isFormData, authToken) {
+  if (isFormData) {
+    return (0, _extends3.default)({
+      "X-Requested-With": "XMLHttpRequest",
+      Accept: "application/json"
+    }, authToken ? { Authorization: authToken } : {});
+  }
+  var headers = {
+    "Content-Type": contentType,
+    "X-Requested-With": "XMLHttpRequest",
+    Accept: "application/json"
+  };
+  var user = (0, _NHCore.getLoginUser)();
+  if (user && user.userId) {
+    headers.loginUserId = user.userId;
+    headers.loginUserOrgId = user.orgId;
+  }
+  var token = authToken || getAuthToken();
+  if (token) {
+    headers.Authorization = token;
+  }
+  return headers;
+};
+
+var setResponseTimeV3 = function setResponseTimeV3() {
+  if (isGatewayV3()) {
+    sessionStorage.setItem("refreshTime", Math.floor(new Date().getTime() / 1000));
+  }
+};
+
+var expiredTips = function expiredTips() {
+  if (window.loginWarnflag) {
+    return;
+  }
+  window.loginWarnflag = true;
+  var returnUrl = encodeURIComponent(window.location.href);
+  _modal2.default.warning({
+    title: "提示",
+    key: "nhfetch-session-expired",
+    content: "会话已过期！",
+    okText: "重新登录",
+    onOk: function onOk() {
+      sessionStorage.removeItem("userLogin");
+      sessionStorage.removeItem("access_token");
+      sessionStorage.removeItem("refresh_token");
+      sessionStorage.removeItem("xtParams");
+      sessionStorage.removeItem("user_last_operation_time");
+      window.loginWarnflag = false;
+      hashHistory.push({
+        pathname: "/login",
+        search: returnUrl ? "?returnUrl=" + returnUrl : ""
+      });
+    }
+  });
+};
+
+var refreshTokenV3 = function refreshTokenV3() {
+  var baseUrl = window.baseUrl || "";
+  return fetch(baseUrl + "api/refreshToken", {
+    method: "GET",
+    credentials: "include",
+    headers: buildRequestHeaders("application/x-www-form-urlencoded;charset=UTF-8", false)
+  }).then(function (response) {
+    return response.json();
+  });
+};
+
+var checkRefreshV3 = function checkRefreshV3(retryRequest) {
+  var expire = parseInt(sessionStorage.getItem("userExpire") || "0", 10) || (0, _NHCore.getLoginUser)().expiresIn || 1800;
+  var freshTime = parseInt(sessionStorage.getItem("refreshTime") || "0", 10);
+  var nowTime = Math.floor(new Date().getTime() / 1000);
+
+  if (nowTime - freshTime < expire) {
+    if (!isRefreshing) {
+      isRefreshing = true;
+      refreshTokenV3().then(function (res) {
+        isRefreshing = false;
+        if (res && res.code == 200) {
+          sessionStorage.setItem("userExpire", res.data.expiration);
+          var token = res.data.token || "";
+          sessionStorage.setItem("access_token", token);
+          var user = (0, _NHCore.getLoginUser)();
+          if (user && user.userId) {
+            user.tokenId = token;
+            sessionStorage.setItem("userLogin", (0, _stringify2.default)(user));
+          }
+          return token;
+        }
+        expiredTips();
+      }).then(function (token) {
+        if (token) {
+          refreshRequests.forEach(function (cb) {
+            return cb(token);
+          });
+          refreshRequests = [];
+        }
+      }).catch(function () {
+        isRefreshing = false;
+        expiredTips();
+      });
+    }
+    return new _promise2.default(function (resolve) {
+      refreshRequests.push(function (token) {
+        resolve(retryRequest(token));
+      });
+    });
+  }
+  expiredTips();
+};
+
+var appendQueryString = function appendQueryString(url, queryString) {
+  if (!queryString) {
+    return url;
+  }
+  var separator = url.indexOf("?") > -1 ? "&" : "?";
+  return url + separator + queryString;
+};
+
 var NHFetch = function NHFetch(pUrl, pMethod, params, errorFunc) {
+  return request(pUrl, pMethod, params, errorFunc);
+};
+
+var request = function request(pUrl, pMethod, params, errorFunc, authTokenOverride) {
   var opts = {};
   var tmpHeader = "";
   var url = pUrl;
@@ -236,16 +388,13 @@ var NHFetch = function NHFetch(pUrl, pMethod, params, errorFunc) {
   }
 
   if (method.toLowerCase() === "get") {
-    //如果是get方式，则把参数拼凑到url路径上面
     if (params !== undefined && params !== "" && (0, _stringify2.default)(params) !== "{}") {
-      //如果params是Map对象，则需要先转换成字符串
       if (typeof params === "string") {
-        url = url + "?" + params;
+        url = appendQueryString(url, params);
       } else {
-        //不是字符串就一定是map对象
         var paramsStr = "";
         for (var key in params) {
-          if ((0, _typeof3.default)(params[key]) === "object") {
+          if ((0, _typeof3.default)(params[key]) === "object" && params[key] !== null) {
             var params2 = params[key];
             for (var key2 in params2) {
               paramsStr += "&" + key + "." + key2 + "=" + params2[key2];
@@ -254,13 +403,10 @@ var NHFetch = function NHFetch(pUrl, pMethod, params, errorFunc) {
             paramsStr += "&" + key + "=" + params[key];
           }
         }
-
-        url = paramsStr ? url + "?" + paramsStr : url;
-        //+"&time="+new Date().getTime();
-      }
-    } else {
-        //url = url + "?time="+new Date().getTime();
+        url = paramsStr ? appendQueryString(url, paramsStr.slice(1)) : url;
       }
+    }
+    url = appendQueryString(url, "_t=" + Math.floor(Date.parse(new Date()) / 1000));
     tmpHeader = "application/x-www-form-urlencoded;charset=UTF-8";
   } else {
     //除了get，所有方法改为post
@@ -279,89 +425,97 @@ var NHFetch = function NHFetch(pUrl, pMethod, params, errorFunc) {
       }
     }
   }
+  var isFormData = params && params.constructor === FormData;
   opts.method = method;
   opts.credentials = "include";
-  opts.headers = { "Content-Type": tmpHeader };
-  if (params && params.constructor === FormData) {
-    // 解决头像上传问题
-    opts.headers = {};
-  }
+  opts.headers = buildRequestHeaders(tmpHeader, isFormData, authTokenOverride);
 
   //设置网关加密串
   var timestemp = new Date().valueOf();
   var csrfToken = (0, _MD.hex_md5)("timestamp=" + timestemp + ",key=" + "lianyi2019" //这个就是与网关约定的秘钥
   );
-  if (url.indexOf("?") > -1 && url.indexOf("=") > -1 && url.indexOf("?") < url.indexOf("=")) {
-    url = url + "&csrfTimestamp=" + timestemp + "&csrfToken=" + csrfToken;
-  } else {
-    url = url + "?csrfTimestamp=" + timestemp + "&csrfToken=" + csrfToken;
-  }
-
-  var token = window.sessionStorage.getItem("access_token");
-  if (token) {
-    opts.headers.Authorization = token;
-  }
-  var nodeEnv = process.env.NODE_ENV || "development";
-  if (nodeEnv === "development") {
-    opts.headers.loginUserId = (0, _NHCore.getLoginUser)().userId;
-  }
+  url = appendQueryString(url, "csrfTimestamp=" + timestemp + "&csrfToken=" + csrfToken);
 
   return fetch(url, opts).then(function (response) {
-    try {
-      if (response.status === 200) {
-        if (pMethod === "nbpost" || pMethod === "NBPOST") {
-          return response.blob();
-        } else {
-          sessionStorage.removeItem("user_last_operation_time");
-          //记录用户最后一次操作时间
-          var userLastOperationTime = (0, _moment2.default)().format("YYYY-MM-DD HH:mm:ss");
-          sessionStorage.setItem("user_last_operation_time", userLastOperationTime);
-          return response.json();
-        }
-      } else if (response.status === 302) {
+    var handleResponseBody = function handleResponseBody() {
+      if (pMethod === "nbpost" || pMethod === "NBPOST") {
+        return response.blob();
+      }
+      return response.json();
+    };
+
+    var isSessionExpiredCode = function isSessionExpiredCode(data) {
+      return data && String(data.code) === "53000010";
+    };
+
+    var shouldRefreshToken = function shouldRefreshToken(data) {
+      return isGatewayV3() && (response.status === 401 || response.status === 302) && isSessionExpiredCode(data) && !window.loginWarnflag;
+    };
+
+    if (response.status === 200) {
+      if (pMethod === "nbpost" || pMethod === "NBPOST") {
+        setResponseTimeV3();
+        return response.blob();
+      }
+      sessionStorage.removeItem("user_last_operation_time");
+      var userLastOperationTime = (0, _moment2.default)().format("YYYY-MM-DD HH:mm:ss");
+      sessionStorage.setItem("user_last_operation_time", userLastOperationTime);
+      setResponseTimeV3();
+      return response.json();
+    }
+
+    return handleResponseBody().then(function (data) {
+      if (shouldRefreshToken(data)) {
+        return checkRefreshV3(function (newToken) {
+          return request(pUrl, pMethod, params, errorFunc, newToken);
+        });
+      }
+
+      if (response.status === 302) {
         if (window.gateway_version === "2") {
-          //新网关
           var userLogin = sessionStorage.getItem("userLogin") ? JSON.parse(sessionStorage.getItem("userLogin")) : {};
-          var _token = sessionStorage.getItem("refresh_token");
+          var refreshTokenValue = sessionStorage.getItem("refresh_token");
           var _userLastOperationTime = sessionStorage.getItem("user_last_operation_time");
           var expiresIn = userLogin.expiresIn || 1800;
-          var userLastOperationTimeStr = _userLastOperationTime.replace("/-/g", "/");
-          //用户最后一次操作时间
+          var userLastOperationTimeStr = _userLastOperationTime ? _userLastOperationTime.replace("/-/g", "/") : "";
           var userLastOperationTimeDate = new Date(userLastOperationTimeStr);
-          //当前时间
           var nowDate = new Date();
-          //在token超时阈值范围内用户没有任何操作，则直接退出登录，重新登录
           var differDate = getDifferDate(userLastOperationTimeDate, nowDate);
           if (differDate >= expiresIn) {
             userLogout();
           } else {
-            //在token超时阈值范围内用户有操作，则重新生成accessToken
-            refreshToken(_token, function (newAccessToken) {
+            refreshToken(refreshTokenValue, function (newAccessToken) {
               sessionStorage.removeItem("access_token");
               sessionStorage.setItem("access_token", newAccessToken);
-              var userLastOperationTime = (0, _moment2.default)().format("YYYY-MM-DD HH:mm:ss");
-              sessionStorage.setItem("user_last_operation_time", userLastOperationTime);
+              var latestOperationTime = (0, _moment2.default)().format("YYYY-MM-DD HH:mm:ss");
+              sessionStorage.setItem("user_last_operation_time", latestOperationTime);
             });
           }
+        } else if (isGatewayV3()) {
+          expiredTips();
         } else {
           _message3.default.error("未登录或登录已过期,请刷新页面重新登录！");
           sessionStorage.removeItem("userLogin");
           sessionStorage.removeItem("access_token");
         }
+        return;
       } else if (response.status === 401) {
+        if (isGatewayV3() && isSessionExpiredCode(data)) {
+          expiredTips();
+          return;
+        }
         _message3.default.warning("您正在尝试访问未授权的功能!");
+        return data;
       } else if (response.status === 504) {
-        // 网关请求超时
         return;
       } else {
-        //如果存在错误的回调方法，则调用回调方法，否则提示网络请求异常
         errorFunc && errorFunc();
       }
-      return response.json();
-    } catch (error) {
+      return data;
+    }).catch(function (error) {
       console.log("请求异常1:", error.message);
       return;
-    }
+    });
   }).then(function (res) {
     var _ref = res || {},
         _ref$meta = _ref.meta,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dlt-for-react",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "description": "dlt for react",
   "main": "lib/index.js",
   "scripts": {