Merge remote-tracking branch 'origin/develop_ShardingSphere' into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/application-kingbase8.properties

@@ -26,15 +26,14 @@ spring.db6.datasource.password=Yeejoin@2020
 spring.db6.datasource.driver-class-name=com.kingbase8.Driver
 
 ## eureka properties:
-eureka.instance.hostname=47.92.234.253
+eureka.instance.hostname=10.20.1.160
 eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
 ## redis properties:
 spring.redis.database=1
-spring.redis.host=47.92.234.253
+spring.redis.host=10.20.0.169
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 
-openHealth=false
 spring.cache.type=GENERIC
 j2cache.open-spring-cache=true
 j2cache.cache-clean-mode=passive
@@ -66,10 +65,10 @@ lettuce.timeout=10000
 
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://47.92.234.253:2883
+emqx.broker=tcp://10.20.1.210:2883
 emqx.user-name=admin
 emqx.password=public
-mqtt.scene.host=mqtt://47.92.234.253:8083/mqtt
+mqtt.scene.host=mqtt://10.20.1.210:8083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000
@@ -79,13 +78,13 @@ emqx.client-password=public
 
 tdengine-server:
 driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
-jdbc-url: jdbc:TAOS-RS://10.20.0.203:6041/iot_data_1?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
+jdbc-url: jdbc:TAOS-RS://10.20.0.169:6041/iot_data_1?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
 username: root
 password: taosdata
 
 
 #spring.db3.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db3.datasource.url=jdbc:TAOS-RS://10.20.0.203:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
+spring.db3.datasource.url=jdbc:TAOS-RS://10.20.0.169:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
 spring.db3.datasource.username=root
 spring.db3.datasource.password=taosdata
 spring.db3.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
@@ -93,7 +92,7 @@ spring.db3.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
 
 # ����ר��td���ݿ� analyse_data
 #spring.db4.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db4.datasource.url=jdbc:TAOS-RS://10.20.0.203:6041/analysis_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
+spring.db4.datasource.url=jdbc:TAOS-RS://10.20.0.169:6041/analysis_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
 spring.db4.datasource.username=root
 spring.db4.datasource.password=taosdata
 spring.db4.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
@@ -150,7 +149,7 @@ amos.secret.key=qaz
 #eureka.instance.ip-address=172.16.3.122
 
 
-spring.activemq.broker-url=tcp://47.92.234.253:61616
+spring.activemq.broker-url=tcp://10.20.0.169:61616
 spring.activemq.user=admin
 spring.activemq.password=admin
 spring.jms.pub-sub-domain=false
@@ -166,16 +165,16 @@ pictureUrl=upload/jxiop/syz/
 
 
 #kafka
-spring.kafka.bootstrap-servers=10.20.0.223:9092,10.20.0.133:9200
+spring.kafka.bootstrap-servers=10.20.0.169:9092
 spring.kafka.producer.retries=1
-spring.kafka.producer.bootstrap-servers=10.20.0.223:9092,10.20.0.133:9200
+spring.kafka.producer.bootstrap-servers=10.20.0.169:9092
 spring.kafka.producer.batch-size=16384
 spring.kafka.producer.buffer-memory=33554432
 spring.kafka.producer.acks=1
 spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
 spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
 spring.kafka.consumer.group-id=consumerGroup
-spring.kafka.consumer.bootstrap-servers=10.20.0.223:9092,10.20.0.133:9200
+spring.kafka.consumer.bootstrap-servers=10.20.0.169:9092
 spring.kafka.consumer.enable-auto-commit=false
 spring.kafka.consumer.auto-offset-reset=earliest
 spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/application.properties

@@ -75,7 +75,7 @@ station.section=10
 gl.sum.column=日发电量,月发电量,年发电量
 gl.avg.column=有功功率,日利用小时,瞬时风速
 
-spring.elasticsearch.rest.uris=http://139.9.173.44:9200
+spring.elasticsearch.rest.uris=http://10.20.0.169:9200
 spring.elasticsearch.rest.connection-timeout=30000
 spring.elasticsearch.rest.username=elastic
 spring.elasticsearch.rest.password=Yeejoin@2020
@@ -90,4 +90,4 @@ healthValue_HourCount=6
 healthValue_MinCount=5
 
 ##是否打开健康计算计算 true 打开 false 关闭
-openHealth = false
\ No newline at end of file
+openHealth = true
\ No newline at end of file