修改公式和计算帮助类

yzg-util-cloud/src/main/java/com/yanzuoguang/cloud/aop/BaseRequestAspect.java

@@ -245,10 +245,10 @@ public class BaseRequestAspect {
             // 日志请求不记录,防止死循环递归
             boolean isLog = isLog(name, log.getActionSubKey());
             if (isLog) {
-                return;
+                logLocal.remove(log);
+            } else {
+                logLocal.result(log, responseResult.getCode(), JsonHelper.serialize(responseResult));
             }
-            // 正常请求不记录
-            logLocal.result(log, responseResult.getCode(), JsonHelper.serialize(responseResult));
         } catch (Exception e) {
             e.printStackTrace();
         } finally {

yzg-util-cloud/src/main/java/com/yanzuoguang/cloud/aop/LogLocal.java

@@ -88,7 +88,7 @@ public class LogLocal implements ThreadNext.Next, InitializingBean {
      */
     public void result(LogVo log, String status, String result) {
         Timeout<LogVo> timeout = cache.get(log.getLogId());
-        result(timeout, log, status, result);
+        result(timeout, log, status, result, true);
     }
 
     /**
@@ -98,7 +98,7 @@ public class LogLocal implements ThreadNext.Next, InitializingBean {
      * @param result
      * @return
      */
-    public void result(Timeout timeout, LogVo log, String status, String result) {
+    private void result(Timeout timeout, LogVo log, String status, String result, boolean write) {
         if (timeout != null) {
             long useTime = System.currentTimeMillis() - timeout.getStart();
             log.setUseTime((int) useTime);
@@ -108,7 +108,19 @@ public class LogLocal implements ThreadNext.Next, InitializingBean {
         if (!StringHelper.compare(status, MAX_TIME)) {
             cache.remove(log.getLogId());
         }
-        logBase.addLog(log);
+        if (write) {
+            logBase.addLog(log);
+        }
+    }
+
+    /**
+     * 删除请求信息
+     *
+     * @param log
+     */
+    public void remove(LogVo log) {
+        Timeout<LogVo> timeout = cache.get(log.getLogId());
+        result(timeout, log, StringHelper.EMPTY, StringHelper.EMPTY, false);
     }
 
     /**
@@ -117,7 +129,7 @@ public class LogLocal implements ThreadNext.Next, InitializingBean {
      * @return
      */
     private void writeTimeout(Timeout<LogVo> timeout) {
-        result(timeout, timeout.getData(), MAX_TIME, MAX_TIME_NAME);
+        result(timeout, timeout.getData(), MAX_TIME, MAX_TIME_NAME, true);
     }
 
     /**