潘钊 / bsth_control · Commits

Commit 017c049601571cd2289f8bcee6748cea5c4972bf

Authored by 王通
1 parent 5a28ca1d
build: skipped

1.成都版本修正

Inline Side-by-side
Showing 3 changed files with 10 additions and 10 deletions
src/main/resources/application-cloud.properties
  View file @017c049
... ... @@ -14,7 +14,7 @@ spring.jpa.properties.hibernate.dialect= org.hibernate.spatial.dialect.mysql.MyS
14 14  
15 15 #DATABASE
16 16 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
17   -spring.datasource.url= jdbc:mysql://192.170.100.132/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
  17 +spring.datasource.url= jdbc:mysql://10.10.154.20/control_dy?useUnicode=true&characterEncoding=utf-8&useSSL=false
18 18 spring.datasource.username= root
19 19 spring.datasource.password= root2jsp
20 20 spring.datasource.type= com.zaxxer.hikari.HikariDataSource
... ... @@ -31,8 +31,8 @@ spring.datasource.hikari.connection-test-query= SELECT 1
31 31 spring.datasource.hikari.validation-timeout= 3000
32 32 spring.datasource.hikari.register-mbeans=true
33 33  
34   -kafka.use= true
35   -spring.kafka.consumer.bootstrap-servers= 192.170.100.114:9092,192.170.100.114:9093,192.170.100.114:9094
  34 +kafka.use= false
  35 +spring.kafka.consumer.bootstrap-servers= 127.0.0.1:9092
36 36 spring.kafka.key-serializer= org.apache.kafka.common.serialization.StringSerializer
37 37 spring.kafka.value-serializer= org.apache.kafka.common.serialization.StringSerializer
38 38 spring.kafka.producer.buffer-memory= 33554432
... ... @@ -40,8 +40,8 @@ spring.kafka.producer.acks= all
40 40 spring.kafka.consumer.group-id= schedule-system
41 41 spring.kafka.consumer.auto-offset-reset= latest
42 42  
43   -sso.enabled= true
  43 +sso.enabled= false
44 44 sso.systemcode = SYS0023
45   -sso.http.url.login= https://112.64.45.51/portal/index.html#/login
46   -sso.http.url.logout= https://112.64.45.51/information/api/v1/logout
47   -sso.http.url.auth= https://112.64.45.51/information/authenticate/authorityAuthentication
48 45 \ No newline at end of file
  46 +sso.http.url.login= https://127.0.0.1/portal/index.html#/login
  47 +sso.http.url.logout= https://127.0.0.1/information/api/v1/logout
  48 +sso.http.url.auth= https://127.0.0.1/information/authenticate/authorityAuthentication
49 49 \ No newline at end of file
... ...
src/main/resources/application.properties
  View file @017c049
1   -spring.profiles.active = test
  1 +spring.profiles.active = cloud
2 2  
3 3 spring.view.suffix=.html
4 4 server.session-timeout=-1
... ...
src/main/resources/datatools/config-cloud.properties
  View file @017c049
... ... @@ -5,13 +5,13 @@ datatools.kettle_properties=/datatools/kettle.properties
5 5 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
6 6  
7 7 #数据库ip地址
8   -datatools.kvars_dbip=192.170.100.132
  8 +datatools.kvars_dbip=10.10.154.20
9 9 #数据库用户名
10 10 datatools.kvars_dbuname=root
11 11 #数据库密码
12 12 datatools.kvars_dbpwd=root2jsp
13 13 #数据库库名
14   -datatools.kvars_dbdname=control
  14 +datatools.kvars_dbdname=control_dy
15 15  
16 16 # 3、上传数据配置信息
17 17 # 上传文件目录配置（根据不同的环境需要修正）
... ...