1

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

@@ -13,14 +13,14 @@ spring:
 #                username: senlinfanghuo
 #                password: slfh123456
 
-#                url: jdbc:mysql://218.27.1.157:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: senlinfanghuo
-#                password: slfh123456
+                url: jdbc:mysql://218.27.1.157:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: senlinfanghuo
+                password: slfh123456
 
 
-                url: jdbc:mysql://36.97.65.105:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: sjkj
-                password: sjkj123456
+#                url: jdbc:mysql://36.97.65.105:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: sjkj
+#                password: sjkj123456
 
 
 

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

@@ -9,7 +9,7 @@ leisp:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/leisp/uploadPath，Linux配置 /home/leisp/uploadPath）
-  profile: D:/temp/
+  profile: /home/soft/temp/
 #  profile: /home/leisp/uploadPath
   #profile : f:/
   # 获取ip地址开关

mybusiness/src/main/java/com/business/slfh/app/login/service/impl/AppLoginServiceImpl.java

@@ -39,6 +39,10 @@ public class AppLoginServiceImpl extends AppBaseService implements AppLoginServi
                     sysConfig.setConfigKey("app_reportonline_sec");
                     long sec = Long.valueOf(sysConfigMapper.selectConfig(sysConfig).getConfigValue());
                     result.data.put("app_reportonline_sec",sec);
+                    SysConfig sysConfig_srs_url = new SysConfig();
+                    sysConfig_srs_url.setConfigKey("srs_url");
+                    String srs_url = sysConfigMapper.selectConfig(sysConfig_srs_url).getConfigValue();
+                    result.data.put("srs_url",srs_url);
                 }else {
                     result.status = Service_Error;
                     result.message = "用户不存在";

mybusiness/src/main/resources/static/visualization/js/sj.js

@@ -1,4 +1,4 @@
-   
+
 //时间
 function getNow(Mytime) { return Mytime < 10 ? '0' + Mytime : Mytime; }
         function CurrentTime() {
@@ -25,9 +25,9 @@ function getNow(Mytime) { return Mytime < 10 ? '0' + Mytime : Mytime; }
 $(function(){
 			//间隔一秒执行一次获取当前时间的方法
         setInterval(function () { CurrentTime() }, 1000);
-			
-     
-			
+
+
+
 //	二维三维切换
 			$(".wei a").on("click", function() {
     var position = $(this)
@@ -68,10 +68,10 @@ var currentWidth = $(".wei .wei_tab")
     .width();
 var current = $(".wei_tab .active").position();
 $(".wei .slide1").css({ left: +current.left, width: currentWidth });
-	
-	
+
+
 //	二维三维 图片切换
-	
+
 	$(".wei_tab .aa").on('click',function(){
 		if($(this).hasClass('ew_li')){
 			$('.map_tab').show();
@@ -79,12 +79,12 @@ $(".wei .slide1").css({ left: +current.left, width: currentWidth });
 			$('.map_tab').hide();
 		}
 	});
-	
-	
-		
+
+
+
 //右侧导航显示隐藏
 	var a = 0
-	
+
 	$(".zhly_close").on('click',function(){
 		var wid = $(".zhly_k").width()+39;
 		a = a + 1;
@@ -99,8 +99,8 @@ $(".wei .slide1").css({ left: +current.left, width: currentWidth });
     }
 	});
 
-	
-	
+
+
 
 //nav导航点击切换
 $(".nav_div .nav").on('click', function () {
@@ -114,6 +114,7 @@ $(".nav_div .nav").on('click', function () {
     }
     $("#qt_iframe").attr("src", "/visualization/event/" + $(this).children('div').attr("url"));
     //首页得导航
+    console.log("=======",$(".sj").children('div').hasClass('on'),$(".sl").children('div').hasClass('on'))
     if($(".sj").children('div').hasClass('on')){
         $(".left_nav").show();
     }else{
@@ -125,14 +126,14 @@ $(".nav_div .nav").on('click', function () {
         $("#sl_nav").hide();
     }
 });
-	
-	
+
+
 //	$(".sj").on('click',function(){
 //		$(".left_nav").toggle();
 //	});
-//	
-	
-	
+//
+
+
 //	iframe高度
 //	var hei = $(document).height();
 //	var wid = $(document).width();
@@ -140,5 +141,5 @@ $(".nav_div .nav").on('click', function () {
 //	$("#qt_iframe").width(wid);
 
 
-			
-		});
+
+		});

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

@@ -354,3 +354,4 @@
     });
 </script>
 </html>
+

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

@@ -7,6 +7,7 @@
     <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet">
 </head>
 <body style=" margin: 0;overflow: hidden;background: #000033;width: 100%;height:100%;position: absolute;top: 0;">
+<label id="distanceLength"></label>
 <div id="map" style="margin:0 auto;width: 100%;height: 100%;background: none;"></div>
 <script th:src="@{/js/jquery.min.js}"></script>
 <script th:src="@{/js/bootstrap.min.js}"></script>
@@ -1588,6 +1589,23 @@
             layer.close(index);
         }
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 </script>
 </body>
 </html>

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

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>四平林业</title>
+    <title>林火直播</title>
     <meta charset="utf-8">
     <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/>
     <style>
@@ -29,7 +29,7 @@
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
-            <a id="srs_index" class="brand" href="#">SRS</a>
+            <a id="srs_index" class="brand" href="#">林火直播</a>
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li class="active"><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
@@ -84,7 +84,7 @@
         <div id="link_modal" class="modal hide fade">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                <h3><a href="https://github.com/ossrs/srs">SRS Link Generator</a></h3>
+                <h3><a href="https://github.com/ossrs/srs">林火直播</a></h3>
             </div>
             <div class="modal-body">
                 <div class="form-horizontal">
@@ -137,7 +137,7 @@
         <div id="main_modal" class="modal hide fade">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                <h3><a href="https://github.com/ossrs/srs">巡林员现场画面</a></h3>
+                <h3><a href="https://github.com/ossrs/srs">林火直播</a></h3>
             </div>
             <div class="modal-body">
                 <div id="player"></div>