tools-min-ns 1.18.8 → 1.18.10

package/README.md

@@ -5,6 +5,8 @@ pnpm i tools-min-ns --save
 ```
 
 # updates
+## v1.18.9/10
+fix: 修改RequestUtil.getAuthorization json排序问题
 ## v1.18.8
 fix: RequestUtil handleRequests并发请求优化
 ## v1.18.7

package/esm/request/RequestUtil.d.ts

@@ -136,9 +136,11 @@ function exampleAsyncFunction() {
         /** POST请求参数 */
         data?: any;
         /** 前端传参方式（默认form）json => body; form=> query */
-        requestType?: any;
+        requestType?: 'json' | 'form';
         /** 前端接受类型（默认json） */
-        responseType?: any;
+        responseType?: 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData';
+        /** 打印 */
+        isLog: boolean;
     };
     export function getAuthorization(opt: RequestParam): string;
     export {};

package/esm/request/RequestUtil.js

@@ -156,6 +156,7 @@ import jsonpFn, { jsonpRquest as jsonpRquestFn } from './jsonp';
 import nsPromiseFn from './nsPromiseFn';
 import StringUtil from '../string/StringUtil';
 import PasswordUtil from '../pwd/PasswordUtil';
+import DateUtil from '../date/DateUtil';
 var RequestUtil;
 (function (RequestUtil) {
   /** @name 浙里办请求工具设置默认请求头 */
@@ -368,31 +369,46 @@ var RequestUtil;
   */
   RequestUtil.nsPromise = nsPromiseFn;
   function getAuthorization(opt) {
+    var _a = opt.data,
+      data = _a === void 0 ? {} : _a,
+      url = opt.url,
+      _b = opt.requestType,
+      requestType = _b === void 0 ? 'form' : _b,
+      _c = opt.responseType,
+      responseType = _c === void 0 ? 'json' : _c,
+      _d = opt.isLog,
+      isLog = _d === void 0 ? false : _d;
     try {
       var uuid = StringUtil.getUuiD(16);
-      var _a = opt.data,
-        data_1 = _a === void 0 ? {} : _a,
-        url = opt.url,
-        _b = opt.requestType,
-        requestType = _b === void 0 ? 'form' : _b,
-        _c = opt.responseType,
-        responseType = _c === void 0 ? 'json' : _c;
       var ts = new Date().getTime();
-      var paramStr = JSON.stringify(data_1);
+      var paramStr = '{}';
       if (responseType === 'json') {
-        if (requestType === 'form') {
+        if (['json', 'form'].includes(requestType)) {
           var _data_1 = {};
-          var sortedKeys = Object.keys(data_1).sort(); // 对键进行排序
+          var sortedKeys = Object.keys(data).sort(function (a, b) {
+            return a.localeCompare(b);
+          }); // 对键进行排序
           sortedKeys.forEach(function (k) {
-            if (!['null', 'undefined'].includes(String(data_1[k]))) _data_1[k] = String(data_1[k]);
+            if (!['null', 'undefined'].includes(String(data[k]))) _data_1[k] = requestType === 'json' ? data[k] : String(data[k]);
           });
           paramStr = JSON.stringify(_data_1);
         }
       }
       var str = url + paramStr + ts + uuid;
-      return ts + PasswordUtil.str2MD5(str, uuid) + uuid;
+      if (isLog) console.info("[".concat(DateUtil.formatDate(), "]"), 'url + paramStr + ts + uuid  ', {
+        url: url,
+        paramStr: paramStr,
+        ts: ts,
+        uuid: uuid
+      });
+      if (isLog) console.info("[".concat(DateUtil.formatDate(), "]"), '加密前 ', str);
+      var md5 = PasswordUtil.str2MD5(str, uuid);
+      if (isLog) console.info("[".concat(DateUtil.formatDate(), "]"), '加密后 ', md5);
+      var s = ts + md5 + uuid;
+      if (isLog) console.info("[".concat(DateUtil.formatDate(), "]"), '最终结果 ', s);
+      return s;
     } catch (error) {
-      console.error(error);
+      if (isLog) console.error('getAuthorization error', error);
       return '';
     }
   }

package/lib/request/RequestUtil.d.ts

@@ -136,9 +136,11 @@ function exampleAsyncFunction() {
         /** POST请求参数 */
         data?: any;
         /** 前端传参方式（默认form）json => body; form=> query */
-        requestType?: any;
+        requestType?: 'json' | 'form';
         /** 前端接受类型（默认json） */
-        responseType?: any;
+        responseType?: 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData';
+        /** 打印 */
+        isLog: boolean;
     };
     export function getAuthorization(opt: RequestParam): string;
     export {};

package/lib/request/RequestUtil.js

@@ -197,6 +197,7 @@ var jsonp_1 = __importStar(require("./jsonp"));
 var nsPromiseFn_1 = __importDefault(require("./nsPromiseFn"));
 var StringUtil_1 = __importDefault(require("../string/StringUtil"));
 var PasswordUtil_1 = __importDefault(require("../pwd/PasswordUtil"));
+var DateUtil_1 = __importDefault(require("../date/DateUtil"));
 var RequestUtil;
 (function (RequestUtil) {
   /** @name 浙里办请求工具设置默认请求头 */
@@ -409,31 +410,46 @@ var RequestUtil;
   */
   RequestUtil.nsPromise = nsPromiseFn_1.default;
   function getAuthorization(opt) {
+    var _a = opt.data,
+      data = _a === void 0 ? {} : _a,
+      url = opt.url,
+      _b = opt.requestType,
+      requestType = _b === void 0 ? 'form' : _b,
+      _c = opt.responseType,
+      responseType = _c === void 0 ? 'json' : _c,
+      _d = opt.isLog,
+      isLog = _d === void 0 ? false : _d;
     try {
       var uuid = StringUtil_1.default.getUuiD(16);
-      var _a = opt.data,
-        data_1 = _a === void 0 ? {} : _a,
-        url = opt.url,
-        _b = opt.requestType,
-        requestType = _b === void 0 ? 'form' : _b,
-        _c = opt.responseType,
-        responseType = _c === void 0 ? 'json' : _c;
       var ts = new Date().getTime();
-      var paramStr = JSON.stringify(data_1);
+      var paramStr = '{}';
       if (responseType === 'json') {
-        if (requestType === 'form') {
+        if (['json', 'form'].includes(requestType)) {
           var _data_1 = {};
-          var sortedKeys = Object.keys(data_1).sort(); // 对键进行排序
+          var sortedKeys = Object.keys(data).sort(function (a, b) {
+            return a.localeCompare(b);
+          }); // 对键进行排序
           sortedKeys.forEach(function (k) {
-            if (!['null', 'undefined'].includes(String(data_1[k]))) _data_1[k] = String(data_1[k]);
+            if (!['null', 'undefined'].includes(String(data[k]))) _data_1[k] = requestType === 'json' ? data[k] : String(data[k]);
           });
           paramStr = JSON.stringify(_data_1);
         }
       }
       var str = url + paramStr + ts + uuid;
-      return ts + PasswordUtil_1.default.str2MD5(str, uuid) + uuid;
+      if (isLog) console.info("[".concat(DateUtil_1.default.formatDate(), "]"), 'url + paramStr + ts + uuid  ', {
+        url: url,
+        paramStr: paramStr,
+        ts: ts,
+        uuid: uuid
+      });
+      if (isLog) console.info("[".concat(DateUtil_1.default.formatDate(), "]"), '加密前 ', str);
+      var md5 = PasswordUtil_1.default.str2MD5(str, uuid);
+      if (isLog) console.info("[".concat(DateUtil_1.default.formatDate(), "]"), '加密后 ', md5);
+      var s = ts + md5 + uuid;
+      if (isLog) console.info("[".concat(DateUtil_1.default.formatDate(), "]"), '最终结果 ', s);
+      return s;
     } catch (error) {
-      console.error(error);
+      if (isLog) console.error('getAuthorization error', error);
       return '';
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tools-min-ns",
   "description": "工具包适用于前端以及node",
-  "version": "1.18.8",
+  "version": "1.18.10",
   "main": "lib/index.js",
   "license": "MIT",
   "author": "nanshen",