From 27e9d7d2c7db63c5f12c83e069980213398e8337 Mon Sep 17 00:00:00 2001 From: XiaoRuby <3114200645@qq.com> Date: 星期四, 13 七月 2023 10:22:51 +0800 Subject: [PATCH] LIMS管理系统框架-开发7-12-v1.0.0 --- user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java | 85 ++++++++++++++++++++++-------------------- 1 files changed, 45 insertions(+), 40 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 b54743d..8bc7c5a 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 @@ -2,6 +2,7 @@ import com.yuanchu.limslaboratory.pojo.User; 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; @@ -23,46 +24,50 @@ @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(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); + 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()); + } } + + +// 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