diff --git a/src/main/java/neatlogic/framework/asynchronization/threadlocal/RequestContext.java b/src/main/java/neatlogic/framework/asynchronization/threadlocal/RequestContext.java index bfd4a4a401cd3c1157fdcd94a05419b408b136f6..d2092a2cc8866b64019b990ea4b5acf10a532322 100644 --- a/src/main/java/neatlogic/framework/asynchronization/threadlocal/RequestContext.java +++ b/src/main/java/neatlogic/framework/asynchronization/threadlocal/RequestContext.java @@ -17,6 +17,7 @@ package neatlogic.framework.asynchronization.threadlocal; import neatlogic.framework.dto.healthcheck.SqlAuditVo; import neatlogic.framework.restful.constvalue.RejectSource; +import org.apache.commons.lang3.StringUtils; import org.slf4j.MDC; import javax.servlet.http.Cookie; @@ -119,7 +120,18 @@ public class RequestContext implements Serializable { context.setUrl(_requestContext.getUrl()); context.setLocale(_requestContext.getLocale()); context.setSqlAuditList(_requestContext.getSqlAuditList()); - MDC.put("url", _requestContext.getUrl()); + String tempUrl = _requestContext.getUrl(); + if (tempUrl == null) { + tempUrl = StringUtils.EMPTY; + } + HttpServletRequest request = _requestContext.getRequest(); + if (request != null) { + String remoteAddr = request.getRemoteAddr(); + if (StringUtils.isNotBlank(remoteAddr)) { + tempUrl += "(" + remoteAddr + ")"; + } + } + MDC.put("url", tempUrl); } instance.set(context); return context; @@ -137,7 +149,12 @@ public class RequestContext implements Serializable { context.setLocale(Locale.getDefault()); } } - MDC.put("url", url); + String tempUrl = url; + String remoteAddr = request.getRemoteAddr(); + if (StringUtils.isNotBlank(remoteAddr)) { + tempUrl += "(" + remoteAddr + ")"; + } + MDC.put("url", tempUrl); return context; } diff --git a/src/main/java/neatlogic/framework/dao/mapper/ConfigMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/ConfigMapper.xml index 0a671bf7ec437623137b2cc2c74a02215eb4199b..17b64dc79a62f94a017ab2d34f838bb3c851abe2 100644 --- a/src/main/java/neatlogic/framework/dao/mapper/ConfigMapper.xml +++ b/src/main/java/neatlogic/framework/dao/mapper/ConfigMapper.xml @@ -16,7 +16,7 @@ along with this program. If not, see .--> - + select token diff --git a/src/main/java/neatlogic/framework/logback/converter/RequestUrlConverter.java b/src/main/java/neatlogic/framework/logback/converter/RequestUrlConverter.java index 1c022a31357dda7ea1838ee959c8816eef9cbc19..b006b3e75d854a88f880ab1e81cc91bbd5bd8916 100644 --- a/src/main/java/neatlogic/framework/logback/converter/RequestUrlConverter.java +++ b/src/main/java/neatlogic/framework/logback/converter/RequestUrlConverter.java @@ -20,6 +20,7 @@ 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; @@ -40,7 +41,18 @@ public class RequestUrlConverter extends ClassicConverter implements Serializabl public String convert(ILoggingEvent event) { RequestContext requestContext = RequestContext.get(); if (requestContext != null) { - return requestContext.getUrl(); + 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 + ")"; + } + } + return url; } else { Map map = event.getMDCPropertyMap(); String url = map.get("url");