From d50e7a3d178a7f05852207d4525b258c826117ac Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 08 五月 2021 23:39:50 +0800
Subject: [PATCH] !30 同步dev分支 Merge pull request !30 from 疯狂的狮子li/dev
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 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 0023855..c55078d 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
@@ -1,24 +1,26 @@
package com.ruoyi.framework.web.service;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.http.useragent.UserAgent;
+import cn.hutool.http.useragent.UserAgentUtil;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
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.common.utils.uuid.IdUtils;
-import eu.bitwalker.useragentutils.UserAgent;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
/**
* token楠岃瘉澶勭悊
@@ -58,7 +60,7 @@
{
// 鑾峰彇璇锋眰鎼哄甫鐨勪护鐗�
String token = getToken(request);
- if (StringUtils.isNotEmpty(token))
+ if (Validator.isNotEmpty(token))
{
Claims claims = parseToken(token);
// 瑙ｆ瀽瀵瑰簲鐨勬潈闄愪互鍙婄敤鎴蜂俊鎭�
@@ -75,7 +77,7 @@
*/
public void setLoginUser(LoginUser loginUser)
{
- if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken()))
+ if (Validator.isNotNull(loginUser) && Validator.isNotEmpty(loginUser.getToken()))
{
refreshToken(loginUser);
}
@@ -86,7 +88,7 @@
*/
public void delLoginUser(String token)
{
- if (StringUtils.isNotEmpty(token))
+ if (Validator.isNotEmpty(token))
{
String userKey = getTokenKey(token);
redisCache.deleteObject(userKey);
@@ -101,7 +103,7 @@
*/
public String createToken(LoginUser loginUser)
{
- String token = IdUtils.fastUUID();
+ String token = IdUtil.fastUUID();
loginUser.setToken(token);
setUserAgent(loginUser);
refreshToken(loginUser);
@@ -148,12 +150,12 @@
*/
public void setUserAgent(LoginUser loginUser)
{
- UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
+ UserAgent userAgent = UserAgentUtil.parse(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());
+ loginUser.setOs(userAgent.getOs().getName());
}
/**
@@ -205,7 +207,7 @@
private String getToken(HttpServletRequest request)
{
String token = request.getHeader(header);
- if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX))
+ if (Validator.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX))
{
token = token.replace(Constants.TOKEN_PREFIX, "");
}
--
Gitblit v1.9.3