unify-external-plugin-platform 0.0.2-68 → 0.0.2-69

package/dist/external-plugin.common.js

@@ -84019,8 +84019,8 @@ var scanner_cameravue_type_template_id_00e9072f_scoped_true_render = function re
 };
 var scanner_cameravue_type_template_id_00e9072f_scoped_true_staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=template&id=65e6d7b8&scoped=true&
-var scanner_camera_componentvue_type_template_id_65e6d7b8_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=template&id=bc9cce92&scoped=true&
+var scanner_camera_componentvue_type_template_id_bc9cce92_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -84084,7 +84084,7 @@ var scanner_camera_componentvue_type_template_id_65e6d7b8_scoped_true_render = f
     }, [_vm._v(_vm._s(item.label))]), _vm._t("action")];
   })], 2)])]);
 };
-var scanner_camera_componentvue_type_template_id_65e6d7b8_scoped_true_staticRenderFns = [];
+var scanner_camera_componentvue_type_template_id_bc9cce92_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./packages/utils/custom-axios.ts
 /**
@@ -84994,12 +84994,764 @@ class UdsPluginSocketService {
 _defineProperty(UdsPluginSocketService, "scannerCameraUrl", 'ws://127.0.0.1:8341');
 _defineProperty(UdsPluginSocketService, "ws", void 0);
 _defineProperty(UdsPluginSocketService, "requestStore", []);
+;// CONCATENATED MODULE: ./packages/service/external-plugins/ewp-plugin-socket.service.ts
+
+
+/**
+ * 沃斯德人证交互终端
+ * E窗通WEBSOCKET服务
+ *
+ * */
+
+var EWindowPassMethodCode;
+(function (EWindowPassMethodCode) {
+  /** 读取社保卡 */
+  EWindowPassMethodCode["iReadCardBas"] = "iReadCardBas";
+  /** 获取签名*/
+  EWindowPassMethodCode["GetSignName_Base64"] = "GetSignName_Base64";
+  /** 读取二代身份证 */
+  EWindowPassMethodCode["ReadIDCard_Base64"] = "ReadIDCard_Base64";
+  /** 人证比对 */
+  EWindowPassMethodCode["FaceValidateWithIdCard_Base64"] = "FaceValidateWithIdCard_Base64";
+  /** 获取指纹 */
+  EWindowPassMethodCode["FingerPrint_Base64"] = "FingerPrint_Base64";
+})(EWindowPassMethodCode || (EWindowPassMethodCode = {}));
+const EWindowPassMethodDesc = {
+  [EWindowPassMethodCode.iReadCardBas]: '读取社保卡',
+  [EWindowPassMethodCode.GetSignName_Base64]: '获取签名',
+  [EWindowPassMethodCode.ReadIDCard_Base64]: '读取二代身份证',
+  [EWindowPassMethodCode.FaceValidateWithIdCard_Base64]: '人证比对',
+  [EWindowPassMethodCode.FingerPrint_Base64]: '获取指纹'
+};
+class EWindowPassService {
+  static startConnect(method) {
+    if (this.ws && this.ws.readyState === WebSocket.CONNECTING) {
+      return this;
+    }
+    let webSocketUrl = '';
+    switch (method) {
+      case EWindowPassMethodCode.FingerPrint_Base64:
+        webSocketUrl = this.fingerPrintBasWebSocketUrl;
+        break;
+      default:
+        webSocketUrl = this.iReadCardBasWebSocketUrl;
+        break;
+    }
+    const ws = new WebSocket(webSocketUrl);
+    let resolved;
+    const onConnect = new Promise(resolve => {
+      resolved = resolve;
+    });
+    ws.onopen = () => {
+      resolved(true);
+    };
+    ws.onmessage = event => {
+      if (method === EWindowPassMethodCode.FingerPrint_Base64) {
+        // 指纹后端返回的是string
+        event = {
+          ...event,
+          data: JSON.stringify({
+            fingerPrintInfo: event.data
+          })
+        };
+      }
+      this.handleMessage(event);
+    };
+    ws.onclose = () => this.handleClose();
+    ws.onerror = () => this.handleError();
+    this.ws = ws;
+    return onConnect;
+  }
+  static handleError() {
+    for (const type in this.requestStore) {
+      this.requestStore.forEach(({
+        reject
+      }) => {
+        reject('handleError');
+      });
+    }
+    throw Error('E窗通设备功能加载失败');
+  }
+  static handleClose() {
+    for (const type in this.requestStore) {
+      this.requestStore.forEach(({
+        reject
+      }) => {
+        reject('close');
+      });
+    }
+  }
+  static handleMessage(msg) {
+    let data = '';
+    try {
+      data = JSON.parse(msg.data);
+    } catch (e) {
+      data = '';
+    }
+    this.requestStore.forEach(({
+      resolve
+    }) => {
+      resolve(data);
+    });
+    this.requestStore = [];
+    this.ws.close();
+  }
+  static async read(method) {
+    await this.startConnect(method);
+    const methodDesc = EWindowPassMethodDesc[method];
+    if (this.ws.readyState === 1) {
+      if (method !== EWindowPassMethodCode.FingerPrint_Base64) console.log(methodDesc + '连接成功');
+      let jsonString;
+      // outTimes：超时时间（秒）
+      switch (method) {
+        case EWindowPassMethodCode.ReadIDCard_Base64:
+          // cardReader：0 读卡器-USB；1 读卡器-COM
+          jsonString = JSON.stringify({
+            method,
+            args: {
+              outTimes: 30,
+              cardReader: 1
+            }
+          });
+          break;
+        case EWindowPassMethodCode.FaceValidateWithIdCard_Base64:
+          // cardReader：0 读卡器-USB；1 读卡器-COM
+          jsonString = JSON.stringify({
+            method,
+            args: {
+              outTimes: 30,
+              cardReader: 1,
+              cameraType: 0
+            }
+          });
+          break;
+        case EWindowPassMethodCode.iReadCardBas:
+          // icType：1接触卡；2非接触卡；3自动（接触优先）；4自动（非接优先）
+          jsonString = JSON.stringify({
+            method,
+            args: {
+              icType: '1'
+            }
+          });
+          break;
+        case EWindowPassMethodCode.FingerPrint_Base64:
+          // 获取指纹：getimgae，颜色(0黑色 1红色), 质量（默认0）, 图像大小（288，360）,类型（0民用，1公安）
+          jsonString = 'getimgae,1,0,288,0';
+          break;
+        default:
+          jsonString = JSON.stringify({
+            method,
+            args: {
+              outTimes: 30
+            }
+          });
+          break;
+      }
+      this.ws.send(jsonString);
+      return new Promise((resolve, reject) => {
+        if (!this.requestStore) {
+          this.requestStore = [];
+        }
+        this.requestStore.push({
+          resolve,
+          reject
+        });
+      });
+    } else {
+      throw Error(methodDesc + '未准备完成');
+    }
+  }
+  /**
+   * 读取二代身份证
+   * */
+  static async idCardRead(method = EWindowPassMethodCode.ReadIDCard_Base64) {
+    const readData = await EWindowPassService.read(EWindowPassMethodCode.ReadIDCard_Base64);
+    console.log('读取二代身份证==>', readData);
+    if (!readData) {
+      throw Error('未匹配可用的E窗通读取设备');
+    }
+    if (readData.retVal !== 0) {
+      throw Error("读取二代身份证失败，返回值：" + readData.retVal + "，错误信息：" + readData.errMsg);
+    }
+    const idInfo = readData.idInfo.data;
+    const {
+      name,
+      sex,
+      birthday,
+      address,
+      id_num,
+      nations
+    } = idInfo;
+    const IDCardData = {
+      info: {
+        name,
+        sex,
+        birthday: birthday.replace('-', '').replace('-', ''),
+        address,
+        cardId: id_num,
+        nation: nations
+      },
+      headImage: readData.idPhotoPicBase64
+    };
+    console.log('读取二代身份证结果==>', IDCardData);
+    return IDCardData;
+  }
+  /**
+   * 人证比对
+   */
+  static async faceValidateWithIdCardRead() {
+    const readData = await EWindowPassService.read(EWindowPassMethodCode.FaceValidateWithIdCard_Base64);
+    console.log('人证比对==>', readData);
+    if (!readData) {
+      throw Error('未匹配可用的E窗通读取设备');
+    }
+    if (readData.retVal !== 0) {
+      throw Error("人证比对失败，返回值：" + readData.retVal + "，错误信息：" + readData.errMsg);
+    }
+    const idInfo = readData.idInfo.data;
+    const {
+      name,
+      sex,
+      birth,
+      address,
+      idNo,
+      nation
+    } = idInfo;
+    const IDCardData = {
+      idCard: {
+        info: {
+          name,
+          sex,
+          birthday: birth.replace('-', '').replace('-', ''),
+          address,
+          cardId: idNo,
+          nation
+        },
+        headImage: readData.idPhotoBase64
+      },
+      faceimg: readData.scenceBase64
+    };
+    console.log('人证比对结果==>', IDCardData);
+    return IDCardData;
+  }
+  /** 读取社保卡 */
+  static async socialSecurityCardRead() {
+    const readData = await EWindowPassService.read(EWindowPassMethodCode.iReadCardBas);
+    if (!readData) {
+      throw Error('未匹配可用的E窗通读取设备');
+    }
+    if (readData.retVal !== 0) {
+      throw Error("读取社保卡基本信息失败，返回值：" + readData.retVal + "，错误信息：" + readData.outInfo);
+    }
+    // 返回数据：330100|350781196403072943|W57681892|331100D10600000300657BCF88899F8E|张三|3B6D000000815444368660330100286BCF|1.00|2020-08-12|2030-08-12|1|SN00000000|（邮编|身份证号|卡号|社会保障号码|姓名|...不知道是什么信息了）
+    const outInfo = readData.outInfo;
+    const outInfoArray = outInfo.split('|');
+    const cardId = outInfoArray[1];
+    const birthday = IdCardCommonUtils.getBirthdayByIdNumber(cardId).replace('-', '').replace('-', '');
+    const sex = IdCardCommonUtils.getGenderByIdNumber(cardId);
+    const IDCardData = {
+      info: {
+        name: outInfoArray[4],
+        sex,
+        birthday,
+        address: '',
+        cardId
+      },
+      headImage: ''
+    };
+    console.log('读取社保卡==>', readData);
+    return IDCardData;
+  }
+  /** 获取签名-base64 */
+  static async signNameRead() {
+    const readData = await EWindowPassService.read(EWindowPassMethodCode.GetSignName_Base64);
+    if (!readData) {
+      throw Error('未匹配可用的E窗通读取设备');
+    }
+    if (readData.retVal !== 0) {
+      throw Error("读取签名失败，返回值：" + readData.retVal + "，错误信息：" + readData.errMsg);
+    }
+    console.log('获取签名==>', readData);
+    return readData.signPicBase64;
+  }
+  /** 获取指纹*/
+  static async fingerPrintRead() {
+    let timeOver = 30;
+    async function readFingerPrint() {
+      const readData = await EWindowPassService.read(EWindowPassMethodCode.FingerPrint_Base64);
+      if (!readData) {
+        throw Error('未匹配可用的E窗通读取设备');
+      }
+      let list = readData.fingerPrintInfo.split("|");
+      console.log(list);
+      let ret = Number(list[1]);
+      if (ret > 1) {
+        if (timeOver > 0) {
+          timeOver--;
+          return await readFingerPrint();
+        } else {
+          return {
+            status: 'error',
+            data: '已超时，请重新操作，按压指纹'
+          };
+        }
+      } else {
+        return {
+          status: 'success',
+          data: readData.fingerPrintInfo
+        };
+      }
+    }
+    let {
+      status,
+      data
+    } = await readFingerPrint();
+    if (status === 'error') {
+      throw Error(data);
+    } else {
+      let [method, result, quality, image, featureCode] = data.split('|');
+      // getimgae|1|68|......|......
+      // method：方法，result：返回的状态，quality：指纹图片质量，image：图片base64，featureCode：指纹特征码
+      return {
+        method,
+        result,
+        quality,
+        image,
+        featureCode
+      };
+    }
+  }
+}
+_defineProperty(EWindowPassService, "iReadCardBasWebSocketUrl", 'ws://127.0.0.1:5847');
+_defineProperty(EWindowPassService, "fingerPrintBasWebSocketUrl", 'ws://127.0.0.1:9000');
+_defineProperty(EWindowPassService, "ws", void 0);
+_defineProperty(EWindowPassService, "requestStore", []);
+;// CONCATENATED MODULE: ./packages/service/external-plugins/wei-rong-plugin-socket.service.ts
+
+
+
+
+/**
+ * @author: lvcy
+ * @date: 2024-03-22
+ * @description：国产客户端，硬件对接
+ */
+var WEIRONGMethodCode;
+(function (WEIRONGMethodCode) {
+  /** 读卡 */
+  WEIRONGMethodCode["ReadCard_Base64"] = "ReadCard_Base64";
+  /** 开始签名*/
+  WEIRONGMethodCode["StartSignName"] = "StartSignName";
+  /** 获取签名状态*/
+  WEIRONGMethodCode["GetSignNameStatus"] = "GetSignNameStatus";
+  /** 获取签名*/
+  WEIRONGMethodCode["GetSignName_Base64"] = "GetSignName_Base64";
+  /** 人证比对 */
+  WEIRONGMethodCode["FaceValidateWithIdCard_Base64"] = "FaceValidateWithIdCard_Base64";
+  /** 打开高拍仪器*/
+  WEIRONGMethodCode["TurnOnTheCamera"] = "TurnOnTheCamera";
+  /** 拍照*/
+  WEIRONGMethodCode["ScannerCamera"] = "ScannerCamera";
+})(WEIRONGMethodCode || (WEIRONGMethodCode = {}));
+const WEIRONGMethodDesc = {
+  [WEIRONGMethodCode.ReadCard_Base64]: '读卡',
+  [WEIRONGMethodCode.GetSignName_Base64]: '获取签名',
+  [WEIRONGMethodCode.FaceValidateWithIdCard_Base64]: '人证比对'
+};
+class WeiRongPluginService {
+  static startConnect(method) {
+    console.log('startConnect', method, this.ws?.readyState, WebSocket.CONNECTING);
+    if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+      return this;
+    }
+    console.log('重新链接');
+    const ws = new WebSocket(this.webSocketUrl);
+    let resolved;
+    const onConnect = new Promise(resolve => {
+      resolved = resolve;
+    });
+    ws.onopen = () => {
+      resolved(true);
+    };
+    ws.onmessage = event => {
+      if (method === EWindowPassMethodCode.FingerPrint_Base64) {
+        // 指纹后端返回的是string
+        event = {
+          ...event,
+          data: JSON.stringify({
+            fingerPrintInfo: event.data
+          })
+        };
+      }
+      this.handleMessage(event);
+    };
+    ws.onclose = () => this.handleClose();
+    ws.onerror = () => this.handleError();
+    this.ws = ws;
+    return onConnect;
+  }
+  static handleError() {
+    for (const type in this.requestStore) {
+      this.requestStore.forEach(({
+        reject
+      }) => {
+        reject('handleError');
+      });
+    }
+    throw Error('设备功能加载失败');
+  }
+  static handleClose() {
+    for (const type in this.requestStore) {
+      this.requestStore.forEach(({
+        reject
+      }) => {
+        reject('close');
+      });
+    }
+  }
+  static handleMessage(msg) {
+    let data = '';
+    try {
+      data = JSON.parse(msg.data);
+    } catch (e) {
+      data = '';
+    }
+    if (data.method === 'FaceScreenStream' || data.method === 'VideoStream') {
+      const event = new ScannerCameraRefreshPhotoEvent(data.imgBase64);
+      return window.dispatchEvent(event);
+    } else {
+      this.requestStore.forEach(({
+        resolve
+      }) => {
+        resolve(data);
+      });
+      this.requestStore = [];
+    }
+    // this.ws.close();
+  }
+
+  static async read(method) {
+    await this.startConnect(method);
+    const methodDesc = WEIRONGMethodDesc[method];
+    if (this.ws.readyState === 1) {
+      let jsonString;
+      switch (method) {
+        case WEIRONGMethodCode.ReadCard_Base64:
+          jsonString = JSON.stringify({
+            method: 'ReadIDCard_Base64',
+            args: {
+              outTimes: 30,
+              cardReader: 0
+            }
+          });
+          break;
+        case WEIRONGMethodCode.FaceValidateWithIdCard_Base64:
+          jsonString = JSON.stringify({
+            method: 'FaceValidateWithIdCard_Base64',
+            args: {
+              outTimes: 30,
+              score: 75
+            }
+          });
+          break;
+        case WEIRONGMethodCode.StartSignName:
+          jsonString = JSON.stringify({
+            method: 'SignNameScreen_Start',
+            args: {
+              outTimes: 30
+            }
+          });
+          break;
+        case WEIRONGMethodCode.GetSignNameStatus:
+          jsonString = JSON.stringify({
+            method: 'SignNameScreen_Status',
+            args: {}
+          });
+          break;
+        case WEIRONGMethodCode.GetSignName_Base64:
+          jsonString = JSON.stringify({
+            method: 'SignNameScreen_Get',
+            args: {}
+          });
+          break;
+        case WEIRONGMethodCode.TurnOnTheCamera:
+          jsonString = JSON.stringify({
+            method: 'VideoStart',
+            args: {}
+          });
+          break;
+        case WEIRONGMethodCode.ScannerCamera:
+          jsonString = JSON.stringify({
+            method: 'GetCameraImage',
+            args: {
+              imagePath: ''
+            }
+          });
+          break;
+      }
+      this.ws.send(jsonString);
+      return new Promise((resolve, reject) => {
+        if (!this.requestStore) {
+          this.requestStore = [];
+        }
+        this.requestStore.push({
+          resolve,
+          reject
+        });
+      });
+    } else {
+      throw Error(methodDesc + '未准备完成');
+    }
+  }
+  /** 读取身份证和永居证*/
+  static async idCardRead() {
+    const readData = await WeiRongPluginService.read(WEIRONGMethodCode.ReadCard_Base64);
+    if (!readData) {
+      throw Error('未匹配到可用的读取设备');
+    }
+    if (readData.retVal !== 0) {
+      this.ws?.close();
+      throw Error("读取二代身份证失败，返回值：" + readData.retVal + "，错误信息：" + readData.errMsg);
+    }
+    let idInfo = readData.idInfo;
+    // name:姓名 "ENfullname":"英文姓名" sex:性别 nation:民族 number 身份证号码 birthday: 生日 address: 地址,
+    // organs:签发机关 signdate:开始有效期 validterm: 结束有效期
+    let {
+      name,
+      ENfullname: englishName,
+      Nationality,
+      sex,
+      birthday,
+      address,
+      number,
+      nation,
+      organs: police,
+      signdate: validStart,
+      validterm: validEnd
+    } = idInfo;
+    let chineseName = '',
+      cardType = '1',
+      nationality = '中国';
+    // 外国人永居证
+    if (readData.cardType == 1 || readData.cardType == 2) {
+      cardType = '9'; // 永居证
+      chineseName = name;
+      name = name || englishName; // 姓名，先读中文名，没有时读英文名
+      police = police || '中华人民共和国国家移民管理局'; // 发证机关，读不到，默认
+      nationality = Nationality; // 永居证国籍放在名族里面的
+      nation = '';
+    } else {
+      // 身份证
+      cardType = '1'; // 身份证
+    }
+
+    const IDCardData = {
+      info: {
+        cardType,
+        nationality,
+        name,
+        chineseName,
+        englishName,
+        sex,
+        birthday: birthday.replace('-', '').replace('-', ''),
+        address,
+        cardId: number,
+        nation,
+        police,
+        validStart,
+        validEnd
+      },
+      headImage: readData.idPhotoBase64
+    };
+    this.ws?.close();
+    return IDCardData;
+  }
+  /** 读取社保卡 */
+  static async socialSecurityCardRead() {
+    const readData = await WeiRongPluginService.read(WEIRONGMethodCode.ReadCard_Base64);
+    if (!readData) {
+      throw Error('未匹配可用的读取设备');
+    }
+    if (readData.retVal !== 0) {
+      this.ws?.close();
+      throw Error("读取社保卡基本信息失败，返回值：" + readData.retVal + "，错误信息：" + readData.idInfo);
+    }
+    // 返回数据：cardType 3 社保卡
+    // idInfo: {
+    //     name:姓名
+    //     sex:性别
+    //     nation:民族
+    //     cardnumber:卡号
+    //     number:社会保障号码(身份证号)
+    //     birthday:出生日期"\
+    //     city:城市代码
+    //     signdate:开始有效期
+    //     validterm:结束有效期
+    //     cardveVrsion:社保卡版本
+    // }
+    const idInfo = readData.idInfo;
+    let {
+      name,
+      sex,
+      birthday,
+      number: cardId,
+      cardnumber
+    } = idInfo;
+    const IDCardData = {
+      info: {
+        name,
+        sex,
+        birthday,
+        address: '',
+        cardId,
+        cardnumber
+      },
+      headImage: ''
+    };
+    this.ws?.close();
+    return IDCardData;
+  }
+  // 港澳台居住证协议
+  // {
+  //     "method": "ReadIDCard_Base64",
+  //     "retVal": 0,
+  //     "errMsg":"",
+  //     "cardType":"4",
+  //     "idInfo":{
+  //         "name":"中文姓名",
+  //         "sex":"性别",
+  //         "birthday":"出生日期",
+  //         "address":"(例:杭州市西湖区XXXX)",
+  //         "number":"证件号码",
+  //         "organs":"签发机关",
+  //         "signdate":"开始有效期",
+  //         "validterm":"结束有效期",
+  //         "signCount":"签证次数",
+  //         "passNu":"通行证号"
+  //     },
+  //     "idPhotoBase64":"小头像base64图片格式"
+  // }
+  /**
+   * 人证比对
+   */
+  static async faceValidateWithIdCardRead() {
+    const readData = await WeiRongPluginService.read(WEIRONGMethodCode.FaceValidateWithIdCard_Base64);
+    if (readData.method === 'FaceValidateWithIdCard_Base64' && readData.retVal == '0') {
+      console.log('认证成功=>', readData);
+      const idInfo = readData.idInfo;
+      let {
+        name,
+        ENfullname: englishName,
+        Nationality,
+        sex,
+        birthday,
+        address,
+        number,
+        nation,
+        organs: police,
+        signdate: validStart,
+        validterm: validEnd
+      } = idInfo;
+      let chineseName = '',
+        cardType = '1',
+        nationality = '中国';
+      // 外国人永居证
+      if (readData.cardType == 1 || readData.cardType == 2) {
+        cardType = '9'; // 永居证
+        chineseName = name;
+        name = name || englishName; // 姓名，先读中文名，没有时读英文名
+        police = police || '中华人民共和国国家移民管理局'; // 发证机关，读不到，默认
+        nationality = Nationality; // 永居证国籍放在名族里面的
+        nation = '';
+      } else {
+        // 身份证
+        cardType = '1'; // 身份证
+      }
+      // idCard：身份证信息；faceimg，拍照照片；score：对比度
+      const IDCardData = {
+        idCard: {
+          info: {
+            cardType,
+            nationality,
+            name,
+            chineseName,
+            englishName,
+            sex,
+            birthday: birthday.replace('-', '').replace('-', ''),
+            address,
+            cardId: number,
+            nation,
+            police,
+            validStart,
+            validEnd
+          },
+          headImage: readData.idPhotoBase64
+        },
+        faceimg: readData.scenceBase64,
+        score: readData.score
+      };
+      this.ws?.close();
+      return IDCardData;
+    } else {
+      this.ws?.close();
+    }
+  }
+  /** 签字*/
+  static async signNameRead() {
+    return new Promise(async (resolve, reject) => {
+      const readData = await WeiRongPluginService.read(WEIRONGMethodCode.StartSignName);
+      console.log('开始签名=>', readData);
+      if (readData.method === 'SignNameScreen_Start') {
+        if (readData.retVal !== 0) {
+          this.ws?.close();
+          reject(`开始签名失败，返回值：${readData.retVal}，错误信息：${readData.errMsg}`);
+        } else {
+          if (!this.timer) {
+            this.timer = setInterval(async () => {
+              let status = await WeiRongPluginService.read(WEIRONGMethodCode.GetSignNameStatus);
+              if (status.signScreenStatus == 2) {
+                clearInterval(this.timer);
+                this.timer = null;
+                let res = await WeiRongPluginService.read(WEIRONGMethodCode.GetSignName_Base64);
+                this.ws?.close();
+                resolve(res.signPicBase64);
+              } else if (status.retVal == 3) {
+                clearInterval(this.timer);
+                this.timer = null;
+                this.ws?.close();
+                reject('签字结果=>签字失败，或意外中断!');
+              }
+            }, 2000);
+          }
+        }
+      }
+    });
+  }
+  // 开启主摄像头/副摄像头
+  static async turnOnTheCamera() {
+    await WeiRongPluginService.read(WEIRONGMethodCode.TurnOnTheCamera);
+  }
+  // 拍照
+  static async scanByCamera() {
+    // if (this.ws) this.ws.close();
+    let res = await WeiRongPluginService.read(WEIRONGMethodCode.ScannerCamera);
+    if (res.method === 'GetCameraImage' && res.retVal == 0) {
+      this.ws?.close();
+      return res.cameraImgBase64;
+    }
+  }
+}
+_defineProperty(WeiRongPluginService, "webSocketUrl", 'ws://127.0.0.1:5847');
+_defineProperty(WeiRongPluginService, "ws", void 0);
+_defineProperty(WeiRongPluginService, "requestStore", []);
+_defineProperty(WeiRongPluginService, "timer", null);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=script&lang=js&
 
 
 
 
 
+
 const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/jpg;base64,';
 /* harmony default export */ var scanner_camera_componentvue_type_script_lang_js_ = ({
   name: "scanner-camera-component",
@@ -85085,6 +85837,13 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
             this.$emit('send-scanner-result', `${scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA}${res}`);
             break;
           }
+        case 6:
+          {
+            // 国产客户端一体机
+            let res = await WeiRongPluginService.scanByCamera();
+            this.$emit('send-scanner-result', `${scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA}${res}`);
+            break;
+          }
       }
     },
     /**
@@ -85108,6 +85867,10 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
           // 良田高拍仪
           this.scannerVideoSrc = eloam_plugin_service_ELoamPassService.mainCameraUrl;
           break;
+        case 6:
+          // 国产客户端一体机
+          await WeiRongPluginService.turnOnTheCamera();
+          break;
       }
     },
     /**
@@ -85131,6 +85894,10 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
           // 良田
           this.scannerVideoSrc = eloam_plugin_service_ELoamPassService.secondaryCameraUrl;
           break;
+        case 6:
+          // 国产客户端一体机
+          await WeiRongPluginService.turnOnTheCamera();
+          break;
       }
     },
     handleAction(name) {
@@ -85153,10 +85920,10 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
 });
 ;// CONCATENATED MODULE: ./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=script&lang=js&
  /* harmony default export */ var component_scanner_camera_componentvue_type_script_lang_js_ = (scanner_camera_componentvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=style&index=0&id=65e6d7b8&prod&scoped=true&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=style&index=0&id=bc9cce92&prod&scoped=true&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=style&index=0&id=65e6d7b8&prod&scoped=true&lang=scss&
+;// CONCATENATED MODULE: ./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=style&index=0&id=bc9cce92&prod&scoped=true&lang=scss&
 
 ;// CONCATENATED MODULE: ./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue
 
@@ -85169,11 +85936,11 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
 
 var scanner_camera_component_component = normalizeComponent(
   component_scanner_camera_componentvue_type_script_lang_js_,
-  scanner_camera_componentvue_type_template_id_65e6d7b8_scoped_true_render,
-  scanner_camera_componentvue_type_template_id_65e6d7b8_scoped_true_staticRenderFns,
+  scanner_camera_componentvue_type_template_id_bc9cce92_scoped_true_render,
+  scanner_camera_componentvue_type_template_id_bc9cce92_scoped_true_staticRenderFns,
   false,
   null,
-  "65e6d7b8",
+  "bc9cce92",
   null
   
 )
@@ -85468,8 +86235,8 @@ id_card_reader_eloam.install = Vue => {
   Vue.component(id_card_reader_eloam.name, id_card_reader_eloam);
 };
 /* harmony default export */ var id_card_reader_id_card_reader_eloam = (id_card_reader_eloam);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/id-card-reader/id-card-reader-button/src/id-card-reader-button.vue?vue&type=template&id=5b90b226&scoped=true&
-var id_card_reader_buttonvue_type_template_id_5b90b226_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/id-card-reader/id-card-reader-button/src/id-card-reader-button.vue?vue&type=template&id=19ae37ba&scoped=true&
+var id_card_reader_buttonvue_type_template_id_19ae37ba_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _vm.tip ? _c('el-tooltip', {
@@ -85546,7 +86313,7 @@ var id_card_reader_buttonvue_type_template_id_5b90b226_scoped_true_render = func
     }
   })], 2);
 };
-var id_card_reader_buttonvue_type_template_id_5b90b226_scoped_true_staticRenderFns = [];
+var id_card_reader_buttonvue_type_template_id_19ae37ba_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./packages/service/external-plugins/default-plugin-socket.service.ts
 
@@ -85566,191 +86333,24 @@ var PluginApiType;
   PluginApiType["camera"] = "sxt";
   /**有为签字 */
   PluginApiType["ywSign"] = "yw";
-  /**汉王签字 */
-  PluginApiType["hwSign"] = "hwsign";
-})(PluginApiType || (PluginApiType = {}));
-class IdCardReadService {
-  // 精伦身份证 JLSFZManage
-  // 之前 SFZManage
-
-  static startConnect(type = PluginApiType.idcard) {
-    if (this.ws && this.ws.readyState === WebSocket.CONNECTING) {
-      return this;
-    }
-    let webSocketUrl = this.idcardWebSocketUrl;
-    switch (type) {
-      case PluginApiType.idcard:
-        webSocketUrl = this.idcardWebSocketUrl;
-        break;
-      case PluginApiType.jlsfz:
-        webSocketUrl = this.jlsfzWebSocketUrl;
-    }
-    const ws = new WebSocket(webSocketUrl);
-    let resolved;
-    const onConnect = new Promise(resolve => {
-      resolved = resolve;
-    });
-    ws.onopen = () => {
-      resolved(true);
-    };
-    ws.onmessage = event => this.handleMessage(event);
-    ws.onclose = () => this.handleClose();
-    ws.onerror = () => this.handleError();
-    this.ws = ws;
-    return onConnect;
-  }
-  static handleError() {
-    for (const type in this.requestStore) {
-      this.requestStore.forEach(({
-        reject
-      }) => {
-        reject('handleError');
-      });
-    }
-    throw Error('读取身份证功能加载失败');
-  }
-  static handleClose() {
-    for (const type in this.requestStore) {
-      this.requestStore.forEach(({
-        reject
-      }) => {
-        reject('close');
-      });
-    }
-  }
-  static handleMessage(msg) {
-    let data = '';
-    try {
-      data = JSON.parse(msg.data);
-    } catch (e) {
-      data = '';
-    }
-    this.requestStore.forEach(({
-      resolve
-    }) => {
-      resolve(data);
-    });
-    this.requestStore = [];
-    this.ws.close();
-  }
-  static async read(type = PluginApiType.idcard) {
-    await this.startConnect(type);
-    if (this.ws.readyState === 1) {
-      this.ws.send(type);
-      return new Promise((resolve, reject) => {
-        if (!this.requestStore) {
-          this.requestStore = [];
-        }
-        this.requestStore.push({
-          resolve,
-          reject
-        });
-      });
-    } else {
-      throw Error('读取身份证未准备完成');
-    }
-  }
-  static async idCardCommonRead() {
-    let idcardInfo;
-    // 顺序不要调整，先连接精伦读卡器，最后连接普通读卡器（也就是PluginApiType.idcard，因为该项读卡失败不会返回消息）
-    for (const t of [PluginApiType.jlsfz, PluginApiType.idcard]) {
-      const readData = await IdCardReadService.read(t);
-      if (readData && readData.hasOwnProperty('info')) {
-        idcardInfo = readData;
-        break;
-      }
-    }
-    if (idcardInfo) {
-      return idcardInfo;
-    } else {
-      throw Error('未匹配可用的读卡器');
-    }
-  }
-}
-_defineProperty(IdCardReadService, "idcardWebSocketUrl", 'ws://127.0.0.1:8152/SFZManage');
-_defineProperty(IdCardReadService, "jlsfzWebSocketUrl", 'ws://127.0.0.1:8152/JLSFZManage');
-_defineProperty(IdCardReadService, "ws", void 0);
-_defineProperty(IdCardReadService, "requestStore", []);
-class CameraReadService {
-  static startConnect() {
-    if (this.ws && this.ws.readyState === WebSocket.CONNECTING) {
-      return this;
-    }
-    let webSocketUrl = this.cameraWebSocketUrl;
-    const ws = new WebSocket(webSocketUrl);
-    let resolved;
-    const onConnect = new Promise(resolve => {
-      resolved = resolve;
-    });
-    ws.onopen = () => {
-      resolved(true);
-    };
-    ws.onmessage = event => this.handleMessage(event);
-    ws.onclose = () => this.handleClose();
-    ws.onerror = () => this.handleError();
-    this.ws = ws;
-    return onConnect;
-  }
-  static handleError() {
-    for (const type in this.requestStore) {
-      this.requestStore.forEach(({
-        reject
-      }) => {
-        reject('handleError');
-      });
-    }
-    throw Error('读取拍照功能加载失败');
-  }
-  static handleClose() {
-    for (const type in this.requestStore) {
-      this.requestStore.forEach(({
-        reject
-      }) => {
-        reject('close');
-      });
-    }
-  }
-  static handleMessage(msg) {
-    let data = msg.data;
-    this.requestStore.forEach(({
-      resolve
-    }) => {
-      resolve(data);
-    });
-    this.requestStore = [];
-    this.ws.close();
-    // this.ws = null;
-  }
+  /**汉王签字 */
+  PluginApiType["hwSign"] = "hwsign";
+})(PluginApiType || (PluginApiType = {}));
+class IdCardReadService {
+  // 精伦身份证 JLSFZManage
+  // 之前 SFZManage
 
-  static async read() {
-    await this.startConnect();
-    if (this.ws.readyState === 1) {
-      this.ws.send(PluginApiType.camera);
-      return new Promise((resolve, reject) => {
-        if (!this.requestStore) {
-          this.requestStore = [];
-        }
-        this.requestStore.push({
-          resolve,
-          reject
-        });
-      });
-    } else {
-      throw Error('读取拍照未准备完成');
-    }
-  }
-}
-_defineProperty(CameraReadService, "cameraWebSocketUrl", 'ws://127.0.0.1:8152/SXTManage');
-_defineProperty(CameraReadService, "ws", void 0);
-_defineProperty(CameraReadService, "requestStore", []);
-class SignReadService {
-  static startConnect(signMode) {
+  static startConnect(type = PluginApiType.idcard) {
     if (this.ws && this.ws.readyState === WebSocket.CONNECTING) {
       return this;
     }
-    let webSocketUrl = this.signWebSocketUrl;
-    if (signMode === PluginApiType.hwSign) {
-      webSocketUrl = this.hwSignWebSocketUrl;
+    let webSocketUrl = this.idcardWebSocketUrl;
+    switch (type) {
+      case PluginApiType.idcard:
+        webSocketUrl = this.idcardWebSocketUrl;
+        break;
+      case PluginApiType.jlsfz:
+        webSocketUrl = this.jlsfzWebSocketUrl;
     }
     const ws = new WebSocket(webSocketUrl);
     let resolved;
@@ -85774,7 +86374,7 @@ class SignReadService {
         reject('handleError');
       });
     }
-    throw Error('签字板加载失败');
+    throw Error('读取身份证功能加载失败');
   }
   static handleClose() {
     for (const type in this.requestStore) {
@@ -85786,7 +86386,12 @@ class SignReadService {
     }
   }
   static handleMessage(msg) {
-    let data = msg.data;
+    let data = '';
+    try {
+      data = JSON.parse(msg.data);
+    } catch (e) {
+      data = '';
+    }
     this.requestStore.forEach(({
       resolve
     }) => {
@@ -85795,11 +86400,10 @@ class SignReadService {
     this.requestStore = [];
     this.ws.close();
   }
-  static async read(signMode = PluginApiType.ywSign) {
-    await this.startConnect(signMode);
+  static async read(type = PluginApiType.idcard) {
+    await this.startConnect(type);
     if (this.ws.readyState === 1) {
-      console.log('签字板连接成功');
-      this.ws.send(signMode);
+      this.ws.send(type);
       return new Promise((resolve, reject) => {
         if (!this.requestStore) {
           this.requestStore = [];
@@ -85810,57 +86414,36 @@ class SignReadService {
         });
       });
     } else {
-      throw Error('签字板未准备完成');
+      throw Error('读取身份证未准备完成');
+    }
+  }
+  static async idCardCommonRead() {
+    let idcardInfo;
+    // 顺序不要调整，先连接精伦读卡器，最后连接普通读卡器（也就是PluginApiType.idcard，因为该项读卡失败不会返回消息）
+    for (const t of [PluginApiType.jlsfz, PluginApiType.idcard]) {
+      const readData = await IdCardReadService.read(t);
+      if (readData && readData.hasOwnProperty('info')) {
+        idcardInfo = readData;
+        break;
+      }
+    }
+    if (idcardInfo) {
+      return idcardInfo;
+    } else {
+      throw Error('未匹配可用的读卡器');
     }
   }
 }
-_defineProperty(SignReadService, "signWebSocketUrl", 'ws://127.0.0.1:8152/chromeManage');
-_defineProperty(SignReadService, "hwSignWebSocketUrl", 'ws://127.0.0.1:8152/HWSIGNManage');
-_defineProperty(SignReadService, "ws", void 0);
-_defineProperty(SignReadService, "requestStore", []);
-;// CONCATENATED MODULE: ./packages/service/external-plugins/ewp-plugin-socket.service.ts
-
-
-/**
- * 沃斯德人证交互终端
- * E窗通WEBSOCKET服务
- *
- * */
-
-var EWindowPassMethodCode;
-(function (EWindowPassMethodCode) {
-  /** 读取社保卡 */
-  EWindowPassMethodCode["iReadCardBas"] = "iReadCardBas";
-  /** 获取签名*/
-  EWindowPassMethodCode["GetSignName_Base64"] = "GetSignName_Base64";
-  /** 读取二代身份证 */
-  EWindowPassMethodCode["ReadIDCard_Base64"] = "ReadIDCard_Base64";
-  /** 人证比对 */
-  EWindowPassMethodCode["FaceValidateWithIdCard_Base64"] = "FaceValidateWithIdCard_Base64";
-  /** 获取指纹 */
-  EWindowPassMethodCode["FingerPrint_Base64"] = "FingerPrint_Base64";
-})(EWindowPassMethodCode || (EWindowPassMethodCode = {}));
-const EWindowPassMethodDesc = {
-  [EWindowPassMethodCode.iReadCardBas]: '读取社保卡',
-  [EWindowPassMethodCode.GetSignName_Base64]: '获取签名',
-  [EWindowPassMethodCode.ReadIDCard_Base64]: '读取二代身份证',
-  [EWindowPassMethodCode.FaceValidateWithIdCard_Base64]: '人证比对',
-  [EWindowPassMethodCode.FingerPrint_Base64]: '获取指纹'
-};
-class EWindowPassService {
-  static startConnect(method) {
+_defineProperty(IdCardReadService, "idcardWebSocketUrl", 'ws://127.0.0.1:8152/SFZManage');
+_defineProperty(IdCardReadService, "jlsfzWebSocketUrl", 'ws://127.0.0.1:8152/JLSFZManage');
+_defineProperty(IdCardReadService, "ws", void 0);
+_defineProperty(IdCardReadService, "requestStore", []);
+class CameraReadService {
+  static startConnect() {
     if (this.ws && this.ws.readyState === WebSocket.CONNECTING) {
       return this;
     }
-    let webSocketUrl = '';
-    switch (method) {
-      case EWindowPassMethodCode.FingerPrint_Base64:
-        webSocketUrl = this.fingerPrintBasWebSocketUrl;
-        break;
-      default:
-        webSocketUrl = this.iReadCardBasWebSocketUrl;
-        break;
-    }
+    let webSocketUrl = this.cameraWebSocketUrl;
     const ws = new WebSocket(webSocketUrl);
     let resolved;
     const onConnect = new Promise(resolve => {
@@ -85869,18 +86452,7 @@ class EWindowPassService {
     ws.onopen = () => {
       resolved(true);
     };
-    ws.onmessage = event => {
-      if (method === EWindowPassMethodCode.FingerPrint_Base64) {
-        // 指纹后端返回的是string
-        event = {
-          ...event,
-          data: JSON.stringify({
-            fingerPrintInfo: event.data
-          })
-        };
-      }
-      this.handleMessage(event);
-    };
+    ws.onmessage = event => this.handleMessage(event);
     ws.onclose = () => this.handleClose();
     ws.onerror = () => this.handleError();
     this.ws = ws;
@@ -85894,7 +86466,7 @@ class EWindowPassService {
         reject('handleError');
       });
     }
-    throw Error('E窗通设备功能加载失败');
+    throw Error('读取拍照功能加载失败');
   }
   static handleClose() {
     for (const type in this.requestStore) {
@@ -85906,12 +86478,7 @@ class EWindowPassService {
     }
   }
   static handleMessage(msg) {
-    let data = '';
-    try {
-      data = JSON.parse(msg.data);
-    } catch (e) {
-      data = '';
-    }
+    let data = msg.data;
     this.requestStore.forEach(({
       resolve
     }) => {
@@ -85919,237 +86486,105 @@ class EWindowPassService {
     });
     this.requestStore = [];
     this.ws.close();
+    // this.ws = null;
   }
-  static async read(method) {
-    await this.startConnect(method);
-    const methodDesc = EWindowPassMethodDesc[method];
+
+  static async read() {
+    await this.startConnect();
     if (this.ws.readyState === 1) {
-      if (method !== EWindowPassMethodCode.FingerPrint_Base64) console.log(methodDesc + '连接成功');
-      let jsonString;
-      // outTimes：超时时间（秒）
-      switch (method) {
-        case EWindowPassMethodCode.ReadIDCard_Base64:
-          // cardReader：0 读卡器-USB；1 读卡器-COM
-          jsonString = JSON.stringify({
-            method,
-            args: {
-              outTimes: 30,
-              cardReader: 1
-            }
-          });
-          break;
-        case EWindowPassMethodCode.FaceValidateWithIdCard_Base64:
-          // cardReader：0 读卡器-USB；1 读卡器-COM
-          jsonString = JSON.stringify({
-            method,
-            args: {
-              outTimes: 30,
-              cardReader: 1,
-              cameraType: 0
-            }
-          });
-          break;
-        case EWindowPassMethodCode.iReadCardBas:
-          // icType：1接触卡；2非接触卡；3自动（接触优先）；4自动（非接优先）
-          jsonString = JSON.stringify({
-            method,
-            args: {
-              icType: '1'
-            }
-          });
-          break;
-        case EWindowPassMethodCode.FingerPrint_Base64:
-          // 获取指纹：getimgae，颜色(0黑色 1红色), 质量（默认0）, 图像大小（288，360）,类型（0民用，1公安）
-          jsonString = 'getimgae,1,0,288,0';
-          break;
-        default:
-          jsonString = JSON.stringify({
-            method,
-            args: {
-              outTimes: 30
-            }
-          });
-          break;
-      }
-      this.ws.send(jsonString);
+      this.ws.send(PluginApiType.camera);
       return new Promise((resolve, reject) => {
         if (!this.requestStore) {
           this.requestStore = [];
         }
         this.requestStore.push({
           resolve,
-          reject
-        });
-      });
-    } else {
-      throw Error(methodDesc + '未准备完成');
-    }
-  }
-  /**
-   * 读取二代身份证
-   * */
-  static async idCardRead(method = EWindowPassMethodCode.ReadIDCard_Base64) {
-    const readData = await EWindowPassService.read(EWindowPassMethodCode.ReadIDCard_Base64);
-    console.log('读取二代身份证==>', readData);
-    if (!readData) {
-      throw Error('未匹配可用的E窗通读取设备');
-    }
-    if (readData.retVal !== 0) {
-      throw Error("读取二代身份证失败，返回值：" + readData.retVal + "，错误信息：" + readData.errMsg);
-    }
-    const idInfo = readData.idInfo.data;
-    const {
-      name,
-      sex,
-      birthday,
-      address,
-      id_num,
-      nations
-    } = idInfo;
-    const IDCardData = {
-      info: {
-        name,
-        sex,
-        birthday: birthday.replace('-', '').replace('-', ''),
-        address,
-        cardId: id_num,
-        nation: nations
-      },
-      headImage: readData.idPhotoPicBase64
-    };
-    console.log('读取二代身份证结果==>', IDCardData);
-    return IDCardData;
-  }
-  /**
-   * 人证比对
-   */
-  static async faceValidateWithIdCardRead() {
-    const readData = await EWindowPassService.read(EWindowPassMethodCode.FaceValidateWithIdCard_Base64);
-    console.log('人证比对==>', readData);
-    if (!readData) {
-      throw Error('未匹配可用的E窗通读取设备');
-    }
-    if (readData.retVal !== 0) {
-      throw Error("人证比对失败，返回值：" + readData.retVal + "，错误信息：" + readData.errMsg);
+          reject
+        });
+      });
+    } else {
+      throw Error('读取拍照未准备完成');
     }
-    const idInfo = readData.idInfo.data;
-    const {
-      name,
-      sex,
-      birth,
-      address,
-      idNo,
-      nation
-    } = idInfo;
-    const IDCardData = {
-      idCard: {
-        info: {
-          name,
-          sex,
-          birthday: birth.replace('-', '').replace('-', ''),
-          address,
-          cardId: idNo,
-          nation
-        },
-        headImage: readData.idPhotoBase64
-      },
-      faceimg: readData.scenceBase64
-    };
-    console.log('人证比对结果==>', IDCardData);
-    return IDCardData;
   }
-  /** 读取社保卡 */
-  static async socialSecurityCardRead() {
-    const readData = await EWindowPassService.read(EWindowPassMethodCode.iReadCardBas);
-    if (!readData) {
-      throw Error('未匹配可用的E窗通读取设备');
+}
+_defineProperty(CameraReadService, "cameraWebSocketUrl", 'ws://127.0.0.1:8152/SXTManage');
+_defineProperty(CameraReadService, "ws", void 0);
+_defineProperty(CameraReadService, "requestStore", []);
+class SignReadService {
+  static startConnect(signMode) {
+    if (this.ws && this.ws.readyState === WebSocket.CONNECTING) {
+      return this;
     }
-    if (readData.retVal !== 0) {
-      throw Error("读取社保卡基本信息失败，返回值：" + readData.retVal + "，错误信息：" + readData.outInfo);
+    let webSocketUrl = this.signWebSocketUrl;
+    if (signMode === PluginApiType.hwSign) {
+      webSocketUrl = this.hwSignWebSocketUrl;
     }
-    // 返回数据：330100|350781196403072943|W57681892|331100D10600000300657BCF88899F8E|张三|3B6D000000815444368660330100286BCF|1.00|2020-08-12|2030-08-12|1|SN00000000|（邮编|身份证号|卡号|社会保障号码|姓名|...不知道是什么信息了）
-    const outInfo = readData.outInfo;
-    const outInfoArray = outInfo.split('|');
-    const cardId = outInfoArray[1];
-    const birthday = IdCardCommonUtils.getBirthdayByIdNumber(cardId).replace('-', '').replace('-', '');
-    const sex = IdCardCommonUtils.getGenderByIdNumber(cardId);
-    const IDCardData = {
-      info: {
-        name: outInfoArray[4],
-        sex,
-        birthday,
-        address: '',
-        cardId
-      },
-      headImage: ''
+    const ws = new WebSocket(webSocketUrl);
+    let resolved;
+    const onConnect = new Promise(resolve => {
+      resolved = resolve;
+    });
+    ws.onopen = () => {
+      resolved(true);
     };
-    console.log('读取社保卡==>', readData);
-    return IDCardData;
+    ws.onmessage = event => this.handleMessage(event);
+    ws.onclose = () => this.handleClose();
+    ws.onerror = () => this.handleError();
+    this.ws = ws;
+    return onConnect;
   }
-  /** 获取签名-base64 */
-  static async signNameRead() {
-    const readData = await EWindowPassService.read(EWindowPassMethodCode.GetSignName_Base64);
-    if (!readData) {
-      throw Error('未匹配可用的E窗通读取设备');
+  static handleError() {
+    for (const type in this.requestStore) {
+      this.requestStore.forEach(({
+        reject
+      }) => {
+        reject('handleError');
+      });
     }
-    if (readData.retVal !== 0) {
-      throw Error("读取签名失败，返回值：" + readData.retVal + "，错误信息：" + readData.errMsg);
+    throw Error('签字板加载失败');
+  }
+  static handleClose() {
+    for (const type in this.requestStore) {
+      this.requestStore.forEach(({
+        reject
+      }) => {
+        reject('close');
+      });
     }
-    console.log('获取签名==>', readData);
-    return readData.signPicBase64;
   }
-  /** 获取指纹*/
-  static async fingerPrintRead() {
-    let timeOver = 30;
-    async function readFingerPrint() {
-      const readData = await EWindowPassService.read(EWindowPassMethodCode.FingerPrint_Base64);
-      if (!readData) {
-        throw Error('未匹配可用的E窗通读取设备');
-      }
-      let list = readData.fingerPrintInfo.split("|");
-      console.log(list);
-      let ret = Number(list[1]);
-      if (ret > 1) {
-        if (timeOver > 0) {
-          timeOver--;
-          return await readFingerPrint();
-        } else {
-          return {
-            status: 'error',
-            data: '已超时，请重新操作，按压指纹'
-          };
+  static handleMessage(msg) {
+    let data = msg.data;
+    this.requestStore.forEach(({
+      resolve
+    }) => {
+      resolve(data);
+    });
+    this.requestStore = [];
+    this.ws.close();
+  }
+  static async read(signMode = PluginApiType.ywSign) {
+    await this.startConnect(signMode);
+    if (this.ws.readyState === 1) {
+      console.log('签字板连接成功');
+      this.ws.send(signMode);
+      return new Promise((resolve, reject) => {
+        if (!this.requestStore) {
+          this.requestStore = [];
         }
-      } else {
-        return {
-          status: 'success',
-          data: readData.fingerPrintInfo
-        };
-      }
-    }
-    let {
-      status,
-      data
-    } = await readFingerPrint();
-    if (status === 'error') {
-      throw Error(data);
+        this.requestStore.push({
+          resolve,
+          reject
+        });
+      });
     } else {
-      let [method, result, quality, image, featureCode] = data.split('|');
-      // getimgae|1|68|......|......
-      // method：方法，result：返回的状态，quality：指纹图片质量，image：图片base64，featureCode：指纹特征码
-      return {
-        method,
-        result,
-        quality,
-        image,
-        featureCode
-      };
+      throw Error('签字板未准备完成');
     }
   }
 }
-_defineProperty(EWindowPassService, "iReadCardBasWebSocketUrl", 'ws://127.0.0.1:5847');
-_defineProperty(EWindowPassService, "fingerPrintBasWebSocketUrl", 'ws://127.0.0.1:9000');
-_defineProperty(EWindowPassService, "ws", void 0);
-_defineProperty(EWindowPassService, "requestStore", []);
+_defineProperty(SignReadService, "signWebSocketUrl", 'ws://127.0.0.1:8152/chromeManage');
+_defineProperty(SignReadService, "hwSignWebSocketUrl", 'ws://127.0.0.1:8152/HWSIGNManage');
+_defineProperty(SignReadService, "ws", void 0);
+_defineProperty(SignReadService, "requestStore", []);
 ;// CONCATENATED MODULE: ./packages/service/external-plugins/huada-plugin-socket.service.ts
 
 
@@ -87311,6 +87746,87 @@ var default_take_photo_dialog_component = normalizeComponent(
 )
 
 /* harmony default export */ var default_take_photo_dialog = (default_take_photo_dialog_component.exports);
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/id-card-reader/id-card-reader-button/src/dialog/wei-rong-face-auth-dialog.vue?vue&type=template&id=d49bc744&scoped=true&
+var wei_rong_face_auth_dialogvue_type_template_id_d49bc744_scoped_true_render = function render() {
+  var _vm = this,
+    _c = _vm._self._c;
+  return _vm.visibility ? _c('el-dialog', {
+    staticClass: "wei-rong-face-auth-dialog",
+    attrs: {
+      "title": "人脸识别",
+      "top": '5vh',
+      "width": "640px",
+      "visible": _vm.visibility,
+      "close-on-click-modal": false
+    },
+    on: {
+      "update:visible": function ($event) {
+        _vm.visibility = $event;
+      }
+    }
+  }, [_c('div', {
+    staticClass: "image-container"
+  }, [_c('img', {
+    staticStyle: {
+      "width": "600px",
+      "height": "450px"
+    },
+    attrs: {
+      "id": "photo",
+      "src": _vm.viewFaceImage
+    }
+  })])]) : _vm._e();
+};
+var wei_rong_face_auth_dialogvue_type_template_id_d49bc744_scoped_true_staticRenderFns = [];
+
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/id-card-reader/id-card-reader-button/src/dialog/wei-rong-face-auth-dialog.vue?vue&type=script&lang=js&
+
+
+const wei_rong_face_auth_dialogvue_type_script_lang_js_BEGIN_DATA = 'data:image/jpg;base64,';
+/* harmony default export */ var wei_rong_face_auth_dialogvue_type_script_lang_js_ = ({
+  name: "wei-rong-face-auth-dialog",
+  data: () => {
+    return {
+      visibility: true,
+      viewFaceImage: ''
+    };
+  },
+  async created() {
+    console.log();
+    window.addEventListener(SCANNER_CAMERA_REFRESH_PHOTO_EVENT, message => {
+      if (message.type === SCANNER_CAMERA_REFRESH_PHOTO_EVENT) {
+        this.viewFaceImage = `${wei_rong_face_auth_dialogvue_type_script_lang_js_BEGIN_DATA}${message.scannerResultUrl}`;
+      }
+    });
+    let res = await WeiRongPluginService.faceValidateWithIdCardRead();
+    this.$message.success('认证成功');
+    setTimeout(() => {
+      this.$emit('close', res);
+    }, 1500);
+  }
+});
+;// CONCATENATED MODULE: ./packages/id-card-reader/id-card-reader-button/src/dialog/wei-rong-face-auth-dialog.vue?vue&type=script&lang=js&
+ /* harmony default export */ var dialog_wei_rong_face_auth_dialogvue_type_script_lang_js_ = (wei_rong_face_auth_dialogvue_type_script_lang_js_); 
+;// CONCATENATED MODULE: ./packages/id-card-reader/id-card-reader-button/src/dialog/wei-rong-face-auth-dialog.vue
+
+
+
+
+
+/* normalize component */
+;
+var wei_rong_face_auth_dialog_component = normalizeComponent(
+  dialog_wei_rong_face_auth_dialogvue_type_script_lang_js_,
+  wei_rong_face_auth_dialogvue_type_template_id_d49bc744_scoped_true_render,
+  wei_rong_face_auth_dialogvue_type_template_id_d49bc744_scoped_true_staticRenderFns,
+  false,
+  null,
+  "d49bc744",
+  null
+  
+)
+
+/* harmony default export */ var wei_rong_face_auth_dialog = (wei_rong_face_auth_dialog_component.exports);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/id-card-reader/id-card-reader-button/src/id-card-reader-button.vue?vue&type=script&lang=js&
 
 
@@ -87325,6 +87841,8 @@ var default_take_photo_dialog_component = normalizeComponent(
 
 
 
+
+
 /* harmony default export */ var id_card_reader_buttonvue_type_script_lang_js_ = ({
   name: 'id-card-reader-button',
   props: {
@@ -87372,10 +87890,10 @@ var default_take_photo_dialog_component = normalizeComponent(
       type: Boolean
     },
     /**
-     * 读卡器：0-默认读卡器及精伦读卡器；1-丽水一体机；2-沃斯德人证交互终端；3-中正人脸识别；4-华大读卡器；5-良田；6-捷宇信息交互终端；7-太极云软/Z300；8-华视电子读卡器；9-捷宇高拍仪读卡
-     * 人脸识别：0-默认人脸识别（拍照）；1-丽水一体机  2-沃斯德人证交互终端；3-中正人脸识别；5-良田；6-捷宇信息交互终端
-     * 读取社保卡：2-沃斯德人证交互终端；4-华大读卡器
-     * 签字版：0-有为签字版；1-汉王签字版；2-沃斯德人证交互终端签字；3-捷宇信息交互终端；4-太极云软签字/P-300；
+     * 读卡器：0-默认读卡器及精伦读卡器；1-丽水一体机；2-沃斯德人证交互终端；3-中正人脸识别；4-华大读卡器；5-良田；6-捷宇信息交互终端；7-太极云软/Z300；8-华视电子读卡器；9-捷宇高拍仪读卡; 10-国产客户端一体机
+     * 人脸识别：0-默认人脸识别（拍照）；1-丽水一体机  2-沃斯德人证交互终端；3-中正人脸识别；5-良田；6-捷宇信息交互终端；10-国产客户端一体机
+     * 读取社保卡：2-沃斯德人证交互终端；4-华大读卡器；5-国产客户端一体机
+     * 签字版：0-有为签字版；1-汉王签字版；2-沃斯德人证交互终端签字；3-捷宇信息交互终端；4-太极云软签字/P-300；5:国产客户端签字版
      */
     readMachineType: {
       default: 0,
@@ -87488,6 +88006,10 @@ var default_take_photo_dialog_component = normalizeComponent(
           idcardInfo = await JieYueService.idCardReadByScanner();
           this.$emit('click', idcardInfo);
           break;
+        case 10:
+          idcardInfo = await WeiRongPluginService.idCardRead();
+          this.$emit('click', idcardInfo);
+          break;
       }
     },
     /**
@@ -87526,6 +88048,9 @@ var default_take_photo_dialog_component = normalizeComponent(
             this.$emit('click', data);
             break;
           }
+        case 10:
+          this.openWEIRONGFaceValidateDialog();
+          break;
       }
     },
     /**
@@ -87541,6 +88066,9 @@ var default_take_photo_dialog_component = normalizeComponent(
           case 4:
             idcardInfo = await HuzReadService.socialSecurityCardRead();
             break;
+          case 5:
+            idcardInfo = await WeiRongPluginService.socialSecurityCardRead();
+            break;
         }
         this.$emit('click', idcardInfo);
       } catch (e) {
@@ -87583,6 +88111,9 @@ var default_take_photo_dialog_component = normalizeComponent(
             userSignature = SignName0;
           }
           break;
+        case 5:
+          userSignature = await WeiRongPluginService.signNameRead();
+          break;
       }
       // 返回base64编码内容，无前缀
       this.$emit('click', userSignature);
@@ -87614,6 +88145,26 @@ var default_take_photo_dialog_component = normalizeComponent(
         parent: this
       }).$mount(modalNode);
     },
+    openWEIRONGFaceValidateDialog() {
+      console.log('打开人脸识别弹框');
+      const modalNode = document.createElement('div');
+      document.body.appendChild(modalNode);
+      const vm = new (external_commonjs_vue_commonjs2_vue_root_Vue_default())({
+        render: h => {
+          return h(wei_rong_face_auth_dialog, {
+            props: {},
+            on: {
+              close: data => {
+                this.$emit('click', data);
+                vm.$destroy();
+                vm.$el.remove();
+              }
+            }
+          });
+        },
+        parent: this
+      }).$mount(modalNode);
+    },
     /** 良田拍照*/
     readFacePhotoByELoam() {
       const modalNode = document.createElement('div');
@@ -87686,11 +88237,11 @@ var default_take_photo_dialog_component = normalizeComponent(
 ;
 var id_card_reader_button_component = normalizeComponent(
   src_id_card_reader_buttonvue_type_script_lang_js_,
-  id_card_reader_buttonvue_type_template_id_5b90b226_scoped_true_render,
-  id_card_reader_buttonvue_type_template_id_5b90b226_scoped_true_staticRenderFns,
+  id_card_reader_buttonvue_type_template_id_19ae37ba_scoped_true_render,
+  id_card_reader_buttonvue_type_template_id_19ae37ba_scoped_true_staticRenderFns,
   false,
   null,
-  "5b90b226",
+  "19ae37ba",
   null
   
 )