Browse Source

Merge branch 'dif-branch' into bug-branch

chen 5 years ago
parent
commit
803dbac716

+ 6 - 6
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