n20-common-lib 2.1.19 → 2.1.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.1.19",
+  "version": "2.1.20",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/LoginTemporary/form.vue

@@ -144,6 +144,7 @@ import axios from '../../utils/axios'
 import auth from '../../utils/auth'
 import qrCode from './qrcode.vue'
 import { siteTree2menus, siteTree2RelaNos } from './utils'
+import CaMap from '../../plugins/Sign/CaMap.js'
 import importG from '../../utils/importGlobal.js'
 
 function encode(pwd = '', key = 0) {
@@ -403,25 +404,8 @@ export default {
         let sign = undefined
         let certDn = undefined
         if (supplier) {
-          if (supplier === 'bjca') {
-            // 北京CA
-            window.sessionStorage.setItem('signType', 'bjcaSign')
-          } else if (supplier === 'Itrus') {
-            // 天威CA
-            window.sessionStorage.setItem('signType', 'ItrusSign')
-          } else if (supplier === 'NetServerSkf') {
-            // 信安国密
-            window.sessionStorage.setItem('signType', 'SkfSign')
-          } else if (supplier === 'netca') {
-            // 网证通
-            window.sessionStorage.setItem('signType', 'netcaSign')
-          } else if (supplier === 'NetSM3') {
-            // 网证通
-            window.sessionStorage.setItem('signType', 'NetSM3')
-          } else {
-            // 信安CA
-            window.sessionStorage.setItem('signType', 'inetSign')
-          }
+          let CaItem = Object.values(CaMap).find((item) => item.supplier === supplier) || CaMap['null']
+          window.sessionStorage.setItem('signType', CaItem.type)
         }
         if (checkCert) {
           this.loadingAdd()

package/src/plugins/Sign/CaMap.js

@@ -0,0 +1,37 @@
+// Key与type值要相同
+export default {
+  null: {
+    name: '信安CA',
+    type: 'inetSign'
+  },
+  inetSign: {
+    name: '信安CA',
+    type: 'inetSign',
+    supplier: 'inetSign'
+  },
+  bjcaSign: {
+    name: '北京CA',
+    type: 'bjcaSign',
+    supplier: 'bjca'
+  },
+  ItrusSign: {
+    name: '天威CA',
+    type: 'ItrusSign',
+    supplier: 'Itrus'
+  },
+  SkfSign: {
+    name: '信安国密',
+    type: 'SkfSign',
+    supplier: 'NetServerSkf'
+  },
+  netcaSign: {
+    name: '网证通',
+    type: 'netcaSign',
+    supplier: 'netca'
+  },
+  NetSM3: {
+    name: '信安国密软签',
+    type: 'NetSM3',
+    supplier: 'NetSM3'
+  }
+}

package/src/plugins/Sign/index.js

@@ -1,18 +1,11 @@
 import importG from '../../utils/importGlobal.js'
 
+import CaMap from './CaMap.js'
 export async function getSign(p1, p2, p3) {
   let signType = window.sessionStorage.getItem('signType')
-  let CaMap = {
-    inetSign: '信安CA',
-    SkfSign: '信安国密',
-    bjcaSign: '北京CA',
-    ItrusSign: '天威CA',
-    netcaSign: '网证通',
-    NetSM3: '信安国密软签'
-  }
   if (!signType || !CaMap[signType]) {
     console.error('请设置签名服务公司sessionStorage.signType,公司字段映射:', CaMap)
-    signType = 'inetSign'
+    signType = CaMap['null'] ? CaMap['null'].type : ''
   }
 
   const por = new Promise((resolve, reject) => {