Commit 27879a120524d8ee33e4c39dbfdf2eb131489fe6
1 parent
e388939e
更新嘉定配置文件
Showing
3 changed files
with
7 additions
and
85 deletions
src/main/resources/application-prod.properties
| ... | ... | @@ -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= false |
| 10 | 10 | spring.datasource.driver-class-name= com.mysql.jdbc.Driver |
| 11 | -spring.datasource.url= jdbc:mysql://10.10.150.20:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false | |
| 11 | +spring.datasource.url= jdbc:mysql://192.168.160.222:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false | |
| 12 | 12 | spring.datasource.username= root |
| 13 | -spring.datasource.password= root2jsp@JSP | |
| 13 | +spring.datasource.password= root2jsp | |
| 14 | 14 | #DATASOURCE |
| 15 | 15 | spring.datasource.max-active=100 |
| 16 | 16 | spring.datasource.max-idle=8 |
| ... | ... | @@ -25,11 +25,11 @@ spring.datasource.validation-query=select 1 |
| 25 | 25 | |
| 26 | 26 | #REDIS |
| 27 | 27 | spring.redis.database=0 |
| 28 | -spring.redis.host=10.10.150.24 | |
| 29 | -spring.redis.password=bsth_control_001 | |
| 28 | +spring.redis.host=192.168.160.153 | |
| 29 | +spring.redis.password=bsth_control_002 | |
| 30 | 30 | spring.redis.port=28008 |
| 31 | 31 | |
| 32 | -http.control.service_data_url= http://10.10.150.20:9088/companyService | |
| 32 | +http.control.service_data_url= http://192.168.160.152:9088/companyService | |
| 33 | 33 | http.control.secret.key= dVPHJkWUt5FhMT7jrM2dLV7QvlHAmZFd42rs1P0usBx8A7HZki |
| 34 | 34 | |
| 35 | -http.gps.real.url= http://10.10.150.21:8080/transport_server/rtgps/ | |
| 36 | 35 | \ No newline at end of file |
| 36 | +http.gps.real.url= http://192.168.160.151:8080/transport_server/rtgps/ | |
| 37 | 37 | \ No newline at end of file | ... | ... |
src/main/resources/ms-jdbc.properties
| ... | ... | @@ -4,6 +4,6 @@ |
| 4 | 4 | #ms.mysql.password= panzhao |
| 5 | 5 | |
| 6 | 6 | ms.mysql.driver= com.mysql.jdbc.Driver |
| 7 | -ms.mysql.url= jdbc:mysql://10.10.200.226:3306/ms?useUnicode=true&characterEncoding=utf-8 | |
| 7 | +ms.mysql.url= jdbc:mysql://192.168.160.222:3306/ms?useUnicode=true&characterEncoding=utf-8 | |
| 8 | 8 | ms.mysql.username= root |
| 9 | 9 | ms.mysql.password= root2jsp |
| 10 | 10 | \ No newline at end of file | ... | ... |
src/main/resources/static/index.html
| ... | ... | @@ -47,84 +47,6 @@ |
| 47 | 47 | |
| 48 | 48 | <body> |
| 49 | 49 | |
| 50 | -<div class="row" style="margin: 15px;"> | |
| 51 | - <div class="col-md-12 well"> | |
| 52 | - <h4>Available SOAP services: <a href="/webservice" target="_blank">/webservice</a></h4> | |
| 53 | - <h4>WSDL: <a href="/webservice/CompanyService?wsdl" target="_blank">/webservice/CompanyService?wsdl</a></h4> | |
| 54 | - </div> | |
| 55 | - | |
| 56 | - <div class="col-lg-4 col-md-6 col-sm-12"> | |
| 57 | - <div class="bs-example" data-example-id="panel-without-body-with-table"> | |
| 58 | - <div class="panel panel-default"> | |
| 59 | - <!-- Default panel contents --> | |
| 60 | - <div class="panel-heading">线路清单</div> | |
| 61 | - <div class="panel-body"> | |
| 62 | - <p style="color: #ff2727;"> | |
| 63 | - 屏蔽新老系统的底层数据差异,对外提供统一的数据输出 | |
| 64 | - </p> | |
| 65 | - <p> | |
| 66 | - 1、使用员工号查询数据时,系统将参考 “线路人员配置” 以确定人员所在线路。 | |
| 67 | - </p> | |
| 68 | - <p> | |
| 69 | - 2、使用公司编码查询数据时,系统将参考 “线路基础信息” 里的公司编码。 | |
| 70 | - </p> | |
| 71 | - </div> | |
| 72 | - <div class="table-wrap"> | |
| 73 | - <table class="table" id="line2SysListTable"> | |
| 74 | - <thead> | |
| 75 | - <tr> | |
| 76 | - <th>线路编码</th> | |
| 77 | - <th>线路名称</th> | |
| 78 | - <th>数据来源</th> | |
| 79 | - </tr> | |
| 80 | - </thead> | |
| 81 | - <tbody> | |
| 82 | - </tbody> | |
| 83 | - </table> | |
| 84 | - </div> | |
| 85 | - </div> | |
| 86 | - </div> | |
| 87 | - </div> | |
| 88 | - | |
| 89 | - <div class="col-lg-8 col-md-6 col-sm-12"> | |
| 90 | - <div class="bs-example"> | |
| 91 | - <div class="panel panel-default"> | |
| 92 | - <div class="panel-heading">接口调试工具</div> | |
| 93 | - <div style="padding: 15px;margin-top: 15px;"> | |
| 94 | - <form class="form-inline"> | |
| 95 | - <div class="form-group"> | |
| 96 | - <label>函数</label> | |
| 97 | - <select class="form-control"> | |
| 98 | - <option value="returnCCInfo">returnCCInfo(获取出场班次信息)</option> | |
| 99 | - <option value="returnJCInfo">returnJCInfo(获取进场班次信息)</option> | |
| 100 | - </select> | |
| 101 | - </div> | |
| 102 | - | |
| 103 | - <div class="form-group"> | |
| 104 | - <label>公司编码</label> | |
| 105 | - <select class="form-control"> | |
| 106 | - <option value="55">55(上南)</option> | |
| 107 | - <option value="22">22(金高)</option> | |
| 108 | - <option value="05">05(杨高)</option> | |
| 109 | - <option value="26">26(南汇)</option> | |
| 110 | - </select> | |
| 111 | - </div> | |
| 112 | - | |
| 113 | - <div class="form-group"> | |
| 114 | - <label>日期</label> | |
| 115 | - <input type="date" class="form-control" style="width: 150px;" required> | |
| 116 | - </div> | |
| 117 | - <button type="submit" class="btn btn-primary">获取数据</button> | |
| 118 | - | |
| 119 | - <textarea class="form-control" rows="25" style="width: 100%;margin-top: 25px;"></textarea> | |
| 120 | - </form> | |
| 121 | - | |
| 122 | - </div> | |
| 123 | - </div> | |
| 124 | - </div> | |
| 125 | - </div> | |
| 126 | -</div> | |
| 127 | - | |
| 128 | 50 | <script id="line2sys-table-list-temp" type="text/html"> |
| 129 | 51 | {{each list as obj i}} |
| 130 | 52 | <tr data-id="{{obj.lineCode}}" data-name="{{obj.lineName}}" {{if obj.new}}class="warning" {{/if}} > | ... | ... |