From a5c00a1316fe9922ff87bf07a5e42c238a07d070 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 10 Aug 2023 16:18:13 +0800
Subject: [PATCH] 单点登出
---
skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java b/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java
index 5ca7780..5e5fbe9 100644
--- a/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java
+++ b/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java
@@ -17,10 +17,11 @@
package cn.gistack.auth.service;
import cn.gistack.auth.constant.AuthConstant;
+import cn.gistack.sm.collect.feign.ICollectClient;
+import cn.gistack.sm.collect.feign.ICollectClientFallback;
import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
import cn.gistack.sm.sjztmd.feign.IAttResManagePersonClient;
import cn.gistack.system.entity.Dept;
-import cn.gistack.system.entity.Role;
import com.alibaba.nacos.common.utils.StringUtils;
import io.jsonwebtoken.Claims;
import lombok.AllArgsConstructor;
@@ -68,6 +69,8 @@
private final BladeRedis bladeRedis;
private final JwtProperties jwtProperties;
+ private final ICollectClient collectClient;
+
@Override
@SneakyThrows
public BladeUserDetails loadUserByUsername(String username) {
@@ -78,7 +81,6 @@
// 获取租户ID
String headerTenant = request.getHeader(TokenUtil.TENANT_HEADER_KEY);
String paramTenant = request.getParameter(TokenUtil.TENANT_PARAM_KEY);
- String password = request.getParameter(TokenUtil.PASSWORD_KEY);
String grantType = request.getParameter(TokenUtil.GRANT_TYPE_KEY);
// 判断租户请求头
if (StringUtil.isAllBlank(headerTenant, paramTenant)) {
@@ -129,12 +131,7 @@
// 用户不存在,但提示用户名与密码错误并锁定账号
if (user == null || user.getId() == null) {
setFailCount(tenantId, username, count);
- throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND);
- }
- // 用户存在但密码错误,超过次数则锁定账号
- if (grantType != null && !grantType.equals(TokenUtil.REFRESH_TOKEN_KEY) && !user.getPassword().equals(DigestUtil.hex(password))) {
- setFailCount(tenantId, username, count);
- throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND);
+ throw new UserDeniedAuthorizationException(TokenUtil.USER_NOT_FOUND);
}
// 用户角色不存在
if (Func.isEmpty(userInfo.getRoles())) {
@@ -154,21 +151,33 @@
}
//拼接用户所属行政区划、责任人需要返回水库ids
- R<AttResManagePerson> attRes = attResManagePersonClient.queryListByPhone(user.getPhone());
- userInfo.getDetail().set("resIds",attRes.getData());
+ userInfo.getDetail().set("resIds","");
+ if (StringUtil.isNotBlank(user.getPhone())) {
+ R<AttResManagePerson> attRes = attResManagePersonClient.queryListByPhone(user.getPhone());
+ userInfo.getDetail().set("resIds",attRes.getData());
+ }
+
String deptStr = "";
- if (userInfo.getUser().getDeptId().indexOf(",") > 0)
+ if (userInfo.getUser().getDeptId().indexOf(",") > 0){
deptStr = userInfo.getUser().getDeptId().split(",")[0];
+ }else {
+ deptStr = userInfo.getUser().getDeptId();
+ }
R<Dept> deptRes = sysClient.getDept(Long.valueOf(deptStr));
- if (StringUtil.isBlank(deptRes.getData().getAdCode()))
+ if (StringUtil.isBlank(deptRes.getData().getAdCode())) {
// 部门为空
- throw new UsernameNotFoundException("没有找到有效组织机构~");
- else
+// throw new UserDeniedAuthorizationException("没有找到有效组织机构~");
+ userInfo.getDetail().set("adCodeBase", "");
+ userInfo.getDetail().set("parentDept",0);
+ } else {
userInfo.getDetail().set("adCodeBase",attResManagePersonClient.getAdBaseById(deptRes.getData().getAdCode()).getData());
+ userInfo.getDetail().set("parentDept",deptRes.getData().getParentId());
+ }
- // 成功则清除登录错误次数
- delFailCount(tenantId, username);
+ String collectResIds = collectClient.getMyCollect(user.getId().toString());
+ userInfo.getDetail().set("collect",collectResIds);
+
return new BladeUserDetails(user.getId(),
user.getTenantId(), StringPool.EMPTY, user.getName(), user.getRealName(), user.getDeptId(), user.getPostId(), user.getRoleId(), Func.join(userInfo.getRoles()), Func.toStr(user.getAvatar(), TokenUtil.DEFAULT_AVATAR),
username, AuthConstant.ENCRYPT + user.getPassword(), userInfo.getDetail(), true, true, true, true,
--
Gitblit v1.9.3