From 064457406bda554e713aea8bada1bb066be42b8e Mon Sep 17 00:00:00 2001 From: XiaoRuby <3114200645@qq.com> Date: 星期六, 23 九月 2023 12:39:29 +0800 Subject: [PATCH] 9-23 去鵷雏管理端验证 --- user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java | 84 ++++++++++++++++-------------------------- 1 files changed, 32 insertions(+), 52 deletions(-) diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java b/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java index 8bc7c5a..2c5771a 100644 --- a/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java +++ b/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java @@ -1,6 +1,13 @@ package com.yuanchu.limslaboratory.clients; +import cn.hutool.crypto.SecureUtil; +import cn.hutool.crypto.symmetric.AES; +import com.yuanchu.limslaboratory.mapper.RoleManageMapper; +import com.yuanchu.limslaboratory.mapper.UserMapper; +import com.yuanchu.limslaboratory.pojo.Menu; +import com.yuanchu.limslaboratory.pojo.RoleMenu; import com.yuanchu.limslaboratory.pojo.User; +import com.yuanchu.limslaboratory.pojo.dto.RoleAndMenuDto; import com.yuanchu.limslaboratory.shiro.utils.JwtUtils; import com.yuanchu.limslaboratory.utils.MyUtil; import com.yuanchu.limslaboratory.utils.RedisUtil; @@ -9,65 +16,38 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; +import java.nio.charset.StandardCharsets; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; @Component public class UserLoginUtils { - @Resource - private UserClient userClient; - - @Value("${login.userID}") - private String LoginUserID; - - @Value("${login.secret}") - private String LoginSecret; - public Result<Map<String, Object>> LoginExamine(User user){ - Map<String, Object> mapData = new HashMap<>(); - mapData.put("LoginUserID", LoginUserID); - mapData.put("LoginSecret", LoginSecret); - Result<?> code = userClient.BusynessUserLogin(mapData); - if (code.getCode() == 200){ - Result<?> result = userClient.BusynessUserLoginToken(code.getData().toString()); - if (result.getCode() == 200){ - Map data = (Map) result.getData(); - String token = data.get("token").toString(); - data.remove("token"); - HashMap<String, Object> mapRedis = new HashMap<>(); - mapRedis.put("id", user.getId()); - mapRedis.put("account", user.getAccount()); - mapRedis.put("name", user.getName()); - mapRedis.put("data", data); - //瀛樺叆redis,浜屼釜灏忔椂鍚庡垹闄� - RedisUtil.set(token, mapRedis, 120); - // 灏嗙鍙戠殑 JWT token 杩斿洖缁欏墠绔� - HashMap<String, Object> map = new HashMap<>(); - String refresh = JwtUtils.sign(user.getAccount()); - map.put("token", token); - map.put("refresh", refresh); - RedisUtil.set(user.getAccount(), map, 168); - return Result.success(map); - } else { - return Result.fail(result.getMessage()); - } - } else { - return Result.fail(code.getMessage()); - } + String token = JwtUtils.sign(user.getAccount()); + HashMap<String, Object> mapRedis = new HashMap<>(); + mapRedis.put("id", user.getId()); + mapRedis.put("account", user.getAccount()); + mapRedis.put("name", user.getName()); + mapRedis.put("enterpriseId", user.getEnterpriseId()); + String adminMD5 = SecureUtil.md5(SecureUtil.md5(user.getAccount())); + // 鏋勫缓 + mapRedis.put("sessionLayerId", adminMD5); + mapRedis.put("roleId",user.getRoleId()); + //瀛樺叆redis,浜屼釜灏忔椂鍚庡垹闄� + RedisUtil.set(token, mapRedis, 120); + // + RedisUtil.set("access_token",token,120); + // 灏嗙鍙戠殑 JWT token 杩斿洖缁欏墠绔� + HashMap<String, Object> map = new HashMap<>(); + String refresh = JwtUtils.sign(user.getAccount()); + map.put("token", token); + map.put("refresh", refresh); + RedisUtil.set(user.getAccount(), map, 168); + return Result.success(map); } - -// public Result<Map<String, Object>> LoginExamine(User user){ -// String token = JwtUtils.sign(user.getAccount()); -// //瀛樺叆redis,浜屼釜灏忔椂鍚庡垹闄� -// RedisUtil.set(token, user, 2); -// // 灏嗙鍙戠殑 JWT token 杩斿洖缁欏墠绔� -// HashMap<String, Object> map = new HashMap<>(); -// String refresh = JwtUtils.sign(user.getAccount()); -// map.put("token", token); -// map.put("refresh", refresh); -// RedisUtil.set(user.getAccount(), map, 120); -// return Result.success(map); -// } } -- Gitblit v1.9.3