Merge branch 'dev' into test

modules/i3plus-core-apiservice/src/main/resources/application-docker.properties

@@ -65,7 +65,7 @@ impp.write.datasource.password=impp_i3_core_pwd
 ##辅数据源，只读
 #impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource
 impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.read.datasource.jdbc-url=jdbc:mysql://dbslave:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
+impp.read.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
 impp.read.datasource.username=impp_i3_core_user
 impp.read.datasource.password=impp_i3_core_pwd
 
@@ -106,9 +106,9 @@ impp.schedule.thread-priority=5
 
 ################################ 其他功能设置 ################################
 #redisIP
-redis.hostName=redis
+redis.hostName=192.168.1.55
 #端口号
-redis.port=6379
+redis.port=16376
 #如果有密码
 redis.password=
 ##其他redis配置需要调整的加在此处
@@ -171,7 +171,7 @@ fastdfs.tracker_servers=tracker:7031
 # tracker的http端口
 fastdfs.http_tracker_http_port=7031
 # 使用自定义工具获取文件展示地址
-fastdfs.http.ui.host=http://tracker:7030
+fastdfs.http.ui.host=http://192.168.1.56:7030
 #密码
 #fastdfs.http.secret_key=