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

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

@@ -150,7 +150,6 @@ public class WhiteController extends CoreBaseController {
     @ApiOperation(value="登陆",notes="登陆")
     public ResultBean login(HttpServletRequest request, String loginName, String loginPwd,
                             @RequestParam(required = false) String languageCode,
-                            @RequestParam(required = false) String ipAddr,
                             @RequestParam(required = false) String deviceId){
         Long startTime = System.currentTimeMillis();
         startMultiService();
@@ -184,7 +183,7 @@ public class WhiteController extends CoreBaseController {
             result.setUrl("/");
 
             // 记录登录记录
-            recordSysUserLog(user.getUser().getUserInfoId(), loginName,CommonEnumUtil.USER_LOGIN_STATUS.LOGIN_SUCCESS.getValue(), ipAddr);
+            recordSysUserLog(user.getUser().getUserInfoId(), loginName,CommonEnumUtil.USER_LOGIN_STATUS.LOGIN_SUCCESS.getValue());
             AuthUtil.setOrganize(user.getUser().getOrganize());
         } catch (IncorrectCredentialsException e) {
             result = ResultBean.fail(ImppExceptionEnum.LOGIN_EXCEPTION_USER_PASSWORD);
@@ -229,24 +228,21 @@ public class WhiteController extends CoreBaseController {
             userLoginStatus = CommonEnumUtil.USER_LOGIN_STATUS.SYSTEM_ERROR;
         }finally {
             // 记录登录记录
-            recordSysUserLog(null, loginName,userLoginStatus.getValue(), ipAddr);
+            recordSysUserLog(null, loginName,userLoginStatus.getValue());
         }
 
         LOGGER.info("会员{}登陆登录完成 ,语言：{} , 登录耗时:{}",loginName,BaseThreadLocal.getThreadLanguageCode(),(System.currentTimeMillis() - startTime));
         return result;
     }
 
-    private void recordSysUserLog(Long userId, String username,Integer userLoginStatus,String IpAddr){
+    private void recordSysUserLog(Long userId, String username,Integer userLoginStatus){
         SysLogUserLogin log = new SysLogUserLogin();
 
         log.setUserId(userId);
         log.setLogLoginName(username);
         log.setLogLoginStatus(userLoginStatus);
         log.setLogLoginBrowser(ServletRequestTool.getRequestBrowser(request));
-        log.setLogLoginHost(IpAddr);
-        if (StringUtils.isBlank(log.getLogLoginHost()) || "null".equals(log.getLogLoginHost())) {
         log.setLogLoginHost(ServletRequestTool.getRequestHost(request));
-        }
         log.setLogLoginPlatform(CommonEnumUtil.LOG_LOGIN_PLATFORM.descOf(ServletRequestTool.getRequestOs(request)));
         log.setLogLoginDateTime(TimeTool.getNowTime(true));