github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

移除 yauaa 获取UA信息，采用hutoolUA工具类-UserAgentUtil 获取浏览器信息:https://github.com/elunez/eladmin-mp/issues/5

pull/805/head
Zheng Jie 2023-07-05 17:54:55 +08:00
parent 39d480938d
commit 189f671e88
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
View File

@ -15,11 +15,11 @@
*/ */
package me.zhengjie.utils; package me.zhengjie.utils;
import cn.hutool.http.useragent.UserAgent;
import cn.hutool.http.useragent.UserAgentUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.dreamlu.mica.ip2region.core.Ip2regionSearcher; import net.dreamlu.mica.ip2region.core.Ip2regionSearcher;
import net.dreamlu.mica.ip2region.core.IpInfo; 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 javax.servlet.http.HttpServletRequest;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.NetworkInterface; 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 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) { public static String getBrowser(HttpServletRequest request) {
UserAgent.ImmutableUserAgent userAgent = USER_AGENT_ANALYZER.parse(request.getHeader("User-Agent")); UserAgent ua = UserAgentUtil.parse(request.getHeader("User-Agent"));
return userAgent.get(UserAgent.AGENT_NAME_VERSION).getValue(); return ua.getBrowser().toString() + " " + ua.getVersion();
} }
/** /**

7
pom.xml
View File

@ -188,13 +188,6 @@
<artifactId>commons-text</artifactId> <artifactId>commons-text</artifactId>
<version>1.10.0</version> <version>1.10.0</version>
</dependency> </dependency>
<!-- 解析客户端操作系统、浏览器信息 -->
<dependency>
<groupId>nl.basjes.parse.useragent</groupId>
<artifactId>yauaa</artifactId>
<version>6.11</version>
</dependency>
</dependencies> </dependencies>
<build> <build>