修复等待时间

yzg-util-base/src/main/java/com/yanzuoguang/util/thread/ThreadHelper.java

 package com.yanzuoguang.util.thread;
 
-import com.yanzuoguang.util.helper.DateHelper;
 import com.yanzuoguang.util.exception.ExceptionHelper;
+import com.yanzuoguang.util.helper.DateHelper;
 
 import java.util.Date;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.function.Predicate;
 
 /**
  * 线程帮助类
+ *
  * @author 颜佐光
  */
 public class ThreadHelper {
@@ -237,4 +239,23 @@ public class ThreadHelper {
         });
     }
 
+    /**
+     * 等待条件是否满足
+     *
+     * @param waitMax  等待最大值
+     * @param waitItem 每次等待值
+     * @param cond     判断等待条件(已等待时间)
+     */
+    public static void waitRun(long waitMax, int waitItem, Predicate<Long> cond) {
+        long waitStart = System.currentTimeMillis();
+        long waitTime = 0;
+        while (cond.test(waitTime)) {
+            // 等待线程同步,超过该时间则不继续等待
+            ThreadHelper.sleep(waitItem);
+            waitTime = System.currentTimeMillis() - waitStart;
+            if (waitTime > waitMax) {
+                break;
+            }
+        }
+    }
 }

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

@@ -20,6 +20,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class AspectLogResult {
 
+    public static final int WAIT_MAX = 30;
+    public static final int WAIT_ITEM = 10;
     private final CloudConfig cloudConfig;
     private final LogLocal logLocal;
     private final AspectLogBody aspectLogBody;
@@ -50,9 +52,9 @@ public class AspectLogResult {
     public void responseLog(Class<?> cls, String tag, String url, boolean logFlag, long start,
                             Object requestBody, Object result, Exception resultEx, LogVo log) {
         try {
+            ThreadHelper.waitRun(WAIT_MAX, WAIT_ITEM, k -> StringHelper.isEmpty(log.getLogId()));
             if (StringHelper.isEmpty(log.getLogId())) {
-                // 等待线程同步,超过该时间则不继续等待
-                ThreadHelper.sleep(30);
+                return;
             }
             String body = aspectLogBody.getBodyString(requestBody);
             if (!StringHelper.compare(log.getContent(), body)) {

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

@@ -66,15 +66,16 @@ public class LogLocal implements ThreadNext.Next, InitializingBean {
      * @param content      请求内容
      */
     public void startLog(LogVo log, String actionKey, String actionSubKey, String content) {
+        // 声明超时对象
+        Timeout<LogVo> time = new Timeout<>(log);
+        log.setCreateDate(DateHelper.getDateTimeString(new Date(time.getStart())));
         // 写入其他对象
         log.setActionKey(actionKey);
         log.setActionSubKey(actionSubKey);
         log.setContent(content);
-        // 声明超时对象
-        Timeout<LogVo> time = new Timeout<>(log);
-        log.setCreateDate(DateHelper.getDateTimeString(new Date(time.getStart())));
         // 生命日志对象爱嗯
         log.setLogId(StringHelper.getNewID());
+
         cache.put(log.getLogId(), time);
     }