n20-common-lib 2.13.4 → 2.13.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.13.4",
+  "version": "2.13.6",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/plugins/Sign/signV3/sign.js

@@ -12,6 +12,7 @@ const {
   IWSAGetAllCertsListInfo
 } = new IWSAgent()
 IWSASetTimeOut(6000)
+let certType = 'RSA'
 let certDN = ''
 function getDN() {
   let dn
@@ -111,7 +112,7 @@ export function getCertInfo(dn) {
         reject()
       }
       if (dnList.length === 0) {
-        Message.error('获取到的证书列表为空!')
+        Message.error('用户证书信息与当前用户不匹配!')
         reject()
       }
 
@@ -128,12 +129,16 @@ export function getCertInfo(dn) {
  * @returns {Promise<string>}  签名后的密文信息
  */
 export async function performSign(plain, index) {
+  let certStoreType = 2
+  if (certType === 'RSA') {
+    certStoreType = 1
+  }
   let signMethod = IWSAAttachedSignAdvDefaultDN
   if (window.NetSignMethod === 'Detached') {
     signMethod = IWSADetachedSignAdvDefaultDN
   }
   return new Promise((resolve, reject) => {
-    signMethod(plain, 'infosec.sm2', 4, certDN, '1', 'SHA1', (errorCode, signedData) => {
+    signMethod(plain, 'infosec.sm2', certStoreType, certDN, '1', 'SHA1', (errorCode, signedData) => {
       if (errorCode === 0 || errorCode === '0') {
         resolve(signedData)
       } else {
@@ -158,6 +163,7 @@ function verifyDn(dnList, dn) {
     let dnAttrsArr = C.certDN.split(',').map((c) => c.trim())
     if (dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
       index = i
+      certType = C.CertType
       certDN = C.certDN // 保存证书DN到全局变量中 =
       return true
     }