n20-common-lib 2.15.1 → 2.15.3

package/package.json

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

package/src/components/HandlingAdvice/index.vue

@@ -147,7 +147,7 @@ export default {
           )
           this.reason = data1?.suggestion || ''
           this.reasonSelect = data1?.suggestion || ''
-          if (data1.flowHistoryCfgs && data1.flowHistoryCfgs.length > 0) {
+          if (data1 && data1.flowHistoryCfgs && data1.flowHistoryCfgs.length > 0) {
             this.otherAttDataA = this.otherAttDataA.map((item) => {
               const bcData = data1.flowHistoryCfgs.find((item2) => {
                 return item2.cfgKey === item.cfgKey

package/src/plugins/Sign/kySign/hex.js

@@ -83,5 +83,10 @@ function toUnsignBytes(bytes) {
   }
   return bs
 }
+function stringToRawHex(str) {
+  return Array.from(str)
+    .map((char) => char.charCodeAt(0).toString(16).padStart(2, '0').toUpperCase())
+    .join('')
+}
 
-export { encode, decode, toUnsignBytes }
+export { encode, decode, toUnsignBytes, stringToRawHex }

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

@@ -1,6 +1,6 @@
 import { Message, MessageBox, Notification } from 'element-ui'
-import { _Base64encode, hexToBase64, base64ToHex, _Base64decode } from './base64'
-import { encode, decode, toUnsignBytes } from './hex'
+import { hexToBase64 } from './base64'
+import { stringToRawHex } from './hex'
 import SKF from './skf'
 
 /*
@@ -69,10 +69,9 @@ export async function getSign(plain, dn = getDN()) {
     Message.error('签名参数DN错误!')
     return false
   }
-
   // 处理签名文本
-  const plainText = typeof plain === 'object' ? _Base64encode(JSON.stringify(plain)) : _Base64encode(plain)
-
+  const plainText =
+    typeof plain === 'object' ? hexToBase64(stringToRawHex(JSON.stringify(plain))) : hexToBase64(stringToRawHex(plain))
   // 获取并验证证书信息
   const checkRes = await getCertInfo(dn)
   console.log('checkRes', checkRes)
@@ -152,8 +151,9 @@ export async function getCertInfo(dn) {
     // 检测dn是否匹配
     if (indexDn === -1) {
       console.log(DNList)
-      // Message.error('当前Ukey不匹配!')
-      resolve({ Container, Application })
+      resolve(-1)
+      Message.error('当前Ukey不匹配!')
+      // resolve({ Container, Application })
     } else {
       resolve({ Container, Application })
     }