From 18135969fb41508af4e1dd337cd2fd1c3c4e32cd Mon Sep 17 00:00:00 2001
From: zhitan-cloud <394600+ustcyc@user.noreply.gitee.com>
Date: 星期一, 17 二月 2025 23:29:48 +0800
Subject: [PATCH] !84 Merge branch 'master' into wt_from_develop1.0 Merge pull request !84 from zhitan-cloud/wt_from_develop1.0
---
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