Commit 89b4db50 authored by yanzg's avatar yanzg

不记录系统日志

parent ea9648f1
...@@ -188,10 +188,10 @@ public class BaseRequestAspect { ...@@ -188,10 +188,10 @@ public class BaseRequestAspect {
* @param resultEx * @param resultEx
* @param start * @param start
*/ */
protected void responseLog(LogVo log, String tag, boolean logFlag, ProceedingJoinPoint joinPoint, long start, Object result, Exception resultEx) { protected void responseLog(LogVo log, String tag, String url, boolean logFlag, ProceedingJoinPoint joinPoint, long start, Object result, Exception resultEx) {
try { try {
long time = System.currentTimeMillis() - start; long time = System.currentTimeMillis() - start;
boolean isLog = (logFlag && logCommon && this.logLocal.isLog()) || resultEx != null; boolean isLog = (logFlag && logCommon && this.logLocal.isLog(tag, url)) || resultEx != null;
String name = joinPoint.getSignature().getName(); String name = joinPoint.getSignature().getName();
// 处理结果 // 处理结果
ResponseResult responseResult = responseDefault; ResponseResult responseResult = responseDefault;
......
...@@ -41,8 +41,9 @@ public class FeignAspect extends BaseRequestAspect { ...@@ -41,8 +41,9 @@ public class FeignAspect extends BaseRequestAspect {
LogVo log = null; LogVo log = null;
boolean clear = requestLogInit(); boolean clear = requestLogInit();
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
String url = getMethodUrl(joinPoint);
if (clear) { if (clear) {
log = startLog(TAG, getMethodUrl(joinPoint), getRequestBody(joinPoint)); log = startLog(TAG, url, getRequestBody(joinPoint));
clear = clear && log != null; clear = clear && log != null;
} }
if (clear) { if (clear) {
...@@ -72,7 +73,7 @@ public class FeignAspect extends BaseRequestAspect { ...@@ -72,7 +73,7 @@ public class FeignAspect extends BaseRequestAspect {
ex = e; ex = e;
throw e; throw e;
} finally { } finally {
responseLog(log, TAG, clear, joinPoint, start, result, ex); responseLog(log, TAG, url, clear, joinPoint, start, result, ex);
} }
} }
......
...@@ -63,13 +63,18 @@ public class LogBase implements ThreadNext.Next, InitializingBean { ...@@ -63,13 +63,18 @@ public class LogBase implements ThreadNext.Next, InitializingBean {
// return true; // return true;
// } // }
if (logFeign == null) {
for (LogFeign log : logFeigns) { for (LogFeign log : logFeigns) {
if (log instanceof LogFeignDefault && logFeign == null) { if (log instanceof LogFeignDefault) {
if (logFeign == null) {
logFeign = log; logFeign = log;
}
} else { } else {
logFeign = log; logFeign = log;
} }
} }
}
while (cache.size() > 0) { while (cache.size() > 0) {
LogVo item = cache.poll(); LogVo item = cache.poll();
......
...@@ -45,8 +45,9 @@ public class MqAspect extends BaseRequestAspect { ...@@ -45,8 +45,9 @@ public class MqAspect extends BaseRequestAspect {
boolean clear = isRabbit(joinPoint); boolean clear = isRabbit(joinPoint);
LogVo log = null; LogVo log = null;
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
String url = getMethodUrl(joinPoint);
if (clear) { if (clear) {
log = startLog(TAG, getMethodUrl(joinPoint), getRequestBody(joinPoint)); log = startLog(TAG, url, getRequestBody(joinPoint));
clear = clear && log != null; clear = clear && log != null;
} }
if (clear) { if (clear) {
...@@ -64,7 +65,7 @@ public class MqAspect extends BaseRequestAspect { ...@@ -64,7 +65,7 @@ public class MqAspect extends BaseRequestAspect {
ex = e; ex = e;
throw e; throw e;
} finally { } finally {
responseLog(log, TAG, clear, joinPoint, start, result, ex); responseLog(log, TAG, url, clear, joinPoint, start, result, ex);
} }
} }
......
...@@ -73,8 +73,9 @@ public class WebAspect extends BaseRequestAspect { ...@@ -73,8 +73,9 @@ public class WebAspect extends BaseRequestAspect {
LogVo log = null; LogVo log = null;
boolean clear = requestLogInit(); boolean clear = requestLogInit();
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
String url = getMethodUrl(joinPoint);
if (clear) { if (clear) {
log = startLog(TAG, getMethodUrl(joinPoint), getRequestBody(joinPoint)); log = startLog(TAG, url, getRequestBody(joinPoint));
clear = clear && log != null; clear = clear && log != null;
} }
if (clear) { if (clear) {
...@@ -123,7 +124,7 @@ public class WebAspect extends BaseRequestAspect { ...@@ -123,7 +124,7 @@ public class WebAspect extends BaseRequestAspect {
if (isInit) { if (isInit) {
TokenHelper.remove(); TokenHelper.remove();
} }
responseLog(log, TAG, clear, joinPoint, start, result, ex); responseLog(log, TAG, url, clear, joinPoint, start, result, ex);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment