From 41d53f6e09c11c2c6d29958c42feb6dad9bbcb02 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 20 Dec 2024 15:28:27 +0800
Subject: [PATCH] 白蚁新模块。12-20
---
skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 145f6b0..f760b50 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
@@ -160,11 +160,11 @@
}
//拼接用户所属行政区划、责任人需要返回水库ids
- userInfo.getDetail().set("resIds","");
- if (StringUtil.isNotBlank(user.getPhone())) {
- 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());
+// }
//返回手机号
userInfo.getDetail().set("phone",Base64Utils.getBase64Encode(user.getPhone()));
@@ -211,8 +211,8 @@
// if (encryptRes.getCode() != 200){
// throw new UserDeniedAuthorizationException("获取密钥失败");
// }
-
- //解码Base64
+//
+// //解码Base64
// String JSONstr = Base64Utils.getBase64Decode(encryptRes.getData().getData());
//
// pwdClient.verify(loginUserInfo.getMaced(),loginUserInfo.getSm4iv(),loginUserInfo.getKeyindexs(),JSONstr,loginUserInfo.getId().toString(),"blade_user");
--
Gitblit v1.9.3