From c86fdc9cad7ad8beaa71f2601cf160021a6ea3e0 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期一, 28 八月 2023 10:51:04 +0800 Subject: [PATCH] 增加一个vo字段 --- user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java | 59 ++++++++++++++++++++++++++++++----------------------------- 1 files changed, 30 insertions(+), 29 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 04dc927..7159e84 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,12 +1,24 @@ package com.yuanchu.limslaboratory.clients; +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; import com.yuanchu.limslaboratory.vo.Result; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import javax.annotation.Resource; 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 { @@ -19,36 +31,10 @@ @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"); -// user.setMap(data); -// //瀛樺叆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, 168); -// return Result.success(map); -// } else { -// return Result.fail(result.getMessage()); -// } -// } else { -// return Result.fail(code.getMessage()); -// } -// } - public Result<Map<String, Object>> LoginExamine(){ + + + public Result<Map<String, Object>> LoginExamine(User user){ Map<String, Object> mapData = new HashMap<>(); mapData.put("LoginUserID", LoginUserID); mapData.put("LoginSecret", LoginSecret); @@ -59,9 +45,23 @@ 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("enterpriseId", user.getEnterpriseId()); + mapRedis.put("data", data); + 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); } else { return Result.fail(result.getMessage()); @@ -70,4 +70,5 @@ return Result.fail(code.getMessage()); } } + } -- Gitblit v1.9.3