From c4fd04af0686d4cb21919c7d5e5b8476b4e6950c Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Tue, 30 Jul 2019 19:34:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/core/apiservice/controller/base/WhiteController.java     | 6 ++----
 .../i3plus/core/apiservice/controller/busi/PersonnelController.java | 1 +
 .../i3plus/core/apiservice/serviceimpl/busi/SysUserService.java     | 2 ++
 .../src/main/resources/application-docker-yfas-nd.properties        | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
index 4fe7530..03d3ba8 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
+++ b/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();
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
index 4c912bb..86a82f6 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
+++ b/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()));
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java
index fce464a..d292abc 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java
+++ b/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;
     }
 
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties b/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties
index cd00a7a..a1c7de1 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties
@@ -58,14 +58,14 @@ 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.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!!