diff --git a/src/main/java/neatlogic/framework/asynchronization/threadlocal/RequestContext.java b/src/main/java/neatlogic/framework/asynchronization/threadlocal/RequestContext.java
index 70529a64ac66a4925479b58a013f67e558fb8d7e..84907aa3cbfbdeade0bdc5ffafef305a21d287ea 100644
--- a/src/main/java/neatlogic/framework/asynchronization/threadlocal/RequestContext.java
+++ b/src/main/java/neatlogic/framework/asynchronization/threadlocal/RequestContext.java
@@ -34,6 +34,7 @@ public class RequestContext implements Serializable {
     private static final ThreadLocal<RequestContext> instance = new ThreadLocal<>();
     private static final long serialVersionUID = -5420998728515359626L;
     private String url;
+    private String remoteAddr;
     private HttpServletRequest request;
     private HttpServletResponse response;
     //接口访问拒绝来源，租户或接口
@@ -55,6 +56,14 @@ public class RequestContext implements Serializable {
         this.url = url;
     }
 
+    public String getRemoteAddr() {
+        return remoteAddr;
+    }
+
+    public void setRemoteAddr(String remoteAddr) {
+        this.remoteAddr = remoteAddr;
+    }
+
     public HttpServletRequest getRequest() {
         return request;
     }
@@ -121,16 +130,14 @@ public class RequestContext implements Serializable {
             context.setUrl(_requestContext.getUrl());
             context.setLocale(_requestContext.getLocale());
             context.setSqlAuditList(_requestContext.getSqlAuditList());
+            context.setRemoteAddr(_requestContext.getRemoteAddr());
             String tempUrl = _requestContext.getUrl();
             if (tempUrl == null) {
                 tempUrl = StringUtils.EMPTY;
             }
-            HttpServletRequest request = _requestContext.getRequest();
-            if (request != null) {
-                String remoteAddr = IpUtil.getIpAddr(request);
-                if (StringUtils.isNotBlank(remoteAddr)) {
-                    tempUrl += "(" + remoteAddr + ")";
-                }
+            String remoteAddr = _requestContext.getRemoteAddr();
+            if (StringUtils.isNotBlank(remoteAddr)) {
+                tempUrl += "(" + remoteAddr + ")";
             }
             MDC.put("url", tempUrl);
         }
@@ -151,8 +158,9 @@ public class RequestContext implements Serializable {
             }
         }
         String tempUrl = url;
-        String remoteAddr = request.getRemoteAddr();
+        String remoteAddr = IpUtil.getIpAddr(request);
         if (StringUtils.isNotBlank(remoteAddr)) {
+            context.setRemoteAddr(remoteAddr);
             tempUrl += "(" + remoteAddr + ")";
         }
         MDC.put("url", tempUrl);
diff --git a/src/main/java/neatlogic/framework/logback/converter/RequestUrlConverter.java b/src/main/java/neatlogic/framework/logback/converter/RequestUrlConverter.java
index b006b3e75d854a88f880ab1e81cc91bbd5bd8916..bcd1beb764dbdcec14325599735d9ffccbb3b376 100644
--- a/src/main/java/neatlogic/framework/logback/converter/RequestUrlConverter.java
+++ b/src/main/java/neatlogic/framework/logback/converter/RequestUrlConverter.java
@@ -17,10 +17,8 @@ package neatlogic.framework.logback.converter;
 
 import ch.qos.logback.classic.pattern.ClassicConverter;
 import ch.qos.logback.classic.spi.ILoggingEvent;
-import neatlogic.framework.asynchronization.threadlocal.RequestContext;
 import org.apache.commons.lang3.StringUtils;
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.Serializable;
 import java.util.Map;
 
@@ -39,26 +37,10 @@ public class RequestUrlConverter extends ClassicConverter implements Serializabl
      */
     @Override
     public String convert(ILoggingEvent event) {
-        RequestContext requestContext = RequestContext.get();
-        if (requestContext != null) {
-            String url = requestContext.getUrl();
-            if (url == null) {
-                url = StringUtils.EMPTY;
-            }
-            HttpServletRequest request = requestContext.getRequest();
-            if (request != null) {
-                String remoteAddr = request.getRemoteAddr();
-                if (StringUtils.isNotBlank(remoteAddr)) {
-                    url += "(" + remoteAddr + ")";
-                }
-            }
+        Map<String, String> map = event.getMDCPropertyMap();
+        String url = map.get("url");
+        if (StringUtils.isNotBlank(url)) {
             return url;
-        } else {
-            Map<String, String> map = event.getMDCPropertyMap();
-            String url = map.get("url");
-            if (StringUtils.isNotBlank(url)) {
-                return url;
-            }
         }
         return StringUtils.EMPTY;
     }
diff --git a/src/main/java/neatlogic/framework/logback/converter/TenantConverter.java b/src/main/java/neatlogic/framework/logback/converter/TenantConverter.java
index dde5dbb9c769028cb36db5661056936f2db0e528..c0efe54bdcf50ed18e4d449e9746890a610345de 100644
--- a/src/main/java/neatlogic/framework/logback/converter/TenantConverter.java
+++ b/src/main/java/neatlogic/framework/logback/converter/TenantConverter.java
@@ -17,7 +17,6 @@ package neatlogic.framework.logback.converter;
 
 import ch.qos.logback.classic.pattern.ClassicConverter;
 import ch.qos.logback.classic.spi.ILoggingEvent;
-import neatlogic.framework.asynchronization.threadlocal.TenantContext;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
@@ -38,14 +37,10 @@ public class TenantConverter extends ClassicConverter implements Serializable {
      */
     @Override
     public String convert(ILoggingEvent event) {
-        if (StringUtils.isNotBlank(TenantContext.get().getTenantUuid())) {
-            return TenantContext.get().getTenantUuid();
-        } else {
-            Map<String, String> map = event.getMDCPropertyMap();
-            String tenant = map.get("tenant");
-            if (StringUtils.isNotBlank(tenant)) {
-                return tenant;
-            }
+        Map<String, String> map = event.getMDCPropertyMap();
+        String tenant = map.get("tenant");
+        if (StringUtils.isNotBlank(tenant)) {
+            return tenant;
         }
         return StringUtils.EMPTY;
     }