Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev

# Conflicts:
#	modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties

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

@@ -65,9 +65,17 @@ impp.write.datasource.password=Wmslogin$%^&7654
 #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.username=wmsreadonly
-impp.read.datasource.password=Wmsreadonly8090!!
+impp.read.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
+impp.read.datasource.username=wmslogin
+impp.read.datasource.password=Wmslogin$%^&7654
+
+##############定时任务持久化##############
+impp.schedule.open=true
+impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver
+impp.schedule.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8
+impp.schedule.datasource.username=wmslogin
+impp.schedule.datasource.password=Wmslogin$%^&7654
+impp.schedule.datasource.max-connections=50
 
 ################ 日志数据源 ################
 spring.data.mongodb.database=mongoDBSource
@@ -85,13 +93,6 @@ spring.jpa.show-sql=true
 #表关系create,create-drop,update,validate
 spring.jpa.properties.hibernate.hbm2ddl.auto=update
 
-##############定时任务持久化##############
-impp.schedule.open=true
-impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.schedule.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8
-impp.schedule.datasource.username=wmslogin
-impp.schedule.datasource.password=Wmslogin$%^&7654
-impp.schedule.datasource.max-connections=50
 #定时任务在服务启动后多少秒执行
 impp.schedule.start.after-second=20
 #是否集群部署