还原扫描线程为线程池运行

byit-myth-core/myth-admin-core/src/main/java/com/byit/factory/BaseDaemonScanThreadRunHelper.java

@@ -49,10 +49,6 @@ public abstract class BaseDaemonScanThreadRunHelper implements DaemonScanThreadR
      */
     public static final Set<String> LOCK_NAMES = new HashSet<>(8);
 
-    /**
-     * 扫描线程数量
-     */
-    public static ThreadPoolExecutor SCAN_WORLD_THREAD = ThreadPoolUtil.createFixedLengthThreadPoolExecutor("scan flow stream thread",THREAD_RUN_OPT.entrySet().size());
 
 
     /**
@@ -71,27 +67,26 @@ public abstract class BaseDaemonScanThreadRunHelper implements DaemonScanThreadR
      */
     @Override
     public void logoutThreadGroup() {
-//        THREAD_GROUP_STOP = true;
-//        Set<Map.Entry<String, Thread>> threadExamples = THREADS_MAP.entrySet();
-//        threadExamples.forEach(threadExample ->{
-//            log.warn("------------开始注销线程{}------------",threadExample);
-//            String threadName = threadExample.getKey();
-//            Thread thread = threadExample.getValue();
-//            dateAligned(CLOSE_WAIT_TIME,threadName);
-//            //判断线程是否处于终止状态
-//            if(thread.getState() != Thread.State.TERMINATED){
-//                thread.interrupt();
-//
-//                try {
-//                    thread.join();
-//                } catch (InterruptedException e) {
-//                    e.printStackTrace( );
-//                }
-//            }
-//            log.warn("--------{}线程被注销---------",threadName);
-//        });
+        THREAD_GROUP_STOP = true;
+        Set<Map.Entry<String, Thread>> threadExamples = THREADS_MAP.entrySet();
+        threadExamples.forEach(threadExample ->{
+            log.warn("------------开始注销线程{}------------",threadExample);
+            String threadName = threadExample.getKey();
+            Thread thread = threadExample.getValue();
+            dateAligned(CLOSE_WAIT_TIME,threadName);
+            //判断线程是否处于终止状态
+            if(thread.getState() != Thread.State.TERMINATED){
+                thread.interrupt();
+
+                try {
+                    thread.join();
+                } catch (InterruptedException e) {
+                    e.printStackTrace( );
+                }
+            }
+            log.warn("--------{}线程被注销---------",threadName);
+        });
 
-        SCAN_WORLD_THREAD.shutdown();
 
         LOCK_NAMES.forEach(lockName ->{
             log.warn("--------{}锁消除---------",lockName);

byit-myth-core/myth-admin-core/src/main/java/com/byit/factory/DaemonScanThreadRunHelperRedisLock.java

@@ -25,12 +25,12 @@ public class DaemonScanThreadRunHelperRedisLock extends BaseDaemonScanThreadRunH
     /**
      * 扫描线程数量
      */
-    public static ThreadPoolExecutor SCAN_WORLD_THREAD = null;
+    //public static ThreadPoolExecutor SCAN_WORLD_THREAD = null;
 
     @Override
     public void runDaemonThreads() {
         Set<Map.Entry<String, BaseThreadRunHelper>> entries = THREAD_RUN_OPT.entrySet();
-        SCAN_WORLD_THREAD = ThreadPoolUtil.createFixedLengthThreadPoolExecutor("scan flow stream thread",entries.size());
+        //SCAN_WORLD_THREAD = ThreadPoolUtil.createFixedLengthThreadPoolExecutor("scan flow stream thread",entries.size());
         entries.forEach(threadExamples ->{
             String examplesKey = threadExamples.getKey();
             BaseThreadRunHelper examplesValue = threadExamples.getValue();
@@ -70,8 +70,8 @@ public class DaemonScanThreadRunHelperRedisLock extends BaseDaemonScanThreadRunH
         });
         exampleThread.setName(threadName);
         exampleThread.setDaemon(true);
-        SCAN_WORLD_THREAD.execute(exampleThread);
-        //exampleThread.start()
+        //SCAN_WORLD_THREAD.execute(exampleThread);
+        exampleThread.start();
         THREADS_MAP.put(threadName,exampleThread);
     }
 }