ucservice 1.2.1 → 1.2.4

package/dist/ucservice.umd.js

@@ -14239,10 +14239,13 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
             return;
           }
 
-          let janusUrl = me._opts.conf.janusUrl;
-          checkIsHttps() && (janusUrl = janusUrl.replace('ws:', 'wss:'));
+          let janusUrl = me._opts.conf.janusUrl; //没有证书，项目需要不使用wss
+          // checkIsHttps() && (janusUrl = janusUrl.replace('ws:','wss:'));
+
           me._opts.janus = new Janus({
-            server: janusUrl.indexOf("127.0.0.1") == -1 ? janusUrl : janusUrl.split("//")[0] + "//" + location.hostname + ":" + janusUrl.split(":")[2],
+            // server: janusUrl.indexOf("127.0.0.1") == -1 ? janusUrl : janusUrl.split("//")[0] + "//" + (location.hostname)+":"+janusUrl.split(":")[2],
+            //使用项目必须定义window.janusHttpsHost来适应https
+            server: location.protocol == "https:" ? janusUrl.split("//")[0] + "//" + "szh.rfb.zj.gov.cn/tytx" + "/janus/" : janusUrl,
             success: function () {
               console.log("Janus服务连接成功！");
 
@@ -16039,9 +16042,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
       if (_connecting) {
         return;
       } // Mangle the URL, changing the scheme from 'http' to 'ws'.
+      // var url = _cometd.getURL().replace(/^http/, 'ws');
+      //因证书问题，暂时将https和http都改成ws
 
 
-      var url = _cometd.getURL().replace(/^http/, 'ws');
+      var url = _cometd.getURL().replace(/^https/, 'ws').replace(/^http/, 'ws');
 
       this._debug('Transport', this.getType(), 'connecting to URL', url);