react_hsbc_teller 0.6.9 → 0.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react_hsbc_teller",
-  "version": "0.6.9",
+  "version": "0.7.0",
   "description": "React",
   "private": false,
   "main": "lib/hsbc.js",

package/packages/common/websocket.js

@@ -3,6 +3,7 @@ import JKL from './JKL';
 
 let websock;
 let id;
+let fromHostName;
 const xmlLang = 'zh';
 const version = '1.0';
 let islogin = false;
@@ -36,6 +37,9 @@ function websocketonopen() { // 连接建立之后执行send方法发送数据
   // 发送建立流请求
   const steam = {
     open: {
+      // '-to': 'im.uat.dsp.hsbcfts.com.cn',
+      // '-from': `${'web'}@${'im.uat.dsp.hsbcfts.com.cn'}`,
+
       '-to': JSON.parse(window.sessionStorage.getItem('sigData')).hostname,
       '-from': `${JSON.parse(window.sessionStorage.getItem('sigData')).account}@${JSON.parse(window.sessionStorage.getItem('sigData')).hostname}`,
       '-xmlns': 'urn:ietf:params:xml:ns:xmpp-framing',
@@ -84,7 +88,8 @@ function websocketonmessage(e) {
   } else if (undefined != jsondata.open) {
     // 记录id
     id = jsondata.open['-id'];
-    console.log(id);
+    fromHostName = jsondata.open["-from"];
+    console.log('记录id',id,fromHostName);
   } else if (undefined != jsondata['stream:features']) {
     if (undefined != jsondata['stream:features'].mechanisms) {
       // 获取登录验证方式
@@ -159,7 +164,7 @@ function newopen() {
       '-xmlns': 'jabber:client',
       '-to': JSON.parse(window.sessionStorage.getItem('sigData')).hostname,
       '-version': version,
-      '-from': `${JSON.parse(window.sessionStorage.getItem('sigData')).account}@${JSON.parse(window.sessionStorage.getItem('sigData')).hostname}`,
+      '-from': JSON.parse(window.sessionStorage.getItem('sigData')).account + '@' + fromHostName,
       '-id': id,
       '-xml:lang': xmlLang,
     },
@@ -184,7 +189,9 @@ function bind() {
 function auth(val) {
   // Base64编码
   console.log('www');
-  const token = window.btoa(`${JSON.parse(window.sessionStorage.getItem('sigData')).account}@${JSON.parse(window.sessionStorage.getItem('sigData')).hostname}\0` + `${JSON.parse(window.sessionStorage.getItem('sigData')).openfireToken}`);
+  // const token = window.btoa('web'+'@'+ fromHostName+ '\0' + '123');
+
+  const token = window.btoa(JSON.parse(window.sessionStorage.getItem('sigData')).account + '@' + fromHostName + '\0' + JSON.parse(window.sessionStorage.getItem('sigData')).openfireToken);
   const message = {
     auth: {
       '-xmlns': 'urn:ietf:params:xml:ns:xmpp-sasl',

package/packages/pages/index.jsx

@@ -46,8 +46,8 @@ class Main extends Component {
 }
 Main.defaultProps = {
   lang: 'zh',
-  baseURL: 'https://zuul.uat.dsp.hsbcfts.com.cn/wealth/zuul/api/leimon-counter-api',
-  // baseURL:'https://counter-web.leimondata.cn:18082/api/leimon-counter-api',
+  // baseURL: 'https://zuul.uat.dsp.hsbcfts.com.cn/wealth/zuul/api/leimon-counter-api',
+  baseURL:'https://counter-web.leimondata.cn:18082/api/leimon-counter-api',
 
 }
 export default Main

package/packages/pages/video/video.jsx

@@ -179,6 +179,12 @@ class Video extends Component {
         appId: result.appId,
         bizName: result.bizName
       });
+      // const data1={
+      //   hostname: 'im.uat.dsp.hsbcfts.com.cn',
+      //   webPort: '443',
+      //   account: 'web',
+      //   openfireToken: '123'
+      // }
       window.sessionStorage.setItem('sigData', JSON.stringify(result));
       if (data.sigType == 1) {
         this.handleEdit()
@@ -191,6 +197,9 @@ class Video extends Component {
   handleEdit = () => {
     console.log(JSON.parse(window.sessionStorage.getItem('sigData')));
     // eslint-disable-next-line no-undef
+    // initWebSocket('wss://im.uat.dsp.hsbcfts.com.cn:443/wealth/im/ws/')
+    // initWebSocket('wss://' + JSON.parse(window.sessionStorage.getItem('sigData')).hostname + ':' + '15603' + '/ws/');
+
     initWebSocket('wss://' + JSON.parse(window.sessionStorage.getItem('sigData')).hostname + ':' + JSON.parse(window.sessionStorage.getItem('sigData')).webPort + '/ws/');
     const config_param = {};
     config_param.workspaceId = this.state.workSpaceId;
@@ -3477,11 +3486,11 @@ Video.defaultProps = {
   tellerAccount: 't001',
   businessNumber: '123',
   callbackUrl: 'http://47.102.126.132:8720/hsbc/callback',
-  roomServerUrl: 'wss://app.uat.dsp.hsbcfts.com.cn/mpaas/mrtc/ws', 
-  // roomServerUrl: 'wss://mrtc.mpaas.cn-hangzhou.aliyuncs.com/ws',
+  // roomServerUrl: 'wss://app.uat.dsp.hsbcfts.com.cn/mpaas/mrtc/ws', 
+  roomServerUrl: 'wss://mrtc.mpaas.cn-hangzhou.aliyuncs.com/ws',
 
-  // resourcePath: 'https://counter-web.leimondata.cn:7199',
-  resourcePath: 'https://zuul.uat.dsp.hsbcfts.com.cn/wealth/js/',
+  resourcePath: 'https://counter-web.leimondata.cn:7199',
+  // resourcePath: 'https://zuul.uat.dsp.hsbcfts.com.cn/wealth/js/',
   prohbiitPrompt: '当前无客户',
   voiceColor: '#0AE544',
   titleBackground: 'rgba(0,0,0,0.65)',

package/src/index.js

@@ -2,8 +2,8 @@ import React from "react";
 import ReactDOM from "react-dom";
 import "./index.less";
 import '@babel/polyfill';
-import { HSBC } from "../lib/hsbc";
-// import {HSBC} from "../packages";
+// import { HSBC } from "../lib/hsbc";
+import {HSBC} from "../packages";
 
 ReactDOM.render(
   <div className="hsbc"><HSBC></HSBC></div>,