Commit 09c8d69418f85e69612c23e587051358472f3d67
update
Showing
7 changed files
with
11 additions
and
16 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 | 11 | +spring.datasource.url= jdbc:mysql://192.168.40.82:3306/qp_control |
| 12 | spring.datasource.username= root | 12 | spring.datasource.username= root |
| 13 | -spring.datasource.password= root2jsp | 13 | +spring.datasource.password= 123456 |
| 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 |
| @@ -26,6 +26,6 @@ spring.datasource.validation-query=select 1 | @@ -26,6 +26,6 @@ spring.datasource.validation-query=select 1 | ||
| 26 | ## | 26 | ## |
| 27 | #222.66.0.204:5555 | 27 | #222.66.0.204:5555 |
| 28 | ##\u5B9E\u65F6gps | 28 | ##\u5B9E\u65F6gps |
| 29 | -http.gps.real.url= http://192.168.168.171:8080/transport_server/rtgps/ | 29 | +http.gps.real.url= http://192.168.40.82:8080/transport_server/rtgps/ |
| 30 | ##\u6D88\u606F\u4E0B\u53D1 | 30 | ##\u6D88\u606F\u4E0B\u53D1 |
| 31 | -http.send.directive = http://192.168.168.171:8080/transport_server/message/ | 31 | +http.send.directive = http://192.168.40.82:8080/transport_server/message/ |
src/main/resources/datatools/config-prod.properties
| @@ -4,13 +4,13 @@ | @@ -4,13 +4,13 @@ | ||
| 4 | datatools.kettle_properties=/datatools/kettle.properties | 4 | datatools.kettle_properties=/datatools/kettle.properties |
| 5 | # 2、ktr文件通用配置变量(数据库连接,根据不同的环境需要修正) | 5 | # 2、ktr文件通用配置变量(数据库连接,根据不同的环境需要修正) |
| 6 | #数据库ip地址 | 6 | #数据库ip地址 |
| 7 | -datatools.kvars_dbip=192.168.168.171 | 7 | +datatools.kvars_dbip=192.168.40.82 |
| 8 | #数据库用户名 | 8 | #数据库用户名 |
| 9 | datatools.kvars_dbuname=root | 9 | datatools.kvars_dbuname=root |
| 10 | #数据库密码 | 10 | #数据库密码 |
| 11 | -datatools.kvars_dbpwd=root2jsp | 11 | +datatools.kvars_dbpwd=123456 |
| 12 | #数据库库名 | 12 | #数据库库名 |
| 13 | -datatools.kvars_dbdname=control | 13 | +datatools.kvars_dbdname=qp_control |
| 14 | 14 | ||
| 15 | # 3、上传数据配置信息 | 15 | # 3、上传数据配置信息 |
| 16 | # 上传文件目录配置(根据不同的环境需要修正) | 16 | # 上传文件目录配置(根据不同的环境需要修正) |
src/main/resources/static/assets/img/logo_text.png
src/main/resources/static/pages/base/carpark/js/carpark-list-table.js
src/main/resources/static/pages/base/carpark/list.html
| @@ -47,6 +47,7 @@ | @@ -47,6 +47,7 @@ | ||
| 47 | </td> | 47 | </td> |
| 48 | <td> | 48 | <td> |
| 49 | <input type="text" class="form-control form-filter input-sm" name="parkCode_like"> | 49 | <input type="text" class="form-control form-filter input-sm" name="parkCode_like"> |
| 50 | + | ||
| 50 | </td> | 51 | </td> |
| 51 | <td> | 52 | <td> |
| 52 | <input type="text" class="form-control form-filter input-sm" name="gCenterPoint_like"> | 53 | <input type="text" class="form-control form-filter input-sm" name="gCenterPoint_like"> |
src/main/resources/static/pages/base/station/js/station-list-table.js
| @@ -42,7 +42,6 @@ | @@ -42,7 +42,6 @@ | ||
| 42 | }); | 42 | }); |
| 43 | 43 | ||
| 44 | function getParams() { | 44 | function getParams() { |
| 45 | - | ||
| 46 | // cells 集合返回表格中所有(列)单元格的一个数组 | 45 | // cells 集合返回表格中所有(列)单元格的一个数组 |
| 47 | var cells = $('tr.filter')[0].cells; | 46 | var cells = $('tr.filter')[0].cells; |
| 48 | 47 | ||
| @@ -73,7 +72,6 @@ | @@ -73,7 +72,6 @@ | ||
| 73 | } | 72 | } |
| 74 | 73 | ||
| 75 | }); | 74 | }); |
| 76 | - | ||
| 77 | return params; | 75 | return params; |
| 78 | } | 76 | } |
| 79 | 77 |
src/main/resources/static/pages/permission/user/list.html
| @@ -133,11 +133,7 @@ | @@ -133,11 +133,7 @@ | ||
| 133 | {{obj.lastLoginDate}} | 133 | {{obj.lastLoginDate}} |
| 134 | </td> | 134 | </td> |
| 135 | <td> | 135 | <td> |
| 136 | - {{if obj.enabled}} | ||
| 137 | - <button type="button" onclick="changeEnabled({{obj.id}},0)" class="btn btn-warning btn-sm">禁用</button> | ||
| 138 | - {{else}} | ||
| 139 | - <button type="button" onclick="changeEnabled({{obj.id}},1)" class="btn btn-success btn-sm">启用</button> | ||
| 140 | - {{/if}} | 136 | + |
| 141 | </td> | 137 | </td> |
| 142 | </tr> | 138 | </tr> |
| 143 | {{/each}} | 139 | {{/each}} |