From 2328cac73e48d2704e4a72b989bccaa33d3d031f Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Thu, 18 Apr 2024 10:37:38 +0800
Subject: [PATCH] sk项目本地电脑配置
---
skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 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 9ddd652..145f6b0 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
@@ -20,7 +20,7 @@
import cn.gistack.common.utils.Base64Utils;
import cn.gistack.pwd.dto.CBCResultDTO;
import cn.gistack.pwd.dto.ResultDTO;
-import cn.gistack.pwd.fegin.IPwdClient;
+//import cn.gistack.pwd.fegin.IPwdClient;
import cn.gistack.sm.collect.feign.ICollectClient;
import cn.gistack.sm.collect.feign.ICollectClientFallback;
import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
@@ -78,7 +78,7 @@
private final ICollectClient collectClient;
- private final IPwdClient pwdClient;
+// private final IPwdClient pwdClient;
@Override
@SneakyThrows
@@ -206,23 +206,23 @@
User loginUserInfo = userInfo.getUser();
//获取解密后的Base64字符串
- R<ResultDTO> encryptRes = pwdClient.getDecrypt(loginUserInfo.getSm4iv(), loginUserInfo.getKeyindexs(),loginUserInfo.getEncdata());
-
- if (encryptRes.getCode() != 200){
- throw new UserDeniedAuthorizationException("获取密钥失败");
- }
+// R<ResultDTO> encryptRes = pwdClient.getDecrypt(loginUserInfo.getSm4iv(), loginUserInfo.getKeyindexs(),loginUserInfo.getEncdata());
+//
+// if (encryptRes.getCode() != 200){
+// throw new UserDeniedAuthorizationException("获取密钥失败");
+// }
//解码Base64
- String JSONstr = Base64Utils.getBase64Decode(encryptRes.getData().getData());
-
- pwdClient.verify(loginUserInfo.getMaced(),loginUserInfo.getSm4iv(),loginUserInfo.getKeyindexs(),JSONstr,loginUserInfo.getId().toString(),"blade_user");
-
- UserSUPO userSUPO = JSONObject.parseObject(JSONstr, UserSUPO.class);
-
- //若登录用户的电话、角色、部门与原加密数据不符，登录失败
- if (!(loginUserInfo.getPhone().equals(userSUPO.getPhone()) && loginUserInfo.getRoleId().equals(userSUPO.getRoleId()) && loginUserInfo.getDeptId().equals(userSUPO.getDeptId())) ){
- throw new UserDeniedAuthorizationException("用户信息异常，请联系管理员");
- }
+// String JSONstr = Base64Utils.getBase64Decode(encryptRes.getData().getData());
+//
+// pwdClient.verify(loginUserInfo.getMaced(),loginUserInfo.getSm4iv(),loginUserInfo.getKeyindexs(),JSONstr,loginUserInfo.getId().toString(),"blade_user");
+//
+// UserSUPO userSUPO = JSONObject.parseObject(JSONstr, 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