From 1a1a68784b9e8fa24b8ab863b974f4e5e84ffe44 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Mon, 11 Jul 2022 16:41:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=B1=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=BA=E7=89=A9?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E7=A7=BB=E9=99=A4=E4=BA=BA=E7=89=A9?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java | 7 ++-----
 src/main/resources/all-application.yml                    | 2 --
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java b/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java
index ade2e622..1f18338b 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java
@@ -103,12 +103,9 @@ public class DynamicTask {
 
     public void stop(String key) {
         if (futureMap.get(key) != null && !futureMap.get(key).isCancelled()) {
-//            Runnable runnable = runnableMap.get(key);
-//            if (runnable instanceof ISubscribeTask) {
-//                ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
-//                subscribeTask.stop();
-//            }
             futureMap.get(key).cancel(false);
+            futureMap.remove(key);
+            runnableMap.remove(key);
         }
     }
 
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 9dedcb14..ef14c242 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -185,8 +185,6 @@ user-settings:
     record-sip: true
     # 是否将日志存储进数据库
     logInDatebase: true
-    # 第三方匹配，用于从stream钟获取有效信息
-    thirdPartyGBIdReg: "[\\s\\S]*"
 
 # 在线文档： swagger-ui（生产环境建议关闭）
 swagger-ui: