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

fix useragent

Browse Source
This commit is contained in:
Looly 2022-04-06 10:18:36 +08:00
parent 58c7c688ae
commit b9f7e062bc
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -11,6 +11,7 @@
* 【core 】 CopyOptions支持以Lambda方式设置忽略属性列表（pr#590@Gitee）
### 🐞Bug修复
* 【core 】 修复UserAgentUtil识别Linux出错（issue#I50YGY@Gitee）
-------------------------------------------------------------------------------------------------------------

2
hutool-http/src/main/java/cn/hutool/http/useragent/OS.java
View File

@ -36,7 +36,7 @@ public class OS extends UserAgentInfo {
new OS("Windows", "windows"), //
new OS("OSX", "os x (\\d+)[._](\\d+)", "os x (\\d+([._]\\d+)*)"), //
new OS("Android", "Android", "Android (\\d+([._]\\d+)*)"),//
new OS("Android", "\\(X\\d+; Linux", "\\(X(\\d+([._]\\d+)*)"),//
new OS("Android", "XiaoMi|MI\\s+", "\\(X(\\d+([._]\\d+)*)"),//
new OS("Linux", "linux"), //
new OS("Wii", "wii", "wii libnup/(\\d+([._]\\d+)*)"), //
new OS("PS3", "playstation 3", "playstation 3; (\\d+([._]\\d+)*)"), //

2
hutool-http/src/main/java/cn/hutool/http/useragent/Platform.java
View File

@ -54,7 +54,7 @@ public class Platform extends UserAgentInfo {
IPAD, //
IPOD, //
IPHONE, //
new Platform("Android", "XiaoMi|MI "), //
new Platform("Android", "XiaoMi|MI\\s+"), //
ANDROID, //
GOOGLE_TV, //
new Platform("htcFlyer", "htc_flyer"), //

8
hutool-http/src/test/java/cn/hutool/http/useragent/UserAgentUtilTest.java
View File

@ -404,4 +404,12 @@ public class UserAgentUtilTest {
Assert.assertEquals("Android", ua.getPlatform().toString());
Assert.assertTrue(ua.isMobile());
}
@Test
public void parseFromDeepinTest(){
// https://gitee.com/dromara/hutool/issues/I50YGY
String uaStr = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36";
final UserAgent ua = UserAgentUtil.parse(uaStr);
Assert.assertEquals("Linux", ua.getOs().toString());
}
}