From 25743ef4cfb9da0be8d3e488c93f5429ffd02f8a Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 21 五月 2024 14:21:25 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java | 97 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 88 insertions(+), 9 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 294696f..d114fd9 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
@@ -1,13 +1,5 @@
package com.ruoyi.common.security.service;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import javax.servlet.http.HttpServletRequest;
-
-import com.ruoyi.system.api.model.LoginUserParent;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.utils.JwtUtils;
@@ -18,10 +10,18 @@
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.api.model.LoginUserParent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
/**
* token验证处理
- *
+ *
* @author ruoyi
*/
@Component
@@ -85,6 +85,27 @@
rspMap.put("expires_in", expireTime);
return rspMap;
}
+
+ public Map<String, Object> createTokenStudy(LoginUserParent loginUser)
+ {
+ String token = IdUtils.fastUUID();
+ Integer userId = loginUser.getUserid();
+ String name = loginUser.getName();
+ loginUser.setToken(token);
+ loginUser.setIpaddr(IpUtils.getIpAddr());
+ refreshTokenStudy(loginUser);
+ // Jwt存储信息
+ Map<String, Object> claimsMap = new HashMap<String, Object>(8);
+ claimsMap.put(SecurityConstants.USER_STUDY_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", expireTime);
+ return rspMap;
+ }
+
/**
* 获取用户身份信息
*
@@ -117,6 +138,16 @@
}
/**
+ * 学习端获取用户身份信息
+ *
+ * @return 用户信息
+ */
+ public LoginUserParent getLoginUserStudy()
+ {
+ return getLoginUserStudy(ServletUtils.getRequest());
+ }
+
+ /**
* 获取用户身份信息
*
* @return 用户信息
@@ -126,6 +157,18 @@
// 获取请求携带的令牌
String token = SecurityUtils.getToken(request);
return getLoginUser1(token);
+ }
+
+ /**
+ * 学习端获取用户身份信息
+ *
+ * @return 用户信息
+ */
+ public LoginUserParent getLoginUserStudy(HttpServletRequest request)
+ {
+ // 获取请求携带的令牌
+ String token = SecurityUtils.getToken(request);
+ return getLoginUserStudy(token);
}
/**
@@ -163,6 +206,30 @@
if (StringUtils.isNotEmpty(token))
{
String userkey = JwtUtils.getUserKey1(token);
+ user = redisService.getCacheObject(getTokenKey(userkey));
+ return user;
+ }
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ return user;
+ }
+
+ /**
+ * 学习端 获取用户身份信息
+ *
+ * @return 用户信息
+ */
+ public LoginUserParent getLoginUserStudy(String token)
+ {
+ LoginUserParent user = null;
+ try
+ {
+ if (StringUtils.isNotEmpty(token))
+ {
+ String userkey = JwtUtils.getUserKeyStudy(token);
user = redisService.getCacheObject(getTokenKey(userkey));
return user;
}
@@ -263,6 +330,18 @@
redisService.setCacheObject(userKey, dto, expireTime, TimeUnit.MINUTES);
}
+ /**
+ * 学习端用户登录
+ */
+ public void refreshTokenStudy(LoginUserParent 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