1

leiSP-admin/src/main/resources/application-druid.yml

@@ -9,11 +9,11 @@ spring:
 #                url: jdbc:mysql://192.168.100.11:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 
 
-#                url: jdbc:mysql://192.168.100.10:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.100.10:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: slfh
                 password: slfh123456
 
-                url: jdbc:mysql://192.168.0.200:3306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://192.168.0.200:3306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                username: slfh
 #                password: slfh123456
 

mybusiness/src/main/java/com/business/slfh/tools/SendSms.java

@@ -123,7 +123,7 @@ public class SendSms {
 //            }
 //        }
 
-        SendSms.sendMessage("13756035707","实验林场车辆:吉A71QH1将于2021-05-02到达保养周期，提前30天通知，请及时登录平台填写保养记录或修改保养时间。");
+        SendSms.sendMessage("13351508891","111实验林场车辆:吉A71QH1将于2021-05-02到达保养周期，提前30天通知，请及时登录平台填写保养记录或修改保养时间。");
     }
 
 

mybusiness/src/main/resources/templates/business/bigdata/camera3/demo_window_simple_playback.html

@@ -238,7 +238,7 @@
             var secret = setEncrypt("8x9Ewm2UVcJqtTGvriEH");   //综合安防管理平台提供的secret，必填
             var ip = "218.27.1.157";                           //综合安防管理平台IP地址，必填
             var playMode = 1;                                  //初始播放模式：0-预览，1-回放
-            var port = 443;                                    //综合安防管理平台端口，若启用HTTPS协议，默认443
+            var port = 1443;                                    //综合安防管理平台端口，若启用HTTPS协议，默认443
             var snapDir = "D:\\SnapDir";                       //抓图存储路径
             var videoDir = "D:\\VideoDir";                     //紧急录像或录像剪辑存储路径
             var layout = "1x1";                                //playMode指定模式的布局

mybusiness/src/main/resources/templates/business/bigdata/camera3/demo_window_simple_preview.html

@@ -178,7 +178,7 @@
             var secret = setEncrypt("8x9Ewm2UVcJqtTGvriEH");   //综合安防管理平台提供的secret，必填
             var ip = "218.27.1.157";                           //综合安防管理平台IP地址，必填
             var playMode = 0;                                  //初始播放模式：0-预览，1-回放
-            var port = 443;                                    //综合安防管理平台端口，若启用HTTPS协议，默认443
+            var port = 1443;                                    //综合安防管理平台端口，若启用HTTPS协议，默认443
             var snapDir = "D:\\SnapDir";                       //抓图存储路径
             var videoDir = "D:\\VideoDir";                     //紧急录像或录像剪辑存储路径
             var layout = "1x1";                                //playMode指定模式的布局

mybusiness/src/main/resources/templates/business/bigdata/camera3/demo_window_simple_preview_wall_special_camera.html

@@ -246,7 +246,7 @@
             var secret = setEncrypt("8x9Ewm2UVcJqtTGvriEH");   //综合安防管理平台提供的secret，必填
             var ip = "218.27.1.157";                           //综合安防管理平台IP地址，必填
             var playMode = 0;                                  //初始播放模式：0-预览，1-回放
-            var port = 443;                                    //综合安防管理平台端口，若启用HTTPS协议，默认443
+            var port = 1443;                                    //综合安防管理平台端口，若启用HTTPS协议，默认443
             var snapDir = "D:\\SnapDir";                       //抓图存储路径
             var videoDir = "D:\\VideoDir";                     //紧急录像或录像剪辑存储路径
             var layout = "1x1";                                //playMode指定模式的布局

mybusiness/src/main/resources/templates/business/bigdata/camera3/demo_window_simple_preview_wall_special_user.html

@@ -246,7 +246,7 @@
             var secret = setEncrypt("8x9Ewm2UVcJqtTGvriEH");   //综合安防管理平台提供的secret，必填
             var ip = "218.27.1.157";                           //综合安防管理平台IP地址，必填
             var playMode = 0;                                  //初始播放模式：0-预览，1-回放
-            var port = 443;                                    //综合安防管理平台端口，若启用HTTPS协议，默认443
+            var port = 1443;                                    //综合安防管理平台端口，若启用HTTPS协议，默认443
             var snapDir = "D:\\SnapDir";                       //抓图存储路径
             var videoDir = "D:\\VideoDir";                     //紧急录像或录像剪辑存储路径
             var layout = "1x1";                                //playMode指定模式的布局

mybusiness/src/main/resources/templates/business/bigdata/inspection.html

@@ -135,7 +135,7 @@
                         <li class="img_big  border_right"><img th:src="@{/bigdata/images/event_processed.png}"> <span><p
                                 th:text="*{done}"></p><p class="text_big">已处理任务</p></span></li>
                         <li class=""><img th:src="@{/bigdata/images/event_fire.png}"> <span><p th:text="*{fire}"></p><p
-                                class="text_big">火灾</p></span></li>
+                                class="text_big"></p></span></li>
                         <li class="border_right"><img th:src="@{/bigdata/images/event_pests.png}"> <span><p
                                 th:text="*{insect}"></p><p class="text_big">病虫害</p></span></li>
                         <li class="i"><img th:src="@{/bigdata/images/event_steal.png}"> <span><p th:text="*{steal}"></p><p

mybusiness/src/main/resources/templates/business/manager/test/websocket_test.html

@@ -15,8 +15,8 @@
             //实现化WebSocket对象，指定要连接的服务器地址与端口  建立连接
             //等同于socket = new WebSocket("ws://localhost:8888/xxxx/im/25");
             //var socketUrl="${request.contextPath}/im/"+$("#userId").val();
-            var socketUrl="http://192.168.1.106/business/app/websocket/"+$("#userId").val();
-            socketUrl=socketUrl.replace("https","ws").replace("http","ws");
+            var socketUrl="https://192.168.1.106/business/app/websocket/"+$("#userId").val();
+            socketUrl=socketUrl.replace("https","wss").replace("http","ws");
             console.log(socketUrl);
             if(socket!=null){
                 socket.close();

mybusiness/src/main/resources/templates/business/visualization/event.html

@@ -94,9 +94,9 @@
                 //实现化WebSocket对象，指定要连接的服务器地址与端口  建立连接
                 //等同于socket = new WebSocket("ws://localhost:8888/xxxx/im/25");
                 //var socketUrl="${request.contextPath}/im/"+$("#userId").val();
-                var socketUrl="http://218.27.1.157:9090/business/app/websocket/"+loginName;
+                var socketUrl="https://218.27.1.157:9090/business/app/websocket/"+loginName;
                 // var socketUrl="http://127.0.0.1/business/app/websocket/"+loginName;
-                socketUrl=socketUrl.replace("https","ws").replace("http","ws");
+                socketUrl=socketUrl.replace("https","wss").replace("http","ws");
                 console.log(socketUrl);
                 if(socket!=null){
                     socket.close();
@@ -333,7 +333,7 @@
 </div>
 <!--事件 左侧导航 结束-->
 <!--森林 左侧导航 开始-->
-<div class="left_nav" id="sl_nav" style="display: none;">
+<div class="left_nav" id="sl_nav" >
     <label><input type="radio"  name="all_event" value="石岭镇林场轮廓" id="slzlc" />石岭林场</label>
     <label><input type="radio"  name="all_event" value="山门镇（城东乡）轮廓" id="smzlc" >山门镇（城东乡）</label>
     <label><input type="radio"  name="all_event" value="叶赫林场轮廓" id="yhlc" />叶赫林场</label>

mybusiness/src/main/resources/templates/business/visualization/event_special_usr.html

@@ -115,9 +115,9 @@
                 //实现化WebSocket对象，指定要连接的服务器地址与端口  建立连接
                 //等同于socket = new WebSocket("ws://localhost:8888/xxxx/im/25");
                 //var socketUrl="${request.contextPath}/im/"+$("#userId").val();
-                var socketUrl="http://218.27.1.157:9090/business/app/websocket/"+loginName;
+                var socketUrl="https://218.27.1.157:9090/business/app/websocket/"+loginName;
                 // var socketUrl="http://127.0.0.1/business/app/websocket/"+loginName;
-                socketUrl=socketUrl.replace("https","ws").replace("http","ws");
+                socketUrl=socketUrl.replace("https","wss").replace("http","ws");
                 console.log(socketUrl);
                 if(socket!=null){
                     socket.close();

pom.xml

@@ -25,7 +25,7 @@
         <kaptcha.version>2.3.2</kaptcha.version>
         <swagger.version>2.9.2</swagger.version>
         <pagehelper.boot.version>1.2.5</pagehelper.boot.version>
-        <fastjson.version>1.2.70</fastjson.version>
+        <fastjson.version>1.2.83</fastjson.version>
         <oshi.version>3.9.1</oshi.version>
         <commons.io.version>2.5</commons.io.version>
         <commons.fileupload.version>1.3.3</commons.fileupload.version>