zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(hutool-http): user-agent 增加企业微信和钉钉. 去除 Browser 中的行尾注释

Browse Source
This commit is contained in:
xyz327
2020-10-22 18:07:56 +08:00
parent bee588de3c
commit a61796de8f
3 changed files with 67 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
hutool-http/src/main/java/cn/hutool/http/useragent/Browser.java
View File

@@ -22,31 +22,36 @@ public class Browser extends UserAgentInfo {
/**
* 支持的浏览器类型
*/
public static final List<Browser> browers = CollUtil.newArrayList(//
new Browser("MSEdge", "Edge|Edg", "(?:edge|Edg)\\/([\\d\\w\\.\\-]+)"), //
new Browser("Chrome", "chrome", "chrome\\/([\\d\\w\\.\\-]+)"), //
new Browser("Firefox", "firefox", Other_Version), //
new Browser("IEMobile", "iemobile", Other_Version), //
new Browser("Android Browser", "android", "version\\/([\\d\\w\\.\\-]+)"), //
new Browser("Safari", "safari", "version\\/([\\d\\w\\.\\-]+)"), //
new Browser("Opera", "opera", Other_Version), //
new Browser("Konqueror", "konqueror", Other_Version), //
new Browser("PS3", "playstation 3", "([\\d\\w\\.\\-]+)\\)\\s*$"), //
new Browser("PSP", "playstation portable", "([\\d\\w\\.\\-]+)\\)?\\s*$"), //
new Browser("Lotus", "lotus.notes", "Lotus-Notes\\/([\\w.]+)"), //
new Browser("Thunderbird", "thunderbird", Other_Version), //
new Browser("Netscape", "netscape", Other_Version), //
new Browser("Seamonkey", "seamonkey", Other_Version), //
new Browser("Outlook", "microsoft.outlook", Other_Version), //
new Browser("Evolution", "evolution", Other_Version), //
new Browser("MSIE", "msie", "msie ([\\d\\w\\.\\-]+)"), //
new Browser("MSIE11", "rv:11", "rv:([\\d\\w\\.\\-]+)"), //
new Browser("Gabble", "Gabble", "Gabble\\/([\\d\\w\\.\\-]+)"), //
new Browser("Yammer Desktop", "AdobeAir", "([\\d\\w\\.\\-]+)\\/Yammer"), //
new Browser("Yammer Mobile", "Yammer[\\s]+([\\d\\w\\.\\-]+)", "Yammer[\\s]+([\\d\\w\\.\\-]+)"), //
new Browser("Apache HTTP Client", "Apache\\\\-HttpClient", "Apache\\-HttpClient\\/([\\d\\w\\.\\-]+)"), //
new Browser("BlackBerry", "BlackBerry", "BlackBerry[\\d]+\\/([\\d\\w\\.\\-]+)"),//
new Browser("MicroMessenger", "MicroMessenger", "MicroMessenger\\/([\\d\\w\\.\\-]+)")//
public static final List<Browser> browers = CollUtil.newArrayList(
new Browser("MSEdge", "Edge|Edg", "(?:edge|Edg)\\/([\\d\\w\\.\\-]+)"),
new Browser("Chrome", "chrome", "chrome\\/([\\d\\w\\.\\-]+)"),
new Browser("Firefox", "firefox", Other_Version),
new Browser("IEMobile", "iemobile", Other_Version),
new Browser("Android Browser", "android", "version\\/([\\d\\w\\.\\-]+)"),
new Browser("Safari", "safari", "version\\/([\\d\\w\\.\\-]+)"),
new Browser("Opera", "opera", Other_Version),
new Browser("Konqueror", "konqueror", Other_Version),
new Browser("PS3", "playstation 3", "([\\d\\w\\.\\-]+)\\)\\s*$"),
new Browser("PSP", "playstation portable", "([\\d\\w\\.\\-]+)\\)?\\s*$"),
new Browser("Lotus", "lotus.notes", "Lotus-Notes\\/([\\w.]+)"),
new Browser("Thunderbird", "thunderbird", Other_Version),
new Browser("Netscape", "netscape", Other_Version),
new Browser("Seamonkey", "seamonkey", Other_Version),
new Browser("Outlook", "microsoft.outlook", Other_Version),
new Browser("Evolution", "evolution", Other_Version),
new Browser("MSIE", "msie", "msie ([\\d\\w\\.\\-]+)"),
new Browser("MSIE11", "rv:11", "rv:([\\d\\w\\.\\-]+)"),
new Browser("Gabble", "Gabble", "Gabble\\/([\\d\\w\\.\\-]+)"),
new Browser("Yammer Desktop", "AdobeAir", "([\\d\\w\\.\\-]+)\\/Yammer"),
new Browser("Yammer Mobile", "Yammer[\\s]+([\\d\\w\\.\\-]+)", "Yammer[\\s]+([\\d\\w\\.\\-]+)"),
new Browser("Apache HTTP Client", "Apache\\\\-HttpClient", "Apache\\-HttpClient\\/([\\d\\w\\.\\-]+)"),
new Browser("BlackBerry", "BlackBerry", "BlackBerry[\\d]+\\/([\\d\\w\\.\\-]+)"),
// 企业微信 企业微信使用微信浏览器内核,会包含 MicroMessenger 所以要放在前面
new Browser("wxwork", "wxwork", "wxwork\\/([\\d\\w\\.\\-]+)"),
// 微信
new Browser("MicroMessenger", "MicroMessenger", "MicroMessenger\\/([\\d\\w\\.\\-]+)"),
// 钉钉
new Browser("DingTalk", "DingTalk", "AliApp\\(DingTalk\\/([\\d\\w\\.\\-]+)\\)")
);
private Pattern versionPattern;