Merge pull request #62 from CloudExplorer-Dev/[email protected]@request_ip

fix(sdk): 【日志】-操作日志中的操作IP没有展示客户端的IP
CloudExplorer-Dev · Apr 20, 2023 · 8f4727f · 8f4727f
2 parents 6390546 + 290a4c1
commit 8f4727f
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/framework/gateway/src/main/java/com/fit2cloud/gateway/config/LoginLogAspect.java b/framework/gateway/src/main/java/com/fit2cloud/gateway/config/LoginLogAspect.java
@@ -22,10 +22,12 @@
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.MDC;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.web.server.context.SecurityContextServerWebExchange;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
 
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.Optional;
 import java.util.UUID;
@@ -91,8 +93,14 @@ private void saveLog(ProceedingJoinPoint pjd, Object res, Long time, ResultHolde
                 logVO.setOperatedName(OperatedTypeEnum.getDescriptionByOperate(logVO.getOperated()));
                 // 资源类型
                 logVO.setResourceType(annotation.resourceType().getCode());
-                // 配置请求信息
-                logVO.setSourceIp(IpUtil.getHostIp());
+                // 请求地址
+                Arrays.stream(args).filter(c -> c instanceof SecurityContextServerWebExchange)
+                        .map(c -> (SecurityContextServerWebExchange) c)
+                        .findFirst()
+                        .ifPresent(s -> {
+                            String ipAddress = IpUtil.getIpAddress(s.getDelegate().getRequest());
+                            logVO.setSourceIp(ipAddress);
+                        });
                 // 上下文设置
                 setMDC(logVO);
                 LogUtil.info(logVO);