Merge remote-tracking branch 'origin/master'

liuhaonan

2022-09-07 4dd900d3ba36d12adf860eb5a28a40589f55e0a2

Merge remote-tracking branch 'origin/master'

 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);