easy3wui 1.5.20 → 1.5.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/lib/Easy3wCaHandler/index.js +7 -1
  2. package/lib/Easy3wDownLoad/index.js +1 -1
  3. package/lib/Easy3wUpload/index.js +1 -1
  4. package/lib/Easy3wUploadB/index.js +1 -1
  5. package/lib/Easy3wUploadM/index.js +1 -1
  6. package/package.json +1 -1
package/lib/Easy3wCaHandler/index.js CHANGED
@@ -23,10 +23,16 @@ function Easy3wCaHandler(serverURL) {
23
23
  if (url.charAt(url.length - 1) === '/') {
24
24
  url = url.substring(0, url.length - 1);
25
25
  }
26
+ var protocol = url.substring(0, url.indexOf(':'));
26
27
  var host = url.substring(url.indexOf(':') + 1);
27
28
  var sender = getId();
28
29
  var receiver = sender + '_server';
29
- var urlSignatureSocket = 'wss:' + host + '/signatureSocket/' + sender;
30
+ // const urlSignatureSocket = `wss:${host}/signatureSocket/${sender}`;
31
+ var wsprotocol = 'ws';
32
+ if (protocol.toUpperCase() === 'HTTPS') {
33
+ wsprotocol = 'wss';
34
+ }
35
+ var urlSignatureSocket = wsprotocol + ':' + host + '/signatureSocket/' + sender;
30
36
  var urlCASign = url + '/TWCA/signMessageNew.html?listenerno=' + receiver;
31
37
  var caIframe = document.getElementById('casigniframe');
32
38
  if (caIframe) {
package/lib/Easy3wDownLoad/index.js CHANGED
@@ -125,7 +125,7 @@ var Easy3wDownLoad = function (_Component) {
125
125
  var propsAFlag = _this.props.propsAFlag; // propsAFlag 加密标识 从引用组件处传入 '1':加密 '0':不加密
126
126
 
127
127
  var retUrl = '';
128
- if (uid !== '' && propsAFlag === '1' || uid !== '' && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
128
+ if (uid !== '' && propsAFlag === '1' || uid !== '' && propsAFlag !== '0' && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
129
129
  var authToken = (0, _Easy3wGetCookie2['default'])('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
130
130
  var nowStr = _.now();
131
131
  var encUrl = (0, _Easy3wAESEncrypt2['default'])(uid + '@#' + nowStr + '@#' + authToken, _comonConfig.a, _comonConfig.b);
package/lib/Easy3wUpload/index.js CHANGED
@@ -117,7 +117,7 @@ var Easy3wUpload = function (_Component) {
117
117
  var propsAFlag = _this.props.propsAFlag; // propsAFlag 加密标识 从引用组件处传入 '1':加密 '0':不加密
118
118
 
119
119
  var retUrl = '';
120
- if (uid !== '' && propsAFlag === '1' || uid !== '' && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
120
+ if (uid !== '' && propsAFlag === '1' || uid !== '' && propsAFlag !== '0' && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
121
121
  var authToken = (0, _Easy3wGetCookie2['default'])('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
122
122
  var nowStr = _.now();
123
123
  var encUrl = (0, _Easy3wAESEncrypt2['default'])(uid + '@#' + nowStr + '@#' + authToken, _comonConfig.a, _comonConfig.b);
package/lib/Easy3wUploadB/index.js CHANGED
@@ -895,7 +895,7 @@ var _initialiseProps = function _initialiseProps() {
895
895
  var propsAFlag = _this3.props.propsAFlag; // propsAFlag 加密标识 从引用组件处传入 '1':加密 '0':不加密
896
896
 
897
897
  var retUrl = '';
898
- if (uid !== '' && propsAFlag === '1' || uid !== '' && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
898
+ if (uid !== '' && propsAFlag === '1' || uid !== '' && propsAFlag !== '0' && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
899
899
  var authToken = Easy3wGetCookie('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
900
900
  var nowStr = _.now();
901
901
  var encUrl = (0, _Easy3wAESEncrypt2['default'])(uid + '@#' + nowStr + '@#' + authToken, _comonConfig.a, _comonConfig.b);
package/lib/Easy3wUploadM/index.js CHANGED
@@ -119,7 +119,7 @@ var Easy3wUploadM = function (_Component) {
119
119
  var propsAFlag = _this.props.propsAFlag; // propsAFlag 加密标识 从引用组件处传入 '1':加密 '0':不加密
120
120
 
121
121
  var retUrl = '';
122
- if (uid !== '' && propsAFlag === '1' || uid !== '' && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
122
+ if (uid !== '' && propsAFlag === '1' || uid !== '' && propsAFlag !== '0' && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
123
123
  var authToken = (0, _Easy3wGetCookie2['default'])('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
124
124
  var nowStr = _.now();
125
125
  var encUrl = (0, _Easy3wAESEncrypt2['default'])(uid + '@#' + nowStr + '@#' + authToken, _comonConfig.a, _comonConfig.b);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "easy3wui",
3
- "version": "1.5.20",
3
+ "version": "1.5.23",
4
4
  "description": "easy3wui components for react",
5
5
  "keywords": [
6
6
  "react",