瀏覽代碼

perf(消费服务): 记录有效性验证优化

1.去掉线程执行超时限制,等线程执行完成
autumnal_wind 11 月之前
父節點
當前提交
b785a8c98f

+ 4 - 8
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/check/CommonCheck.java

@@ -117,7 +117,8 @@ public class CommonCheck {
                 }
 
                 try {
-                    R<ErrorInfo> result = future.get(VALIDATION_TIMEOUT, TimeUnit.MILLISECONDS);
+                    // R<ErrorInfo> result = future.get(VALIDATION_TIMEOUT, TimeUnit.MILLISECONDS);
+                    R<ErrorInfo> result = future.get();
                     // 发现错误,立即取消其他任务
                     if (result != null && R.isError(result)) {
                         if (firstError.compareAndSet(null, result)) {
@@ -125,17 +126,12 @@ public class CommonCheck {
                         }
                     }
                 } catch (ExecutionException e) {
-                    log.error("{}验证执行异常",getTaskName(taskIndex), e);
+                    log.error("{}验证执行异常", getTaskName(taskIndex), e);
                     if (firstError.compareAndSet(null, createError(TradeStatusEnum.SysError))) {
                         futures.forEach(f -> f.cancel(true));
                     }
-                } catch (TimeoutException e) {
-                    log.warn("{}超时",getTaskName(taskIndex));
-                    if (firstError.compareAndSet(null, createError(TradeStatusEnum.VALIDATION_TIMEOUT))) {
-                        futures.forEach(f -> f.cancel(true));
-                    }
                 } finally {
-                    log.info("{}完成,耗时:{} ms",getTaskName(taskIndex),System.currentTimeMillis()-starTime);
+                    log.info("{}完成,耗时:{} ms", getTaskName(taskIndex), System.currentTimeMillis() - starTime);
                     taskIndex++;
                 }
             }