From 78acc99449ff821d1fe687114bf8fedf5d06908f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 13 Oct 2023 16:17:24 +0800
Subject: [PATCH] 登录加密校验回滚
---
skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 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 f62eda6..c8927ea 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
@@ -187,24 +187,24 @@
String collectResIds = collectClient.getMyCollect(user.getId().toString());
userInfo.getDetail().set("collect",collectResIds);
-// User loginUserInfo = userInfo.getUser();
-//
-// //获取解密后的Base64字符串
-// R<ResultDTO> encryptRes = pwdClient.getDecrypt(loginUserInfo.getSm4iv(), loginUserInfo.getKeyindexs(),loginUserInfo.getEncdata());
-//
-// if (encryptRes.getCode() != 200){
-// throw new UserDeniedAuthorizationException("获取密钥失败");
-// }
-//
-// //解码Base64
-// String base64Decode = Base64Utils.getBase64Decode(encryptRes.getData().getData());
-//
-// UserSUPO userSUPO = JSONObject.parseObject(base64Decode, UserSUPO.class);
-//
-// //若登录用户的电话、角色、部门与原加密数据不符，登录失败
-// if (!(loginUserInfo.getPhone().equals(userSUPO.getPhone()) && loginUserInfo.getRoleId().equals(userSUPO.getRoleId()) && loginUserInfo.getDeptId().equals(userSUPO.getDeptId())) ){
-// throw new UserDeniedAuthorizationException("用户信息异常，请联系管理员");
-// }
+ User loginUserInfo = userInfo.getUser();
+
+ //获取解密后的Base64字符串
+ R<ResultDTO> encryptRes = pwdClient.getDecrypt(loginUserInfo.getSm4iv(), loginUserInfo.getKeyindexs(),loginUserInfo.getEncdata());
+
+ if (encryptRes.getCode() != 200){
+ throw new UserDeniedAuthorizationException("获取密钥失败");
+ }
+
+ //解码Base64
+ String base64Decode = Base64Utils.getBase64Decode(encryptRes.getData().getData());
+
+ UserSUPO userSUPO = JSONObject.parseObject(base64Decode, UserSUPO.class);
+
+ //若登录用户的电话、角色、部门与原加密数据不符，登录失败
+ if (!(loginUserInfo.getPhone().equals(userSUPO.getPhone()) && loginUserInfo.getRoleId().equals(userSUPO.getRoleId()) && loginUserInfo.getDeptId().equals(userSUPO.getDeptId())) ){
+ throw new UserDeniedAuthorizationException("用户信息异常，请联系管理员");
+ }
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),
--
Gitblit v1.9.3