From 595e3c6c810722ab4a37d61ca781fdf8531ec3b1 Mon Sep 17 00:00:00 2001
From: airoger <czzx201101136>
Date: Thu, 29 Sep 2022 22:26:31 +0800
Subject: [PATCH] finish thread pool config modification verify module

---
 .../hippo4j/common/function/MatcherFunctionTest.java   |  2 +-
 .../console/controller/ThreadPoolController.java       |  3 +++
 .../cn/hippo4j/console/model/WebThreadPoolReqDTO.java  |  2 +-
 .../cn/hippo4j/console/model/WebThreadPoolRespDTO.java | 10 ++++++++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/hippo4j-common/src/test/java/cn/hippo4j/common/function/MatcherFunctionTest.java b/hippo4j-common/src/test/java/cn/hippo4j/common/function/MatcherFunctionTest.java
index 2a202302..93287ed2 100644
--- a/hippo4j-common/src/test/java/cn/hippo4j/common/function/MatcherFunctionTest.java
+++ b/hippo4j-common/src/test/java/cn/hippo4j/common/function/MatcherFunctionTest.java
@@ -22,7 +22,7 @@ import java.math.BigDecimal;
 import org.junit.Test;
 
 public final class MatcherFunctionTest {
-    
+
     public static <T> boolean matchTest(Matcher<T> matcher, T value) {
         return matcher.match(value);
     }
diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java
index 05891903..428f9644 100644
--- a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java
+++ b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java
@@ -148,6 +148,8 @@ public class ThreadPoolController {
                 continue;
             }
             WebThreadPoolRespDTO result = BeanUtil.convert(data, WebThreadPoolRespDTO.class);
+            result.setItemId(itemId);
+            result.setTenantId(each.getHolder().getGroupKey().split("[+]")[1]);
             result.setActive(each.getHolder().getActive());
             result.setIdentify(each.getHolder().getIdentify());
             result.setClientAddress(each.getHolder().getCallBackUrl());
@@ -218,4 +220,5 @@ public class ThreadPoolController {
         });
         return Results.success(returnThreadPool);
     }
+
 }
diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/model/WebThreadPoolReqDTO.java b/hippo4j-console/src/main/java/cn/hippo4j/console/model/WebThreadPoolReqDTO.java
index 349207d1..47deec6a 100644
--- a/hippo4j-console/src/main/java/cn/hippo4j/console/model/WebThreadPoolReqDTO.java
+++ b/hippo4j-console/src/main/java/cn/hippo4j/console/model/WebThreadPoolReqDTO.java
@@ -60,7 +60,7 @@ public class WebThreadPoolReqDTO {
     /**
      * weather modify all instances
      */
-    private Integer modifyAll;
+    private Boolean modifyAll;
 
     /**
      * Client address list
diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/model/WebThreadPoolRespDTO.java b/hippo4j-console/src/main/java/cn/hippo4j/console/model/WebThreadPoolRespDTO.java
index b32cb9d2..73be8520 100644
--- a/hippo4j-console/src/main/java/cn/hippo4j/console/model/WebThreadPoolRespDTO.java
+++ b/hippo4j-console/src/main/java/cn/hippo4j/console/model/WebThreadPoolRespDTO.java
@@ -25,6 +25,16 @@ import lombok.Data;
 @Data
 public class WebThreadPoolRespDTO {
 
+    /**
+     * thread pool tenant id
+     */
+    private String tenantId;
+
+    /**
+     * item id
+     */
+    private String itemId;
+
     /**
      * Active
      */