Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial

648540858

2022-07-03 e78c402a248ff252ee93e724396c62d806087fab

 src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java

@@ -103,12 +103,12 @@

    public void stop(String key) {
        if (futureMap.get(key) != null && !futureMap.get(key).isCancelled()) {
            futureMap.get(key).cancel(true);
            Runnable runnable = runnableMap.get(key);
            if (runnable instanceof ISubscribeTask) {
                ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
                subscribeTask.stop();
            }
//            Runnable runnable = runnableMap.get(key);
//            if (runnable instanceof ISubscribeTask) {
//                ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
//                subscribeTask.stop();
//            }
            futureMap.get(key).cancel(false);
        }
    }