From 0f4459e4201fdc19185b7dd03215871f036acd70 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 28 五月 2025 16:45:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TokenUtil.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TokenUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TokenUtil.java
index 5bc9ab1..43639b4 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TokenUtil.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TokenUtil.java
@@ -69,8 +69,8 @@
*
* @return 用户信息
*/
- public LoginUser getLoginUser() {
- LoginUser loginUser = getLoginUser(ServletUtils.getRequest());
+ public Operator getLoginUser() {
+ Operator loginUser = getLoginUser(ServletUtils.getRequest());
if (loginUser == null) {
throw new NotLoginException("令牌已过期，请重新登录！");
}
@@ -82,7 +82,7 @@
*
* @return 用户信息
*/
- public LoginUser getLoginUser(HttpServletRequest request) {
+ public Operator getLoginUser(HttpServletRequest request) {
// 获取请求携带的令牌
String token = SecurityUtils.getToken(request);
return getLoginUser(token);
@@ -93,8 +93,8 @@
*
* @return 用户信息
*/
- public LoginUser getLoginUser(String token) {
- LoginUser user = null;
+ public Operator getLoginUser(String token) {
+ Operator user = null;
try {
if (StringUtils.isNotEmpty(token)) {
String userkey = JwtUtils.getUserKey(token);
@@ -102,6 +102,7 @@
return user;
}
} catch (Exception e) {
+ e.printStackTrace();
}
return user;
}
@@ -150,14 +151,7 @@
String userKey = getTokenKey(operator.getToken());
redisService.setCacheObject(userKey, operator, expireTime, TimeUnit.MINUTES);
}
-
- public void refreshToken1(LoginUserApplet dto) {
- dto.setLoginTime(System.currentTimeMillis());
- dto.setExpireTime(dto.getLoginTime() + expireAppletTime * MILLIS_MINUTE);
- // 根据uuid将loginUser缓存
- String userKey = getTokenKey(dto.getToken());
- redisService.setCacheObject(userKey, dto, expireAppletTime, TimeUnit.MINUTES);
- }
+
private String getTokenKey(String token) {
return ACCESS_TOKEN + token;
--
Gitblit v1.7.1