Merge branch 'update-branch' into aijia-branch

ssj-common-service/src/main/resources/application-common-local.properties

@@ -1,8 +1,8 @@
 #\u5F00\u53D1\u73AF\u5883\u6253\u5305\u65B9\u5F0F-\u914D\u7F6E\uFF08\u9ED8\u8BA4\uFF09
 logging.config=classpath:logback.xml
-spring.datasource.url=jdbc:mysql://47.112.200.206:8066/aijia?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&rewriteBatchedStatements=true
-spring.datasource.username=root
-spring.datasource.password=ssj1QAZxsw2!@
+spring.datasource.url=jdbc:mysql://192.168.2.152:3306/aijia?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+spring.datasource.username=aijia
+spring.datasource.password=SSJ1QAZxsw2!@
 
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
@@ -24,14 +24,14 @@ spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowS
 
 spring.data.solr.host=http://120.79.142.254:8080/solr
 
-spring.redis.password=dc1qazxsw2!@
+spring.redis.password=aijia@78342
 spring.redis.timeout=3000
 spring.redis.block-when-exhausted=true
 
 
 
 #spring.redis.cluster.nodes=120.79.157.115:6379
-spring.redis.cluster.nodes=47.106.111.166:6380,47.106.111.166:6381,47.106.111.166:6382,47.106.111.166:6383,47.106.111.166:6384,47.106.111.166:6385
+spring.redis.cluster.nodes=192.168.2.117:7000,192.168.2.117:7001,192.168.2.117:7002,192.168.2.117:7003,192.168.2.117:7004,192.168.2.117:7005
 spring.redis.cluster.timeout=30
 
 spring.redis.cluster.pool.max-active=8
@@ -61,7 +61,7 @@ spring.thymeleaf.cache=false
 
 
 
-spring.elasticsearch.cluster.host=47.112.200.206
+spring.elasticsearch.cluster.host=192.168.2.152
 spring.elasticsearch.cluster.port=9200
 spring.elasticsearch.cluster.scheme=http
 spring.elasticsearch.cluster.username=elastic

ssj-common-service/src/main/resources/application-common-test.properties

@@ -1,7 +1,8 @@
 logging.config=classpath:logback-test.xml
-spring.datasource.url=jdbc:mysql://172.18.106.198:8066/aijia?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&rewriteBatchedStatements=true
-spring.datasource.username=root
-spring.datasource.password=ssj1QAZxsw2!@
+spring.datasource.url=jdbc:mysql://172.18.106.198:3306/aijia?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+#characterEncoding=utf8&useSSL=false&serverTimezone=UTC
+spring.datasource.username=aijia
+spring.datasource.password=SSJ1QAZxsw2!@
 
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
@@ -51,7 +52,7 @@ spring.redis.block-when-exhausted=true
 
 
 #spring.redis.cluster.nodes=120.79.157.115:6379
-spring.redis.cluster.nodes=47.106.111.166:6380,47.106.111.166:6381,47.106.111.166:6382,47.106.111.166:6383,47.106.111.166:6384,47.106.111.166:6385
+spring.redis.cluster.nodes=172.18.30.192:6380,172.18.30.192:6381,172.18.30.192:6382,172.18.30.192:6383,172.18.30.192:6384,172.18.30.192:6385
 spring.redis.cluster.timeout=30
 
 spring.redis.cluster.pool.max-active=8
@@ -62,16 +63,16 @@ spring.redis.cluster.pool.min-idle=0
 
 spring.jmx.enabled=false
 
-spring.rabbitmq.host=172.18.121.4
+spring.rabbitmq.host=172.18.30.192
 spring.rabbitmq.port=5672
-spring.rabbitmq.username=admin1
-spring.rabbitmq.password=admin1
+spring.rabbitmq.username=guest
+spring.rabbitmq.password=guest
 spring.rabbitmq.publisher-confirms=true  
 spring.rabbitmq.publisher-returns=true
 
 
 dubbo.registry.id=ssj-dubbo-registry
-dubbo.registry.address=zookeeper://172.18.121.4:2181
+dubbo.registry.address=zookeeper://39.108.210.183:2181
 dubbo.protocol.serialization=java
 dubbo.consumer.timeout=50000