From 95777575c02311079aa91ab179d0d1bc5cf3481e Mon Sep 17 00:00:00 2001 From: bryan31 Date: Fri, 23 Jul 2021 18:42:21 +0800 Subject: [PATCH] =?UTF-8?q?bug=20#I40VPB=20=E5=85=B3=E4=BA=8ELiteflowExecu?= =?UTF-8?q?torAutoConfiguration=E4=B8=AD=E7=9A=84shutdown=20bean=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{Shutdown.java => LiteFlowExecutorPoolShutdown.java} | 4 ++-- .../springboot/LiteflowExecutorAutoConfiguration.java | 6 +++--- .../src/main/resources/applicationContext.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename liteflow-core/src/main/java/com/yomahub/liteflow/util/{Shutdown.java => LiteFlowExecutorPoolShutdown.java} (80%) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/util/Shutdown.java b/liteflow-core/src/main/java/com/yomahub/liteflow/util/LiteFlowExecutorPoolShutdown.java similarity index 80% rename from liteflow-core/src/main/java/com/yomahub/liteflow/util/Shutdown.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/util/LiteFlowExecutorPoolShutdown.java index 5076944c0..d4f913f36 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/util/Shutdown.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/util/LiteFlowExecutorPoolShutdown.java @@ -11,9 +11,9 @@ import java.util.concurrent.ExecutorService; * 执行清理工作 * @author Bryan.Zhang */ -public class Shutdown { +public class LiteFlowExecutorPoolShutdown { - private static final Logger LOG = LoggerFactory.getLogger(Shutdown.class); + private static final Logger LOG = LoggerFactory.getLogger(LiteFlowExecutorPoolShutdown.class); @PreDestroy public void destroy() throws Exception { diff --git a/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowExecutorAutoConfiguration.java b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowExecutorAutoConfiguration.java index ec7ab9c71..25a08cf15 100644 --- a/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowExecutorAutoConfiguration.java +++ b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowExecutorAutoConfiguration.java @@ -2,7 +2,7 @@ package com.yomahub.liteflow.springboot; import com.yomahub.liteflow.property.LiteflowConfig; import com.yomahub.liteflow.util.ExecutorHelper; -import com.yomahub.liteflow.util.Shutdown; +import com.yomahub.liteflow.util.LiteFlowExecutorPoolShutdown; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -30,7 +30,7 @@ public class LiteflowExecutorAutoConfiguration { } @Bean - public Shutdown shutdown() { - return new Shutdown(); + public LiteFlowExecutorPoolShutdown liteFlowExecutorPoolShutdown() { + return new LiteFlowExecutorPoolShutdown(); } } diff --git a/liteflow-test-spring/src/main/resources/applicationContext.xml b/liteflow-test-spring/src/main/resources/applicationContext.xml index d913fcc11..f3cbabd26 100644 --- a/liteflow-test-spring/src/main/resources/applicationContext.xml +++ b/liteflow-test-spring/src/main/resources/applicationContext.xml @@ -33,6 +33,6 @@ - +