From 8567b31b38b222426468d1d677fea9cf915fb90e Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 16 九月 2022 10:51:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
index ff2c588..b2d19f2 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 @Component("VnnoxAPIUtil")
 @AllArgsConstructor
@@ -316,7 +317,7 @@
         CountDownLatch countDownLatch = new CountDownLatch(size * 2);
         countDownLatchUtil.push(response.getLogid(), countDownLatch);
         try {
-            countDownLatch.await();
+            countDownLatch.await(10000, TimeUnit.MILLISECONDS);
             countDownLatchUtil.remove(response.getLogid());
         } catch (InterruptedException e) {
             throw new RuntimeException(e);

--
Gitblit v1.9.3