wotokol-edm 1.1.65 → 1.1.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wotokol-edm",
-  "version": "1.1.65",
+  "version": "1.1.66",
   "description": "",
   "main": "wotokol-edm.common.js",
   "scripts": {

package/wotokol-edm.common.js

@@ -89460,9 +89460,9 @@ const secret = 'hoSA59LcWfCz5';
   while (!![]) {
     try {
       const _0x42a87d = parseInt(_0x4ee0fa(0xae)) / 0x1 + -parseInt(_0x4ee0fa(0xb4)) / 0x2 * (-parseInt(_0x4ee0fa(0xbc)) / 0x3) + parseInt(_0x4ee0fa(0xbf)) / 0x4 + parseInt(_0x4ee0fa(0xba)) / 0x5 * (-parseInt(_0x4ee0fa(0xaf)) / 0x6) + parseInt(_0x4ee0fa(0xb6)) / 0x7 * (parseInt(_0x4ee0fa(0xb7)) / 0x8) + parseInt(_0x4ee0fa(0xb1)) / 0x9 * (parseInt(_0x4ee0fa(0xbe)) / 0xa) + parseInt(_0x4ee0fa(0xab)) / 0xb * (-parseInt(_0x4ee0fa(0xaa)) / 0xc);
-      if (_0x42a87d === _0x3e8342) break;else _0x3d2f55['push'](_0x3d2f55['shift']());
+      if (_0x42a87d === _0x3e8342) break;else _0x3d2f55["push"](_0x3d2f55["shift"]());
     } catch (_0x30a31) {
-      _0x3d2f55['push'](_0x3d2f55['shift']());
+      _0x3d2f55["push"](_0x3d2f55["shift"]());
     }
   }
 })(a0_0x4618, 0x27ae1);
@@ -89478,7 +89478,7 @@ function a0_0x5c93(_0x4cbd12, _0x41f8e9) {
   }, a0_0x5c93(_0x4cbd12, _0x41f8e9);
 }
 function a0_0x4618() {
-  const _0x1403af = ['220JKmUTi', '647424wcZBOq', 'forEach', 'join', 'parse', 'object', 'keys', '672cNtUNN', '75878KcqKRv', 'assign', 'string', '227842LrIoro', '6KBydfJ', 'toString', '12006VhMdDm', 'replace', 'getOwnPropertyNames', '6284avKoRc', 'timestamp', '562156ifldcF', '8bJpdQv', 'push', 'reverse', '239695hZNslf', 'stringify', '93NmxXlV', 'sort'];
+  const _0x1403af = ["220JKmUTi", "647424wcZBOq", "forEach", "join", "parse", "object", "keys", "672cNtUNN", "75878KcqKRv", "assign", "string", "227842LrIoro", "6KBydfJ", "toString", "12006VhMdDm", "replace", "getOwnPropertyNames", "6284avKoRc", "timestamp", "562156ifldcF", "8bJpdQv", "push", "reverse", "239695hZNslf", "stringify", "93NmxXlV", "sort"];
   a0_0x4618 = function () {
     return _0x1403af;
   };
@@ -89487,60 +89487,132 @@ function a0_0x4618() {
 function signatureAlgorithm(_0x54486a, _0x235110, _0x247160, _0x4454df) {
   const _0x2a24af = a0_0x5c93,
     _0x811d5e = {
-      'appkey': a,
-      's': _0x54486a,
-      'nonce': _0x235110,
-      'timestamp': _0x247160
+      appkey: a,
+      s: _0x54486a,
+      nonce: _0x235110,
+      timestamp: _0x247160
     },
     _0x1bc676 = _0x4454df ? objKeySort(Object[_0x2a24af(0xac)](_0x811d5e, JSON[_0x2a24af(0xa7)](JSON[_0x2a24af(0xbb)](_0x4454df)))) : objKeySort(_0x811d5e),
     _0x3ee6ea = [];
   for (const _0x42cab8 in _0x1bc676) {
-    typeof _0x1bc676[_0x42cab8] === _0x2a24af(0xa8) && (_0x1bc676[_0x42cab8] = JSON['stringify'](_0x1bc676[_0x42cab8]));
+    typeof _0x1bc676[_0x42cab8] === _0x2a24af(0xa8) && (_0x1bc676[_0x42cab8] = JSON["stringify"](_0x1bc676[_0x42cab8]));
   }
-  Object['getOwnPropertyNames'](_0x1bc676)[_0x2a24af(0xa5)](_0x55a2a0 => {
+  Object["getOwnPropertyNames"](_0x1bc676)[_0x2a24af(0xa5)](_0x55a2a0 => {
     const _0x50191c = _0x2a24af;
-    _0x3ee6ea[_0x50191c(0xb8)](_0x55a2a0 + '=' + _0x1bc676[_0x55a2a0]);
+    _0x3ee6ea[_0x50191c(0xb8)](_0x55a2a0 + "=" + _0x1bc676[_0x55a2a0]);
   });
-  const _0x278e25 = _0x3ee6ea[_0x2a24af(0xa6)]('&'),
+  const _0x278e25 = _0x3ee6ea[_0x2a24af(0xa6)]("&"),
     _0xf8244e = crypto_js_default().HmacSHA256(_0x278e25, t)[_0x2a24af(0xb0)](),
     _0x39978f = {
-      'hmacBytes': _0xf8244e,
-      'timestamp': _0x811d5e['timestamp']
+      hmacBytes: _0xf8244e,
+      timestamp: _0x811d5e["timestamp"]
     };
   return _0x39978f;
 }
-function signatureAlgorithmForJava(_0x54486a, _0x235110, _0x247160, _0x4454df, _key) {
-  //console.log('_key',_key)
+function getUrlParams(url) {
+  // 获取查询字符串
+  let queryString = "";
+  if (typeof url === "string") {
+    const queryStart = url.indexOf("?");
+    if (queryStart !== -1) {
+      queryString = url.slice(queryStart + 1);
+      // 移除哈希部分
+      const hashIndex = queryString.indexOf("#");
+      if (hashIndex !== -1) {
+        queryString = queryString.slice(0, hashIndex);
+      }
+    }
+  } else {
+    queryString = window.location.search.slice(1);
+  }
+  const params = {};
+  const pairs = queryString.split("&");
+  for (const pair of pairs) {
+    if (!pair) continue; // 跳过空字符串
+
+    let [key, value] = pair.split("=");
+    // 处理没有值的参数（如"key"）
+    if (typeof value === "undefined") value = "";
+
+    // 解码并转换+号为空格
+    key = decodeURIComponent(key.replace(/\+/g, " "));
+    value = decodeURIComponent(value.replace(/\+/g, " "));
+
+    // 处理重复键
+    if (params.hasOwnProperty(key)) {
+      if (Array.isArray(params[key])) {
+        params[key].push(value);
+      } else {
+        params[key] = [params[key], value];
+      }
+    } else {
+      params[key] = value;
+    }
+  }
+  return params;
+}
+function signatureAlgorithmForJava(_0x54486a, _0x235110, _0x247160, _0x4454df, _key, method) {
+  let sortedObj = {};
+  let url = _0x54486a;
+  let postUrlParams = {};
+  if (method === "get") {
+    sortedObj = Object.assign({
+      s: url,
+      nonce: _0x235110,
+      timestamp: _0x247160
+    }, JSON.parse(JSON.stringify(_0x4454df)));
+  } else if (method === "post" || method === "put" || method === "delete") {
+    url = _0x54486a && _0x54486a.includes("?") ? _0x54486a.split("?")[0] : _0x54486a;
+    postUrlParams = getUrlParams(_0x54486a);
+    if (!!_0x4454df && typeof _0x4454df === "object" && Object.keys(_0x4454df).length) {
+      sortedObj = Object.assign({
+        s: url,
+        nonce: _0x235110,
+        timestamp: _0x247160,
+        ...postUrlParams
+      }, {
+        p: JSON.stringify(_0x4454df)
+      });
+    } else {
+      sortedObj = Object.assign({
+        s: url,
+        nonce: _0x235110,
+        timestamp: _0x247160,
+        ...postUrlParams
+      }, {});
+    }
+  }
   const _0x2a24af = a0_0x5c93,
     _0x811d5e = {
-      's': _0x54486a,
-      'nonce': _0x235110,
-      'timestamp': _0x247160
+      s: url,
+      nonce: _0x235110,
+      timestamp: _0x247160,
+      ...postUrlParams
     },
-    _0x1bc676 = _0x4454df ? objKeySort(Object[_0x2a24af(0xac)](_0x811d5e, JSON[_0x2a24af(0xa7)](JSON[_0x2a24af(0xbb)](_0x4454df)))) : objKeySort(_0x811d5e),
+    _0x1bc676 = _0x4454df ? objKeySort(sortedObj) : objKeySort(_0x811d5e),
     _0x3ee6ea = [];
   for (const _0x42cab8 in _0x1bc676) {
-    typeof _0x1bc676[_0x42cab8] === _0x2a24af(0xa8) && (_0x1bc676[_0x42cab8] = JSON['stringify'](_0x1bc676[_0x42cab8]));
+    typeof _0x1bc676[_0x42cab8] === _0x2a24af(0xa8) && (_0x1bc676[_0x42cab8] = JSON["stringify"](_0x1bc676[_0x42cab8]));
   }
-  Object['getOwnPropertyNames'](_0x1bc676)[_0x2a24af(0xa5)](_0x55a2a0 => {
+  Object["getOwnPropertyNames"](_0x1bc676)[_0x2a24af(0xa5)](_0x55a2a0 => {
     const _0x50191c = _0x2a24af;
-    _0x3ee6ea[_0x50191c(0xb8)](_0x55a2a0 + '=' + _0x1bc676[_0x55a2a0]);
+    _0x3ee6ea[_0x50191c(0xb8)](_0x55a2a0 + "=" + _0x1bc676[_0x55a2a0]);
   });
-  const _0x278e25 = _0x3ee6ea[_0x2a24af(0xa6)]('&'),
+  const _0x278e25 = _0x3ee6ea[_0x2a24af(0xa6)]("&"),
     _0xf8244e = crypto_js_default().HmacSHA256(_0x278e25, _key)[_0x2a24af(0xb0)](),
     _0x39978f = {
-      'hmacBytes': _0xf8244e,
-      'timestamp': _0x811d5e['timestamp']
+      hmacBytes: _0xf8244e,
+      timestamp: _0x811d5e["timestamp"]
     };
-  //console.log('t_java',t)
-  //console.log('params_java',_0x278e25)
+  console.log("-------验签");
+  console.log(_0x278e25);
   return _0x39978f;
 }
 function objKeySort(_0x59d16c) {
   const _0x3d021c = a0_0x5c93,
     _0x55835c = Object[_0x3d021c(0xa9)](_0x59d16c)[_0x3d021c(0xbd)](),
     _0x48f643 = {};
-  for (let _0x570b57 = 0x0; _0x570b57 < _0x55835c['length']; _0x570b57++) {
+  for (let _0x570b57 = 0x0; _0x570b57 < _0x55835c["length"]; _0x570b57++) {
     _0x48f643[_0x55835c[_0x570b57]] = _0x59d16c[_0x55835c[_0x570b57]];
   }
   return _0x48f643;
@@ -89548,31 +89620,35 @@ function objKeySort(_0x59d16c) {
 function signatureAlgorithm2(_0x450ec5) {
   const _0x239810 = a0_0x5c93,
     _0x48d0b6 = {
-      'appkey': appkey,
-      'timestamp': new Date()['getTime']()
+      appkey: appkey,
+      timestamp: new Date()["getTime"]()
     },
-    _0x3ef1f0 = _0x450ec5 ? objKeySort2(Object['assign'](_0x48d0b6, JSON['parse'](JSON[_0x239810(0xbb)](_0x450ec5)))) : objKeySort2(_0x48d0b6),
+    _0x3ef1f0 = _0x450ec5 ? objKeySort2(Object["assign"](_0x48d0b6, {
+      p: JSON.stringify(_0x450ec5)
+    })) : objKeySort2(_0x48d0b6),
     _0x2e2f54 = [];
+  // console.log("-----wwwwwww");
+  // console.log(_0x3ef1f0);
   for (const _0x3748cf in _0x3ef1f0) {
-    typeof _0x3ef1f0[_0x3748cf] === _0x239810(0xad) && (_0x3ef1f0[_0x3748cf] = _0x3ef1f0[_0x3748cf][_0x239810(0xb2)](/\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g, '')), typeof _0x3ef1f0[_0x3748cf] === _0x239810(0xa8) && (_0x3ef1f0[_0x3748cf] = JSON[_0x239810(0xbb)](_0x3ef1f0[_0x3748cf]));
+    typeof _0x3ef1f0[_0x3748cf] === _0x239810(0xad) && (_0x3ef1f0[_0x3748cf] = _0x3ef1f0[_0x3748cf][_0x239810(0xb2)](/\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g, "")), typeof _0x3ef1f0[_0x3748cf] === _0x239810(0xa8) && (_0x3ef1f0[_0x3748cf] = JSON[_0x239810(0xbb)](_0x3ef1f0[_0x3748cf]));
   }
   Object[_0x239810(0xb3)](_0x3ef1f0)[_0x239810(0xa5)](_0x588667 => {
     const _0x3506b7 = _0x239810;
-    _0x2e2f54[_0x3506b7(0xb8)](_0x3ef1f0[_0x588667] + '=' + _0x588667);
+    _0x2e2f54[_0x3506b7(0xb8)](_0x3ef1f0[_0x588667] + "=" + _0x588667);
   });
-  const _0x481f2b = _0x2e2f54[_0x239810(0xa6)]('&'),
+  const _0x481f2b = _0x2e2f54[_0x239810(0xa6)]("&"),
     _0x24d2af = crypto_js_default().HmacSHA512(_0x481f2b, secret)[_0x239810(0xb0)](),
     _0x422dec = {
-      'hmacBytes': _0x24d2af,
-      'timestamp': _0x48d0b6[_0x239810(0xb5)]
+      hmacBytes: _0x24d2af,
+      timestamp: _0x48d0b6[_0x239810(0xb5)]
     };
   return _0x422dec;
 }
 function objKeySort2(_0x7b0de7) {
   const _0x3fbcfa = a0_0x5c93,
-    _0x236dda = Object[_0x3fbcfa(0xa9)](_0x7b0de7)['sort']()[_0x3fbcfa(0xb9)](),
+    _0x236dda = Object[_0x3fbcfa(0xa9)](_0x7b0de7)["sort"]()[_0x3fbcfa(0xb9)](),
     _0x5a500e = {};
-  for (let _0x2baf9d = 0x0; _0x2baf9d < _0x236dda['length']; _0x2baf9d++) {
+  for (let _0x2baf9d = 0x0; _0x2baf9d < _0x236dda["length"]; _0x2baf9d++) {
     _0x5a500e[_0x236dda[_0x2baf9d]] = _0x7b0de7[_0x236dda[_0x2baf9d]];
   }
   return _0x5a500e;
@@ -97375,6 +97451,33 @@ function testD(str) {
 
 let baseUrl = "";
 let defaultEnv = "";
+
+// 替换空值
+function replaceNullWithEmptyMutate(obj) {
+  if (obj === null) return;
+  if (Array.isArray(obj)) {
+    // 修改数组元素
+    for (let i = 0; i < obj.length; i++) {
+      if (obj[i] === null) {
+        obj[i] = undefined; // 直接修改数组元素
+      } else if (typeof obj[i] === "object") {
+        replaceNullWithEmptyMutate(obj[i]); // 递归处理嵌套结构
+      }
+    }
+  } else if (typeof obj === "object") {
+    // 修改对象属性
+    for (const key in obj) {
+      if (obj.hasOwnProperty(key)) {
+        if (obj[key] === null) {
+          obj[key] = undefined; // 直接修改属性值
+        } else if (typeof obj[key] === "object") {
+          replaceNullWithEmptyMutate(obj[key]); // 递归处理嵌套结构
+        }
+      }
+    }
+  }
+  return obj; // 返回修改后的原对象
+}
 function initJavaService(env) {
   defaultEnv = env;
   if (env === "dev" || env === "development" || env === "test") {
@@ -97395,13 +97498,14 @@ request_instance.interceptors.request.use(function (config) {
   // 设置签名
   let _key = uuid.v4();
   const parameter = config.params || config.data;
+  replaceNullWithEmptyMutate(parameter);
   let signatureObj = {};
   let signature = "";
   if (parameter) {
-    signatureObj = signatureAlgorithmForJava(config.url, nonce, timestamp, parameter, _key);
+    signatureObj = signatureAlgorithmForJava(config.url, nonce, timestamp, parameter, _key, config.method);
     signature = signatureObj.hmacBytes;
   } else {
-    signatureObj = signatureAlgorithmForJava(config.url, nonce, timestamp, null, _key);
+    signatureObj = signatureAlgorithmForJava(config.url, nonce, timestamp, null, _key, config.method);
     signature = signatureObj.hmacBytes;
   }
   config.baseURL = defaultEnv ? baseUrl : "https://k8s-api.wotohub.com"; //https://pre-api.kuku.info';

package/wotokol-edm.umd.js

@@ -89470,9 +89470,9 @@ const secret = 'hoSA59LcWfCz5';
   while (!![]) {
     try {
       const _0x42a87d = parseInt(_0x4ee0fa(0xae)) / 0x1 + -parseInt(_0x4ee0fa(0xb4)) / 0x2 * (-parseInt(_0x4ee0fa(0xbc)) / 0x3) + parseInt(_0x4ee0fa(0xbf)) / 0x4 + parseInt(_0x4ee0fa(0xba)) / 0x5 * (-parseInt(_0x4ee0fa(0xaf)) / 0x6) + parseInt(_0x4ee0fa(0xb6)) / 0x7 * (parseInt(_0x4ee0fa(0xb7)) / 0x8) + parseInt(_0x4ee0fa(0xb1)) / 0x9 * (parseInt(_0x4ee0fa(0xbe)) / 0xa) + parseInt(_0x4ee0fa(0xab)) / 0xb * (-parseInt(_0x4ee0fa(0xaa)) / 0xc);
-      if (_0x42a87d === _0x3e8342) break;else _0x3d2f55['push'](_0x3d2f55['shift']());
+      if (_0x42a87d === _0x3e8342) break;else _0x3d2f55["push"](_0x3d2f55["shift"]());
     } catch (_0x30a31) {
-      _0x3d2f55['push'](_0x3d2f55['shift']());
+      _0x3d2f55["push"](_0x3d2f55["shift"]());
     }
   }
 })(a0_0x4618, 0x27ae1);
@@ -89488,7 +89488,7 @@ function a0_0x5c93(_0x4cbd12, _0x41f8e9) {
   }, a0_0x5c93(_0x4cbd12, _0x41f8e9);
 }
 function a0_0x4618() {
-  const _0x1403af = ['220JKmUTi', '647424wcZBOq', 'forEach', 'join', 'parse', 'object', 'keys', '672cNtUNN', '75878KcqKRv', 'assign', 'string', '227842LrIoro', '6KBydfJ', 'toString', '12006VhMdDm', 'replace', 'getOwnPropertyNames', '6284avKoRc', 'timestamp', '562156ifldcF', '8bJpdQv', 'push', 'reverse', '239695hZNslf', 'stringify', '93NmxXlV', 'sort'];
+  const _0x1403af = ["220JKmUTi", "647424wcZBOq", "forEach", "join", "parse", "object", "keys", "672cNtUNN", "75878KcqKRv", "assign", "string", "227842LrIoro", "6KBydfJ", "toString", "12006VhMdDm", "replace", "getOwnPropertyNames", "6284avKoRc", "timestamp", "562156ifldcF", "8bJpdQv", "push", "reverse", "239695hZNslf", "stringify", "93NmxXlV", "sort"];
   a0_0x4618 = function () {
     return _0x1403af;
   };
@@ -89497,60 +89497,132 @@ function a0_0x4618() {
 function signatureAlgorithm(_0x54486a, _0x235110, _0x247160, _0x4454df) {
   const _0x2a24af = a0_0x5c93,
     _0x811d5e = {
-      'appkey': a,
-      's': _0x54486a,
-      'nonce': _0x235110,
-      'timestamp': _0x247160
+      appkey: a,
+      s: _0x54486a,
+      nonce: _0x235110,
+      timestamp: _0x247160
     },
     _0x1bc676 = _0x4454df ? objKeySort(Object[_0x2a24af(0xac)](_0x811d5e, JSON[_0x2a24af(0xa7)](JSON[_0x2a24af(0xbb)](_0x4454df)))) : objKeySort(_0x811d5e),
     _0x3ee6ea = [];
   for (const _0x42cab8 in _0x1bc676) {
-    typeof _0x1bc676[_0x42cab8] === _0x2a24af(0xa8) && (_0x1bc676[_0x42cab8] = JSON['stringify'](_0x1bc676[_0x42cab8]));
+    typeof _0x1bc676[_0x42cab8] === _0x2a24af(0xa8) && (_0x1bc676[_0x42cab8] = JSON["stringify"](_0x1bc676[_0x42cab8]));
   }
-  Object['getOwnPropertyNames'](_0x1bc676)[_0x2a24af(0xa5)](_0x55a2a0 => {
+  Object["getOwnPropertyNames"](_0x1bc676)[_0x2a24af(0xa5)](_0x55a2a0 => {
     const _0x50191c = _0x2a24af;
-    _0x3ee6ea[_0x50191c(0xb8)](_0x55a2a0 + '=' + _0x1bc676[_0x55a2a0]);
+    _0x3ee6ea[_0x50191c(0xb8)](_0x55a2a0 + "=" + _0x1bc676[_0x55a2a0]);
   });
-  const _0x278e25 = _0x3ee6ea[_0x2a24af(0xa6)]('&'),
+  const _0x278e25 = _0x3ee6ea[_0x2a24af(0xa6)]("&"),
     _0xf8244e = crypto_js_default().HmacSHA256(_0x278e25, t)[_0x2a24af(0xb0)](),
     _0x39978f = {
-      'hmacBytes': _0xf8244e,
-      'timestamp': _0x811d5e['timestamp']
+      hmacBytes: _0xf8244e,
+      timestamp: _0x811d5e["timestamp"]
     };
   return _0x39978f;
 }
-function signatureAlgorithmForJava(_0x54486a, _0x235110, _0x247160, _0x4454df, _key) {
-  //console.log('_key',_key)
+function getUrlParams(url) {
+  // 获取查询字符串
+  let queryString = "";
+  if (typeof url === "string") {
+    const queryStart = url.indexOf("?");
+    if (queryStart !== -1) {
+      queryString = url.slice(queryStart + 1);
+      // 移除哈希部分
+      const hashIndex = queryString.indexOf("#");
+      if (hashIndex !== -1) {
+        queryString = queryString.slice(0, hashIndex);
+      }
+    }
+  } else {
+    queryString = window.location.search.slice(1);
+  }
+  const params = {};
+  const pairs = queryString.split("&");
+  for (const pair of pairs) {
+    if (!pair) continue; // 跳过空字符串
+
+    let [key, value] = pair.split("=");
+    // 处理没有值的参数（如"key"）
+    if (typeof value === "undefined") value = "";
+
+    // 解码并转换+号为空格
+    key = decodeURIComponent(key.replace(/\+/g, " "));
+    value = decodeURIComponent(value.replace(/\+/g, " "));
+
+    // 处理重复键
+    if (params.hasOwnProperty(key)) {
+      if (Array.isArray(params[key])) {
+        params[key].push(value);
+      } else {
+        params[key] = [params[key], value];
+      }
+    } else {
+      params[key] = value;
+    }
+  }
+  return params;
+}
+function signatureAlgorithmForJava(_0x54486a, _0x235110, _0x247160, _0x4454df, _key, method) {
+  let sortedObj = {};
+  let url = _0x54486a;
+  let postUrlParams = {};
+  if (method === "get") {
+    sortedObj = Object.assign({
+      s: url,
+      nonce: _0x235110,
+      timestamp: _0x247160
+    }, JSON.parse(JSON.stringify(_0x4454df)));
+  } else if (method === "post" || method === "put" || method === "delete") {
+    url = _0x54486a && _0x54486a.includes("?") ? _0x54486a.split("?")[0] : _0x54486a;
+    postUrlParams = getUrlParams(_0x54486a);
+    if (!!_0x4454df && typeof _0x4454df === "object" && Object.keys(_0x4454df).length) {
+      sortedObj = Object.assign({
+        s: url,
+        nonce: _0x235110,
+        timestamp: _0x247160,
+        ...postUrlParams
+      }, {
+        p: JSON.stringify(_0x4454df)
+      });
+    } else {
+      sortedObj = Object.assign({
+        s: url,
+        nonce: _0x235110,
+        timestamp: _0x247160,
+        ...postUrlParams
+      }, {});
+    }
+  }
   const _0x2a24af = a0_0x5c93,
     _0x811d5e = {
-      's': _0x54486a,
-      'nonce': _0x235110,
-      'timestamp': _0x247160
+      s: url,
+      nonce: _0x235110,
+      timestamp: _0x247160,
+      ...postUrlParams
     },
-    _0x1bc676 = _0x4454df ? objKeySort(Object[_0x2a24af(0xac)](_0x811d5e, JSON[_0x2a24af(0xa7)](JSON[_0x2a24af(0xbb)](_0x4454df)))) : objKeySort(_0x811d5e),
+    _0x1bc676 = _0x4454df ? objKeySort(sortedObj) : objKeySort(_0x811d5e),
     _0x3ee6ea = [];
   for (const _0x42cab8 in _0x1bc676) {
-    typeof _0x1bc676[_0x42cab8] === _0x2a24af(0xa8) && (_0x1bc676[_0x42cab8] = JSON['stringify'](_0x1bc676[_0x42cab8]));
+    typeof _0x1bc676[_0x42cab8] === _0x2a24af(0xa8) && (_0x1bc676[_0x42cab8] = JSON["stringify"](_0x1bc676[_0x42cab8]));
   }
-  Object['getOwnPropertyNames'](_0x1bc676)[_0x2a24af(0xa5)](_0x55a2a0 => {
+  Object["getOwnPropertyNames"](_0x1bc676)[_0x2a24af(0xa5)](_0x55a2a0 => {
     const _0x50191c = _0x2a24af;
-    _0x3ee6ea[_0x50191c(0xb8)](_0x55a2a0 + '=' + _0x1bc676[_0x55a2a0]);
+    _0x3ee6ea[_0x50191c(0xb8)](_0x55a2a0 + "=" + _0x1bc676[_0x55a2a0]);
   });
-  const _0x278e25 = _0x3ee6ea[_0x2a24af(0xa6)]('&'),
+  const _0x278e25 = _0x3ee6ea[_0x2a24af(0xa6)]("&"),
     _0xf8244e = crypto_js_default().HmacSHA256(_0x278e25, _key)[_0x2a24af(0xb0)](),
     _0x39978f = {
-      'hmacBytes': _0xf8244e,
-      'timestamp': _0x811d5e['timestamp']
+      hmacBytes: _0xf8244e,
+      timestamp: _0x811d5e["timestamp"]
     };
-  //console.log('t_java',t)
-  //console.log('params_java',_0x278e25)
+  console.log("-------验签");
+  console.log(_0x278e25);
   return _0x39978f;
 }
 function objKeySort(_0x59d16c) {
   const _0x3d021c = a0_0x5c93,
     _0x55835c = Object[_0x3d021c(0xa9)](_0x59d16c)[_0x3d021c(0xbd)](),
     _0x48f643 = {};
-  for (let _0x570b57 = 0x0; _0x570b57 < _0x55835c['length']; _0x570b57++) {
+  for (let _0x570b57 = 0x0; _0x570b57 < _0x55835c["length"]; _0x570b57++) {
     _0x48f643[_0x55835c[_0x570b57]] = _0x59d16c[_0x55835c[_0x570b57]];
   }
   return _0x48f643;
@@ -89558,31 +89630,35 @@ function objKeySort(_0x59d16c) {
 function signatureAlgorithm2(_0x450ec5) {
   const _0x239810 = a0_0x5c93,
     _0x48d0b6 = {
-      'appkey': appkey,
-      'timestamp': new Date()['getTime']()
+      appkey: appkey,
+      timestamp: new Date()["getTime"]()
     },
-    _0x3ef1f0 = _0x450ec5 ? objKeySort2(Object['assign'](_0x48d0b6, JSON['parse'](JSON[_0x239810(0xbb)](_0x450ec5)))) : objKeySort2(_0x48d0b6),
+    _0x3ef1f0 = _0x450ec5 ? objKeySort2(Object["assign"](_0x48d0b6, {
+      p: JSON.stringify(_0x450ec5)
+    })) : objKeySort2(_0x48d0b6),
     _0x2e2f54 = [];
+  // console.log("-----wwwwwww");
+  // console.log(_0x3ef1f0);
   for (const _0x3748cf in _0x3ef1f0) {
-    typeof _0x3ef1f0[_0x3748cf] === _0x239810(0xad) && (_0x3ef1f0[_0x3748cf] = _0x3ef1f0[_0x3748cf][_0x239810(0xb2)](/\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g, '')), typeof _0x3ef1f0[_0x3748cf] === _0x239810(0xa8) && (_0x3ef1f0[_0x3748cf] = JSON[_0x239810(0xbb)](_0x3ef1f0[_0x3748cf]));
+    typeof _0x3ef1f0[_0x3748cf] === _0x239810(0xad) && (_0x3ef1f0[_0x3748cf] = _0x3ef1f0[_0x3748cf][_0x239810(0xb2)](/\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g, "")), typeof _0x3ef1f0[_0x3748cf] === _0x239810(0xa8) && (_0x3ef1f0[_0x3748cf] = JSON[_0x239810(0xbb)](_0x3ef1f0[_0x3748cf]));
   }
   Object[_0x239810(0xb3)](_0x3ef1f0)[_0x239810(0xa5)](_0x588667 => {
     const _0x3506b7 = _0x239810;
-    _0x2e2f54[_0x3506b7(0xb8)](_0x3ef1f0[_0x588667] + '=' + _0x588667);
+    _0x2e2f54[_0x3506b7(0xb8)](_0x3ef1f0[_0x588667] + "=" + _0x588667);
   });
-  const _0x481f2b = _0x2e2f54[_0x239810(0xa6)]('&'),
+  const _0x481f2b = _0x2e2f54[_0x239810(0xa6)]("&"),
     _0x24d2af = crypto_js_default().HmacSHA512(_0x481f2b, secret)[_0x239810(0xb0)](),
     _0x422dec = {
-      'hmacBytes': _0x24d2af,
-      'timestamp': _0x48d0b6[_0x239810(0xb5)]
+      hmacBytes: _0x24d2af,
+      timestamp: _0x48d0b6[_0x239810(0xb5)]
     };
   return _0x422dec;
 }
 function objKeySort2(_0x7b0de7) {
   const _0x3fbcfa = a0_0x5c93,
-    _0x236dda = Object[_0x3fbcfa(0xa9)](_0x7b0de7)['sort']()[_0x3fbcfa(0xb9)](),
+    _0x236dda = Object[_0x3fbcfa(0xa9)](_0x7b0de7)["sort"]()[_0x3fbcfa(0xb9)](),
     _0x5a500e = {};
-  for (let _0x2baf9d = 0x0; _0x2baf9d < _0x236dda['length']; _0x2baf9d++) {
+  for (let _0x2baf9d = 0x0; _0x2baf9d < _0x236dda["length"]; _0x2baf9d++) {
     _0x5a500e[_0x236dda[_0x2baf9d]] = _0x7b0de7[_0x236dda[_0x2baf9d]];
   }
   return _0x5a500e;
@@ -97385,6 +97461,33 @@ function testD(str) {
 
 let baseUrl = "";
 let defaultEnv = "";
+
+// 替换空值
+function replaceNullWithEmptyMutate(obj) {
+  if (obj === null) return;
+  if (Array.isArray(obj)) {
+    // 修改数组元素
+    for (let i = 0; i < obj.length; i++) {
+      if (obj[i] === null) {
+        obj[i] = undefined; // 直接修改数组元素
+      } else if (typeof obj[i] === "object") {
+        replaceNullWithEmptyMutate(obj[i]); // 递归处理嵌套结构
+      }
+    }
+  } else if (typeof obj === "object") {
+    // 修改对象属性
+    for (const key in obj) {
+      if (obj.hasOwnProperty(key)) {
+        if (obj[key] === null) {
+          obj[key] = undefined; // 直接修改属性值
+        } else if (typeof obj[key] === "object") {
+          replaceNullWithEmptyMutate(obj[key]); // 递归处理嵌套结构
+        }
+      }
+    }
+  }
+  return obj; // 返回修改后的原对象
+}
 function initJavaService(env) {
   defaultEnv = env;
   if (env === "dev" || env === "development" || env === "test") {
@@ -97405,13 +97508,14 @@ request_instance.interceptors.request.use(function (config) {
   // 设置签名
   let _key = uuid.v4();
   const parameter = config.params || config.data;
+  replaceNullWithEmptyMutate(parameter);
   let signatureObj = {};
   let signature = "";
   if (parameter) {
-    signatureObj = signatureAlgorithmForJava(config.url, nonce, timestamp, parameter, _key);
+    signatureObj = signatureAlgorithmForJava(config.url, nonce, timestamp, parameter, _key, config.method);
     signature = signatureObj.hmacBytes;
   } else {
-    signatureObj = signatureAlgorithmForJava(config.url, nonce, timestamp, null, _key);
+    signatureObj = signatureAlgorithmForJava(config.url, nonce, timestamp, null, _key, config.method);
     signature = signatureObj.hmacBytes;
   }
   config.baseURL = defaultEnv ? baseUrl : "https://k8s-api.wotohub.com"; //https://pre-api.kuku.info';