优化登录提示信息

vber-framework/src/main/java/com/vber/framework/web/service/UserDetailsServiceImpl.java

@@ -4,6 +4,7 @@ import com.vber.common.core.domain.entity.SysUser;
 import com.vber.common.core.domain.model.LoginUser;
 import com.vber.common.enums.UserStatus;
 import com.vber.common.exception.ServiceException;
+import com.vber.common.utils.MessageUtils;
 import com.vber.common.utils.StringUtils;
 import com.vber.system.service.ISysUserService;
 import org.slf4j.Logger;
@@ -18,44 +19,40 @@ import org.springframework.stereotype.Service;
  * 用户验证处理
  */
 @Service
-public class UserDetailsServiceImpl implements UserDetailsService
-{
+public class UserDetailsServiceImpl implements UserDetailsService {
     private static final Logger log = LoggerFactory.getLogger(UserDetailsServiceImpl.class);
 
     private ISysUserService userService;
+    private SysPasswordService passwordService;
+    private SysPermissionService permissionService;
+
     @Autowired
     public void setSysUserService(ISysUserService userService) {
         this.userService = userService;
     }
 
-    private SysPasswordService passwordService;
     @Autowired
     public void setSysPasswordService(SysPasswordService passwordService) {
         this.passwordService = passwordService;
     }
-    private SysPermissionService permissionService;
+
     @Autowired
     public void setSysPermissionService(SysPermissionService permissionService) {
         this.permissionService = permissionService;
     }
+
     @Override
-    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
-    {
+    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
         SysUser user = userService.selectUserByUserName(username);
-        if (StringUtils.isNull(user))
-        {
+        if (StringUtils.isNull(user)) {
             log.info("登录用户：{} 不存在.", username);
-            throw new ServiceException("登录用户：" + username + " 不存在");
-        }
-        else if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
-        {
+            throw new ServiceException(MessageUtils.message("user.not.exists"));
+        } else if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
             log.info("登录用户：{} 已被删除.", username);
-            throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
-        }
-        else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
-        {
+            throw new ServiceException(MessageUtils.message("user.password.delete"));
+        } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
             log.info("登录用户：{} 已被停用.", username);
-            throw new ServiceException("对不起，您的账号：" + username + " 已停用");
+            throw new ServiceException(MessageUtils.message("user.blocked"));
         }
 
         passwordService.validate(user);
@@ -63,8 +60,7 @@ public class UserDetailsServiceImpl implements UserDetailsService
         return createLoginUser(user);
     }
 
-    public UserDetails createLoginUser(SysUser user)
-    {
+    public UserDetails createLoginUser(SysUser user) {
         return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
     }
 }