潘钊 / bsth_control · Commits

Commit 1d50c5ab0e4c0f8b24a1933d669ad48f757059e1

Authored by 徐烜
2 parents 4308e58a 691a1a1c
build: skipped

Merge branch 'emeishi' of http://192.168.168.245:8888/panzhaov5/bsth_control into emeishi

Inline Side-by-side
Showing 4 changed files with 16 additions and 16 deletions
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <groupId>com.bsth</groupId> 5 <groupId>com.bsth</groupId>
6 <artifactId>bsth_control</artifactId> 6 <artifactId>bsth_control</artifactId>
7 <version>0.0.1-SNAPSHOT</version> 7 <version>0.0.1-SNAPSHOT</version>
8 - <packaging>jar</packaging> 8 + <packaging>war</packaging>
9 9
10 <parent> 10 <parent>
11 <groupId>org.springframework.boot</groupId> 11 <groupId>org.springframework.boot</groupId>
src/main/resources/application-cloud.properties
  View file @1d50c5a
@@ -14,9 +14,9 @@ spring.jpa.properties.hibernate.dialect= org.hibernate.spatial.dialect.mysql.MyS @@ -14,9 +14,9 @@ spring.jpa.properties.hibernate.dialect= org.hibernate.spatial.dialect.mysql.MyS
14 14
15 #DATABASE control 15 #DATABASE control
16 spring.datasource.control.driver-class-name= com.mysql.cj.jdbc.Driver 16 spring.datasource.control.driver-class-name= com.mysql.cj.jdbc.Driver
17 -spring.datasource.control.jdbc-url= jdbc:mysql://192.168.168.152/control_dy?useUnicode=true&characterEncoding=utf-8&useSSL=false  
18 -spring.datasource.control.username= root  
19 -spring.datasource.control.password= root2jsp 17 +spring.datasource.control.jdbc-url= jdbc:mysql://10.0.0.6/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
  18 +spring.datasource.control.username= schedule
  19 +spring.datasource.control.password= fsodlgjiuigAQF2$9fs9
20 spring.datasource.control.type= com.zaxxer.hikari.HikariDataSource 20 spring.datasource.control.type= com.zaxxer.hikari.HikariDataSource
21 #DATASOURCE 21 #DATASOURCE
22 spring.datasource.control.minimum-idle= 8 22 spring.datasource.control.minimum-idle= 8
@@ -31,9 +31,9 @@ spring.datasource.control.register-mbeans=false @@ -31,9 +31,9 @@ spring.datasource.control.register-mbeans=false
31 31
32 #DATABASE info-publish 32 #DATABASE info-publish
33 spring.datasource.info-publish.driver-class-name= com.mysql.cj.jdbc.Driver 33 spring.datasource.info-publish.driver-class-name= com.mysql.cj.jdbc.Driver
34 -spring.datasource.info-publish.jdbc-url= jdbc:mysql://192.168.168.152/info_publish?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false  
35 -spring.datasource.info-publish.username= root  
36 -spring.datasource.info-publish.password= root2jsp 34 +spring.datasource.info-publish.jdbc-url= jdbc:mysql://10.0.0.6/info_publish?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
  35 +spring.datasource.info-publish.username= schedule
  36 +spring.datasource.info-publish.password= fsodlgjiuigAQF2$9fs9
37 spring.datasource.info-publish.type= com.zaxxer.hikari.HikariDataSource 37 spring.datasource.info-publish.type= com.zaxxer.hikari.HikariDataSource
38 #DATASOURCE 38 #DATASOURCE
39 spring.datasource.info-publish.minimum-idle= 8 39 spring.datasource.info-publish.minimum-idle= 8
@@ -48,9 +48,9 @@ spring.datasource.info-publish.register-mbeans=false @@ -48,9 +48,9 @@ spring.datasource.info-publish.register-mbeans=false
48 48
49 #DATABASE ms 49 #DATABASE ms
50 spring.datasource.ms.driver-class-name= com.mysql.cj.jdbc.Driver 50 spring.datasource.ms.driver-class-name= com.mysql.cj.jdbc.Driver
51 -spring.datasource.ms.jdbc-url= jdbc:mysql://192.168.168.152/ms?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false  
52 -spring.datasource.ms.username= root  
53 -spring.datasource.ms.password= root2jsp 51 +spring.datasource.ms.jdbc-url= jdbc:mysql://10.0.0.6/ms?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
  52 +spring.datasource.ms.username= schedule
  53 +spring.datasource.ms.password= fsodlgjiuigAQF2$9fs9
54 spring.datasource.ms.type= com.zaxxer.hikari.HikariDataSource 54 spring.datasource.ms.type= com.zaxxer.hikari.HikariDataSource
55 #DATASOURCE 55 #DATASOURCE
56 spring.datasource.ms.minimum-idle= 8 56 spring.datasource.ms.minimum-idle= 8
@@ -64,7 +64,7 @@ spring.datasource.ms.validation-timeout= 3000 @@ -64,7 +64,7 @@ spring.datasource.ms.validation-timeout= 3000
64 spring.datasource.ms.register-mbeans=false 64 spring.datasource.ms.register-mbeans=false
65 65
66 kafka.use= false 66 kafka.use= false
67 -spring.kafka.consumer.bootstrap-servers= 192.168.168.152:9092 67 +spring.kafka.consumer.bootstrap-servers= 10.0.0.6:9092
68 spring.kafka.key-serializer= org.apache.kafka.common.serialization.StringSerializer 68 spring.kafka.key-serializer= org.apache.kafka.common.serialization.StringSerializer
69 spring.kafka.value-serializer= org.apache.kafka.common.serialization.StringSerializer 69 spring.kafka.value-serializer= org.apache.kafka.common.serialization.StringSerializer
70 spring.kafka.producer.buffer-memory= 33554432 70 spring.kafka.producer.buffer-memory= 33554432
src/main/resources/ftp.properties
  View file @1d50c5a
1 -ftp.url=118.113.164.50  
2 -ftp.port=10021 1 +ftp.url=113.249.109.139
  2 +ftp.port=11121
3 ftp.username=ftpadmin 3 ftp.username=ftpadmin
4 ftp.password=ftp@123 4 ftp.password=ftp@123
5 ftp.path=/transport/down/ 5 ftp.path=/transport/down/
src/main/resources/ms-jdbc.properties
  View file @1d50c5a
@@ -4,6 +4,6 @@ @@ -4,6 +4,6 @@
4 #ms.mysql.password= 123456 4 #ms.mysql.password= 123456
5 5
6 ms.mysql.driver= com.mysql.cj.jdbc.Driver 6 ms.mysql.driver= com.mysql.cj.jdbc.Driver
7 -ms.mysql.url= jdbc:mysql://192.168.168.152/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false  
8 -ms.mysql.username= root  
9 -ms.mysql.password= root2jsp  
10 \ No newline at end of file 7 \ No newline at end of file
  8 +ms.mysql.url= jdbc:mysql://10.0.0.6/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
  9 +ms.mysql.username= schedule
  10 +ms.mysql.password= fsodlgjiuigAQF2$9fs9
11 \ No newline at end of file 11 \ No newline at end of file