Merge remote-tracking branch 'upstream/develop' into develop

# Conflicts:
#	hippo4j-example/hippo4j-config-etcd-spring-boot-starter-example/src/main/java/cn/hippo4j/example/config/etcd/config/ThreadPoolConfig.java

README.md

@@ -242,21 +242,28 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池
             <sub><b>Serenity</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/baymax55">
+            <img src="https://avatars.githubusercontent.com/u/35788491?v=4" width="50;" alt="baymax55"/>
+            <br />
+            <sub><b>Baymax55</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/gewuwo">
             <img src="https://avatars.githubusercontent.com/u/97213587?v=4" width="50;" alt="gewuwo"/>
             <br />
             <sub><b>格悟沃</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/hushtian">
             <img src="https://avatars.githubusercontent.com/u/55479601?v=4" width="50;" alt="hushtian"/>
             <br />
             <sub><b>Null</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/jinlingmei">
             <img src="https://avatars.githubusercontent.com/u/24669082?v=4" width="50;" alt="jinlingmei"/>
@@ -312,15 +319,15 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池
             <br />
             <sub><b>Null</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/onesimplecoder">
             <img src="https://avatars.githubusercontent.com/u/30288465?v=4" width="50;" alt="onesimplecoder"/>
             <br />
             <sub><b>Alic</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/CalebZYC">
             <img src="https://avatars.githubusercontent.com/u/42887532?v=4" width="50;" alt="CalebZYC"/>
@@ -376,21 +383,14 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池
             <br />
             <sub><b>WuLang</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/alexhaoxuan">
             <img src="https://avatars.githubusercontent.com/u/46749051?v=4" width="50;" alt="alexhaoxuan"/>
             <br />
             <sub><b>Alexli</b></sub>
         </a>
-    </td></tr>
-<tr>
-    <td align="center">
-        <a href="https://github.com/baymax55">
-            <img src="https://avatars.githubusercontent.com/u/35788491?v=4" width="50;" alt="baymax55"/>
-            <br />
-            <sub><b>Baymax55</b></sub>
-        </a>
     </td>
     <td align="center">
         <a href="https://github.com/qizhongju">

hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/ThreadPoolBuilder.java

@@ -17,14 +17,19 @@
 
 package cn.hippo4j.core.executor.support;
 
+import java.math.BigDecimal;
+import java.util.Optional;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
 import cn.hippo4j.common.design.builder.Builder;
 import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum;
 import cn.hippo4j.common.toolkit.Assert;
-import org.springframework.core.task.TaskDecorator;
 
-import java.math.BigDecimal;
-import java.util.Optional;
-import java.util.concurrent.*;
+import org.springframework.core.task.TaskDecorator;
 
 /**
  * Thread-pool builder.
@@ -221,6 +226,19 @@ public class ThreadPoolBuilder implements Builder<ThreadPoolExecutor> {
         return new ThreadPoolBuilder();
     }
 
+    /**
+     * Create dynamic thread pool by thread pool id
+     * @param threadPoolId threadPoolId
+     * @return ThreadPoolExecutor
+     */
+    public static ThreadPoolExecutor builderDynamicPoolById(String threadPoolId) {
+        return ThreadPoolBuilder.builder()
+                .threadFactory(threadPoolId)
+                .threadPoolId(threadPoolId)
+                .dynamicPool()
+                .build();
+    }
+
     private static ThreadPoolExecutor buildPool(ThreadPoolBuilder builder) {
         return AbstractBuildThreadPoolTemplate.buildPool(buildInitParam(builder));
     }

hippo4j-example/hippo4j-config-etcd-spring-boot-starter-example/src/main/java/cn/hippo4j/example/config/etcd/config/ThreadPoolConfig.java

@@ -35,11 +35,6 @@ public class ThreadPoolConfig {
     @SpringDynamicThreadPool
     public ThreadPoolExecutor messageConsumeDynamicExecutor() {
         String threadPoolId = "message-consume";
-        ThreadPoolExecutor messageConsumeDynamicExecutor = ThreadPoolBuilder.builder()
-                .threadFactory(threadPoolId)
-                .threadPoolId(threadPoolId)
-                .dynamicPool()
-                .build();
-        return messageConsumeDynamicExecutor;
+        return ThreadPoolBuilder.builderDynamicPoolById(threadPoolId);
     }
 }