Merge branch 'fu-dev' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/SysLoginService.java

@@ -118,37 +118,37 @@ public class SysLoginService {
 
     public SysUser appLogin(String username, String password, Integer tenantId, String phone, String verify) {
         SysUser loginUser = new SysUser();
+        //查询用户信息
+        loginUser = sysUserService.getAppUserInfo(username, tenantId, null);
         if (!StringUtils.isBlank(username) && !StringUtils.isBlank(password)) {
             // 用户名或密码为空 错误
             if (StringUtils.isAnyBlank(username, password)) {
-                recordLogininfor(tenantId,username, Constants.LOGIN_FAIL, "用户/密码必须填写");
+                recordLogininfor(tenantId,loginUser.getUserName(), Constants.LOGIN_FAIL, "用户/密码必须填写");
                 throw new BusinessException("用户/密码必须填写");
             }
 
             // 密码如果不在指定范围内 错误
             if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
                     || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
-                recordLogininfor(tenantId,username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
+                recordLogininfor(tenantId,loginUser.getUserName(), Constants.LOGIN_FAIL, "用户密码不在指定范围");
                 throw new BusinessException("用户密码不在指定范围");
             }
 
             // 用户名不在指定范围内 错误
             if (username.length() < UserConstants.USERNAME_MIN_LENGTH
                     || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
-                recordLogininfor(tenantId,username, Constants.LOGIN_FAIL, "用户名不在指定范围");
+                recordLogininfor(tenantId,loginUser.getUserName(), Constants.LOGIN_FAIL, "用户名不在指定范围");
                 throw new BusinessException("用户名不在指定范围");
             }
 
-            //查询用户信息
-            loginUser = sysUserService.getAppUserInfo(username, tenantId, null);
 
             if (Objects.isNull(loginUser)) {
-                recordLogininfor(tenantId,username, Constants.LOGIN_FAIL, "用户不存在");
+                recordLogininfor(tenantId,loginUser.getUserName(), Constants.LOGIN_FAIL, "用户不存在");
                 throw new BusinessException("用户不存在");
             }
 
             if (!SecurityUtils.matchesPassword(password, loginUser.getPassword())) {
-                recordLogininfor(tenantId,username, Constants.LOGIN_FAIL, "用户密码错误");
+                recordLogininfor(tenantId,loginUser.getUserName(), Constants.LOGIN_FAIL, "用户密码错误");
                 throw new BusinessException("用户不存在/密码错误");
             }
         } else if(!StringUtils.isBlank(phone) && !StringUtils.isBlank(verify)) {
@@ -176,15 +176,15 @@ public class SysLoginService {
         }
 
         if (UserStatus.DELETED.getCode().equals(loginUser.getDelFlag())) {
-            recordLogininfor(tenantId,username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
+            recordLogininfor(tenantId,loginUser.getUserName(), Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
             throw new BusinessException("对不起，您的账号：" + username + " 已被删除");
         }
         if (UserStatus.DISABLE.getCode().equals(loginUser.getStatus())) {
-            recordLogininfor(tenantId,username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
-            throw new BusinessException("对不起，您的账号：" + username + " 已停用");
+            recordLogininfor(tenantId,loginUser.getUserName(), Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
+            throw new BusinessException("对不起，您的账号：" + loginUser.getUserName() + " 已停用");
         }
 
-        recordLogininfor(tenantId,username, Constants.LOGIN_SUCCESS, "登录成功");
+        recordLogininfor(tenantId,loginUser.getUserName(), Constants.LOGIN_SUCCESS, "登录成功");
         return loginUser;
     }
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceSettingServiceImpl.java

@@ -35,13 +35,13 @@ public class MceSettingServiceImpl extends AbstractCrudService<MceSettingMapper,
     public void add(MceSetting mceSetting){
         if (mceSetting.getId().equals(0)){
             if(StringUtils.isBlank(mceSetting.getAppMode())){
-                mceSetting.setAppMode("{\"1\":true,\"2\":true,\"3\":true,\"4\":true}");
+                mceSetting.setAppMode("{\"1\":true,\"2\":true,\"3\":true,\"4\":true,\"5\":true}");
             }
             if(StringUtils.isBlank(mceSetting.getPcMode())){
-                mceSetting.setPcMode("{\"1\":true,\"2\":true,\"3\":true,\"4\":true}");
+                mceSetting.setPcMode("{\"1\":true,\"2\":true,\"3\":true,\"4\":true,\"5\":true}");
             }
             if(StringUtils.isBlank(mceSetting.getWcMode())){
-                mceSetting.setWcMode("{\"1\":true,\"2\":true,\"3\":true,\"4\":true}");
+                mceSetting.setWcMode("{\"1\":true,\"2\":true,\"3\":true,\"4\":true,\"5\":true}");
             }
 
             mceSetting.setCreateBy(SecurityUtils.getUsername());
@@ -70,6 +70,7 @@ public class MceSettingServiceImpl extends AbstractCrudService<MceSettingMapper,
             map1.put("2", true);
             map1.put("3", true);
             map1.put("4", true);
+            map1.put("5", true);
             map.put("appMode",map1);
             map.put("pcMode",map1);
             map.put("wcMode",map1);