Merge branch 'fix-syslogin' of uskycloud/usky-cloud into master

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

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
@@ -141,6 +142,11 @@ public class SysLoginService {
             //查询用户信息
             loginUser = sysUserService.getAppUserInfo(username, tenantId, null);
 
+            if (Objects.isNull(loginUser)) {
+                recordLogininfor(username, Constants.LOGIN_FAIL, "用户不存在");
+                throw new BusinessException("用户不存在");
+            }
+
             if (!SecurityUtils.matchesPassword(password, loginUser.getPassword())) {
                 recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码错误");
                 throw new BusinessException("用户不存在/密码错误");

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

@@ -1,6 +1,7 @@
 package com.usky.system.service.impl;
 
 
+import com.usky.common.core.constants.Constants;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.exception.BusinessException;
@@ -502,9 +503,7 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
             sysUser = userMapper.selectUserDataOne(tenantId,phone);
         }
 
-        if (Objects.isNull(sysUser)) {
-            throw new BusinessException("用户信息/密码不存在");
-        }
+
         return sysUser;
     }