From 816df6ec0a43ef777e0d4cd0daff61f870626d83 Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期四, 05 六月 2025 13:53:12 +0800 Subject: [PATCH] feat(system): 添加节假日管理功能- 新增 SysHolidayController、SysHoliday、SysHolidayMapper、SysHolidayServiceImpl 和 ISysHolidayService 类- 实现节假日信息的增删改查和导出功能 - 添加工作日判断方法 - 新增相关 API 接口 --- zhitan-framework/src/main/java/com/zhitan/framework/web/service/UserDetailsServiceImpl.java | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/zhitan-framework/src/main/java/com/zhitan/framework/web/service/UserDetailsServiceImpl.java b/zhitan-framework/src/main/java/com/zhitan/framework/web/service/UserDetailsServiceImpl.java index 95cb696..15575ac 100644 --- a/zhitan-framework/src/main/java/com/zhitan/framework/web/service/UserDetailsServiceImpl.java +++ b/zhitan-framework/src/main/java/com/zhitan/framework/web/service/UserDetailsServiceImpl.java @@ -1,12 +1,5 @@ package com.zhitan.framework.web.service; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import javax.annotation.Resource; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.stereotype.Service; import com.zhitan.common.core.domain.entity.SysUser; import com.zhitan.common.core.domain.model.LoginUser; import com.zhitan.common.enums.UserStatus; @@ -14,6 +7,14 @@ import com.zhitan.common.utils.MessageUtils; import com.zhitan.common.utils.StringUtils; import com.zhitan.system.service.ISysUserService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; /** * 鐢ㄦ埛楠岃瘉澶勭悊 @@ -27,7 +28,7 @@ @Resource private ISysUserService userService; - + @Resource private SysPasswordService passwordService; @@ -54,7 +55,7 @@ throw new ServiceException(MessageUtils.message("user.blocked")); } - passwordService.validate(user); +// passwordService.validate(user); return createLoginUser(user); } -- Gitblit v1.9.3