From 1067567f1c7b5a4a809e5e5478323bf983b9136b Mon Sep 17 00:00:00 2001
From: 尹志芳 <yinzhifang5@163.com>
Date: 星期日, 09 四月 2023 13:20:59 +0800
Subject: [PATCH] 下拉图标选择组件优化：1.已选择图标高亮回显 2.滚动条采用el-scrollbar
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
index 66885af..4b190d0 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
@@ -7,6 +7,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
+import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
@@ -22,7 +23,7 @@
/**
* token验证处理
- *
+ *
* @author ruoyi
*/
@Component
@@ -51,7 +52,7 @@
/**
* 获取用户身份信息
- *
+ *
* @return 用户信息
*/
public LoginUser getLoginUser(HttpServletRequest request)
@@ -60,12 +61,18 @@
String token = getToken(request);
if (StringUtils.isNotEmpty(token))
{
- Claims claims = parseToken(token);
- // 解析对应的权限以及用户信息
- String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
- String userKey = getTokenKey(uuid);
- LoginUser user = redisCache.getCacheObject(userKey);
- return user;
+ try
+ {
+ Claims claims = parseToken(token);
+ // 解析对应的权限以及用户信息
+ String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
+ String userKey = getTokenKey(uuid);
+ LoginUser user = redisCache.getCacheObject(userKey);
+ return user;
+ }
+ catch (Exception e)
+ {
+ }
}
return null;
}
@@ -95,7 +102,7 @@
/**
* 创建令牌
- *
+ *
* @param loginUser 用户信息
* @return 令牌
*/
@@ -113,8 +120,8 @@
/**
* 验证令牌有效期，相差不足20分钟，自动刷新缓存
- *
- * @param token 令牌
+ *
+ * @param loginUser
* @return 令牌
*/
public void verifyToken(LoginUser loginUser)
@@ -129,7 +136,7 @@
/**
* 刷新令牌有效期
- *
+ *
* @param loginUser 登录信息
*/
public void refreshToken(LoginUser loginUser)
@@ -140,22 +147,22 @@
String userKey = getTokenKey(loginUser.getToken());
redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
}
-
+
/**
* 设置用户代理信息
- *
+ *
* @param loginUser 登录信息
*/
public void setUserAgent(LoginUser loginUser)
{
UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
- String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
+ String ip = IpUtils.getIpAddr();
loginUser.setIpaddr(ip);
loginUser.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
loginUser.setBrowser(userAgent.getBrowser().getName());
loginUser.setOs(userAgent.getOperatingSystem().getName());
}
-
+
/**
* 从数据声明生成令牌
*
@@ -214,6 +221,6 @@
private String getTokenKey(String uuid)
{
- return Constants.LOGIN_TOKEN_KEY + uuid;
+ return CacheConstants.LOGIN_TOKEN_KEY + uuid;
}
}
--
Gitblit v1.9.2