diff --git a/dinky-admin/src/main/java/org/dinky/controller/AlertGroupController.java b/dinky-admin/src/main/java/org/dinky/controller/AlertGroupController.java
index 57030ed9f4..0010de8037 100644
--- a/dinky-admin/src/main/java/org/dinky/controller/AlertGroupController.java
+++ b/dinky-admin/src/main/java/org/dinky/controller/AlertGroupController.java
@@ -24,7 +24,6 @@
 import org.dinky.data.enums.BusinessType;
 import org.dinky.data.enums.Status;
 import org.dinky.data.model.AlertGroup;
-import org.dinky.data.result.ProTableResult;
 import org.dinky.data.result.Result;
 import org.dinky.service.AlertGroupService;
 
@@ -32,15 +31,12 @@
 
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.fasterxml.jackson.databind.JsonNode;
-
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaMode;
 import io.swagger.annotations.Api;
@@ -65,7 +61,7 @@ public class AlertGroupController {
      * @param alertGroup {@link AlertGroup}
      * @return {@link Result} with {@link Void}
      */
-    @PutMapping
+    @PutMapping("/addOrUpdate")
     @SaCheckPermission(
             value = {PermissionConstants.REGISTRATION_ALERT_GROUP_ADD, PermissionConstants.REGISTRATION_ALERT_GROUP_EDIT
             },
@@ -89,19 +85,13 @@ public Result<Void> saveOrUpdateAlertGroup(@RequestBody AlertGroup alertGroup) {
     /**
      * list alert groups
      *
-     * @param para {@link JsonNode}
-     * @return {@link ProTableResult} with {@link AlertGroup}
+     * @param keyword {@link String}
+     * @return {@link Result} with {@link AlertGroup}
      */
-    @PostMapping
-    @ApiImplicitParam(
-            name = "para",
-            value = "JsonNode",
-            required = true,
-            dataType = "JsonNode",
-            dataTypeClass = JsonNode.class)
+    @GetMapping("/list")
     @ApiOperation("Query AlertGroup List")
-    public ProTableResult<AlertGroup> listAlertGroups(@RequestBody JsonNode para) {
-        return alertGroupService.selectForProTable(para);
+    public Result<List<AlertGroup>> listAlertGroups(@RequestParam String keyword) {
+        return Result.succeed(alertGroupService.selectListByKeyWord(keyword));
     }
 
     /**
diff --git a/dinky-admin/src/main/java/org/dinky/controller/AlertInstanceController.java b/dinky-admin/src/main/java/org/dinky/controller/AlertInstanceController.java
index bb2e27b2c5..79d609bebc 100644
--- a/dinky-admin/src/main/java/org/dinky/controller/AlertInstanceController.java
+++ b/dinky-admin/src/main/java/org/dinky/controller/AlertInstanceController.java
@@ -27,7 +27,6 @@
 import org.dinky.data.enums.BusinessType;
 import org.dinky.data.enums.Status;
 import org.dinky.data.model.AlertInstance;
-import org.dinky.data.result.ProTableResult;
 import org.dinky.data.result.Result;
 import org.dinky.service.AlertInstanceService;
 
@@ -42,7 +41,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
 import com.github.xiaoymin.knife4j.annotations.DynamicResponseParameters;
 
@@ -54,7 +52,9 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-/** AlertInstanceController */
+/**
+ * AlertInstanceController
+ */
 @Slf4j
 @RestController
 @Api(tags = "Alert Instance Controller")
@@ -71,7 +71,7 @@ public class AlertInstanceController {
      * @return {@link Result} of {@link Void}
      * @throws Exception {@link Exception}
      */
-    @PutMapping
+    @PutMapping("/saveOrUpdate")
     @Log(title = "Insert OR Update AlertInstance", businessType = BusinessType.INSERT_OR_UPDATE)
     @ApiOperation("Insert OR Update AlertInstance")
     @ApiImplicitParam(
@@ -98,21 +98,12 @@ public Result<Void> saveOrUpdate(@RequestBody AlertInstance alertInstance) throw
 
     /**
      * listAlertInstances
-     *
-     * @param para {@link JsonNode}
-     * @return {@link ProTableResult} of {@link AlertInstance}
+     * @return {@link Result} of {@link AlertInstance}
      */
-    @PostMapping
+    @GetMapping("/list")
     @ApiOperation("Query AlertInstance List")
-    @ApiImplicitParam(
-            name = "para",
-            value = "Query Condition",
-            dataType = "JsonNode",
-            paramType = "body",
-            required = true,
-            dataTypeClass = JsonNode.class)
-    public ProTableResult<AlertInstance> listAlertInstances(@RequestBody JsonNode para) {
-        return alertInstanceService.selectForProTable(para);
+    public Result<List<AlertInstance>> listAlertInstances(@RequestParam(value = "keyword") String keyword) {
+        return Result.succeed(alertInstanceService.selectListByKeyWord(keyword));
     }
 
     /**
diff --git a/dinky-admin/src/main/java/org/dinky/controller/ClusterConfigurationController.java b/dinky-admin/src/main/java/org/dinky/controller/ClusterConfigurationController.java
index d6ea31c9ce..9a2de6e714 100644
--- a/dinky-admin/src/main/java/org/dinky/controller/ClusterConfigurationController.java
+++ b/dinky-admin/src/main/java/org/dinky/controller/ClusterConfigurationController.java
@@ -25,13 +25,11 @@
 import org.dinky.data.enums.BusinessType;
 import org.dinky.data.enums.Status;
 import org.dinky.data.model.ClusterConfiguration;
-import org.dinky.data.result.ProTableResult;
 import org.dinky.data.result.Result;
 import org.dinky.gateway.result.TestResult;
 import org.dinky.service.ClusterConfigurationService;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -42,8 +40,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.fasterxml.jackson.databind.JsonNode;
-
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaMode;
 import io.swagger.annotations.Api;
@@ -70,7 +66,7 @@ public class ClusterConfigurationController {
      * @param clusterConfiguration
      * @return
      */
-    @PutMapping
+    @PutMapping("/saveOrUpdate")
     @Log(title = "Insert Or Update Cluster Config", businessType = BusinessType.INSERT_OR_UPDATE)
     @ApiOperation("Insert Or Update Cluster Config")
     @ApiImplicitParam(
@@ -98,29 +94,13 @@ public Result<Void> saveOrUpdateClusterConfig(@RequestBody ClusterConfigurationD
 
     /**
      * query cluster config list
-     *
-     * @param para
+     * @param keyword
      * @return
      */
-    @PostMapping
+    @GetMapping("/list")
     @ApiOperation("Cluster Config List")
-    @ApiImplicitParam(
-            name = "para",
-            value = "Cluster Configuration",
-            dataType = "JsonNode",
-            paramType = "body",
-            required = true)
-    public ProTableResult<ClusterConfigurationDTO> listClusterConfigList(@RequestBody JsonNode para) {
-        ProTableResult<ClusterConfiguration> result = clusterConfigurationService.selectForProTable(para);
-        List<ClusterConfigurationDTO> dtoList =
-                result.getData().stream().map(ClusterConfigurationDTO::fromBean).collect(Collectors.toList());
-        return ProTableResult.<ClusterConfigurationDTO>builder()
-                .success(true)
-                .data(dtoList)
-                .total(result.getTotal())
-                .current(result.getCurrent())
-                .pageSize(result.getPageSize())
-                .build();
+    public Result<List<ClusterConfigurationDTO>> listClusterConfigList(@RequestParam String keyword) {
+        return Result.succeed(clusterConfigurationService.selectListByKeyWord(keyword));
     }
 
     /**
diff --git a/dinky-admin/src/main/java/org/dinky/controller/ClusterInstanceController.java b/dinky-admin/src/main/java/org/dinky/controller/ClusterInstanceController.java
index b92f4a4229..555f6cff8d 100644
--- a/dinky-admin/src/main/java/org/dinky/controller/ClusterInstanceController.java
+++ b/dinky-admin/src/main/java/org/dinky/controller/ClusterInstanceController.java
@@ -40,7 +40,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.databind.JsonNode;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -156,12 +155,7 @@ public Result<Void> deleteClusterInstanceById(@RequestParam Integer id) {
             required = true,
             dataTypeClass = JsonNode.class)
     public Result<List<ClusterInstance>> listClusterInstance(@RequestParam("keyword") String searchKeyWord) {
-        return Result.succeed(clusterInstanceService.list(new LambdaQueryWrapper<ClusterInstance>()
-                .like(ClusterInstance::getName, searchKeyWord)
-                .or()
-                .like(ClusterInstance::getAlias, searchKeyWord)
-                .or()
-                .like(ClusterInstance::getNote, searchKeyWord)));
+        return Result.succeed(clusterInstanceService.selectListByKeyWord(searchKeyWord));
     }
 
     /**
diff --git a/dinky-admin/src/main/java/org/dinky/controller/DataBaseController.java b/dinky-admin/src/main/java/org/dinky/controller/DataBaseController.java
index 9b328fd26e..b941056fdc 100644
--- a/dinky-admin/src/main/java/org/dinky/controller/DataBaseController.java
+++ b/dinky-admin/src/main/java/org/dinky/controller/DataBaseController.java
@@ -31,7 +31,6 @@
 import org.dinky.data.model.QueryData;
 import org.dinky.data.model.Schema;
 import org.dinky.data.model.SqlGeneration;
-import org.dinky.data.result.ProTableResult;
 import org.dinky.data.result.Result;
 import org.dinky.metadata.driver.DriverPool;
 import org.dinky.metadata.result.JdbcSelectResult;
@@ -50,8 +49,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.fasterxml.jackson.databind.JsonNode;
-
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaMode;
 import io.swagger.annotations.Api;
@@ -107,27 +104,13 @@ public Result<Void> saveOrUpdateDataBase(@RequestBody DataBaseDTO dataBaseDTO) {
     /**
      * get all database
      *
-     * @param para {@link JsonNode}
-     * @return {@link ProTableResult}< {@link DataBase}>
+     * @param keyword {@link String}
+     * @return {@link Result}< {@link DataBase}>
      */
-    @PostMapping
+    @GetMapping("/list")
     @ApiOperation("DataBase Get All")
-    @ApiImplicitParam(
-            name = "para",
-            value = "JsonNode",
-            required = true,
-            dataType = "JsonNode",
-            paramType = "body",
-            dataTypeClass = JsonNode.class)
-    public ProTableResult<DataBase> listDataBases(@RequestBody JsonNode para) {
-        final ProTableResult<DataBase> result = databaseService.selectForProTable(para);
-        // 密码不返回
-        if (result != null && result.getData() != null) {
-            for (DataBase data : result.getData()) {
-                data.setPassword(null);
-            }
-        }
-        return result;
+    public Result<List<DataBase>> listDataBases(@RequestParam(value = "keyword") String keyword) {
+        return Result.succeed(databaseService.selectListByKeyWord(keyword));
     }
 
     /**
@@ -295,9 +278,9 @@ public Result<String> unCacheSchemasAndTables(@RequestParam Integer id) {
     /**
      * get columns of table
      *
-     * @param id {@link Integer}
+     * @param id         {@link Integer}
      * @param schemaName {@link String}
-     * @param tableName {@link String}
+     * @param tableName  {@link String}
      * @return {@link Result}< {@link List}< {@link Column}>>
      */
     @GetMapping("/listColumns")
@@ -387,9 +370,9 @@ public Result<JdbcSelectResult> execSql(@RequestBody QueryData queryData) {
     /**
      * get sql generation
      *
-     * @param id {@link Integer}
+     * @param id         {@link Integer}
      * @param schemaName {@link String}
-     * @param tableName {@link String}
+     * @param tableName  {@link String}
      * @return {@link Result}< {@link SqlGeneration}>
      */
     @GetMapping("/getSqlGeneration")
diff --git a/dinky-admin/src/main/java/org/dinky/service/AlertGroupService.java b/dinky-admin/src/main/java/org/dinky/service/AlertGroupService.java
index 5ca9aa8a8c..c7f05f3b9c 100644
--- a/dinky-admin/src/main/java/org/dinky/service/AlertGroupService.java
+++ b/dinky-admin/src/main/java/org/dinky/service/AlertGroupService.java
@@ -57,4 +57,6 @@ public interface AlertGroupService extends ISuperService<AlertGroup> {
      * @return {@link Boolean}
      */
     Boolean deleteGroupById(Integer id);
+
+    List<AlertGroup> selectListByKeyWord(String keyword);
 }
diff --git a/dinky-admin/src/main/java/org/dinky/service/AlertInstanceService.java b/dinky-admin/src/main/java/org/dinky/service/AlertInstanceService.java
index a3c134e11a..f4530ff036 100644
--- a/dinky-admin/src/main/java/org/dinky/service/AlertInstanceService.java
+++ b/dinky-admin/src/main/java/org/dinky/service/AlertInstanceService.java
@@ -60,4 +60,6 @@ public interface AlertInstanceService extends ISuperService<AlertInstance> {
      * @return {@link Boolean}
      */
     Boolean modifyAlertInstanceStatus(Integer id);
+
+    List<AlertInstance> selectListByKeyWord(String keyword);
 }
diff --git a/dinky-admin/src/main/java/org/dinky/service/ClusterConfigurationService.java b/dinky-admin/src/main/java/org/dinky/service/ClusterConfigurationService.java
index 7b15b2b02c..6d0687b3df 100644
--- a/dinky-admin/src/main/java/org/dinky/service/ClusterConfigurationService.java
+++ b/dinky-admin/src/main/java/org/dinky/service/ClusterConfigurationService.java
@@ -72,4 +72,6 @@ public interface ClusterConfigurationService extends ISuperService<ClusterConfig
      * @return A boolean value indicating whether the modification was successful.
      */
     Boolean modifyClusterConfigStatus(Integer id);
+
+    List<ClusterConfigurationDTO> selectListByKeyWord(String keyword);
 }
diff --git a/dinky-admin/src/main/java/org/dinky/service/ClusterInstanceService.java b/dinky-admin/src/main/java/org/dinky/service/ClusterInstanceService.java
index d87a5b19ad..43742d40d4 100644
--- a/dinky-admin/src/main/java/org/dinky/service/ClusterInstanceService.java
+++ b/dinky-admin/src/main/java/org/dinky/service/ClusterInstanceService.java
@@ -144,4 +144,6 @@ public interface ClusterInstanceService extends ISuperService<ClusterInstance> {
      * @return {@link ClusterInstance}
      */
     ClusterInstance deploySessionCluster(Integer id);
+
+    List<ClusterInstance> selectListByKeyWord(String searchKeyWord);
 }
diff --git a/dinky-admin/src/main/java/org/dinky/service/DataBaseService.java b/dinky-admin/src/main/java/org/dinky/service/DataBaseService.java
index f388101175..c8245f6311 100644
--- a/dinky-admin/src/main/java/org/dinky/service/DataBaseService.java
+++ b/dinky-admin/src/main/java/org/dinky/service/DataBaseService.java
@@ -194,4 +194,6 @@ public interface DataBaseService extends ISuperService<DataBase> {
      * @return A {@link JobResult} object representing the execution result of the SQL statement.
      */
     JobResult executeCommonSql(SqlDTO sqlDTO);
+
+    List<DataBase> selectListByKeyWord(String keyword);
 }
diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/AlertGroupServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/AlertGroupServiceImpl.java
index 7a075b9908..629c910a34 100644
--- a/dinky-admin/src/main/java/org/dinky/service/impl/AlertGroupServiceImpl.java
+++ b/dinky-admin/src/main/java/org/dinky/service/impl/AlertGroupServiceImpl.java
@@ -43,7 +43,9 @@
 import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;
 
-/** AlertGroupServiceImpl */
+/**
+ * AlertGroupServiceImpl
+ */
 @Service
 @RequiredArgsConstructor
 public class AlertGroupServiceImpl extends SuperServiceImpl<AlertGroupMapper, AlertGroup> implements AlertGroupService {
@@ -100,4 +102,17 @@ public Boolean deleteGroupById(Integer id) {
                 .forEach(alertHistory -> alertHistoryService.removeById(alertHistory.getId()));
         return removeById(id);
     }
+
+    /**
+     * @param keyword
+     * @return
+     */
+    @Override
+    public List<AlertGroup> selectListByKeyWord(String keyword) {
+        return getBaseMapper()
+                .selectList(new LambdaQueryWrapper<>(AlertGroup.class)
+                        .like(AlertGroup::getName, keyword)
+                        .or()
+                        .like(AlertGroup::getNote, keyword));
+    }
 }
diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/AlertInstanceServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/AlertInstanceServiceImpl.java
index b447cc7e96..3301f5cd9c 100644
--- a/dinky-admin/src/main/java/org/dinky/service/impl/AlertInstanceServiceImpl.java
+++ b/dinky-admin/src/main/java/org/dinky/service/impl/AlertInstanceServiceImpl.java
@@ -109,6 +109,19 @@ public Boolean modifyAlertInstanceStatus(Integer id) {
         return updateById(alertInstance);
     }
 
+    /**
+     * @param keyword
+     * @return
+     */
+    @Override
+    public List<AlertInstance> selectListByKeyWord(String keyword) {
+        return getBaseMapper()
+                .selectList(new LambdaQueryWrapper<AlertInstance>()
+                        .like(AlertInstance::getName, keyword)
+                        .or()
+                        .like(AlertInstance::getType, keyword));
+    }
+
     private void writeBackGroupInformation(Map<Integer, Set<Integer>> alertGroupInformation) {
         if (MapUtils.isEmpty(alertGroupInformation)) {
             return;
diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/ClusterConfigurationServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/ClusterConfigurationServiceImpl.java
index ce01a6c73c..8dbc6e2741 100644
--- a/dinky-admin/src/main/java/org/dinky/service/impl/ClusterConfigurationServiceImpl.java
+++ b/dinky-admin/src/main/java/org/dinky/service/impl/ClusterConfigurationServiceImpl.java
@@ -31,10 +31,12 @@
 import org.dinky.service.ClusterConfigurationService;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import cn.hutool.core.lang.Assert;
@@ -87,4 +89,17 @@ public Boolean modifyClusterConfigStatus(Integer id) {
         }
         return false;
     }
+
+    /**
+     * @param keyword
+     * @return
+     */
+    @Override
+    public List<ClusterConfigurationDTO> selectListByKeyWord(String keyword) {
+        return getBaseMapper()
+                .selectList(new LambdaQueryWrapper<ClusterConfiguration>().like(ClusterConfiguration::getName, keyword))
+                .stream()
+                .map(ClusterConfigurationDTO::fromBean)
+                .collect(Collectors.toList());
+    }
 }
diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/ClusterInstanceServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/ClusterInstanceServiceImpl.java
index 35d86d39e1..f88337eda5 100644
--- a/dinky-admin/src/main/java/org/dinky/service/impl/ClusterInstanceServiceImpl.java
+++ b/dinky-admin/src/main/java/org/dinky/service/impl/ClusterInstanceServiceImpl.java
@@ -45,6 +45,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import cn.hutool.core.util.StrUtil;
@@ -207,6 +208,21 @@ public ClusterInstance deploySessionCluster(Integer id) {
                 null));
     }
 
+    /**
+     * @param searchKeyWord
+     * @return
+     */
+    @Override
+    public List<ClusterInstance> selectListByKeyWord(String searchKeyWord) {
+        return getBaseMapper()
+                .selectList(new LambdaQueryWrapper<ClusterInstance>()
+                        .like(ClusterInstance::getName, searchKeyWord)
+                        .or()
+                        .like(ClusterInstance::getAlias, searchKeyWord)
+                        .or()
+                        .like(ClusterInstance::getNote, searchKeyWord));
+    }
+
     private boolean checkHealth(ClusterInstance clusterInstance) {
         FlinkClusterInfo info = checkHeartBeat(clusterInstance.getHosts(), clusterInstance.getJobManagerHost());
         if (!info.isEffective()) {
diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/DataBaseServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/DataBaseServiceImpl.java
index df37534871..f528ab35a9 100644
--- a/dinky-admin/src/main/java/org/dinky/service/impl/DataBaseServiceImpl.java
+++ b/dinky-admin/src/main/java/org/dinky/service/impl/DataBaseServiceImpl.java
@@ -51,8 +51,11 @@
 
 import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
+import cn.hutool.core.collection.CollectionUtil;
+
 /**
  * DataBaseServiceImpl
  *
@@ -308,4 +311,25 @@ public JobResult executeCommonSql(SqlDTO sqlDTO) {
         result.setEndTime(LocalDateTime.now());
         return result;
     }
+
+    /**
+     * @param keyword
+     * @return
+     */
+    @Override
+    public List<DataBase> selectListByKeyWord(String keyword) {
+
+        List<DataBase> dataBaseList = getBaseMapper()
+                .selectList(new LambdaQueryWrapper<DataBase>()
+                        .like(DataBase::getName, keyword)
+                        .or()
+                        .like(DataBase::getNote, keyword));
+
+        if (CollectionUtil.isNotEmpty(dataBaseList)) {
+            for (DataBase data : dataBaseList) {
+                data.setPassword(null);
+            }
+        }
+        return dataBaseList;
+    }
 }
diff --git a/dinky-web/src/locales/en-US/pages.ts b/dinky-web/src/locales/en-US/pages.ts
index 2dabb560b2..408248c2af 100644
--- a/dinky-web/src/locales/en-US/pages.ts
+++ b/dinky-web/src/locales/en-US/pages.ts
@@ -438,6 +438,7 @@ export default {
   'rc.ag.management': 'Alert Group Management ',
   'rc.ag.modify': 'Modify Alert Group',
   'rc.ag.name': 'Alert Group Name',
+  'rc.ag.search': 'Search Name/Note',
   'rc.ai.accessKeyId': 'AccessKeyId',
   'rc.ai.accessKeyIdPleaseHolder': 'Please enter AccessKeyId',
   'rc.ai.accessKeySecret': 'AccessKeySecret',
@@ -500,6 +501,7 @@ export default {
   'rc.ai.mf.uni': 'Uni SMS',
   'rc.ai.mf.yunpian': 'Yunpian SMS',
   'rc.ai.modify': 'Modify Alert Instance',
+  'rc.ai.search': 'Search Name/Type',
   'rc.ai.name': 'Name',
   'rc.ai.namePleaseHolder': 'please enter Alert instance name',
   'rc.ai.password': 'Password',
@@ -634,6 +636,7 @@ export default {
   'rc.cc.management': 'Cluster Config Management',
   'rc.cc.modify': 'Modify Cluster Config',
   'rc.cc.name': 'Cluster Config Name',
+  'rc.cc.search': 'Search Name',
   'rc.cc.namePlaceholder': 'Please enter the cluster configuration name!',
   'rc.cc.spDir': 'SavePoint Path',
   'rc.cc.spDirHelp': 'Please enter the savepoint path! This parameter configuration item is',
@@ -708,6 +711,7 @@ export default {
   'rc.ds.columnName': 'Field Name',
   'rc.ds.columnType': 'Type',
   'rc.ds.comment': 'Comment',
+  'rc.ds.search': 'Search Name/Note',
   'rc.ds.console.exec': 'Execute',
   'rc.ds.console.running': 'Running...',
   'rc.ds.create': 'Create DataSource',
diff --git a/dinky-web/src/locales/zh-CN/pages.ts b/dinky-web/src/locales/zh-CN/pages.ts
index 16528c23cd..f54d21c181 100644
--- a/dinky-web/src/locales/zh-CN/pages.ts
+++ b/dinky-web/src/locales/zh-CN/pages.ts
@@ -422,6 +422,7 @@ export default {
   'rc.ag.management': '告警组管理',
   'rc.ag.modify': '修改告警组',
   'rc.ag.name': '告警组名称',
+  'rc.ag.search': '搜索 名称/备注',
   'rc.ai.accessKeyId': 'AccessKeyId',
   'rc.ai.accessKeyIdPleaseHolder': '请输入AccessKeyId',
   'rc.ai.accessKeySecret': 'AccessKeySecret',
@@ -483,6 +484,7 @@ export default {
   'rc.ai.mf.yunpian': '云片短信',
   'rc.ai.modify': '修改告警实例',
   'rc.ai.name': '名称',
+  'rc.ai.search': '搜索 名称/类型',
   'rc.ai.namePleaseHolder': '请输入告警实例名称',
   'rc.ai.password': '密码',
   'rc.ai.passwordPleaseHolder': '请输入密码',
@@ -605,6 +607,7 @@ export default {
   'rc.cc.management': '集群配置管理',
   'rc.cc.modify': '修改集群配置',
   'rc.cc.name': '集群配置名称',
+  'rc.cc.search': '搜索 名称',
   'rc.cc.namePlaceholder': '请输入集群配置名称!',
   'rc.cc.spDir': '保存点路径',
   'rc.cc.spDirHelp': '请输入保存点路径! 此参数配置项为',
@@ -674,6 +677,7 @@ export default {
   'rc.ds.collationRule': '排序规则',
   'rc.ds.columnName': '名称',
   'rc.ds.columnType': '类型',
+  'rc.ds.search': '搜索 名称/注释',
   'rc.ds.comment': '注释',
   'rc.ds.console.exec': '执行',
   'rc.ds.console.running': '运行中...',
diff --git a/dinky-web/src/pages/DataStudio/RightContainer/JobConfig/index.tsx b/dinky-web/src/pages/DataStudio/RightContainer/JobConfig/index.tsx
index 1b1f8cb674..ec3105702d 100644
--- a/dinky-web/src/pages/DataStudio/RightContainer/JobConfig/index.tsx
+++ b/dinky-web/src/pages/DataStudio/RightContainer/JobConfig/index.tsx
@@ -1,19 +1,19 @@
 /*
  *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements.  See the NOTICE file distributed with
- *   this work for additional information regarding copyright ownership.
- *   The ASF licenses this file to You under the Apache License, Version 2.0
- *   (the "License"); you may not use this file except in compliance with
- *   the License.  You may obtain a copy of the License at
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
  */
 
@@ -131,11 +131,21 @@ const JobConfig = (props: any) => {
   ) : (
     <ProFormSelect
       style={{ width: '100%' }}
-      placeholder={l('pages.datastudio.label.jobConfig.cluster.tip')}
+      placeholder={l('pages.datastudio.label.jobConfig.clusterConfig.tip1', '', {
+        type: current?.type
+      })}
       label={l('pages.datastudio.label.jobConfig.cluster')}
       tooltip={l('pages.datastudio.label.jobConfig.clusterConfig.tip1', '', {
         type: current?.type
       })}
+      rules={[
+        {
+          required: true,
+          message: l('pages.datastudio.label.jobConfig.clusterConfig.tip1', '', {
+            type: current?.type
+          })
+        }
+      ]}
       name='clusterId'
       options={buildClusterOptions(sessionCluster)}
       fieldProps={{
@@ -150,10 +160,10 @@ const JobConfig = (props: any) => {
         size={'middle'}
         initialValues={{
           type: RUN_MODE.LOCAL,
-          envId: 0,
+          envId: -1,
           parallelism: 1,
           savePointStrategy: 0,
-          alertGroupId: 0
+          alertGroupId: -1
         }}
         className={'data-studio-form'}
         style={{ paddingInline: '15px', overflow: 'scroll' }}
@@ -166,6 +176,7 @@ const JobConfig = (props: any) => {
           name='type'
           label={l('global.table.execmode')}
           tooltip={l('pages.datastudio.label.jobConfig.execmode.tip')}
+          rules={[{ required: true, message: l('pages.datastudio.label.jobConfig.execmode.tip') }]}
           options={buildRunModelOptions()}
         />
 
@@ -183,9 +194,12 @@ const JobConfig = (props: any) => {
             name='clusterConfigurationId'
             placeholder={l('pages.datastudio.label.jobConfig.clusterConfig.tip2')}
             label={l('pages.datastudio.label.jobConfig.clusterConfig')}
-            tooltip={l('pages.datastudio.label.jobConfig.clusterConfig.tip1', '', {
+            tooltip={l('pages.datastudio.label.jobConfig.clusterConfig.tip2', '', {
               type: current?.type
             })}
+            rules={[
+              { required: true, message: l('pages.datastudio.label.jobConfig.clusterConfig.tip2') }
+            ]}
             options={buildClusterConfigOptions(current, clusterConfiguration)}
           />
         )}
@@ -195,6 +209,9 @@ const JobConfig = (props: any) => {
           label={l('pages.datastudio.label.jobConfig.flinksql.env')}
           tooltip={l('pages.datastudio.label.jobConfig.flinksql.env.tip1')}
           options={buildEnvOptions(env)}
+          rules={[
+            { required: true, message: l('pages.datastudio.label.jobConfig.flinksql.env.tip1') }
+          ]}
           showSearch
         />
 
diff --git a/dinky-web/src/pages/RegCenter/Alert/AlertGroup/index.tsx b/dinky-web/src/pages/RegCenter/Alert/AlertGroup/index.tsx
index 8340acb35c..5bca2e8fe1 100644
--- a/dinky-web/src/pages/RegCenter/Alert/AlertGroup/index.tsx
+++ b/dinky-web/src/pages/RegCenter/Alert/AlertGroup/index.tsx
@@ -26,8 +26,12 @@ import { Authorized, HasAuthority } from '@/hooks/useAccess';
 import AlertGroupForm from '@/pages/RegCenter/Alert/AlertGroup/components/AlertGroupForm';
 import { getAlertIcon } from '@/pages/RegCenter/Alert/AlertInstance/function';
 import { ALERT_MODEL_ASYNC } from '@/pages/RegCenter/Alert/AlertInstance/model';
-import { queryList } from '@/services/api';
-import { handleAddOrUpdate, handleRemoveById, updateDataByParam } from '@/services/BusinessCrud';
+import {
+  handleAddOrUpdate,
+  handleRemoveById,
+  queryDataByParams,
+  updateDataByParam
+} from '@/services/BusinessCrud';
 import { PROTABLE_OPTIONS_PUBLIC, PRO_LIST_CARD_OPTIONS } from '@/services/constants';
 import { API_CONSTANTS } from '@/services/endpoints';
 import { Alert, ALERT_TYPE } from '@/types/RegCenter/data.d';
@@ -39,7 +43,7 @@ import { ProList } from '@ant-design/pro-components';
 import { PageContainer } from '@ant-design/pro-layout';
 import { ActionType } from '@ant-design/pro-table';
 import { connect, Dispatch } from '@umijs/max';
-import { Button, Descriptions, Modal, Space, Tag, Tooltip } from 'antd';
+import { Button, Descriptions, Input, Modal, Space, Tag, Tooltip } from 'antd';
 import React, { useEffect, useRef, useState } from 'react';
 
 const AlertGroupTableList: React.FC = (props: any) => {
@@ -54,9 +58,12 @@ const AlertGroupTableList: React.FC = (props: any) => {
    * execute query alert instance list
    * set alert instance list
    */
-  const queryAlertGroupList = async () => {
-    queryList(API_CONSTANTS.ALERT_GROUP).then((res) =>
-      setAlertGroupState((prevState) => ({ ...prevState, alertGroupList: res.data }))
+  const queryAlertGroupList = async (keyword = '') => {
+    queryDataByParams(API_CONSTANTS.ALERT_GROUP, { keyword }).then((res) =>
+      setAlertGroupState((prevState) => ({
+        ...prevState,
+        alertGroupList: res as Alert.AlertGroup[]
+      }))
     );
   };
 
@@ -124,7 +131,7 @@ const AlertGroupTableList: React.FC = (props: any) => {
   const handleSubmit = async (value: Alert.AlertGroup) => {
     await exexuteWithRefreshLoading(async () =>
       handleAddOrUpdate(
-        API_CONSTANTS.ALERT_GROUP,
+        API_CONSTANTS.ALERT_GROUP_ADD_OR_UPDATE,
         value,
         () => {},
         () => handleCleanState()
@@ -137,6 +144,13 @@ const AlertGroupTableList: React.FC = (props: any) => {
    */
   const renderToolBar = () => {
     return () => [
+      <Input.Search
+        loading={alertGroupState.loading}
+        key={`_search`}
+        allowClear
+        placeholder={l('rc.ag.search')}
+        onSearch={(value) => queryAlertGroupList(value)}
+      />,
       <Authorized key='create' path='/registration/alert/group/add'>
         <Button
           key={'CreateAlertGroup'}
diff --git a/dinky-web/src/pages/RegCenter/Alert/AlertInstance/components/AlertInstanceList/index.tsx b/dinky-web/src/pages/RegCenter/Alert/AlertInstance/components/AlertInstanceList/index.tsx
index 21d8ff2fa5..b96857b426 100644
--- a/dinky-web/src/pages/RegCenter/Alert/AlertInstance/components/AlertInstanceList/index.tsx
+++ b/dinky-web/src/pages/RegCenter/Alert/AlertInstance/components/AlertInstanceList/index.tsx
@@ -1,18 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
 
 import { CreateBtn } from '@/components/CallBackButton/CreateBtn';
@@ -30,8 +32,7 @@ import {
   createOrModifyAlertInstance,
   sendTest
 } from '@/pages/RegCenter/Alert/AlertInstance/service';
-import { queryList } from '@/services/api';
-import { handleRemoveById, updateDataByParam } from '@/services/BusinessCrud';
+import { handleRemoveById, queryDataByParams, updateDataByParam } from '@/services/BusinessCrud';
 import { PROTABLE_OPTIONS_PUBLIC, PRO_LIST_CARD_OPTIONS } from '@/services/constants';
 import { API_CONSTANTS } from '@/services/endpoints';
 import { Alert } from '@/types/RegCenter/data.d';
@@ -40,7 +41,7 @@ import { AlertInstanceState } from '@/types/RegCenter/state.d';
 import { l } from '@/utils/intl';
 import { ProList } from '@ant-design/pro-components';
 import { ActionType } from '@ant-design/pro-table';
-import { Descriptions, Modal, Space, Tag, Tooltip } from 'antd';
+import { Descriptions, Input, Modal, Space, Tag, Tooltip } from 'antd';
 import DescriptionsItem from 'antd/es/descriptions/Item';
 import React, { useEffect, useRef, useState } from 'react';
 import AlertTypeChoose from '../AlertTypeChoose';
@@ -58,9 +59,12 @@ const AlertInstanceList: React.FC = () => {
    * execute query alert instance list
    * set alert instance list
    */
-  const queryAlertInstanceList = async () => {
-    queryList(API_CONSTANTS.ALERT_INSTANCE).then((res) =>
-      setAlertInstanceState((prevState) => ({ ...prevState, alertInstanceList: res.data }))
+  const queryAlertInstanceList = async (keyword = '') => {
+    queryDataByParams(API_CONSTANTS.ALERT_INSTANCE, { keyword }).then((res) =>
+      setAlertInstanceState((prevState) => ({
+        ...prevState,
+        alertInstanceList: res as Alert.AlertInstance[]
+      }))
     );
   };
 
@@ -191,6 +195,13 @@ const AlertInstanceList: React.FC = () => {
    */
   const renderToolBar = () => {
     return () => [
+      <Input.Search
+        loading={alertInstanceState.loading}
+        key={`_search`}
+        allowClear
+        placeholder={l('rc.ai.search')}
+        onSearch={(value) => queryAlertInstanceList(value)}
+      />,
       <Authorized key='create' path='/registration/alert/instance/add'>
         <CreateBtn
           key={'CreateAlertInstanceBtn'}
diff --git a/dinky-web/src/pages/RegCenter/Alert/AlertInstance/service.ts b/dinky-web/src/pages/RegCenter/Alert/AlertInstance/service.ts
index e2b37eb0f7..f2bae1a38b 100644
--- a/dinky-web/src/pages/RegCenter/Alert/AlertInstance/service.ts
+++ b/dinky-web/src/pages/RegCenter/Alert/AlertInstance/service.ts
@@ -1,23 +1,26 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
 
 import { postAll } from '@/services/api';
 import { handleAddOrUpdate } from '@/services/BusinessCrud';
 import { RESPONSE_CODE } from '@/services/constants';
+import { API_CONSTANTS } from '@/services/endpoints';
 import { Alert } from '@/types/RegCenter/data.d';
 import { l } from '@/utils/intl';
 import {
@@ -28,13 +31,13 @@ import {
 } from '@/utils/messages';
 
 export async function createOrModifyAlertInstance(alertInstance: Alert.AlertInstance) {
-  return handleAddOrUpdate('/api/alertInstance', alertInstance);
+  return handleAddOrUpdate(API_CONSTANTS.ALERT_INSTANCE_ADD_OR_UPDATE, alertInstance);
 }
 
 export async function sendTest(alertInstance: Alert.AlertInstance) {
   await LoadingMessageAsync(l('app.request.test.alert.msg'));
   try {
-    const { code, msg } = await postAll('/api/alertInstance/sendTest', alertInstance);
+    const { code, msg } = await postAll(API_CONSTANTS.ALERT_INSTANCE_SEND_TEST, alertInstance);
     if (code === RESPONSE_CODE.SUCCESS) {
       SuccessMessage(msg);
       return true;
diff --git a/dinky-web/src/pages/RegCenter/Cluster/Configuration/components/ConfigurationList/index.tsx b/dinky-web/src/pages/RegCenter/Cluster/Configuration/components/ConfigurationList/index.tsx
index 22c6d07632..a78fb6e770 100644
--- a/dinky-web/src/pages/RegCenter/Cluster/Configuration/components/ConfigurationList/index.tsx
+++ b/dinky-web/src/pages/RegCenter/Cluster/Configuration/components/ConfigurationList/index.tsx
@@ -1,19 +1,19 @@
 /*
  *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements.  See the NOTICE file distributed with
- *   this work for additional information regarding copyright ownership.
- *   The ASF licenses this file to You under the Apache License, Version 2.0
- *   (the "License"); you may not use this file except in compliance with
- *   the License.  You may obtain a copy of the License at
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
  */
 
@@ -28,12 +28,12 @@ import { Authorized, HasAuthority } from '@/hooks/useAccess';
 import { imgStyle } from '@/pages/Home/constants';
 import ConfigurationModal from '@/pages/RegCenter/Cluster/Configuration/components/ConfigurationModal';
 import { CLUSTER_CONFIG_TYPE } from '@/pages/RegCenter/Cluster/Configuration/components/contants';
-import { queryList } from '@/services/api';
 import {
   handleAddOrUpdate,
   handleOption,
   handlePutDataByParams,
   handleRemoveById,
+  queryDataByParams,
   updateDataByParam
 } from '@/services/BusinessCrud';
 import { PROTABLE_OPTIONS_PUBLIC, PRO_LIST_CARD_OPTIONS } from '@/services/constants';
@@ -44,7 +44,7 @@ import { ClusterConfigState } from '@/types/RegCenter/state.d';
 import { l } from '@/utils/intl';
 import { CheckCircleOutlined, ExclamationCircleOutlined, HeartTwoTone } from '@ant-design/icons';
 import { ActionType, ProList } from '@ant-design/pro-components';
-import { Button, Descriptions, Modal, Space, Tag, Tooltip } from 'antd';
+import { Button, Descriptions, Input, Modal, Space, Tag, Tooltip } from 'antd';
 import { useEffect, useRef, useState } from 'react';
 
 export default () => {
@@ -56,15 +56,9 @@ export default () => {
 
   const actionRef = useRef<ActionType>();
 
-  // const { data, run  } = useRequest({
-  //   url: API_CONSTANTS.CLUSTER_CONFIGURATION,
-  //   method: 'POST',
-  //   data: {}
-  // });
-
-  const queryClusterConfigList = async () => {
-    queryList(API_CONSTANTS.CLUSTER_CONFIGURATION).then((res) =>
-      setClusterConfigState((prevState) => ({ ...prevState, configList: res.data }))
+  const queryClusterConfigList = async (keyword = '') => {
+    queryDataByParams(API_CONSTANTS.CLUSTER_CONFIGURATION, { keyword }).then((res) =>
+      setClusterConfigState((prevState) => ({ ...prevState, configList: res as Cluster.Config[] }))
     );
   };
 
@@ -144,7 +138,7 @@ export default () => {
    */
   const handleSubmit = async (value: Partial<Cluster.Config>) => {
     await executeAndCallbackRefresh(async () => {
-      await handleAddOrUpdate(API_CONSTANTS.CLUSTER_CONFIGURATION, value);
+      await handleAddOrUpdate(API_CONSTANTS.CLUSTER_CONFIGURATION_ADD_OR_UPDATE, value);
       await handleCancel();
     });
   };
@@ -260,6 +254,13 @@ export default () => {
    * tool bar render
    */
   const toolBarRender = () => [
+    <Input.Search
+      loading={clusterConfigState.loading}
+      key={`_search`}
+      allowClear
+      placeholder={l('rc.cc.search')}
+      onSearch={(value) => queryClusterConfigList(value)}
+    />,
     <Authorized key='new' path='/registration/cluster/config/add'>
       <CreateBtn
         key={'configcreate'}
diff --git a/dinky-web/src/pages/RegCenter/DataSource/components/DataSourceList/index.tsx b/dinky-web/src/pages/RegCenter/DataSource/components/DataSourceList/index.tsx
index bcfbdb9846..e9fab6c81d 100644
--- a/dinky-web/src/pages/RegCenter/DataSource/components/DataSourceList/index.tsx
+++ b/dinky-web/src/pages/RegCenter/DataSource/components/DataSourceList/index.tsx
@@ -1,18 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
 
 import { CreateBtn } from '@/components/CallBackButton/CreateBtn';
@@ -25,11 +27,11 @@ import { StateType, STUDIO_MODEL } from '@/pages/DataStudio/model';
 import DataSourceDetail from '@/pages/RegCenter/DataSource/components/DataSourceDetail';
 import { renderDBIcon } from '@/pages/RegCenter/DataSource/components/function';
 import { handleTest, saveOrUpdateHandle } from '@/pages/RegCenter/DataSource/service';
-import { queryList } from '@/services/api';
 import {
   handleOption,
   handlePutDataByParams,
   handleRemoveById,
+  queryDataByParams,
   updateDataByParam
 } from '@/services/BusinessCrud';
 import { PROTABLE_OPTIONS_PUBLIC, PRO_LIST_CARD_OPTIONS } from '@/services/constants';
@@ -45,7 +47,7 @@ import {
   HeartTwoTone
 } from '@ant-design/icons';
 import { ActionType, ProList } from '@ant-design/pro-components';
-import { Button, Descriptions, Modal, Space, Tag, Tooltip } from 'antd';
+import { Button, Descriptions, Input, Modal, Space, Tag, Tooltip } from 'antd';
 import DescriptionsItem from 'antd/es/descriptions/Item';
 import React, { useEffect, useState } from 'react';
 import { connect } from 'umi';
@@ -65,6 +67,12 @@ const DataSourceTable: React.FC<connect & StateType> = (props) => {
   const [formValues, setFormValues] = useState<Partial<DataSources.DataSource>>({});
   const actionRef = React.useRef<ActionType>();
 
+  const queryDataSourceList = async (keyword = '') => {
+    queryDataByParams(API_CONSTANTS.DATASOURCE, { keyword }).then((res) =>
+      setDataSource(res as DataSources.DataSource[])
+    );
+  };
+
   /**
    * query  list
    */
@@ -76,10 +84,6 @@ const DataSourceTable: React.FC<connect & StateType> = (props) => {
    * execute query  list
    * set   list
    */
-  const queryDataSourceList = async () => {
-    const res = await queryList(API_CONSTANTS.DATASOURCE);
-    setDataSource(res.data);
-  };
 
   /**
    * extra callback
@@ -257,6 +261,21 @@ const DataSourceTable: React.FC<connect & StateType> = (props) => {
     setFormValues({});
   };
 
+  const renderToolBar = () => {
+    return [
+      <Input.Search
+        loading={loading}
+        key={`_search`}
+        allowClear
+        placeholder={l('rc.ds.search')}
+        onSearch={(value) => queryDataSourceList(value)}
+      />,
+      <Authorized key='create' path='/registration/datasource/add'>
+        <CreateBtn key={'CreateBtn'} onClick={() => setModalVisible(true)} />
+      </Authorized>
+    ];
+  };
+
   /**
    * render
    */
@@ -271,11 +290,7 @@ const DataSourceTable: React.FC<connect & StateType> = (props) => {
             tooltip={l('rc.ds.enter')}
             actionRef={actionRef}
             headerTitle={l('rc.ds.management')}
-            toolBarRender={() => [
-              <Authorized key='create' path='/registration/datasource/add'>
-                <CreateBtn key={'CreateBtn'} onClick={() => setModalVisible(true)} />
-              </Authorized>
-            ]}
+            toolBarRender={renderToolBar}
             dataSource={renderDataSource}
           />
 
diff --git a/dinky-web/src/services/endpoints.tsx b/dinky-web/src/services/endpoints.tsx
index 1003e246b6..6589dbaead 100644
--- a/dinky-web/src/services/endpoints.tsx
+++ b/dinky-web/src/services/endpoints.tsx
@@ -112,13 +112,14 @@ export enum API_CONSTANTS {
   CLUSTER_INSTANCE_RECYCLE = '/api/cluster/recycle',
   CLUSTER_CONFIGURATION_START = '/api/cluster/deploySessionClusterInstance',
   // cluster configuration list
-  CLUSTER_CONFIGURATION = '/api/clusterConfiguration',
+  CLUSTER_CONFIGURATION = '/api/clusterConfiguration/list',
+  CLUSTER_CONFIGURATION_ADD_OR_UPDATE = '/api/clusterConfiguration/addOrUpdate',
   CLUSTER_CONFIGURATION_DELETE = '/api/clusterConfiguration/delete',
   CLUSTER_CONFIGURATION_ENABLE = '/api/clusterConfiguration/enable',
   CLUSTER_CONFIGURATION_TEST = '/api/clusterConfiguration/testConnect',
 
   // datasource registries list
-  DATASOURCE = '/api/database',
+  DATASOURCE = '/api/database/list',
   // datasource registries delete
   DATASOURCE_DELETE = '/api/database/delete',
   // datasource registries enable or disable
@@ -144,16 +145,20 @@ export enum API_CONSTANTS {
 
   // ---- alert instance ----
   // alert instance list
-  ALERT_INSTANCE = '/api/alertInstance',
+  ALERT_INSTANCE = '/api/alertInstance/list',
+  ALERT_INSTANCE_ADD_OR_UPDATE = '/api/alertInstance/addOrUpdate',
   // delete alert instance by id
   ALERT_INSTANCE_DELETE = '/api/alertInstance/delete',
   // alert instance enable or disable
   ALERT_INSTANCE_ENABLE = '/api/alertInstance/enable',
   // alert instance list all
   ALERT_INSTANCE_LIST_ENABLE_ALL = '/api/alertInstance/listEnabledAll',
+  // sendTest
+  ALERT_INSTANCE_SEND_TEST = '/api/alertInstance/sendTest',
 
   // ---- alert group ----
-  ALERT_GROUP = '/api/alertGroup',
+  ALERT_GROUP = '/api/alertGroup/list',
+  ALERT_GROUP_ADD_OR_UPDATE = '/api/alertGroup/addOrUpdate',
   // delete alert group by id
   ALERT_GROUP_DELETE = '/api/alertGroup/delete',
   // alert group enable or disable