From 1b43670626f48266efb898ec7cd7deedcab9ba10 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期六, 17 八月 2024 15:31:23 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile --- ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java | 64 +++++++++++++++++++++++++++++++- 1 files changed, 62 insertions(+), 2 deletions(-) diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java index 139ee8b..2735380 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java @@ -4,6 +4,9 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import javax.servlet.http.HttpServletRequest; + +import com.ruoyi.common.core.exception.user.UserAppletException; +import com.ruoyi.system.api.model.LoginUserApplet; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.ruoyi.common.core.constant.CacheConstants; @@ -33,6 +36,7 @@ protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND; private final static long expireTime = CacheConstants.EXPIRATION; + private final static long expireAppletTime = CacheConstants.EXPIRATION_APPLET; private final static String ACCESS_TOKEN = CacheConstants.LOGIN_TOKEN_KEY; @@ -64,7 +68,57 @@ rspMap.put("expires_in", expireTime); return rspMap; } - + /** + * 创建小程序令牌 + */ + public Map<String, Object> createTokenApplet(LoginUserApplet loginUser) { + String token = IdUtils.fastUUID(); + Long userId = loginUser.getUserId(); + String name = loginUser.getName(); + loginUser.setToken(token); + loginUser.setIpaddr(IpUtils.getIpAddr()); + refreshToken1(loginUser); + // Jwt存储信息 + Map<String, Object> claimsMap = new HashMap<String, Object>(); + claimsMap.put(SecurityConstants.USER_APPLET_KEY, token); + claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId); + claimsMap.put(SecurityConstants.DETAILS_USERNAME, name); + // 接口返回信息 + Map<String, Object> rspMap = new HashMap<String, Object>(); + rspMap.put("access_token", JwtUtils.createToken(claimsMap)); + rspMap.put("expires_in", expireAppletTime); + return rspMap; + } + public LoginUserApplet getLoginUserApplet() { + LoginUserApplet loginUserAppletToken = getLoginUserAppletToken(ServletUtils.getRequest()); + if (loginUserAppletToken == null){ + throw new UserAppletException("登录失效,请重新登录!", 401); + } + return loginUserAppletToken; + } + public LoginUserApplet getLoginUserAppletToken(HttpServletRequest request) { + // 获取请求携带的令牌 + String token = SecurityUtils.getToken(request); + return getLoginUserApplet(token); + } + /** + * 小程序 获取用户身份信息 + * + * @return 用户信息 + */ + public LoginUserApplet getLoginUserApplet(String token) { + LoginUserApplet user = null; + try { + if (StringUtils.isNotEmpty(token)) { + String userKey = JwtUtils.getUserKeyApplet(token); + user = redisService.getCacheObject(getTokenKey(userKey)); + return user; + } + } catch (Exception e) { + e.printStackTrace(); + } + return user; + } /** * 获取用户身份信息 * @@ -161,7 +215,13 @@ String userKey = getTokenKey(loginUser.getToken()); redisService.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES); } - + public void refreshToken1(LoginUserApplet dto) { + dto.setLoginTime(System.currentTimeMillis()); + dto.setExpireTime(dto.getLoginTime() + expireTime * MILLIS_MINUTE); + // 根据uuid将loginUser缓存 + String userKey = getTokenKey(dto.getToken()); + redisService.setCacheObject(userKey, dto, expireTime, TimeUnit.MINUTES); + } private String getTokenKey(String token) { return ACCESS_TOKEN + token; -- Gitblit v1.7.1