n20-common-lib 2.9.81 → 2.9.82

package/package.json

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

package/src/plugins/Sign/index.js

@@ -17,14 +17,15 @@ async function disposeSign(config, p1, p2, p3) {
   try {
     // 如果是信安CA且在银河麒麟系统上，则使用国密签名
     // 使用更可靠的系统和环境检测方法
-    if (config.type === 'inetSign' && (
+    if (
+      config.type === 'inetSign' &&
       // 检查操作系统
-      navigator.platform.toLowerCase().includes('linux') ||
-      navigator.userAgent.toLowerCase().includes('linux') ||
-      // 检查是否为银河麒麟特有的环境变量或特征
-      typeof window.KylinOS !== 'undefined' ||
-      document.documentElement.dataset.osType === 'kylin'
-    )) {
+      (navigator.platform.toLowerCase().includes('linux') ||
+        navigator.userAgent.toLowerCase().includes('linux') ||
+        // 检查是否为银河麒麟特有的环境变量或特征
+        typeof window.KylinOS !== 'undefined' ||
+        document.documentElement.dataset.osType === 'kylin')
+    ) {
       // 确保CaMap中存在SkfSign配置
       if (!CaMap['SkfSign']) {
         console.warn('未找到SkfSign配置，将继续使用原始配置')
@@ -33,7 +34,8 @@ async function disposeSign(config, p1, p2, p3) {
       config = CaMap['SkfSign']
     }
 
-    const path = typeof config.path === 'function' ? config.path(p3) : config.path
+    const path =
+      typeof config.path === 'function' ? config.path(p3) : config.path
     const module = await importG(config.type, () =>
       import(/*webpackChunkName: "[request]"*/ `${path}`)
     )
@@ -42,7 +44,7 @@ async function disposeSign(config, p1, p2, p3) {
       await new Promise((resolve, reject) => {
         module.availableSign((available) => {
           available ? resolve() : reject(new Error('签名不可用'))
-        }, window.NetSignName)
+        }, systemIdentification())
       })
     }
 
@@ -53,6 +55,19 @@ async function disposeSign(config, p1, p2, p3) {
   }
 }
 
+function systemIdentification() {
+  const userAgent = navigator.userAgent || navigator.vendor || window.opera
+  let url = window.NetSignName || '/portal/NetSignCNG-v2.1.152.2.exe'
+  if (/windows/i.test(userAgent)) {
+    url = window.NetSignName
+  } else if (/linux/i.test(userAgent)) {
+    url = /Kylin/i.test(userAgent)
+      ? window.KylinSignName || '/portal/NetSignCNG-v2.1.152.2.rpm' // 麒麟系统
+      : window.linuxSignName || '/portal/NetSignCNG-v2.1.152.2.deb' // 普通Linux
+  }
+  return url
+}
+
 /**
  * 获取签名
  * @param {*} p1 - 签名参数1

package/src/plugins/Sign/sign.js

@@ -28,7 +28,6 @@ export function availableSign(fn, url) {
     fn && fn(available)
   } else {
     IWSASendAvailable()
-    url || (url = '/portal/NetSignCNG-v2.1.152.2.exe')
     let count = 0
     checkAvailable(fn, url, count)
   }