更新青浦配置文件

潘钊
1 parent af8ec3be
Showing 8 changed files with 12 additions and 14 deletions
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/resources/application-prod.properties
src/main/resources/ms-jdbc.properties
src/main/resources/static/index.html
src/main/resources/static/login.html
src/main/resources/static/pages/control/line/index.html
src/main/resources/static/real_control_v2/main.html
@@ -51,7 +51,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
 		logger.info("ArrivalData_GPS,30,10");
-		Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 30, 10, TimeUnit.SECONDS);
+		//Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 30, 10, TimeUnit.SECONDS);
 	}
 	@Component
@@ -72,7 +72,7 @@ public class GpsRealData implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
-		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, TimeUnit.SECONDS);
+		//Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, TimeUnit.SECONDS);
 	}
 	public GpsEntity add(GpsEntity gps) {
@@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.168.171:3306/control
+spring.datasource.url= jdbc:mysql://192.168.40.100:3306/qp_control
 spring.datasource.username= root
-spring.datasource.password= root2jsp
+spring.datasource.password= root@JSP2jsp
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -23,9 +23,7 @@ spring.datasource.test-on-return=true
 spring.datasource.test-while-idle=true
 spring.datasource.validation-query=select 1
-##
-#222.66.0.204:5555
 ##\u5B9E\u65F6gps
-http.gps.real.url= http://192.168.168.171:8080/transport_server/rtgps/
+http.gps.real.url= http://192.168.40.82:8080/transport_server/rtgps/
 ##\u6D88\u606F\u4E0B\u53D1
-http.send.directive = http://192.168.168.171:8080/transport_server/message/
 \ No newline at end of file
+http.send.directive = http://192.168.40.82:8080/transport_server/message/
 \ No newline at end of file
@@ -4,6 +4,6 @@ ms.mysql.username= root
 ms.mysql.password= 123456
 #ms.mysql.driver= com.mysql.jdbc.Driver
-#ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
+#ms.mysql.url= jdbc:mysql://192.168.40.82:3306/ms?useUnicode=true&characterEncoding=utf-8
 #ms.mysql.username= root
-#ms.mysql.password= root2jsp
 \ No newline at end of file
+#ms.mysql.password= 123456
 \ No newline at end of file
@@ -143,7 +143,7 @@ tr.row-active td {
         <div class="page-header-inner ">
             <!-- LOGO -->
             <div class="page-logo">
-                <a href="index.html" class="logo-default logo-default-text" > 闵行公交调度系统 </a>
+                <a href="index.html" class="logo-default logo-default-text" > 青浦公交调度系统 </a>
                 <div class="menu-toggler sidebar-toggler">
                 </div>
             </div>
@@ -180,7 +180,7 @@ h3.logo-text{
 	<div class="wrapper ng-scope">
 		<div id="loginPanel" class="dialog dialog-shadow">
 			<br>
-			<h3 class="logo-text">闵行公交调度系统  </h3>
+			<h3 class="logo-text">青浦公交调度系统  </h3>
 			<hr>
 			<form style="padding: 0px 35px;">
 				<div class="form-group" style="margin-bottom: 0">
@@ -18,7 +18,7 @@
     <div class="portlet-title banner" >
         <div class="caption col_hide_1280" style="color: #FFF;">
 			<i class="fa fa-life-ring" style="font-size: 22px;color: #FFF;"></i> <span
-				class="caption-subject bold" style="font-size: 24px;">闵行公交线路调度系统</span>
+				class="caption-subject bold" style="font-size: 24px;">青浦公交线路调度系统</span>
 		</div>
 		<div class="col_hide_1440" style="color: white;font-size: 18px;position: absolute;right: 25px;top: 75px;">
 			<span class="top_username"></span> <span class="operation_mode_text animated" ></span> 
@@ -37,7 +37,7 @@
             <div class="uk-width-4-10">
                 <div class="uk-panel">
                     <h2 class="north-logo">
-                    <i class="uk-icon-life-ring"></i> 闵行公交线路调度
+                    <i class="uk-icon-life-ring"></i> 青浦公交线路调度
                   </h2>
                 </div>
             </div>