Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -45,10 +45,10 @@ public class RequestLogAspect {
|
||||
public Object doAround(ProceedingJoinPoint proceedingJoinPoint) throws Throwable {
|
||||
|
||||
long start = System.currentTimeMillis();
|
||||
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
|
||||
HttpServletRequest request = attributes.getRequest();
|
||||
Object result = proceedingJoinPoint.proceed();
|
||||
|
||||
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
|
||||
if (attributes != null) {
|
||||
HttpServletRequest request = attributes.getRequest();
|
||||
if (frameConfig.getShowControllerLog()) {
|
||||
RequestInfo requestInfo = new RequestInfo();
|
||||
requestInfo.setIp(request.getRemoteAddr());
|
||||
@@ -61,12 +61,15 @@ public class RequestLogAspect {
|
||||
requestInfo.setTimeCost(System.currentTimeMillis() - start);
|
||||
LOGGER.info("Request Info : {}", JSON.toJSONString(requestInfo));
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@AfterThrowing(pointcut = "requestServer()", throwing = "e")
|
||||
public void doAfterThrow(JoinPoint joinPoint, RuntimeException e) {
|
||||
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
|
||||
if (attributes != null) {
|
||||
HttpServletRequest request = attributes.getRequest();
|
||||
RequestErrorInfo requestErrorInfo = new RequestErrorInfo();
|
||||
requestErrorInfo.setIp(request.getRemoteAddr());
|
||||
@@ -78,6 +81,7 @@ public class RequestLogAspect {
|
||||
requestErrorInfo.setException(e);
|
||||
LOGGER.error("Error Request Info : {}", JSON.toJSONString(requestErrorInfo));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取入参
|
||||
|
||||
@@ -230,25 +230,25 @@
|
||||
</profile>
|
||||
</profiles>
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>releases</id>
|
||||
<name>Releases</name>
|
||||
<url>http://192.168.0.123:8081/repository/maven-releases/</url>
|
||||
</repository>
|
||||
<snapshotRepository>
|
||||
<id>snapshots</id>
|
||||
<name>Snapshot</name>
|
||||
<url>http://192.168.0.123:8081/repository/maven-snapshots/</url>
|
||||
</snapshotRepository>
|
||||
<!-- <repository>-->
|
||||
<!-- <id>releases-hc</id>-->
|
||||
<!-- <id>releases</id>-->
|
||||
<!-- <name>Releases</name>-->
|
||||
<!-- <url>https://qs.taixingyiji.com:8082/repository/maven-releases/</url>-->
|
||||
<!-- <url>http://192.168.0.123:8081/repository/maven-releases/</url>-->
|
||||
<!-- </repository>-->
|
||||
<!-- <snapshotRepository>-->
|
||||
<!-- <id>snapshots-hc</id>-->
|
||||
<!-- <id>snapshots</id>-->
|
||||
<!-- <name>Snapshot</name>-->
|
||||
<!-- <url>https://qs.taixingyiji.com:8082/repository/maven-snapshots/</url>-->
|
||||
<!-- <url>http://192.168.0.123:8081/repository/maven-snapshots/</url>-->
|
||||
<!-- </snapshotRepository>-->
|
||||
<repository>
|
||||
<id>releases-hc</id>
|
||||
<name>Releases</name>
|
||||
<url>https://qs.taixingyiji.com:8082/repository/maven-releases/</url>
|
||||
</repository>
|
||||
<snapshotRepository>
|
||||
<id>snapshots-hc</id>
|
||||
<name>Snapshot</name>
|
||||
<url>https://qs.taixingyiji.com:8082/repository/maven-snapshots/</url>
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
</project>
|
||||
|
||||
Reference in New Issue
Block a user