接口验签修改

wxminipro/plugin/config.js

@@ -29,9 +29,12 @@ const baseObject = {
     // reqEtcAppId: "52188934",
     // sm3Key: "TlRJeE9EZzVNalZmTWpBeU5UQXhNVEV4TURNeU1EYz0=",
     // sm4Key: "0db682514bfeadd0"
-    reqEtcAppId: "52088945",
-    sm3Key: "TIRJd09EZzVORFZmTWpBeU5UQUNVGd5TWpJMk16UT0=",
-    sm4Key: "70c6bc714096bdcb"
+    // reqEtcAppId: "52088945",
+    // sm3Key: "TIRJd09EZzVORFZmTWpBeU5UQUNVGd5TWpJMk16UT0=",
+    // sm4Key: "70c6bc714096bdcb"
+    reqEtcAppId: "admin001",
+    sm3Key: "WVdSdGFXNHdNREZmTWpBeU16QTRNRE09",
+    sm4Key: "MIGfMA0GCSqGSIb3"
   },
   // 体验版
   trial: {},

wxminipro/plugin/miniprogram_npm/base64-js/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1718761350160, function(require, module, exports) {
+__DEFINE__(1757657343136, function(require, module, exports) {
 
 
 exports.byteLength = byteLength
@@ -157,7 +157,7 @@ function fromByteArray (uint8) {
 }
 
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1718761350160);
+return __REQUIRE__(1757657343136);
 })()
 //miniprogram-npm-outsideDeps=[]
 //# sourceMappingURL=index.js.map

wxminipro/plugin/miniprogram_npm/gm-crypt/index.js

@@ -4,15 +4,15 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1756859482087, function(require, module, exports) {
+__DEFINE__(1757657343137, function(require, module, exports) {
 const SM4 = require('./src/sm4')
 
 module.exports = {
   sm4: SM4
 }
 
-}, function(modId) {var map = {"./src/sm4":1756859482088}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1756859482088, function(require, module, exports) {
+}, function(modId) {var map = {"./src/sm4":1757657343138}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1757657343138, function(require, module, exports) {
 
 
 const Crypt = require('./crypt')
@@ -415,8 +415,8 @@ class SM4 {
 
 module.exports = SM4
 
-}, function(modId) { var map = {"./crypt":1756859482089}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1756859482089, function(require, module, exports) {
+}, function(modId) { var map = {"./crypt":1757657343139}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1757657343139, function(require, module, exports) {
 
 
 const base64js = require('base64-js')
@@ -481,7 +481,7 @@ class Crypt {
 module.exports = Crypt
 
 }, function(modId) { var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1756859482087);
+return __REQUIRE__(1757657343137);
 })()
 //miniprogram-npm-outsideDeps=["base64-js","util"]
 //# sourceMappingURL=index.js.map

wxminipro/plugin/miniprogram_npm/jsbn/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1718761350164, function(require, module, exports) {
+__DEFINE__(1757657343140, function(require, module, exports) {
 (function(){
 
     // Copyright (c) 2005  Tom Wu
@@ -1368,7 +1368,7 @@ __DEFINE__(1718761350164, function(require, module, exports) {
 }).call(this);
 
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1718761350164);
+return __REQUIRE__(1757657343140);
 })()
 //miniprogram-npm-outsideDeps=[]
 //# sourceMappingURL=index.js.map

wxminipro/plugin/miniprogram_npm/sm-crypto/index.js

@@ -4,15 +4,15 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1756859482091, function(require, module, exports) {
+__DEFINE__(1757657343141, function(require, module, exports) {
 module.exports = {
   sm2: require('./sm2/index'),
   sm3: require('./sm3/index'),
   sm4: require('./sm4/index'),
 }
 
-}, function(modId) {var map = {"./sm2/index":1756859482092,"./sm3/index":1756859482097,"./sm4/index":1756859482098}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1756859482092, function(require, module, exports) {
+}, function(modId) {var map = {"./sm2/index":1757657343142,"./sm3/index":1757657343147,"./sm4/index":1757657343148}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1757657343142, function(require, module, exports) {
 /* eslint-disable no-use-before-define */
 const {BigInteger} = require('jsbn')
 const {encodeDer, decodeDer} = require('./asn1')
@@ -275,8 +275,8 @@ module.exports = {
   verifyPublicKey: _.verifyPublicKey,
 }
 
-}, function(modId) { var map = {"./asn1":1756859482093,"./utils":1756859482094,"./sm3":1756859482096}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1756859482093, function(require, module, exports) {
+}, function(modId) { var map = {"./asn1":1757657343143,"./utils":1757657343144,"./sm3":1757657343146}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1757657343143, function(require, module, exports) {
 /* eslint-disable class-methods-use-this */
 const {BigInteger} = require('jsbn')
 
@@ -440,7 +440,7 @@ module.exports = {
 }
 
 }, function(modId) { var map = {}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1756859482094, function(require, module, exports) {
+__DEFINE__(1757657343144, function(require, module, exports) {
 /* eslint-disable no-bitwise, no-mixed-operators, no-use-before-define, max-len */
 const {BigInteger, SecureRandom} = require('jsbn')
 const {ECCurveFp} = require('./ec')
@@ -636,8 +636,8 @@ module.exports = {
   comparePublicKeyHex,
 }
 
-}, function(modId) { var map = {"./ec":1756859482095}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1756859482095, function(require, module, exports) {
+}, function(modId) { var map = {"./ec":1757657343145}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1757657343145, function(require, module, exports) {
 /* eslint-disable no-case-declarations, max-len */
 const {BigInteger} = require('jsbn')
 
@@ -972,7 +972,7 @@ module.exports = {
 }
 
 }, function(modId) { var map = {}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1756859482096, function(require, module, exports) {
+__DEFINE__(1757657343146, function(require, module, exports) {
 // 消息扩展
 const W = new Uint32Array(68)
 const M = new Uint32Array(64) // W'
@@ -1145,7 +1145,7 @@ module.exports = {
 }
 
 }, function(modId) { var map = {}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1756859482097, function(require, module, exports) {
+__DEFINE__(1757657343147, function(require, module, exports) {
 const {sm3, hmac} = require('../sm2/sm3')
 
 /**
@@ -1241,8 +1241,8 @@ module.exports = function (input, options) {
   return ArrayToHex(sm3(input))
 }
 
-}, function(modId) { var map = {"../sm2/sm3":1756859482096}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1756859482098, function(require, module, exports) {
+}, function(modId) { var map = {"../sm2/sm3":1757657343146}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1757657343148, function(require, module, exports) {
 /* eslint-disable no-bitwise, no-mixed-operators, complexity */
 const DECRYPT = 0
 const ROUND = 32
@@ -1604,7 +1604,7 @@ module.exports = {
 }
 
 }, function(modId) { var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1756859482091);
+return __REQUIRE__(1757657343141);
 })()
 //miniprogram-npm-outsideDeps=["jsbn"]
 //# sourceMappingURL=index.js.map

wxminipro/plugin/network/request.js

@@ -114,7 +114,8 @@ class NetworkRequest {
       });
     } else {
       if (res.bizContent) {
-        decrypting = sm4Decrypt(res.bizContent);
+        // decrypting = sm4Decrypt(res.bizContent);
+        decrypting = JSON.parse(res.bizContent);
       }
       console.log("返回数据", decrypting)
       if (decrypting.errcode != 0 && decrypting.errcode) {

wxminipro/plugin/new-utils/SM3.js

@@ -14,8 +14,8 @@ function sm3(message, key) {
     // 在小程序环境中直接使用字符串，不使用Buffer
     if (key) {
       // HMAC-SM3 模式
-      const hmac = SM3.sm3(message, {
-        key: key
+      const hmac = SM3.sm3(stringToArrayBuffer(message), {
+        key: stringToArrayBuffer(key)
       });
       console.log('HMAC-SM3 结果:', hmac);
       return hmac?.toUpperCase();
@@ -31,6 +31,14 @@ function sm3(message, key) {
   }
 }
 
+function stringToArrayBuffer(str) {
+  const encoder = new TextEncoder();
+  const uint8Array = encoder.encode(str);
+  console.log(uint8Array)
+  return uint8Array;
+}
+
+
 module.exports = {
   sm3: sm3
 }

wxminipro/plugin/new-utils/encryption.js

@@ -216,11 +216,12 @@ function encryption(ifCode, subdata, type) {
     let requestData = new Array();
     requestData["ifCode"] = ifCode;
     requestData["appId"] = configObj.reqEtcAppId; //"52088945";
-    requestData["encryptType"] = "SM4";
+    requestData["encryptType"] = "NONE";
 
     // 执行SM4加密
     console.log("sm4Key", configObj.sm4Key)
-    requestData["bizContent"] = s4.encryptData_CBC(subdata, configObj.sm4Key);
+    requestData["bizContent"] = JSON.stringify(subdata);
+    // requestData["bizContent"] = s4.encryptData_CBC(subdata, configObj.sm4Key);
     console.log('加密后的bizContent:', requestData["bizContent"]);
 
     requestData["reqId"] = requestData["appId"] + "_" + getDate() + "_" + generateMixed(5);