From 2f4555ade506bd5e7c8cafef5d717c635edfab2d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 09 Apr 2024 16:13:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 c8927ea..a79e260 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
@@ -166,6 +166,8 @@
userInfo.getDetail().set("resIds",attRes.getData());
}
+ //返回手机号
+ userInfo.getDetail().set("phone",Base64Utils.getBase64Encode(user.getPhone()));
String deptStr = "";
if (userInfo.getUser().getDeptId().indexOf(",") > 0){
@@ -197,9 +199,11 @@
}
//解码Base64
- String base64Decode = Base64Utils.getBase64Decode(encryptRes.getData().getData());
+ String JSONstr = Base64Utils.getBase64Decode(encryptRes.getData().getData());
- UserSUPO userSUPO = JSONObject.parseObject(base64Decode, UserSUPO.class);
+ 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())) ){
--
Gitblit v1.9.3