From 415dd09bcfd958d68cbfdccebd9c49a88173aeb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Wed, 26 Jul 2023 11:52:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=80=BC=E7=8F=AD=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=97=A5=E5=BF=97=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hnac/hzims/common/logs/aop/SysLogAspect.java | 3 ++- .../hnac/hzims/common/logs/utils/WebIpUtils.java | 29 ++++++++++++++++++++++ .../controller/DangerSourceController.java | 2 +- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/utils/WebIpUtils.java diff --git a/hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/aop/SysLogAspect.java b/hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/aop/SysLogAspect.java index c2935fe..7fae2b4 100644 --- a/hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/aop/SysLogAspect.java +++ b/hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/aop/SysLogAspect.java @@ -7,6 +7,7 @@ import com.hnac.hzims.common.logs.consumer.SysLogQueue; import com.hnac.hzims.common.logs.to.SysLogTo; import com.hnac.hzims.common.logs.enums.BusinessStatus; import com.hnac.hzims.common.logs.utils.StringUtils; +import com.hnac.hzims.common.logs.utils.WebIpUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.*; @@ -226,7 +227,7 @@ public class SysLogAspect { sysLog.setOperationUserName(userName); sysLog.setOperationUserId(userId); sysLog.setTenantId(Func.toStr(AuthUtil.getTenantId(), BladeConstant.ADMIN_TENANT_ID)); - sysLog.setLocalIp(WebUtil.getIP(request));// 请求IP + sysLog.setLocalIp(WebIpUtils.getIpAddr(request));// 请求IP // if (stopWatch.isRunning()) { // stopWatch.stop(); // } diff --git a/hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/utils/WebIpUtils.java b/hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/utils/WebIpUtils.java new file mode 100644 index 0000000..c07c428 --- /dev/null +++ b/hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/utils/WebIpUtils.java @@ -0,0 +1,29 @@ +package com.hnac.hzims.common.logs.utils; + +import javax.servlet.http.HttpServletRequest; + +/** + * @Author WL + * @Version v1.0 + * @Serial 1.0 + * @Date 2023/7/26 11:34 + */ +public class WebIpUtils { + + public static String getIpAddr(HttpServletRequest request) { + String ip = request.getHeader("x-forwarded-for"); + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("WL-Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getRemoteAddr(); + } + if (!(null == ip || "".equals(ip.trim()) || "null".equalsIgnoreCase(ip.trim())) && ip.contains(",")) { + ip = ip.split(",")[0]; + } + return ip; + } +} diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/DangerSourceController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/DangerSourceController.java index 5215e5c..db6a7b9 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/DangerSourceController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/DangerSourceController.java @@ -85,7 +85,7 @@ public class DangerSourceController extends BladeController { @ApiOperation(value = "分页", notes = "查询条件：eqId,level,`dangerEle,applyType,type") @OperationAnnotation(moduleName = "安全管理",title = "危险点列表",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "分页查询危险点列表列表") + action = "分页查询危险点列表") public R> list(DangerSourceEntity req, Query query) { return dangerSourceService.pageCondition(req, query); }