潘钊 / bsth_control · Commits

Commit 102bcda6f22fe541ba466bca73735c09dc82a37c

Authored by 王通
1 parent daa64c1c
build: skipped

Merge branch 'pudong' into pudong_test 

# Conflicts:
#	src/main/java/com/bsth/XDApplication.java
#	src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController_facade.java
#	src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
#	src/main/resources/datatools/ktrs/ttinfodetailoutputforedit.ktr
#	src/main/resources/dubbo/config-dev.properties
#	src/main/resources/dubbo/config-prod.properties
Inline Side-by-side
Showing 1 changed file with 42 additions and 42 deletions
src/main/resources/application-prod.properties
  View file @102bcda
1 -server.port=9088  
2 -#management.port= 9001  
3 -#management.address= 127.0.0.1  
4 -management.security.enabled=false  
5 -management.context-path=/manage  
6 -dubbo.use=true  
7 -  
8 -spring.jpa.hibernate.ddl-auto= update  
9 -spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy  
10 -#DATABASE  
11 -spring.jpa.database= MYSQL  
12 -spring.jpa.show-sql= false  
13 -spring.datasource.driver-class-name= com.mysql.jdbc.Driver  
14 -spring.datasource.url= jdbc:mysql://10.10.150.24:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false  
15 -spring.datasource.username= root  
16 -spring.datasource.password= root2jsp  
17 -#DATASOURCE  
18 -spring.datasource.max-active=100  
19 -spring.datasource.max-idle=8  
20 -spring.datasource.min-idle=8  
21 -spring.datasource.initial-size=5  
22 -  
23 -spring.datasource.test-on-borrow=true  
24 -spring.datasource.test-on-connect=true  
25 -spring.datasource.test-on-return=true  
26 -spring.datasource.test-while-idle=true  
27 -spring.datasource.validation-query=select 1  
28 -  
29 -## gps client data  
30 -http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all  
31 -## gateway real data  
32 -http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/  
33 -## gateway send directive  
34 -#http.send.directive = http://10.10.200.79:8080/transport_server/message/  
35 -## wxsb  
36 -#http.report.url.05= http://192.168.168.154:8088/ygjwsystem_j2ee/clbx/clbx_dd.do  
37 -#http.report.url.22= http://192.168.168.154:8088/jgjwsystem_j2ee/clbx/clbx_dd.do  
38 -#http.report.url.26= http://192.168.168.154:8088/nhjwsystem_j2ee/clbx/clbx_dd.do  
39 -#http.report.url.55= http://192.168.168.154:8088/snjwsystem_j2ee/clbx/clbx_dd.do  
40 -http.report.url.05= http://116.228.197.222:8081/ygjwsystem_j2ee/clbx/clbx_dd1.do  
41 -http.report.url.22= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd1.do  
42 -http.report.url.26= http://116.236.141.34:8088/nhjwsystem_j2ee/clbx/clbx_dd1.do 1 +server.port=9088
  2 +#management.port= 9001
  3 +#management.address= 127.0.0.1
  4 +management.security.enabled=false
  5 +management.context-path=/manage
  6 +dubbo.use=true
  7 +
  8 +spring.jpa.hibernate.ddl-auto= update
  9 +spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
  10 +#DATABASE
  11 +spring.jpa.database= MYSQL
  12 +spring.jpa.show-sql= false
  13 +spring.datasource.driver-class-name= com.mysql.jdbc.Driver
  14 +spring.datasource.url= jdbc:mysql://10.10.200.148:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
  15 +spring.datasource.username= root
  16 +spring.datasource.password= root
  17 +#DATASOURCE
  18 +spring.datasource.max-active=100
  19 +spring.datasource.max-idle=8
  20 +spring.datasource.min-idle=8
  21 +spring.datasource.initial-size=5
  22 +
  23 +spring.datasource.test-on-borrow=true
  24 +spring.datasource.test-on-connect=true
  25 +spring.datasource.test-on-return=true
  26 +spring.datasource.test-while-idle=true
  27 +spring.datasource.validation-query=select 1
  28 +
  29 +## gps client data
  30 +http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
  31 +## gateway real data
  32 +http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/
  33 +## gateway send directive
  34 +#http.send.directive = http://10.10.200.79:8080/transport_server/message/
  35 +## wxsb
  36 +#http.report.url.05= http://192.168.168.154:8088/ygjwsystem_j2ee/clbx/clbx_dd.do
  37 +#http.report.url.22= http://192.168.168.154:8088/jgjwsystem_j2ee/clbx/clbx_dd.do
  38 +#http.report.url.26= http://192.168.168.154:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
  39 +#http.report.url.55= http://192.168.168.154:8088/snjwsystem_j2ee/clbx/clbx_dd.do
  40 +http.report.url.05= http://116.228.197.222:8081/ygjwsystem_j2ee/clbx/clbx_dd1.do
  41 +http.report.url.22= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd1.do
  42 +http.report.url.26= http://116.236.141.34:8088/nhjwsystem_j2ee/clbx/clbx_dd1.do
43 http.report.url.55= http://180.168.216.248:8088/snjwsystem_j2ee/clbx/clbx_dd1.do 43 http.report.url.55= http://180.168.216.248:8088/snjwsystem_j2ee/clbx/clbx_dd1.do
44 \ No newline at end of file 44 \ No newline at end of file