From 189f671e88c207a06e767f72d0807f5a47e304ea Mon Sep 17 00:00:00 2001
From: Zheng Jie <201507802@qq.com>
Date: Wed, 5 Jul 2023 17:54:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=20yauaa=20=E8=8E=B7=E5=8F=96?=
=?UTF-8?q?UA=E4=BF=A1=E6=81=AF=EF=BC=8C=E9=87=87=E7=94=A8hutoolUA?=
=?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB-UserAgentUtil=20=E8=8E=B7=E5=8F=96?=
=?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E4=BF=A1=E6=81=AF:https://github.co?=
=?UTF-8?q?m/elunez/eladmin-mp/issues/5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/me/zhengjie/utils/StringUtils.java | 16 ++++------------
pom.xml | 7 -------
2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java b/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
index 9c87bd4c..ddb9f2f5 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
@@ -15,11 +15,11 @@
*/
package me.zhengjie.utils;
+import cn.hutool.http.useragent.UserAgent;
+import cn.hutool.http.useragent.UserAgentUtil;
import lombok.extern.slf4j.Slf4j;
import net.dreamlu.mica.ip2region.core.Ip2regionSearcher;
import net.dreamlu.mica.ip2region.core.IpInfo;
-import nl.basjes.parse.useragent.UserAgent;
-import nl.basjes.parse.useragent.UserAgentAnalyzer;
import javax.servlet.http.HttpServletRequest;
import java.net.InetAddress;
import java.net.NetworkInterface;
@@ -43,14 +43,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
*/
private final static Ip2regionSearcher IP_SEARCHER = SpringContextHolder.getBean(Ip2regionSearcher.class);
-
- private static final UserAgentAnalyzer USER_AGENT_ANALYZER = UserAgentAnalyzer
- .newBuilder()
- .hideMatcherLoadStats()
- .withCache(10000)
- .withField(UserAgent.AGENT_NAME_VERSION)
- .build();
-
/**
* 驼峰命名法工具
*
@@ -178,8 +170,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
}
public static String getBrowser(HttpServletRequest request) {
- UserAgent.ImmutableUserAgent userAgent = USER_AGENT_ANALYZER.parse(request.getHeader("User-Agent"));
- return userAgent.get(UserAgent.AGENT_NAME_VERSION).getValue();
+ UserAgent ua = UserAgentUtil.parse(request.getHeader("User-Agent"));
+ return ua.getBrowser().toString() + " " + ua.getVersion();
}
/**
diff --git a/pom.xml b/pom.xml
index d2a4392f..2444137c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -188,13 +188,6 @@
commons-text
1.10.0
-
-
-
- nl.basjes.parse.useragent
- yauaa
- 6.11
-