Commit 974415a8f47cb67465f4e5e36969af06e89b0888
1 parent
9ab7bacf
修改浦东配置文件
Showing
6 changed files
with
10 additions
and
11 deletions
src/main/resources/application-prod.properties
| @@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy | @@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy | ||
| 8 | spring.jpa.database= MYSQL | 8 | spring.jpa.database= MYSQL |
| 9 | spring.jpa.show-sql= true | 9 | spring.jpa.show-sql= true |
| 10 | spring.datasource.driver-class-name= com.mysql.jdbc.Driver | 10 | spring.datasource.driver-class-name= com.mysql.jdbc.Driver |
| 11 | -spring.datasource.url= jdbc:mysql://192.168.168.171:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false | 11 | +spring.datasource.url= jdbc:mysql://192.168.80.20:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false |
| 12 | spring.datasource.username= root | 12 | spring.datasource.username= root |
| 13 | -spring.datasource.password= root2jsp | 13 | +spring.datasource.password= root2jsp@JSP |
| 14 | #DATASOURCE | 14 | #DATASOURCE |
| 15 | spring.datasource.max-active=100 | 15 | spring.datasource.max-active=100 |
| 16 | spring.datasource.max-idle=8 | 16 | spring.datasource.max-idle=8 |
| @@ -24,8 +24,7 @@ spring.datasource.test-while-idle=true | @@ -24,8 +24,7 @@ spring.datasource.test-while-idle=true | ||
| 24 | spring.datasource.validation-query=select 1 | 24 | spring.datasource.validation-query=select 1 |
| 25 | 25 | ||
| 26 | ## | 26 | ## |
| 27 | -#222.66.0.204:5555 | ||
| 28 | ##\u5B9E\u65F6gps | 27 | ##\u5B9E\u65F6gps |
| 29 | -http.gps.real.url= http://192.168.168.171:8080/transport_server/rtgps/ | 28 | +http.gps.real.url= http://192.168.80.20:8080/transport_server/rtgps/ |
| 30 | ##\u6D88\u606F\u4E0B\u53D1 | 29 | ##\u6D88\u606F\u4E0B\u53D1 |
| 31 | -http.send.directive = http://192.168.168.171:8080/transport_server/message/ | ||
| 32 | \ No newline at end of file | 30 | \ No newline at end of file |
| 31 | +http.send.directive = http://192.168.80.20:8080/transport_server/message/ | ||
| 33 | \ No newline at end of file | 32 | \ No newline at end of file |
src/main/resources/ms-jdbc.properties
| @@ -4,6 +4,6 @@ ms.mysql.username= root | @@ -4,6 +4,6 @@ ms.mysql.username= root | ||
| 4 | ms.mysql.password= 123456 | 4 | ms.mysql.password= 123456 |
| 5 | 5 | ||
| 6 | #ms.mysql.driver= com.mysql.jdbc.Driver | 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.80.21:3306/ms?useUnicode=true&characterEncoding=utf-8 |
| 8 | #ms.mysql.username= root | 8 | #ms.mysql.username= root |
| 9 | -#ms.mysql.password= root2jsp | 9 | +#ms.mysql.password= root2jsp@JSP |
src/main/resources/static/index.html
| @@ -145,7 +145,7 @@ tr.row-active td { | @@ -145,7 +145,7 @@ tr.row-active td { | ||
| 145 | <div class="page-header-inner "> | 145 | <div class="page-header-inner "> |
| 146 | <!-- LOGO --> | 146 | <!-- LOGO --> |
| 147 | <div class="page-logo"> | 147 | <div class="page-logo"> |
| 148 | - <a href="index.html" class="logo-default logo-default-text" > 闵行公交调度系统 </a> | 148 | + <a href="index.html" class="logo-default logo-default-text" > 浦东公交调度系统 </a> |
| 149 | <div class="menu-toggler sidebar-toggler"> | 149 | <div class="menu-toggler sidebar-toggler"> |
| 150 | </div> | 150 | </div> |
| 151 | </div> | 151 | </div> |
src/main/resources/static/login.html
| @@ -180,7 +180,7 @@ h3.logo-text{ | @@ -180,7 +180,7 @@ h3.logo-text{ | ||
| 180 | <div class="wrapper ng-scope"> | 180 | <div class="wrapper ng-scope"> |
| 181 | <div id="loginPanel" class="dialog dialog-shadow"> | 181 | <div id="loginPanel" class="dialog dialog-shadow"> |
| 182 | <br> | 182 | <br> |
| 183 | - <h3 class="logo-text">闵行公交调度系统 </h3> | 183 | + <h3 class="logo-text">浦东公交调度系统 </h3> |
| 184 | <hr> | 184 | <hr> |
| 185 | <form style="padding: 0px 35px;"> | 185 | <form style="padding: 0px 35px;"> |
| 186 | <div class="form-group" style="margin-bottom: 0"> | 186 | <div class="form-group" style="margin-bottom: 0"> |
src/main/resources/static/pages/control/line/index.html
| @@ -18,7 +18,7 @@ | @@ -18,7 +18,7 @@ | ||
| 18 | <div class="portlet-title banner" > | 18 | <div class="portlet-title banner" > |
| 19 | <div class="caption col_hide_1280" style="color: #FFF;"> | 19 | <div class="caption col_hide_1280" style="color: #FFF;"> |
| 20 | <i class="fa fa-life-ring" style="font-size: 22px;color: #FFF;"></i> <span | 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 | </div> | 22 | </div> |
| 23 | <div class="col_hide_1440" style="color: white;font-size: 18px;position: absolute;right: 25px;top: 75px;"> | 23 | <div class="col_hide_1440" style="color: white;font-size: 18px;position: absolute;right: 25px;top: 75px;"> |
| 24 | <span class="top_username"></span> <span class="operation_mode_text animated" ></span> | 24 | <span class="top_username"></span> <span class="operation_mode_text animated" ></span> |
src/main/resources/static/real_control_v2/main.html
| @@ -38,7 +38,7 @@ | @@ -38,7 +38,7 @@ | ||
| 38 | <div class="uk-width-4-10"> | 38 | <div class="uk-width-4-10"> |
| 39 | <div class="uk-panel"> | 39 | <div class="uk-panel"> |
| 40 | <h2 class="north-logo"> | 40 | <h2 class="north-logo"> |
| 41 | - <i class="uk-icon-life-ring"></i> 闵行公交线路调度 | 41 | + <i class="uk-icon-life-ring"></i> 浦东公交线路调度 |
| 42 | </h2> | 42 | </h2> |
| 43 | </div> | 43 | </div> |
| 44 | </div> | 44 | </div> |