Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java

@@ -74,9 +74,6 @@ public class WhiteController extends CoreBaseController {
     private ISysDictionaryService dictionaryService;
 
     @Autowired
-    private FastDFSClient dfsClient;
-
-    @Autowired
     private ISysOrderNoRuleService sysOrderNoRuleService;
 
     @Autowired
@@ -116,7 +113,8 @@ public class WhiteController extends CoreBaseController {
 
     @GetMapping(value="/auth/login")
     @ApiOperation(value="登陆",notes="登陆")
-    public ResultBean login(HttpServletRequest request, String loginName, String loginPwd, String languageCode,
+    public ResultBean login(HttpServletRequest request, String loginName, String loginPwd,
+                            @RequestParam(required = false) String languageCode,
                             @RequestParam(required = false) String ipAddr,
                             @RequestParam(required = false) String deviceId){
         startMultiService();

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java

@@ -695,6 +695,7 @@ public class PersonnelController extends CoreBaseController {
             user.setDepartmentId(Long.parseLong(model.getUserDepartmentId()));
             user.setUserEmail(model.getUserEmail());
             user.setUserPhone(model.getUserPhone());
+            user.setLanguageCode(model.getUserLanguageCode());
 
             if (!StringUtils.isAnyBlank(model.getUserLoginPassword())) {   // 使用新密码
                 user.setUserLoginPassword(EncryptTool.hexMD5(model.getUserLoginPassword()));

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java

@@ -599,6 +599,8 @@ public class SysUserService implements ISysUserService {
         sessionUser.setToken(AuthUtil.getSession().getId().toString());
         sessionUser.setUser(user);
 
+        AuthUtil.setDeviceId(deviceId);
+
         return sessionUser;
     }
 

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

@@ -58,16 +58,24 @@ spring.datasource.time-between-eviction-runs-millis=300000
 ##主数据源，读写
 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource
 impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.write.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_wms?autoReconnect=true&useSSL=false&characterEncoding=utf-8
+impp.write.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
 impp.write.datasource.username=wmslogin
 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_wms?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
 #是否集群部署