ucservice 1.2.3 → 1.2.4

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.
@@ -14239,12 +14239,13 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
14239
14239
  return;
14240
14240
  }
14241
14241
 
14242
- let janusUrl = me._opts.conf.janusUrl;
14243
- checkIsHttps() && (janusUrl = janusUrl.replace('ws:', 'wss:'));
14242
+ let janusUrl = me._opts.conf.janusUrl; //没有证书,项目需要不使用wss
14243
+ // checkIsHttps() && (janusUrl = janusUrl.replace('ws:','wss:'));
14244
+
14244
14245
  me._opts.janus = new Janus({
14245
14246
  // server: janusUrl.indexOf("127.0.0.1") == -1 ? janusUrl : janusUrl.split("//")[0] + "//" + (location.hostname)+":"+janusUrl.split(":")[2],
14246
14247
  //使用项目必须定义window.janusHttpsHost来适应https
14247
- server: location.protocol == "https:" ? janusUrl.split("//")[0] + "//" + "112.124.244.179:9999" + "/janus/" : janusUrl,
14248
+ server: location.protocol == "https:" ? janusUrl.split("//")[0] + "//" + "szh.rfb.zj.gov.cn/tytx" + "/janus/" : janusUrl,
14248
14249
  success: function () {
14249
14250
  console.log("Janus服务连接成功!");
14250
14251
 
@@ -16041,9 +16042,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
16041
16042
  if (_connecting) {
16042
16043
  return;
16043
16044
  } // Mangle the URL, changing the scheme from 'http' to 'ws'.
16045
+ // var url = _cometd.getURL().replace(/^http/, 'ws');
16046
+ //因证书问题,暂时将https和http都改成ws
16044
16047
 
16045
16048
 
16046
- var url = _cometd.getURL().replace(/^http/, 'ws');
16049
+ var url = _cometd.getURL().replace(/^https/, 'ws').replace(/^http/, 'ws');
16047
16050
 
16048
16051
  this._debug('Transport', this.getType(), 'connecting to URL', url);
16049
16052
 
Binary file