From 770a25907efdec9fa0102508b23a505069f8b833 Mon Sep 17 00:00:00 2001 From: xiwa Date: Fri, 12 Jan 2024 07:52:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:runMode=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DLT645-plugin/pom.xml | 2 +- http-plugin/pom.xml | 4 +-- .../src/main/resources/application.yml | 2 +- hydrovalve-plugin/pom.xml | 2 +- .../src/main/resources/application.yml | 2 +- modbus-plugin/pom.xml | 2 +- .../src/main/resources/application.yml | 2 +- mqtt-plugin/pom.xml | 2 +- .../src/main/resources/application.yml | 2 +- pom.xml | 10 ++----- tcp-plugin/pom.xml | 2 +- .../iotkit/plugins/tcp/server/TcpPlugin.java | 30 +++++++++++-------- .../plugins/tcp/server/TcpServerVerticle.java | 13 ++++---- tcp-plugin/src/main/resources/application.yml | 2 +- 14 files changed, 39 insertions(+), 38 deletions(-) diff --git a/DLT645-plugin/pom.xml b/DLT645-plugin/pom.xml index 1df61f8..3c57ec6 100755 --- a/DLT645-plugin/pom.xml +++ b/DLT645-plugin/pom.xml @@ -57,7 +57,7 @@ com.gitee.starblues spring-brick-maven-packager - ${spring-brick-package.version} + ${spring-brick.version} ${plugin.build.mode} diff --git a/http-plugin/pom.xml b/http-plugin/pom.xml index 021396c..91d21ef 100755 --- a/http-plugin/pom.xml +++ b/http-plugin/pom.xml @@ -52,7 +52,7 @@ com.gitee.starblues spring-brick-maven-packager - ${spring-brick-package.version} + ${spring-brick.version} ${plugin.build.mode} @@ -64,7 +64,7 @@ application.yml - jar + zip diff --git a/http-plugin/src/main/resources/application.yml b/http-plugin/src/main/resources/application.yml index 4bf4e13..dc52b9e 100755 --- a/http-plugin/src/main/resources/application.yml +++ b/http-plugin/src/main/resources/application.yml @@ -1,5 +1,5 @@ plugin: - runMode: dev + runMode: prod mainPackage: cc.iotkit.plugin http: diff --git a/hydrovalve-plugin/pom.xml b/hydrovalve-plugin/pom.xml index 2e1a147..17ea6b8 100644 --- a/hydrovalve-plugin/pom.xml +++ b/hydrovalve-plugin/pom.xml @@ -35,7 +35,7 @@ com.gitee.starblues spring-brick-maven-packager - ${spring-brick-package.version} + ${spring-brick.version} ${plugin.build.mode} diff --git a/hydrovalve-plugin/src/main/resources/application.yml b/hydrovalve-plugin/src/main/resources/application.yml index 9ff6468..3eecb34 100644 --- a/hydrovalve-plugin/src/main/resources/application.yml +++ b/hydrovalve-plugin/src/main/resources/application.yml @@ -3,6 +3,6 @@ plugin: mainPackage: cc.iotkit.plugin hydrovalve: - host: 25on621889.goho.co + host: xxxx port: 38807 interval: 20000 diff --git a/modbus-plugin/pom.xml b/modbus-plugin/pom.xml index 712982e..baa4ab2 100755 --- a/modbus-plugin/pom.xml +++ b/modbus-plugin/pom.xml @@ -45,7 +45,7 @@ com.gitee.starblues spring-brick-maven-packager - ${spring-brick-package.version} + ${spring-brick.version} ${plugin.build.mode} diff --git a/modbus-plugin/src/main/resources/application.yml b/modbus-plugin/src/main/resources/application.yml index 3fb99fe..2401036 100755 --- a/modbus-plugin/src/main/resources/application.yml +++ b/modbus-plugin/src/main/resources/application.yml @@ -1,5 +1,5 @@ plugin: - runMode: dev + runMode: prod mainPackage: cc.iotkit.plugin diff --git a/mqtt-plugin/pom.xml b/mqtt-plugin/pom.xml index aa53073..2739d51 100755 --- a/mqtt-plugin/pom.xml +++ b/mqtt-plugin/pom.xml @@ -56,7 +56,7 @@ com.gitee.starblues spring-brick-maven-packager - ${spring-brick-package.version} + ${spring-brick.version} ${plugin.build.mode} diff --git a/mqtt-plugin/src/main/resources/application.yml b/mqtt-plugin/src/main/resources/application.yml index edb8497..778daac 100755 --- a/mqtt-plugin/src/main/resources/application.yml +++ b/mqtt-plugin/src/main/resources/application.yml @@ -1,5 +1,5 @@ plugin: - runMode: dev + runMode: prod mainPackage: cc.iotkit.plugin mqtt: diff --git a/pom.xml b/pom.xml index ce0eaf9..b28dfdf 100755 --- a/pom.xml +++ b/pom.xml @@ -10,6 +10,7 @@ tcp-plugin DLT645-plugin hydrovalve-plugin + @@ -27,8 +28,7 @@ 11 2.7.11 - 3.1.2 - 3.1.3 + 3.1.3 4.2.2 @@ -86,12 +86,6 @@ lombok - - com.gitee.starblues - spring-brick-maven-packager - ${spring-brick-package.version} - - \ No newline at end of file diff --git a/tcp-plugin/pom.xml b/tcp-plugin/pom.xml index 21a2241..9ce4022 100755 --- a/tcp-plugin/pom.xml +++ b/tcp-plugin/pom.xml @@ -58,7 +58,7 @@ com.gitee.starblues spring-brick-maven-packager - ${spring-brick-package.version} + ${spring-brick.version} ${plugin.build.mode} diff --git a/tcp-plugin/src/main/java/cc/iotkit/plugins/tcp/server/TcpPlugin.java b/tcp-plugin/src/main/java/cc/iotkit/plugins/tcp/server/TcpPlugin.java index eaf1569..2a8b675 100755 --- a/tcp-plugin/src/main/java/cc/iotkit/plugins/tcp/server/TcpPlugin.java +++ b/tcp-plugin/src/main/java/cc/iotkit/plugins/tcp/server/TcpPlugin.java @@ -70,19 +70,23 @@ public class TcpPlugin implements PluginCloseListener, IPlugin { @Override public void close(GenericApplicationContext applicationContext, PluginInfo pluginInfo, PluginCloseType closeType) { log.info("plugin close,type:{},pluginId:{}", closeType, pluginInfo.getPluginId()); - if (deployedId != null) { - CountDownLatch wait = new CountDownLatch(1); - Future future = vertx.undeploy(deployedId); - future.onSuccess(unused -> { - log.info("tcp plugin stopped success"); - wait.countDown(); - }); - future.onFailure(h -> { - log.info("tcp plugin stopped failed"); - h.printStackTrace(); - wait.countDown(); - }); - wait.await(5, TimeUnit.SECONDS); + try { + if (deployedId != null) { + CountDownLatch wait = new CountDownLatch(1); + Future future = vertx.undeploy(deployedId); + future.onSuccess(unused -> { + log.info("tcp plugin stopped success"); + wait.countDown(); + }); + future.onFailure(h -> { + log.info("tcp plugin stopped failed"); + h.printStackTrace(); + wait.countDown(); + }); + wait.await(5, TimeUnit.SECONDS); + } + } catch (Throwable e) { + log.error("close plugin error", e); } } diff --git a/tcp-plugin/src/main/java/cc/iotkit/plugins/tcp/server/TcpServerVerticle.java b/tcp-plugin/src/main/java/cc/iotkit/plugins/tcp/server/TcpServerVerticle.java index 62b8465..d9fb27e 100755 --- a/tcp-plugin/src/main/java/cc/iotkit/plugins/tcp/server/TcpServerVerticle.java +++ b/tcp-plugin/src/main/java/cc/iotkit/plugins/tcp/server/TcpServerVerticle.java @@ -37,6 +37,7 @@ import javax.annotation.PostConstruct; import java.time.Duration; import java.util.*; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; /** @@ -76,13 +77,14 @@ public class TcpServerVerticle extends AbstractVerticle { @AutowiredType(AutowiredType.Type.MAIN_PLUGIN) private IThingService thingService; - @Override - public void start() { - initTcpServer(); - } - @Override public void stop() { + if (netServer != null) { + netServer.close(rst -> { + log.info("tcp server close:{}", rst.succeeded()); + }); + } + log.info("tcp server stopped"); } @@ -97,6 +99,7 @@ public class TcpServerVerticle extends AbstractVerticle { if (scriptEngine == null) { throw new BizException("script engine is null"); } + Executors.newSingleThreadScheduledExecutor().schedule(this::initTcpServer, 3, TimeUnit.SECONDS); } diff --git a/tcp-plugin/src/main/resources/application.yml b/tcp-plugin/src/main/resources/application.yml index 26b9230..e1d8e8f 100755 --- a/tcp-plugin/src/main/resources/application.yml +++ b/tcp-plugin/src/main/resources/application.yml @@ -1,5 +1,5 @@ plugin: - runMode: dev + runMode: prod mainPackage: cc.iotkit.plugin tcp: