潘钊 / bsth_control · Commits

Commit 80dcf5b204e1a84b98e25771fe0a93a96f49763d

Authored by 潘钊
1 parent af8ec3be

更新青浦配置文件

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