Commit c456e24b410e881b72e4b83851b82b436198b505
1 parent
9f82216c
1.青浦民营公交分支
Showing
11 changed files
with
17 additions
and
17 deletions
pom.xml
src/main/resources/application-prod.properties
| ... | ... | @@ -2,7 +2,7 @@ server.port=9088 |
| 2 | 2 | management.port= 9001 |
| 3 | 3 | management.address= 127.0.0.1 |
| 4 | 4 | |
| 5 | -dubbo.use=true | |
| 5 | +dubbo.use=false | |
| 6 | 6 | |
| 7 | 7 | spring.jpa.hibernate.ddl-auto= none |
| 8 | 8 | spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy |
| ... | ... | @@ -10,9 +10,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy |
| 10 | 10 | spring.jpa.database= MYSQL |
| 11 | 11 | spring.jpa.show-sql= true |
| 12 | 12 | spring.datasource.driver-class-name= com.mysql.jdbc.Driver |
| 13 | -spring.datasource.url= jdbc:mysql://192.168.40.100:3306/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false | |
| 13 | +spring.datasource.url= jdbc:mysql://112.64.148.30:54002/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false | |
| 14 | 14 | spring.datasource.username= root |
| 15 | -spring.datasource.password= root@JSP2jsp | |
| 15 | +spring.datasource.password= Aa123456 | |
| 16 | 16 | #DATASOURCE |
| 17 | 17 | spring.datasource.max-active=100 |
| 18 | 18 | spring.datasource.max-idle=8 |
| ... | ... | @@ -26,6 +26,6 @@ spring.datasource.test-while-idle=true |
| 26 | 26 | spring.datasource.validation-query=select 1 |
| 27 | 27 | |
| 28 | 28 | ## gateway real data |
| 29 | -http.gps.real.url= http://192.168.40.82:8080/transport_server/rtgps/ | |
| 29 | +http.gps.real.url= http://10.3.30.4:14004/transport_server/rtgps/ | |
| 30 | 30 | ## gateway send directive |
| 31 | -http.send.directive = http://192.168.40.82:8080/transport_server/message/ | |
| 31 | +http.send.directive = http://10.3.30.4:14004/transport_server/message/ | ... | ... |
src/main/resources/datatools/config-prod.properties
| ... | ... | @@ -5,11 +5,11 @@ datatools.kettle_properties=/datatools/kettle.properties |
| 5 | 5 | # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正） |
| 6 | 6 | |
| 7 | 7 | #数据库ip地址 |
| 8 | -datatools.kvars_dbip=192.168.40.100 | |
| 8 | +datatools.kvars_dbip=112.64.148.30 | |
| 9 | 9 | #数据库用户名 |
| 10 | 10 | datatools.kvars_dbuname=root |
| 11 | 11 | #数据库密码 |
| 12 | -datatools.kvars_dbpwd=root@JSP2jsp | |
| 12 | +datatools.kvars_dbpwd=Aa123456 | |
| 13 | 13 | #数据库库名 |
| 14 | 14 | datatools.kvars_dbdname=qp_control |
| 15 | 15 | ... | ... |
src/main/resources/ms-jdbc.properties
| ... | ... | @@ -4,6 +4,6 @@ |
| 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.40.82:3306/ms?useUnicode=true&characterEncoding=utf-8 | |
| 7 | +ms.mysql.url= jdbc:mysql://112.64.148.30:54002/ms?useUnicode=true&characterEncoding=utf-8 | |
| 8 | 8 | ms.mysql.username= root |
| 9 | -ms.mysql.password= 123456 | |
| 9 | +ms.mysql.password= Aa123456 | ... | ... |
src/main/resources/static/index.html
src/main/resources/static/login.html
| ... | ... | @@ -181,7 +181,7 @@ |
| 181 | 181 | <div class="wrapper ng-scope"> |
| 182 | 182 | <div id="loginPanel" class="dialog dialog-shadow"> |
| 183 | 183 | <br> |
| 184 | - <h3 class="logo-text">青浦公交调度系统</h3> | |
| 184 | + <h3 class="logo-text">调度系统</h3> | |
| 185 | 185 | <hr> |
| 186 | 186 | <form style="padding: 0px 35px;"> |
| 187 | 187 | <div class="form-group" style="margin-bottom: 0"> | ... | ... |
src/main/resources/static/pages/control/line/index.html
| ... | ... | @@ -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
src/main/resources/static/real_control_v2_mobile/main.html
src/main/resources/static/real_control_v2_mobile/sch_manage/sch_imitate.html
| ... | ... | @@ -164,7 +164,7 @@ |
| 164 | 164 | <div class="uk-width-4-10"> |
| 165 | 165 | <div class="uk-panel"> |
| 166 | 166 | <h2 class="north-logo" style="color: #f1f1f1;"> |
| 167 | - <i class="uk-icon-life-ring"></i> 青浦公交线路调度班次管理 | |
| 167 | + <i class="uk-icon-life-ring"></i> 线路调度班次管理 | |
| 168 | 168 | </h2> |
| 169 | 169 | </div> |
| 170 | 170 | </div> | ... | ... |
src/main/resources/traffic-jdbc.properties