diff --git a/dev-support/hippo4j_checkstyle_suppression.xml b/dev-support/hippo4j_checkstyle_suppression.xml index e760e379..765a781b 100644 --- a/dev-support/hippo4j_checkstyle_suppression.xml +++ b/dev-support/hippo4j_checkstyle_suppression.xml @@ -27,5 +27,6 @@ + diff --git a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ConfigVerifyController.java b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ConfigVerifyController.java index 313af1a0..1d58b101 100644 --- a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ConfigVerifyController.java +++ b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ConfigVerifyController.java @@ -30,8 +30,16 @@ import cn.hippo4j.config.service.biz.ConfigModificationVerifyService; import cn.hippo4j.config.verify.ConfigModificationVerifyServiceChoose; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +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; +/** + * Config Verify Controller + */ @RestController @AllArgsConstructor @RequestMapping(Constants.VERIFY_PATH) diff --git a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/DashboardController.java b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/DashboardController.java index 3aca1125..db705ae8 100644 --- a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/DashboardController.java +++ b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/DashboardController.java @@ -20,7 +20,11 @@ package cn.hippo4j.console.controller; import cn.hippo4j.common.constant.Constants; import cn.hippo4j.common.web.base.Result; import cn.hippo4j.common.web.base.Results; -import cn.hippo4j.console.model.*; +import cn.hippo4j.console.model.ChartInfo; +import cn.hippo4j.console.model.LineChartInfo; +import cn.hippo4j.console.model.PieChartInfo; +import cn.hippo4j.console.model.RankingChart; +import cn.hippo4j.console.model.TenantChart; import cn.hippo4j.console.service.DashboardService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; diff --git a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ItemController.java b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ItemController.java index 1b2f71d2..828120fb 100644 --- a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ItemController.java +++ b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ItemController.java @@ -28,7 +28,13 @@ import cn.hippo4j.config.service.biz.ItemService; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * Item controller. diff --git a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/NotifyController.java b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/NotifyController.java index 203b2f9f..c4710d3f 100644 --- a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/NotifyController.java +++ b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/NotifyController.java @@ -27,7 +27,12 @@ import cn.hippo4j.config.model.biz.notify.NotifyRespDTO; import cn.hippo4j.config.service.biz.NotifyService; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/PermissionController.java b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/PermissionController.java index 89715e6e..60245961 100644 --- a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/PermissionController.java +++ b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/PermissionController.java @@ -23,7 +23,12 @@ import cn.hippo4j.auth.service.PermissionService; import cn.hippo4j.common.web.base.Result; import cn.hippo4j.common.web.base.Results; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * Permission controller. diff --git a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/RoleController.java b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/RoleController.java index 5758ef2f..d61c3da2 100644 --- a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/RoleController.java +++ b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/RoleController.java @@ -23,7 +23,12 @@ import cn.hippo4j.auth.service.RoleService; import cn.hippo4j.common.web.base.Result; import cn.hippo4j.common.web.base.Results; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/TenantController.java b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/TenantController.java index ce259601..0040f5e7 100644 --- a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/TenantController.java +++ b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/TenantController.java @@ -28,7 +28,13 @@ import cn.hippo4j.config.service.biz.TenantService; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * Tenant controller. diff --git a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolAdapterController.java b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolAdapterController.java index ada43d70..bb0094b2 100644 --- a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolAdapterController.java +++ b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolAdapterController.java @@ -18,7 +18,9 @@ package cn.hippo4j.console.controller; import cn.hippo4j.common.constant.ConfigModifyTypeConstants; -import cn.hippo4j.common.toolkit.*; +import cn.hippo4j.common.toolkit.BeanUtil; +import cn.hippo4j.common.toolkit.StringUtil; +import cn.hippo4j.common.toolkit.UserContext; import cn.hippo4j.common.toolkit.http.HttpUtil; import cn.hippo4j.common.web.base.Result; import cn.hippo4j.common.web.base.Results; diff --git a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java index 8ea3847d..b3ffd783 100644 --- a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java +++ b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java @@ -20,13 +20,20 @@ package cn.hippo4j.console.controller; import cn.hippo4j.common.constant.ConfigModifyTypeConstants; import cn.hippo4j.common.constant.Constants; import cn.hippo4j.common.model.InstanceInfo; -import cn.hippo4j.common.toolkit.*; +import cn.hippo4j.common.toolkit.BeanUtil; +import cn.hippo4j.common.toolkit.CollectionUtil; +import cn.hippo4j.common.toolkit.StringUtil; +import cn.hippo4j.common.toolkit.UserContext; import cn.hippo4j.common.toolkit.http.HttpUtil; import cn.hippo4j.common.web.base.Result; import cn.hippo4j.common.web.base.Results; import cn.hippo4j.common.web.exception.ErrorCodeEnum; import cn.hippo4j.config.model.CacheItem; -import cn.hippo4j.config.model.biz.threadpool.*; +import cn.hippo4j.config.model.biz.threadpool.ConfigModifySaveReqDTO; +import cn.hippo4j.config.model.biz.threadpool.ThreadPoolDelReqDTO; +import cn.hippo4j.config.model.biz.threadpool.ThreadPoolQueryReqDTO; +import cn.hippo4j.config.model.biz.threadpool.ThreadPoolRespDTO; +import cn.hippo4j.config.model.biz.threadpool.ThreadPoolSaveOrUpdateReqDTO; import cn.hippo4j.config.service.ConfigCacheService; import cn.hippo4j.config.service.biz.ThreadPoolService; import cn.hippo4j.config.verify.ConfigModificationVerifyServiceChoose; @@ -38,7 +45,14 @@ import cn.hippo4j.discovery.core.Lease; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +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 java.util.ArrayList; import java.util.List; diff --git a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/UserController.java b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/UserController.java index dea073cb..e30719c0 100644 --- a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/UserController.java +++ b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/UserController.java @@ -29,7 +29,14 @@ import cn.hippo4j.common.web.base.Result; import cn.hippo4j.common.web.base.Results; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +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.RestController; import java.util.List; diff --git a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/model/RankingChart.java b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/model/RankingChart.java index 9a079300..220e1516 100644 --- a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/model/RankingChart.java +++ b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/model/RankingChart.java @@ -36,6 +36,9 @@ public class RankingChart { */ private List rankingChartInfoList; + /** + * RankingChartInfo + */ @Data public static class RankingChartInfo { diff --git a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/service/DashboardService.java b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/service/DashboardService.java index 72fea63f..af5451f2 100644 --- a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/service/DashboardService.java +++ b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/service/DashboardService.java @@ -17,7 +17,11 @@ package cn.hippo4j.console.service; -import cn.hippo4j.console.model.*; +import cn.hippo4j.console.model.ChartInfo; +import cn.hippo4j.console.model.LineChartInfo; +import cn.hippo4j.console.model.PieChartInfo; +import cn.hippo4j.console.model.RankingChart; +import cn.hippo4j.console.model.TenantChart; /** * Dashboard service. diff --git a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/service/impl/DashboardServiceImpl.java b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/service/impl/DashboardServiceImpl.java index b67960c7..75035031 100644 --- a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/service/impl/DashboardServiceImpl.java +++ b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/service/impl/DashboardServiceImpl.java @@ -26,9 +26,17 @@ import cn.hippo4j.config.mapper.ConfigInfoMapper; import cn.hippo4j.config.mapper.HisRunDataMapper; import cn.hippo4j.config.mapper.ItemInfoMapper; import cn.hippo4j.config.mapper.TenantInfoMapper; -import cn.hippo4j.config.model.*; +import cn.hippo4j.config.model.CacheItem; +import cn.hippo4j.config.model.ConfigAllInfo; +import cn.hippo4j.config.model.ConfigInfoBase; +import cn.hippo4j.config.model.ItemInfo; +import cn.hippo4j.config.model.TenantInfo; import cn.hippo4j.config.service.ConfigCacheService; -import cn.hippo4j.console.model.*; +import cn.hippo4j.console.model.ChartInfo; +import cn.hippo4j.console.model.LineChartInfo; +import cn.hippo4j.console.model.PieChartInfo; +import cn.hippo4j.console.model.RankingChart; +import cn.hippo4j.console.model.TenantChart; import cn.hippo4j.console.service.DashboardService; import cn.hippo4j.discovery.core.BaseInstanceRegistry; import cn.hippo4j.discovery.core.Lease; @@ -38,7 +46,10 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import java.time.LocalDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import static cn.hippo4j.common.toolkit.ContentUtil.getGroupKey;