@toolspack/ttd-common 1.2.0 → 1.3.1

package/src/packages/ukey/WzhSign.vue

@@ -6,9 +6,11 @@
   </div>
 </template>
 <script>
-import { getUrl } from '../utils'
+
+import WzhMixin from './WzhMixin';
 
 export default {
+  mixins: [WzhMixin],
   name: 'wzh-sing',
   data() {
     let codebase = ''
@@ -30,20 +32,8 @@ export default {
       publicPath: 'https://wsp.totodi.com/jz/', // 为了获取public下的静态文件
       codebase,
       classid,
-      sourceData: '', // 签名原文， 动态随机字符串
-      certType: 'RSA', // 签名算法
-      CryptoAgent: null,
     }
   },
-  props: {
-    api: {
-      type: Object,
-      required: true,
-    },
-  },
-  mounted() {
-    this.onLoad()
-  },
   methods: {
     /**
      * 初始化验签工具包，加载 验签空间（object）
@@ -57,75 +47,6 @@ export default {
         alert('验签插件加载失败！')
       }
     },
-
-    getUkeyImage() {
-      let image = ''
-      try {
-        image = this.CryptoAgent.GetSealImage('CFCA_UKEY_P11.dll')
-        // console.log('CFCA_UKEY_P11', image)
-      } catch (e) {
-        console.log('CFCA_UKEY_P11 error', e)
-      }
-      if (!image) {
-        try {
-          image = this.CryptoAgent.GetSealImage('UyeePKCS11.Enterprise.dll')
-          // console.log('UyeePKCS11', image)
-        } catch (e) {
-          console.log('UyeePKCS11 error', e)
-        }
-      }
-      if (!image) {
-        try {
-          image = this.CryptoAgent.GetSealImage('UlanPKCS11.Enterprise.dll')
-          // console.log('UlanPKCS11.Enterprise', image)
-        } catch (e) {
-          console.log('UlanPKCS11.Enterprise error', e)
-        }
-      }
-      if (!image) {
-        try {
-          image = this.CryptoAgent.GetSealImage('UlanPKCS11.dll')
-          // console.log('UlanPKCS11', image)
-        } catch (e) {
-          console.log('error', e)
-        }
-      }
-      if (!image) {
-        alert('读取Ukey印章图片失败！')
-      }
-      return image
-    },
-    // 消息签名, 生成Base64 编码的 PKCS#7 签名结果
-    SignOnClick() {
-      this.sourceData = `${new Date().getTime()}`
-      try {
-        const source = this.sourceData
-        let signature = ''
-        const signType = 'Attach' // 签名类型
-        const selectedAlg = 'SHA-1' // 哈希算法(仅对RSA算法有效，SM2默认使用SM3哈希算法)：
-
-        if (signType === 'Attach') {
-          // PKCS#7 Attach
-          signature = this.CryptoAgent.SignMsgPKCS7(source, selectedAlg, true)
-        } else if (signType === 'Detach') {
-          // PKCS#7 Detach
-          signature = this.CryptoAgent.SignMsgPKCS7(source, selectedAlg, false)
-        } else {
-          // PKCS#1
-          signature = this.CryptoAgent.SignMsgPKCS1(source, selectedAlg)
-        }
-        if (!signature) {
-          this.ShowErrorInfo()
-          return ''
-        }
-        console.log('SignOnClick 签名结果:', signature)
-        return signature
-      } catch (e) {
-        console.log('SignOnClick error=', e)
-        this.ShowErrorInfo()
-        return ''
-      }
-    },
     GetCertInfoOnClick(InfoTypeID) {
       InfoTypeID = InfoTypeID || 'SubjectDN'
       try {
@@ -141,67 +62,27 @@ export default {
         return false
       }
     },
+
     SelectCertificateOnClick(serialNo = '') {
-      // if (!this.isIE) {
-      //   alert('请使用IE浏览器！')
-      // }
       try {
         const subjectDNFilter = '';
         const issuerDNFilter = 'CFCA ACS';// CFCA ACS OCA31 ,CFCA ACS OCA32, CFCA ACS TEST OCA31
         const serialNumFilter = serialNo;
         const bstrSM2CSPNameList = 'Uyee CSP v6.0 (Enterprise)||CFCA FOR UKEY CSP v1.1.0'
         let bSelectCertResult = '';
-        console.log('无纸化 选证书 selectSignCert， serialNo(非传)=', serialNo)
         bSelectCertResult = this.CryptoAgent.SelectCertificate(subjectDNFilter, issuerDNFilter, serialNumFilter, bstrSM2CSPNameList);
         // Opera浏览器，NPAPI函数执行结果为false时，不能触发异常，需要自己判断返回值。
         if (!bSelectCertResult) {
-          console.log('wzh SelectCertResult 不存在')
           this.ShowErrorInfo()
           return false;
         }
-        console.log('wzh SelectCertResult', bSelectCertResult)
         return true
       } catch (e) {
-        console.log('wzh SelectCertResult error: ', e)
         this.ShowErrorInfo(e)
         return false
       }
     },
-    getHashValue(label, fileOss, params) {
-      const CertContent = this.CryptoAgent.GetSignCertInfo('CertContent');
-      this.$emit('getImg', params)
-      if (!CertContent) {
-        alert('获取证书公钥失败！')
-        return Promise.reject()
-      }
-      if (fileOss.bucketName && fileOss.objectKey) {
-        return this.api.getSignHash({
-          jsonData: {
-            source: 'TTDFUND',
-            timestamp: new Date().getTime(),
-            msgBody: {
-              // 合同地址, 相对路径--合同文件全路径。网络地址：http://xxxxxx.pdf；阿里云地址：oss:bucketxx:key
-              attachfile: `oss:${fileOss.bucketName}:${fileOss.objectKey}`,
-              reason: '', // 签署原因
-              location: '', // 签署地点
-              signImgfileName: '', // 图片名称
-              signImgfile: params.image, // 图片路径，格式同文件字段类似
-              signImgMd5: params.md5, // 印章图片的md5
-              sealId: params.sealId, // 印章图片的id
-              serialNo: params.serialNo, // 证书序列号
-              ukeyType: params.ukeyType, // 证书类型（ttd配置）
-              userId: params.userId, // 用户id
-              pageNo: label.pageIndex, // 签章页
-              pageX: Number(label.X), // 签章页签章位置X坐标
-              pageY: Number(label.Y), // 签章页签章位置Y坐标
-              certBase64: CertContent, // 证书公钥
-            },
-          },
-        })
-      }
-      alert('文件对象不合规！')
-      return Promise.reject()
-    },
+
     async getSignHashValue(item, fileItem, params) {
       let sourceHashData = ''
       const { code, data, msg } = await this.getHashValue(item, fileItem, params);
@@ -229,75 +110,7 @@ export default {
       alert('获取PKCS#7分离式签名失败！')
       return false
     },
-    async signFileKeyImage(item, fileItem, params) {
-      const res = await this.getSignHashValue(item, fileItem, params)
-      let errorMsg = '计算Hash 失败！'
-      if (res) {
-        const { data, code, msg } = await this.api.mergeHash({
-          jsonData: {
-            source: 'TTDFUND',
-            timestamp: new Date().getTime(),
-            msgBody: {
-              sigString: res.signature, // 签名后的hash值
-              id: res.id, // 计算接口返回的ID
-            },
-          },
-        })
-        // 此方法 code 不能完全说明正确，调用失败code 也是0
-        if (code === 0) {
-          if (data.bean.url) {
-            return data.bean
-          }
-          errorMsg = data.bean.msg
-        } else {
-          errorMsg = data.msg || msg
-        }
-      }
-      this.$message.error(errorMsg || 'error计算Hash失败！')
-      return false
-    },
-    // fileOss: 为文件对象 {obje}
-    //  isOffset: 修正印章的位置，印章加时间后需要向下修正
-    //  parama:  其他参数：ukeyType,  image, md5, isOffset
-    async multipleSign(labels, fileOss, params) {
-      let result = ''
-      const localParams = { ...params }
-      const { isOffset = 18 } = localParams
-      if (!localParams.image) {
-        alert('印章图片缺失！')
-        return false
-      }
 
-      for (let index = 0; index < labels.length; index++) {
-        const item = getUrl(labels[index])
-        // 此处for循环多个文件时候以前签署，所以提示无意义
-        // const message = `签署 [${text}] 位于第${label.pageIndex}页的位置，[总共:${index + 1}/${labels.length}个位置]`
-        if (typeof isOffset === 'number') {
-          // 印章统一向下偏移
-          item.Y -= isOffset
-        }
-        if (index > 0) {
-          const serialNoAgain = this.CryptoAgent.GetSignCertInfo('SerialNumber');
-          if (localParams.serialNo !== serialNoAgain) {
-            console.log(`params.serialNo:${ localParams.serialNo}`, `serialNoAgain${ serialNoAgain}`)
-            alert('签署过程中，请不要更换ukey!')
-            return false
-          }
-          // 这里签署第二个章，需要在第一个签好的文件上签署 所以用result中是文件
-          if (result) {
-            // eslint-disable-next-line
-            result = await this.signFileKeyImage((item), result, {...localParams})
-          }
-          console.log(`iterateSign 签章结果${index}---result----`, result)
-        } else {
-          // eslint-disable-next-line
-          result = await this.signFileKeyImage((item), fileOss, {...localParams})
-          console.log('第一个章 签章结果', result)
-        }
-      }
-      console.log('multipleSign 签章的结果', result)
-      return result
-    },
     ShowErrorInfo(response = '') {
       if (!this.CryptoAgent) {
         alert('不支持该功能!');

package/src/packages/ukey/WzhSignChrome.vue

@@ -3,28 +3,11 @@
   <div class="CryptoAgent-wrapper"></div>
 </template>
 <script>
-import { getUrl } from '../utils'
-
+import WzhMixin from './WzhMixin';
 import WZHforChrome from './WZHforChrome'
 
 export default {
-  mixins: [WZHforChrome],
-  data() {
-    return {
-      sourceData: '', // 签名原文， 动态随机字符串
-      certType: 'RSA', // 签名算法
-      CryptoAgent: null,
-    }
-  },
-  props: {
-    api: {
-      type: Object,
-      required: true,
-    },
-  },
-  mounted() {
-    this.onLoad()
-  },
+  mixins: [WzhMixin, WZHforChrome],
   methods: {
     /**
      * 初始化验签工具包，加载 验签空间（object）
@@ -35,65 +18,13 @@ export default {
       }
       this.LoadObj()
     },
-
-    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'
-        }
-      }
-      // console.log('CryptoAgent InfoContent ', InfoContent)
-      return new Promise((resolve, reject) => {
-        // 老ukey 获取图片 'CFCA_UKEY_P11.dll'
-        // 新ukey 获取图片 'UyeePKCS11.Enterprise.dll'
-        this.CryptoAgent.GetSealImage(bstrP11Name).then((response) => {
-          resolve(response.result)
-        }).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) => {
         this.ShowErrorInfo(e)
       })
     },
 
-    async  SignOnClick() {
-      this.sourceData = `${new Date().getTime()}`
-      const source = this.sourceData
-      let signature = ''
-      const signType = 'Attach' // 签名类型
-      const selectedAlg = 'SHA-1' // 哈希算法(仅对RSA算法有效，SM2默认使用SM3哈希算法)：
-
-      if (signType === 'Attach') {
-        // PKCS#7 Attach
-        signature = await this.CryptoAgent.SignMsgPKCS7(source, selectedAlg, true)
-      } else if (signType === 'Detach') {
-        // PKCS#7 Detach
-        signature = await this.CryptoAgent.SignMsgPKCS7(source, selectedAlg, false)
-      } else {
-        // PKCS#1
-        signature = await this.CryptoAgent.SignMsgPKCS1(source, selectedAlg)
-      }
-      console.log('SignOnClick 签名结果:', signature)
-      return signature.result
-    },
     async SelectCertificateOnClick(serialNumFilter = '') {
       const subjectDNFilter = '';
       const issuerDNFilter = 'CFCA ACS ';// CFCA ACS OCA31 ,CFCA ACS OCA32, CFCA ACS TEST OCA31
@@ -103,7 +34,7 @@ export default {
       if (!serialNumFilter) {
         try {
           const version = await this.CryptoAgent.GetVersion()
-          console.log('CryptoAgent version ', version)
+          // console.log('CryptoAgent version ', version)
         } catch (response) {
           alert('扩展初始化失败，请联系管理员！')
           this.ShowErrorInfo(response);
@@ -122,41 +53,7 @@ export default {
       })
       // 返回值resSelect  在chrome下是 对象，在ie下返回是 true/false
     },
-    async getHashValue(label, fileOss, params) {
-      const CertContent = await this.GetCertInfoOnClick('CertContent');
-      this.$emit('getImg', params)
-      if (!CertContent) {
-        alert('获取证书公钥失败！')
-        return Promise.reject()
-      }
-      if (fileOss.bucketName && fileOss.objectKey) {
-        return this.api.getSignHash({
-          jsonData: {
-            source: 'TTDFUND',
-            timestamp: new Date().getTime(),
-            msgBody: {
-            // 合同地址, 相对路径--合同文件全路径。网络地址：http://xxxxxx.pdf；阿里云地址：oss:bucketxx:key
-              attachfile: `oss:${fileOss.bucketName}:${fileOss.objectKey}`,
-              reason: '', // 签署原因
-              location: '', // 签署地点
-              signImgfileName: '', // 图片名称
-              signImgfile: params.image, // 图片路径，格式同文件字段类似
-              signImgMd5: params.md5, // 印章图片的md5
-              sealId: params.sealId, // 印章图片的id
-              serialNo: params.serialNo, // 证书序列号
-              ukeyType: params.ukeyType, // 证书类型（ttd配置）
-              userId: params.userId, // 用户id
-              pageNo: label.pageIndex, // 签章页
-              pageX: Number(label.X), // 签章页签章位置X坐标
-              pageY: Number(label.Y), // 签章页签章位置Y坐标
-              certBase64: CertContent, // 证书公钥
-            },
-          },
-        })
-      }
-      alert('文件对象不合规！')
-      return Promise.reject()
-    },
+
     async getSignHashValue(item, fileItem, params) {
       let sourceHashData = ''
       const { code, data } = await this.getHashValue(item, fileItem, params);
@@ -177,75 +74,13 @@ export default {
           this.ShowErrorInfo(response);
         });
     },
-    async signFileKeyImage(item, fileItem, params) {
-      const res = await this.getSignHashValue(item, fileItem, params)
-      let errorMsg = '计算Hash 失败！'
-      if (res) {
-        const { data, code } = await this.api.mergeHash({
-          jsonData: {
-            source: 'TTDFUND',
-            timestamp: new Date().getTime(),
-            msgBody: {
-              sigString: res.signature, // 签名后的hash值
-              id: res.id, // 计算接口返回的ID
-            },
-          },
-        })
-        // 此方法 code 不能完全说明正确，调用失败code 也是0
-        if (code === 0) {
-          if (data.bean.url) {
-            return data.bean
-          }
-          errorMsg = data.bean.msg
-        } else {
-          errorMsg = data.msg
-        }
-      }
-      this.$message.error(errorMsg || 'error计算Hash失败！')
-      return false
-    },
-    // fileOss: 为文件对象 {obje}
-    //  isOffset: 修正印章的位置，印章加时间后需要向下修正
-    //  parama:  其他参数：ukeyType,  image, md5, isOffset
-    async multipleSign(labels, fileOss, params) {
-      let result = ''
-      const localParams = { ...params }
-      const { isOffset = 18 } = localParams
-      if (!localParams.image) {
-        alert('印章图片缺失！')
-        return false
-      }
-      console.log('multipleSign-params=  ', localParams)
-      for (let index = 0; index < labels.length; index++) {
-        const item = getUrl(labels[index])
-        // 此处for循环多个文件时候以前签署，所以提示无意义
-        // const message = `签署 [${text}] 位于第${label.pageIndex}页的位置，[总共:${index + 1}/${labels.length}个位置]`
-        if (typeof isOffset === 'number') {
-          // 印章统一向下偏移
-          item.Y -= isOffset
-        }
-        if (index > 0) {
-          const serialNoAgain = await this.GetCertInfoOnClick('SerialNumber');
-          if (localParams.serialNo !== serialNoAgain) {
-            console.log(`params.serialNo:${ localParams.serialNo}`, `serialNoAgain${ serialNoAgain}`)
-            alert('签署过程中，请不要更换ukey!')
-            return false
-          }
-          // 这里签署第二个章，需要在第一个签好的文件上签署 所以用result中是文件
-          if (result) {
-            // eslint-disable-next-line
-            result = await this.signFileKeyImage((item), result, {...localParams})
-          }
-          console.log(`iterateSign 签章结果${index}---result----`, result)
-        } else {
-          // eslint-disable-next-line
-          result = await this.signFileKeyImage((item), fileOss, {...localParams})
-          console.log('第一个章 签章结果', result)
-        }
-      }
-      console.log('multipleSign 签章的结果', result)
-      return result
-    },
+  },
+  beforeDestroy() {
+    try {
+      this.CryptoAgent.uninit().then(() => { });
+    } catch (e) {
+      alert(e);
+    }
   },
 }