Merge remote-tracking branch 'origin/developer' into developer

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

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

 package com.byit.factory;
 
 import com.byit.thread.BaseThreadRunHelper;
+import com.byit.util.ThreadPoolUtil;
 import com.byit.util.lock.RedissLockUtil;
 import lombok.extern.slf4j.Slf4j;
 
@@ -8,6 +9,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -48,6 +50,12 @@ 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());
+
+
+    /**
      * 线程添加 将线程扫描器添加进线程管理池
      * @param threadRunHelper 扫描器
      */
@@ -63,25 +71,27 @@ 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();
+//        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);
+//        });
 
-                try {
-                    thread.join();
-                } catch (InterruptedException e) {
-                    e.printStackTrace( );
-                }
-            }
-            log.warn("--------{}线程被注销---------",threadName);
-        });
+        SCAN_WORLD_THREAD.shutdown();
 
         LOCK_NAMES.forEach(lockName ->{
             log.warn("--------{}锁消除---------",lockName);