diff --git a/system/src/main/java/com/njcn/gather/system/log/aop/LogAdvice.java b/system/src/main/java/com/njcn/gather/system/log/aop/LogAdvice.java
index e71fdc71..57aef9c5 100644
--- a/system/src/main/java/com/njcn/gather/system/log/aop/LogAdvice.java
+++ b/system/src/main/java/com/njcn/gather/system/log/aop/LogAdvice.java
@@ -2,14 +2,9 @@ package com.njcn.gather.system.log.aop;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.spring.SpringUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.njcn.common.bean.CustomCacheUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.constant.SecurityConstants;
 import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.utils.JwtUtil;
 import com.njcn.db.mybatisplus.constant.UserConstant;
 import com.njcn.gather.system.log.pojo.enums.LogLevelEnum;
 import com.njcn.gather.system.log.pojo.enums.LogOperationTypeEnum;
@@ -19,9 +14,9 @@ import com.njcn.gather.system.log.service.ISysLogAuditService;
 import com.njcn.gather.user.user.pojo.po.SysUser;
 import com.njcn.gather.user.user.service.ISysUserService;
 import com.njcn.web.utils.HttpServletUtil;
+import com.njcn.web.utils.RequestUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.apache.logging.log4j.util.Strings;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -35,7 +30,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Map;
 import java.util.concurrent.*;
 
 /**
@@ -61,14 +55,10 @@ public class LogAdvice implements ApplicationListener<ContextRefreshedEvent> {
     @Around("logPointcut()")
     public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
         String username = "";
-        HttpServletRequest request = HttpServletUtil.getRequest();
-        String authorization = request.getHeader(SecurityConstants.AUTHORIZATION_KEY);
-        if (StrUtil.isNotBlank(authorization)) {
-            String tokenStr = authorization.replace(SecurityConstants.AUTHORIZATION_PREFIX, Strings.EMPTY);
-
-            Map<String, Object> map = JwtUtil.parseToken(tokenStr);
-            SysUser user = sysUserService.getById((String) map.get(SecurityConstants.USER_ID));
-            if(ObjectUtil.isNotNull(user)){
+        String userId = RequestUtil.getUserId();
+        if (StrUtil.isNotBlank(userId)) {
+            SysUser user = sysUserService.getById(RequestUtil.getUserId());
+            if (ObjectUtil.isNotNull(user)) {
                 username = user.getName();
             }
         }
@@ -92,8 +82,7 @@ public class LogAdvice implements ApplicationListener<ContextRefreshedEvent> {
         sysLogAudit.setWarn(warn); //0-未告警，1-告警
         sysLogAudit.setCreateBy(username);
 
-        HttpServletRequest request = HttpServletUtil.getRequest();
-        sysLogAudit.setIp(request.getRemoteAddr());
+        sysLogAudit.setIp(RequestUtil.getUserIp());
 
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         Method method = signature.getMethod();
diff --git a/system/src/main/java/com/njcn/gather/system/log/service/impl/SysLogAuditServiceImpl.java b/system/src/main/java/com/njcn/gather/system/log/service/impl/SysLogAuditServiceImpl.java
index d404ab64..b85c4796 100644
--- a/system/src/main/java/com/njcn/gather/system/log/service/impl/SysLogAuditServiceImpl.java
+++ b/system/src/main/java/com/njcn/gather/system/log/service/impl/SysLogAuditServiceImpl.java
@@ -17,6 +17,7 @@ import com.njcn.gather.user.user.pojo.po.SysUser;
 import com.njcn.gather.user.user.service.ISysUserService;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.HttpServletUtil;
+import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -99,8 +100,7 @@ public class SysLogAuditServiceImpl extends ServiceImpl<SysLogAuditMapper, SysLo
         sysLogAudit.setOperateType(LogOperationTypeEnum.OPERATE.getMsg());
         sysLogAudit.setLevel(LogLevelEnum.INFO.getCode());
         sysLogAudit.setWarn(0);
-        HttpServletRequest request = HttpServletUtil.getRequest();
-        sysLogAudit.setIp(request.getRemoteAddr());
+        sysLogAudit.setIp(RequestUtil.getUserIp());
         String typeStr = (type == 1 ? "登录" : "注销");
         sysLogAudit.setResult(typeStr + "成功");
         String now = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));