From be0b36f6b928c349a197092cc4695d6825777736 Mon Sep 17 00:00:00 2001
From: yangfanao <2364917935@qq.com>
Date: 星期二, 25 四月 2023 17:35:36 +0800
Subject: [PATCH] update ruoyi-ui/src/layout/components/Sidebar/Logo.vue. 修改了第38行的/* title: '若依后台管理系统', */ 为/* title: process.env.VUE_APP_TITLE, */，使得侧边栏的平台标题内容可以和vue.config.js里面的process.env.VUE_APP_TITLE保持同步。
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
index 43faf64..234a502 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
@@ -10,7 +10,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.UserStatus;
-import com.ruoyi.common.exception.BaseException;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysUserService;
@@ -26,6 +26,9 @@
@Autowired
private ISysUserService userService;
+
+ @Autowired
+ private SysPasswordService passwordService;
@Autowired
private SysPermissionService permissionService;
@@ -37,19 +40,21 @@
if (StringUtils.isNull(user))
{
log.info("登录用户：{} 不存在.", username);
- throw new UsernameNotFoundException("登录用户：" + username + " 不存在");
+ throw new ServiceException("登录用户：" + username + " 不存在");
}
else if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
{
log.info("登录用户：{} 已被删除.", username);
- throw new BaseException("对不起，您的账号：" + username + " 已被删除");
+ throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
}
else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
{
log.info("登录用户：{} 已被停用.", username);
- throw new BaseException("对不起，您的账号：" + username + " 已停用");
+ throw new ServiceException("对不起，您的账号：" + username + " 已停用");
}
+ passwordService.validate(user);
+
return createLoginUser(user);
}
--
Gitblit v1.9.2