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

refactor(log): 兼容小写 user-agent 情况

Browse Source
This commit is contained in:
Charles7c
2024-02-05 23:18:58 +08:00
parent c963978980
commit 18b9d1ba79
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/LogRequest.java
View File

@@ -18,7 +18,6 @@ package top.charles7c.continew.starter.log.common.model;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import top.charles7c.continew.starter.core.util.ExceptionUtils;
import top.charles7c.continew.starter.core.util.IpUtils; import top.charles7c.continew.starter.core.util.IpUtils;
import top.charles7c.continew.starter.log.common.enums.Include; import top.charles7c.continew.starter.log.common.enums.Include;
import top.charles7c.continew.starter.web.util.ServletUtils; import top.charles7c.continew.starter.web.util.ServletUtils;
@@ -91,7 +90,15 @@ public class LogRequest {
this.param = request.getParam(); this.param = request.getParam();
} }
this.address = (includes.contains(Include.IP_ADDRESS)) ? IpUtils.getAddress(this.ip) : null; this.address = (includes.contains(Include.IP_ADDRESS)) ? IpUtils.getAddress(this.ip) : null;
String userAgentString = ExceptionUtils.exToNull(() -> this.headers.get(HttpHeaders.USER_AGENT)); if (null == this.headers) {
return;
}
String userAgentString = this.headers.entrySet()
.stream()
.filter(h -> HttpHeaders.USER_AGENT.equalsIgnoreCase(h.getKey()))
.map(Map.Entry::getValue)
.findFirst()
.orElse(null);
if (StrUtil.isNotBlank(userAgentString)) { if (StrUtil.isNotBlank(userAgentString)) {
this.browser = (includes.contains(Include.BROWSER)) ? ServletUtils.getBrowser(userAgentString) : null; this.browser = (includes.contains(Include.BROWSER)) ? ServletUtils.getBrowser(userAgentString) : null;
this.os = (includes.contains(Include.OS)) ? ServletUtils.getOs(userAgentString) : null; this.os = (includes.contains(Include.OS)) ? ServletUtils.getOs(userAgentString) : null;