n20-common-lib 2.9.91 → 2.9.92

package/package.json

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

package/src/plugins/Sign/SkfSign/index.js

@@ -84,56 +84,44 @@ function verifyDn(dnList, dn) {
 }
 
 // 签名
-export async function getSign(plain, dn) {
-  if (dn === undefined) {
-    dn = getDN()
-  }
+export async function getSign(plain, dn = getDN()) {
+  // 验证DN参数
   if (!dn) {
     Message.error('签名参数DN错误!')
     return false
   }
 
-  let plainText = ''
-  if (typeof plain === 'object') {
-    plainText = JSON.stringify(plain)
-  } else {
-    plainText = plain
-  }
+  // 处理签名文本
+  const plainText = typeof plain === 'object' ? JSON.stringify(plain) : plain
+
+  // 获取并验证证书信息
   const checkRes = await getCertInfo(dn)
+  
+  // 证书验证错误处理
+  const errorMessages = {
+    'dnListEmpty': '没有匹配到证书!',
+    'dnIsEmpty': 'DN参数为空!', 
+    'Empty': '当前Ukey不匹配!'
+  }
 
-  if (
-    checkRes === -1 ||
-    ['dnListEmpty', 'dnIsEmpty', 'Empty'].includes(checkRes)
-  ) {
-    switch (checkRes) {
-      case 'dnListEmpty':
-        Message.warning('没有匹配到证书!')
-        break
-      case 'dnIsEmpty':
-        Message.warning('DN参数为空!')
-        break
-      case 'Empty':
-        Message.warning('当前Ukey不匹配!')
-        break
-      default:
-        Message.warning('没有匹配到证书!')
-    }
+  if (checkRes === -1 || Object.keys(errorMessages).includes(checkRes)) {
+    Message.warning(errorMessages[checkRes] || '没有匹配到证书!')
     return ''
   }
-  let answer
-  await MessageBox.prompt('请输入PIN码', '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    closeOnClickModal: false,
-    inputType: 'password'
-  }).then(({ value }) => {
-    performSign(plainText, value).then((signedData) => {
-      answer = signedData
-    })
-  })
-  // 签名
 
-  return answer
+  // 获取PIN码并执行签名
+  try {
+    const { value: pin } = await MessageBox.prompt('请输入PIN码', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      closeOnClickModal: false,
+      inputType: 'password'
+    })
+    
+    return await performSign(plainText, pin)
+  } catch (error) {
+    return Promise.reject(error)
+  }
 }
 
 /**