From a691da0c975eba5a71b888cb0687ee4d21b84dc9 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 10 七月 2020 16:36:25 +0800
Subject: [PATCH] 防止切换权限用户后登录出现404
---
ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
index 5eafd02..7637ed8 100644
--- a/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
@@ -9,9 +9,13 @@
import org.springframework.stereotype.Component;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.IdUtils;
+import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.ip.AddressUtils;
+import com.ruoyi.common.utils.ip.IpUtils;
import com.ruoyi.framework.redis.RedisCache;
import com.ruoyi.framework.security.LoginUser;
+import eu.bitwalker.useragentutils.UserAgent;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
@@ -67,6 +71,29 @@
}
/**
+ * 璁剧疆鐢ㄦ埛韬唤淇℃伅
+ */
+ public void setLoginUser(LoginUser loginUser)
+ {
+ if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken()))
+ {
+ refreshToken(loginUser);
+ }
+ }
+
+ /**
+ * 鍒犻櫎鐢ㄦ埛韬唤淇℃伅
+ */
+ public void delLoginUser(String token)
+ {
+ if (StringUtils.isNotEmpty(token))
+ {
+ String userKey = getTokenKey(token);
+ redisCache.deleteObject(userKey);
+ }
+ }
+
+ /**
* 鍒涘缓浠ょ墝
*
* @param loginUser 鐢ㄦ埛淇℃伅
@@ -76,6 +103,7 @@
{
String token = IdUtils.fastUUID();
loginUser.setToken(token);
+ setUserAgent(loginUser);
refreshToken(loginUser);
Map<String, Object> claims = new HashMap<>();
@@ -95,8 +123,6 @@
long currentTime = System.currentTimeMillis();
if (expireTime - currentTime <= MILLIS_MINUTE_TEN)
{
- String token = loginUser.getToken();
- loginUser.setToken(token);
refreshToken(loginUser);
}
}
@@ -104,8 +130,7 @@
/**
* 鍒锋柊浠ょ墝鏈夋晥鏈�
*
- * @param token 浠ょ墝
- * @return 浠ょ墝
+ * @param loginUser 鐧诲綍淇℃伅
*/
public void refreshToken(LoginUser loginUser)
{
@@ -115,7 +140,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());
+ loginUser.setIpaddr(ip);
+ loginUser.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
+ loginUser.setBrowser(userAgent.getBrowser().getName());
+ loginUser.setOs(userAgent.getOperatingSystem().getName());
+ }
+
/**
* 浠庢暟鎹０鏄庣敓鎴愪护鐗�
*
--
Gitblit v1.9.3