lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-05-05 13:17:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2021-07-05 10:47:23 +08:00
parent 29c2db6246
commit 31398c727f
3 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hutool-http/src/main/java/cn/hutool/http/useragent/Engine.java
View File

@ -1,8 +1,10 @@
package cn.hutool.http.useragent; package cn.hutool.http.useragent;
import java.util.List;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ReUtil;
import java.util.List;
import java.util.regex.Pattern;
/** /**
* 引擎对象 * 引擎对象
@ -40,4 +42,16 @@ public class Engine extends UserAgentInfo {
super(name, regex); super(name, regex);
} }
/**
* 获取引擎版本
*
* @param userAgentString User-Agent字符串
* @return 版本
* @since 5.7.4
*/
public String getVersion(String userAgentString) {
final String regexp = getName() + "[/\\- ]([\\d\\w.\\-]+)";
final Pattern pattern = Pattern.compile(regexp, Pattern.CASE_INSENSITIVE);
return ReUtil.getGroup1(pattern, userAgentString);
}
} }

24
hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentParser.java
View File

@ -1,10 +1,7 @@
package cn.hutool.http.useragent; package cn.hutool.http.useragent;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import java.util.regex.Pattern;
/** /**
* User-Agent解析器 * User-Agent解析器
* *
@ -25,16 +22,22 @@ public class UserAgentParser {
} }
final UserAgent userAgent = new UserAgent(); final UserAgent userAgent = new UserAgent();
// 浏览器
final Browser browser = parseBrowser(userAgentString); final Browser browser = parseBrowser(userAgentString);
userAgent.setBrowser(parseBrowser(userAgentString)); userAgent.setBrowser(parseBrowser(userAgentString));
userAgent.setVersion(browser.getVersion(userAgentString)); userAgent.setVersion(browser.getVersion(userAgentString));
// 浏览器引擎
final Engine engine = parseEngine(userAgentString); final Engine engine = parseEngine(userAgentString);
userAgent.setEngine(engine); userAgent.setEngine(engine);
if (false == engine.isUnknown()) { if (false == engine.isUnknown()) {
userAgent.setEngineVersion(parseEngineVersion(engine, userAgentString)); userAgent.setEngineVersion(engine.getVersion(userAgentString));
} }
// 操作系统
userAgent.setOs(parseOS(userAgentString)); userAgent.setOs(parseOS(userAgentString));
// 平台
final Platform platform = parsePlatform(userAgentString); final Platform platform = parsePlatform(userAgentString);
userAgent.setPlatform(platform); userAgent.setPlatform(platform);
userAgent.setMobile(platform.isMobile() || browser.isMobile()); userAgent.setMobile(platform.isMobile() || browser.isMobile());
@ -73,19 +76,6 @@ public class UserAgentParser {
return Engine.Unknown; return Engine.Unknown;
} }
/**
* 解析引擎版本
*
* @param engine 引擎
* @param userAgentString User-Agent字符串
* @return 引擎版本
*/
private static String parseEngineVersion(Engine engine, String userAgentString) {
final String regexp = engine.getName() + "[/\\- ]([\\d\\w.\\-]+)";
final Pattern pattern = Pattern.compile(regexp, Pattern.CASE_INSENSITIVE);
return ReUtil.getGroup1(pattern, userAgentString);
}
/** /**
* 解析系统类型 * 解析系统类型
* *