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

fix(log/core): 兼容日志记录 IPv6 IP 归属地场景

Browse Source
This commit is contained in:
Charles7c
2024-06-20 22:51:09 +08:00
parent 332ef45c4a
commit 0bba30b9c4
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
continew-starter-core/src/main/java/top/continew/starter/core/util/IpUtils.java
View File

@@ -44,8 +44,8 @@ public class IpUtils {
* @param ip IP 地址 * @param ip IP 地址
* @return IP 归属地 * @return IP 归属地
*/ */
public static String getAddress(String ip) { public static String getIpv4Address(String ip) {
if (isInnerIp(ip)) { if (isInnerIpv4(ip)) {
return "内网IP"; return "内网IP";
} }
Ip2regionSearcher ip2regionSearcher = SpringUtil.getBean(Ip2regionSearcher.class); Ip2regionSearcher ip2regionSearcher = SpringUtil.getBean(Ip2regionSearcher.class);
@@ -64,7 +64,7 @@ public class IpUtils {
* @param ip IP 地址 * @param ip IP 地址
* @return 是否为内网 IP * @return 是否为内网 IP
*/ */
public static boolean isInnerIp(String ip) { public static boolean isInnerIpv4(String ip) {
return NetUtil.isInnerIP("0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : HtmlUtil.cleanHtmlTag(ip)); return NetUtil.isInnerIP("0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : HtmlUtil.cleanHtmlTag(ip));
} }
} }

5
continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/model/LogRequest.java
View File

@@ -18,6 +18,7 @@ package top.continew.starter.log.core.model;
import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.CharSequenceUtil;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import top.continew.starter.core.util.ExceptionUtils;
import top.continew.starter.core.util.IpUtils; import top.continew.starter.core.util.IpUtils;
import top.continew.starter.log.core.enums.Include; import top.continew.starter.log.core.enums.Include;
import top.continew.starter.web.util.ServletUtils; import top.continew.starter.web.util.ServletUtils;
@@ -89,7 +90,9 @@ public class LogRequest {
} else if (includes.contains(Include.REQUEST_PARAM)) { } else if (includes.contains(Include.REQUEST_PARAM)) {
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))
? ExceptionUtils.exToNull(() -> IpUtils.getIpv4Address(this.ip))
: null;
if (null == this.headers) { if (null == this.headers) {
return; return;
} }