ContiNew/continew-starter
1
1
Fork 0
mirror of https://github.com/continew-org/continew-starter.git synced 2025-12-11 18:57:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(web): 添加Servlet工具类对getOs和getBrowser方法中User-Agent为空或解析失败时的非空判断

Browse Source
This commit is contained in:
beginner
2025-05-21 01:01:38 +00:00
committed by Charles7c
parent b543b2f94d
commit abc005e690
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
continew-starter-web/src/main/java/top/continew/starter/web/util/ServletUtils.java
View File

@@ -24,6 +24,7 @@ import cn.hutool.http.useragent.UserAgentUtil;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession; import jakarta.servlet.http.HttpSession;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
@@ -68,8 +69,22 @@ public class ServletUtils extends JakartaServletUtil {
* @return 浏览器及其版本信息 * @return 浏览器及其版本信息
*/ */
public static String getBrowser(String userAgentString) { public static String getBrowser(String userAgentString) {
UserAgent userAgent = UserAgentUtil.parse(userAgentString); if (StringUtils.isBlank(userAgentString)) {
return userAgent.getBrowser().getName() + StringConstants.SPACE + userAgent.getVersion(); return null;
}
try {
UserAgent userAgent = UserAgentUtil.parse(userAgentString);
if (userAgent == null || userAgent.getBrowser() == null) {
return null;
}
String browserName = userAgent.getBrowser().getName();
String version = userAgent.getVersion();
return StringUtils.isBlank(version)
? browserName
: browserName + StringConstants.SPACE + version;
} catch (Exception e) {
return null;
}
} }
/** /**
@@ -92,8 +107,18 @@ public class ServletUtils extends JakartaServletUtil {
* @return 操作系统 * @return 操作系统
*/ */
public static String getOs(String userAgentString) { public static String getOs(String userAgentString) {
UserAgent userAgent = UserAgentUtil.parse(userAgentString); if (StringUtils.isEmpty(userAgentString)) {
return userAgent.getOs().getName(); return null;
}
try {
UserAgent userAgent = UserAgentUtil.parse(userAgentString);
if (userAgent == null || userAgent.getOs() == null) {
return null;
}
return userAgent.getOs().getName();
} catch (Exception e) {
return null;
}
} }
/** /**