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 -