wenhongquan 2 rokov pred
rodič
commit
2fc3a9e6e6

+ 7 - 7
index.html

@@ -14,20 +14,20 @@
     <script src="./lib/md5.js"></script>
     <script src="./lib/jsencrypt.min.js"></script>
     <!-- <script src="./flexible.js"></script> -->
-    <script src="./login.js?time=6"></script>
-    <script src="./webClient/defaultConfig.js?time=117"></script>
-    <script src="./webClient/initWebSocket.js?time=131"></script>
-    <script src="./webClient/webClient_initWnd.js?time=1228"></script>
+    <script src="./login.js?time=7"></script>
+    <script src="./webClient/defaultConfig.js?time=118"></script>
+    <script src="./webClient/initWebSocket.js?time=132"></script>
+    <script src="./webClient/webClient_initWnd.js?time=1230"></script>
 
 
 
     <!--    <script src="../webClient/defaultConfig.js"></script>-->
     <!--    <script src="../webClient/initWebSocket.js"></script>-->
     <!--    <script src="../webClient/webClient_initWnd.js"></script>-->
-    <script src="./js/common.js?time=7"></script>
+    <script src="./js/common.js?time=8"></script>
 
-    <script src="./meeting.js?time=46"></script>
-    <script src="./js/videoplay.js?time=5"></script>
+    <script src="./meeting.js?time=47"></script>
+    <script src="./js/videoplay.js?time=6"></script>
 
     <!-- <script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.g6-3.1.1/build/g6.js"></script> -->
     <link rel="stylesheet" href="<%- mapurl %>/minemapapi/v2.1.0/minemap.css">

+ 2 - 2
public/js/common.js

@@ -2,8 +2,8 @@ var setting = {
     username: window.spuser,
     password: "huashe123",
     ip: "10.55.134.3",
-    host: "https",
-    port: "8320",
+    host: "http",
+    port: "8314",
 };
 setting.URL = setting.host + "://" + setting.ip + ":" + setting.port;
 localStorage.setItem("url", setting.URL);

+ 2 - 2
public/main.js

@@ -4,8 +4,8 @@ var setting = {
     username: window.spuser,
     password: "huashe123",
     ip: "10.55.134.3",
-    host: "https",
-    port: "8320",
+    host: "http",
+    port: "8314",
 };
 
 setting.URL = setting.host + "://" + setting.ip + ":" + setting.port;

+ 2 - 2
public/webClient/defaultConfig.js

@@ -11,8 +11,8 @@
 */
 let defaultConfig = { // 默认配置,可以通过option覆盖
     // 协议
-    protocol: location.protocol === "file:" ? "https" : location.protocol.split(":")[0],
+    protocol: location.protocol === "file:" ? "http" : location.protocol.split(":")[0],
     // 开发环境配置
     loginIp: '10.55.134.3', // DEMO采用登陆页面的地址,   若第三方自行开发,请填写大华服务器对应的IP
-    port: '8320' //  DEMO采用登陆页面的映射端口,若第三方自行开发,请填写大华服务器对应的端口
+    port: '8314' //  DEMO采用登陆页面的映射端口,若第三方自行开发,请填写大华服务器对应的端口
 };

+ 2 - 2
src/constants/constants.ts

@@ -8,8 +8,8 @@ export const DA_HUA = {
   username: window.spuser,
   password: 'huashe123',
   ip: '10.55.134.3',
-  host: 'https',
-  port: '8320',
+  host: 'http',
+  port: '8314',
 };
 
 export const DA_HUA_URL_PREFIX =