@toolspack/ttd-common 1.1.7 → 1.3.0

package/src/packages/ukey/WzhSignChrome.vue

@@ -36,27 +36,38 @@ export default {
       this.LoadObj()
     },
 
-    getUkeyImage() {
+    async getUkeyImage(bstrP11Name) {
+      // 为了兼容 (新老ukey)，获取证书的CSPName
+      // 老版本ukey CSPName: CFCA FOR UKEY CSP v1.1.0
+      // 新版本ukey CSPName: Uyee CSP v6.0 (Enterprise)
+      if (!bstrP11Name) {
+        let InfoContent = ''
+        await this.SelectCertificateOnClick()
+        try {
+          InfoContent = await this.GetCertInfoOnClick('CSPName');
+        } catch (e) {
+          console.log(e)
+        }
+        if (InfoContent.indexOf('CFCA FOR UKEY CSP') > -1) {
+          bstrP11Name = 'CFCA_UKEY_P11.dll'
+        } else {
+          bstrP11Name = 'UyeePKCS11.Enterprise.dll'
+        }
+      }
       return new Promise((resolve, reject) => {
-        this.CryptoAgent.GetSealImage('UyeePKCS11.Enterprise.dll').then((response) => {
+        // 老ukey 获取图片 'CFCA_UKEY_P11.dll'
+        // 新ukey 获取图片 'UyeePKCS11.Enterprise.dll'
+        this.CryptoAgent.GetSealImage(bstrP11Name).then((response) => {
           resolve(response.result)
-        }).catch((response) => {
-          // this.ShowErrorInfo(response);
-          this.CryptoAgent.GetSealImage('CFCA_UKEY_P11.dll').then((response2) => {
-            resolve(response2.result)
-          }).catch((response2) => {
-            this.ShowErrorInfo(response2);
-            console.log('读取Ukey印章图片失败！')
-            reject(response2)
-          });
+        }).catch((response1) => {
+          this.ShowErrorInfo(response1);
+          reject(response1)
         });
       })
     },
     GetCertInfoOnClick(InfoTypeID) {
       InfoTypeID = InfoTypeID || 'SubjectDN'
-      console.log('GetCertInfoOnClick:InfoTypeID ', InfoTypeID)
       return this.CryptoAgent.GetSignCertInfo(InfoTypeID).then((response) => response.result).catch((e) => {
-        console.log('GetCertInfoOnClick-WzhSign: ', e)
         this.ShowErrorInfo(e)
       })
     },
@@ -92,7 +103,6 @@ export default {
           const version = await this.CryptoAgent.GetVersion()
           console.log('CryptoAgent version ', version)
         } catch (response) {
-          console.log('GetVersion error', response)
           alert('扩展初始化失败，请联系管理员！')
           this.ShowErrorInfo(response);
           return Promise.reject()
@@ -104,7 +114,6 @@ export default {
             resolve(response.result)
           })
           .catch((response) => {
-            console.log('SelectCertificate：', response)
             this.ShowErrorInfo(response);
             reject()
           });
@@ -139,6 +148,7 @@ export default {
               pageX: Number(label.X), // 签章页签章位置X坐标
               pageY: Number(label.Y), // 签章页签章位置Y坐标
               certBase64: CertContent, // 证书公钥
+              sealImageSize: params.sealImageSize, // 签章图片大小
             },
           },
         })
@@ -168,7 +178,7 @@ export default {
     },
     async signFileKeyImage(item, fileItem, params) {
       const res = await this.getSignHashValue(item, fileItem, params)
-      let errorMsg = '计算Hash 失败！'
+      let errorMsg = '计算Hash失败！'
       if (res) {
         const { data, code } = await this.api.mergeHash({
           jsonData: {
@@ -189,6 +199,7 @@ export default {
         } else {
           errorMsg = data.msg
         }
+        console.error(errorMsg)
       }
       this.$message.error(errorMsg || 'error计算Hash失败！')
       return false
@@ -205,7 +216,6 @@ export default {
         return false
       }
       console.log('multipleSign-params=  ', localParams)
-
       for (let index = 0; index < labels.length; index++) {
         const item = getUrl(labels[index])
         // 此处for循环多个文件时候以前签署，所以提示无意义

package/src/packages/ukey/nmCryptokit.ToToDi.js

@@ -132,7 +132,6 @@ nmCryptokit.SendMessage = function(browser, requestJSON) {
 nmCryptokit.checkExtension = function(browser) {
     return new Promise(function (resolve, reject) {
         var result = new Object();
-        // console.log('444', browser)
         if (nmCryptokit.Browser.Chrome == browser || nmCryptokit.Browser.Edg == browser) {
             if(chrome.runtime) {
                 resolve(browser);
@@ -162,10 +161,7 @@ nmCryptokit.checkExtension = function(browser) {
 }
 	
 nmCryptokit.prototype.init = function () {
-
     var browser = this.browser;
-    console.log('2223', browser)
-
     return nmCryptokit.checkExtension(browser)
         .then(function (browser) {
             var request = new Object();
@@ -190,37 +186,29 @@ nmCryptokit.prototype.init = function () {
 
 
 nmCryptokit.prototype.uninit = function () {
-
     var request = new Object();                   
     request.action = "disconnect";
     request.host = nmCryptokit.productID;
-
     return nmCryptokit.SendMessage(this.browser, request);
 }
 
 
 nmCryptokit.prototype.getExtensionVersion = function ( ) {
-
     var request = new Object();
     var funcInfo = new Object();
-    
     funcInfo.function = "getExtensionVersion";
     funcInfo.params = null;
     request.action = "getExtensionVersion";
     request.funcInfo = funcInfo;
-
     return nmCryptokit.SendMessage(this.browser, request);
 }
 
 nmCryptokit.prototype.GetSealImage = function (bstrP11Name) {
-
     var request = new Object();
     var funcInfo = new Object();
     var paramArr = new Array();
     var randomId = GenerateRandomId();
-
     paramArr.push(bstrP11Name);
-
     funcInfo.function = "GetSealImage";
     funcInfo.params = paramArr;
     funcInfo.randomId = randomId;
@@ -240,10 +228,8 @@ nmCryptokit.prototype.getHostVersion = function () {
     funcInfo.function = "GetVersion";
     funcInfo.params = null;
     funcInfo.randomId = randomId;
-       
     request.action = "invoke";
     request.funcInfo = funcInfo;
-
     return nmCryptokit.SendMessage(this.browser, request);
 }