From 6c70c94e44b796277d1c16b83e4ecf9971b6f0a5 Mon Sep 17 00:00:00 2001 From: Eric Zhao Date: Tue, 8 Jan 2019 09:45:16 +0800 Subject: [PATCH] dashboard: structure rearrangement and polish related code Signed-off-by: Eric Zhao --- .../{view => controller}/AppController.java | 5 +-- .../AuthorityRuleController.java | 3 +- .../DegradeController.java | 3 +- .../{view => controller}/DemoController.java | 2 +- .../FlowControllerV1.java | 7 ++-- .../MachineRegistryController.java | 3 +- .../MetricController.java | 5 +-- .../ParamFlowRuleController.java | 4 ++- .../ResourceController.java | 5 +-- .../SystemController.java | 3 +- .../cluster/ClusterAssignController.java | 4 +-- .../cluster/ClusterConfigController.java | 4 +-- .../v2}/FlowControllerV2.java | 3 +- .../dashboard/{view => domain}/Result.java | 2 +- .../{view => domain}/vo/MachineInfoVo.java | 2 +- .../{view => domain}/vo/MetricVo.java | 2 +- .../{view => domain}/vo/ResourceVo.java | 2 +- .../sentinel/dashboard/view/HealthCheck.java | 33 ------------------- 18 files changed, 35 insertions(+), 57 deletions(-) rename sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/{view => controller}/AppController.java (94%) rename sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/{view => controller}/AuthorityRuleController.java (98%) rename sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/{view => controller}/DegradeController.java (98%) rename sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/{view => controller}/DemoController.java (98%) rename sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/{view => controller}/FlowControllerV1.java (97%) rename sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/{view => controller}/MachineRegistryController.java (96%) rename sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/{view => controller}/MetricController.java (97%) rename sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/{view => controller}/ParamFlowRuleController.java (98%) rename sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/{view => controller}/ResourceController.java (95%) rename sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/{view => controller}/SystemController.java (98%) rename sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/{view => controller}/cluster/ClusterAssignController.java (97%) rename sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/{view => controller}/cluster/ClusterConfigController.java (98%) rename sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/{view => controller/v2}/FlowControllerV2.java (98%) rename sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/{view => domain}/Result.java (98%) rename sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/{view => domain}/vo/MachineInfoVo.java (98%) rename sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/{view => domain}/vo/MetricVo.java (99%) rename sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/{view => domain}/vo/ResourceVo.java (99%) delete mode 100755 sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/HealthCheck.java diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/AppController.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/AppController.java similarity index 94% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/AppController.java rename to sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/AppController.java index 024a094e..25e45373 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/AppController.java +++ b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/AppController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.view; +package com.taobao.csp.sentinel.dashboard.controller; import java.util.ArrayList; import java.util.Collections; @@ -25,7 +25,8 @@ import javax.servlet.http.HttpServletRequest; import com.taobao.csp.sentinel.dashboard.discovery.AppInfo; import com.taobao.csp.sentinel.dashboard.discovery.AppManagement; import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; -import com.taobao.csp.sentinel.dashboard.view.vo.MachineInfoVo; +import com.taobao.csp.sentinel.dashboard.domain.Result; +import com.taobao.csp.sentinel.dashboard.domain.vo.MachineInfoVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/AuthorityRuleController.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/AuthorityRuleController.java similarity index 98% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/AuthorityRuleController.java rename to sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/AuthorityRuleController.java index 367067b9..1f28e9ba 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/AuthorityRuleController.java +++ b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/AuthorityRuleController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.view; +package com.taobao.csp.sentinel.dashboard.controller; import java.util.Date; import java.util.List; @@ -24,6 +24,7 @@ import com.alibaba.csp.sentinel.util.StringUtil; import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity; import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; +import com.taobao.csp.sentinel.dashboard.domain.Result; import com.taobao.csp.sentinel.dashboard.repository.rule.RuleRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/DegradeController.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/DegradeController.java similarity index 98% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/DegradeController.java rename to sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/DegradeController.java index 78d3ffc1..ef50d2b4 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/DegradeController.java +++ b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/DegradeController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.view; +package com.taobao.csp.sentinel.dashboard.controller; import java.util.Date; import java.util.List; @@ -24,6 +24,7 @@ import com.alibaba.csp.sentinel.util.StringUtil; import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity; import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; +import com.taobao.csp.sentinel.dashboard.domain.Result; import com.taobao.csp.sentinel.dashboard.repository.rule.InMemDegradeRuleStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/DemoController.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/DemoController.java similarity index 98% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/DemoController.java rename to sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/DemoController.java index 8b7ab528..a30ea440 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/DemoController.java +++ b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/DemoController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.view; +package com.taobao.csp.sentinel.dashboard.controller; import java.util.Random; import java.util.concurrent.TimeUnit; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/FlowControllerV1.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/FlowControllerV1.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/FlowControllerV1.java rename to sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/FlowControllerV1.java index dd435fe1..94ac3e55 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/FlowControllerV1.java +++ b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/FlowControllerV1.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.view; +package com.taobao.csp.sentinel.dashboard.controller; import java.util.Date; import java.util.List; @@ -23,6 +23,7 @@ import com.alibaba.csp.sentinel.util.StringUtil; import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; +import com.taobao.csp.sentinel.dashboard.domain.Result; import com.taobao.csp.sentinel.dashboard.repository.rule.InMemoryRuleRepositoryAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,8 +57,8 @@ public class FlowControllerV1 { @GetMapping("/rules") public Result> apiQueryMachineRules(@RequestParam String app, - @RequestParam String ip, - @RequestParam Integer port) { + @RequestParam String ip, + @RequestParam Integer port) { if (StringUtil.isEmpty(app)) { return Result.ofFail(-1, "app can't be null or empty"); } diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/MachineRegistryController.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/MachineRegistryController.java similarity index 96% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/MachineRegistryController.java rename to sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/MachineRegistryController.java index 5a73f5ec..e55f111f 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/MachineRegistryController.java +++ b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/MachineRegistryController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.view; +package com.taobao.csp.sentinel.dashboard.controller; import java.util.Date; @@ -22,6 +22,7 @@ import com.alibaba.csp.sentinel.util.StringUtil; import com.taobao.csp.sentinel.dashboard.discovery.AppManagement; import com.taobao.csp.sentinel.dashboard.discovery.MachineDiscovery; import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; +import com.taobao.csp.sentinel.dashboard.domain.Result; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/MetricController.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/MetricController.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/MetricController.java rename to sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/MetricController.java index ee336664..9de26680 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/MetricController.java +++ b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/MetricController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.view; +package com.taobao.csp.sentinel.dashboard.controller; import java.util.ArrayList; import java.util.Collections; @@ -24,6 +24,7 @@ import java.util.Map; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; +import com.taobao.csp.sentinel.dashboard.domain.Result; import com.taobao.csp.sentinel.dashboard.repository.metric.MetricsRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +37,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.alibaba.csp.sentinel.util.StringUtil; import com.taobao.csp.sentinel.dashboard.datasource.entity.MetricEntity; -import com.taobao.csp.sentinel.dashboard.view.vo.MetricVo; +import com.taobao.csp.sentinel.dashboard.domain.vo.MetricVo; /** * @author leyou diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/ParamFlowRuleController.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/ParamFlowRuleController.java similarity index 98% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/ParamFlowRuleController.java rename to sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/ParamFlowRuleController.java index c24b605d..dfe2cfba 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/ParamFlowRuleController.java +++ b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/ParamFlowRuleController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.view; +package com.taobao.csp.sentinel.dashboard.controller; import java.util.Date; import java.util.List; @@ -30,6 +30,7 @@ import com.taobao.csp.sentinel.dashboard.datasource.entity.SentinelVersion; import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity; import com.taobao.csp.sentinel.dashboard.discovery.AppManagement; import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; +import com.taobao.csp.sentinel.dashboard.domain.Result; import com.taobao.csp.sentinel.dashboard.repository.rule.RuleRepository; import com.taobao.csp.sentinel.dashboard.util.VersionUtils; import org.slf4j.Logger; @@ -123,6 +124,7 @@ public class ParamFlowRuleController { return unsupportedVersion(); } entity.setId(null); + entity.getRule().setResource(entity.getResource().trim()); Date date = new Date(); entity.setGmtCreate(date); entity.setGmtModified(date); diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/ResourceController.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/ResourceController.java similarity index 95% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/ResourceController.java rename to sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/ResourceController.java index a6e16cae..3189923f 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/ResourceController.java +++ b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/ResourceController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.view; +package com.taobao.csp.sentinel.dashboard.controller; import java.util.List; import java.util.stream.Collectors; @@ -23,7 +23,8 @@ import com.alibaba.csp.sentinel.command.vo.NodeVo; import com.taobao.csp.sentinel.dashboard.domain.ResourceTreeNode; import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; -import com.taobao.csp.sentinel.dashboard.view.vo.ResourceVo; +import com.taobao.csp.sentinel.dashboard.domain.Result; +import com.taobao.csp.sentinel.dashboard.domain.vo.ResourceVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/SystemController.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/SystemController.java similarity index 98% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/SystemController.java rename to sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/SystemController.java index 17dfe833..437b2e4e 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/SystemController.java +++ b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/SystemController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.view; +package com.taobao.csp.sentinel.dashboard.controller; import java.util.Date; import java.util.List; @@ -23,6 +23,7 @@ import com.alibaba.csp.sentinel.util.StringUtil; import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity; import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; +import com.taobao.csp.sentinel.dashboard.domain.Result; import com.taobao.csp.sentinel.dashboard.repository.rule.InMemSystemRuleStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/cluster/ClusterAssignController.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/cluster/ClusterAssignController.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/cluster/ClusterAssignController.java rename to sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/cluster/ClusterAssignController.java index 0a91e56b..491386ce 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/cluster/ClusterAssignController.java +++ b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/cluster/ClusterAssignController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.view.cluster; +package com.taobao.csp.sentinel.dashboard.controller.cluster; import java.util.Collections; import java.util.Set; @@ -24,7 +24,7 @@ import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterAppFullAssignRequ import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterAppAssignResultVO; import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterAppSingleServerAssignRequest; import com.taobao.csp.sentinel.dashboard.service.ClusterAssignService; -import com.taobao.csp.sentinel.dashboard.view.Result; +import com.taobao.csp.sentinel.dashboard.domain.Result; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/cluster/ClusterConfigController.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/cluster/ClusterConfigController.java similarity index 98% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/cluster/ClusterConfigController.java rename to sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/cluster/ClusterConfigController.java index ee234e69..bcbb3b65 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/cluster/ClusterConfigController.java +++ b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/cluster/ClusterConfigController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.view.cluster; +package com.taobao.csp.sentinel.dashboard.controller.cluster; import java.util.List; import java.util.Optional; @@ -37,7 +37,7 @@ import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalSt import com.taobao.csp.sentinel.dashboard.service.ClusterConfigService; import com.taobao.csp.sentinel.dashboard.util.ClusterEntityUtils; import com.taobao.csp.sentinel.dashboard.util.VersionUtils; -import com.taobao.csp.sentinel.dashboard.view.Result; +import com.taobao.csp.sentinel.dashboard.domain.Result; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/FlowControllerV2.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java similarity index 98% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/FlowControllerV2.java rename to sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java index c3bf5bf9..fb9ecb49 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/FlowControllerV2.java +++ b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.view; +package com.taobao.csp.sentinel.dashboard.controller.v2; import java.util.Date; import java.util.List; @@ -24,6 +24,7 @@ import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; import com.taobao.csp.sentinel.dashboard.repository.rule.InMemoryRuleRepositoryAdapter; import com.taobao.csp.sentinel.dashboard.rule.DynamicRuleProvider; import com.taobao.csp.sentinel.dashboard.rule.DynamicRulePublisher; +import com.taobao.csp.sentinel.dashboard.domain.Result; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/Result.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/Result.java similarity index 98% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/Result.java rename to sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/Result.java index 5f8ee746..23d8d84d 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/Result.java +++ b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/Result.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.view; +package com.taobao.csp.sentinel.dashboard.domain; /** * @author leyou diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/vo/MachineInfoVo.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/vo/MachineInfoVo.java similarity index 98% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/vo/MachineInfoVo.java rename to sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/vo/MachineInfoVo.java index 4e9af367..835237e1 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/vo/MachineInfoVo.java +++ b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/vo/MachineInfoVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.view.vo; +package com.taobao.csp.sentinel.dashboard.domain.vo; import java.util.ArrayList; import java.util.Date; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/vo/MetricVo.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/vo/MetricVo.java similarity index 99% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/vo/MetricVo.java rename to sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/vo/MetricVo.java index c2e73713..460580c6 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/vo/MetricVo.java +++ b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/vo/MetricVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.view.vo; +package com.taobao.csp.sentinel.dashboard.domain.vo; import java.util.ArrayList; import java.util.Collection; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/vo/ResourceVo.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/vo/ResourceVo.java similarity index 99% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/vo/ResourceVo.java rename to sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/vo/ResourceVo.java index 1870e6aa..a5fb302e 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/vo/ResourceVo.java +++ b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/vo/ResourceVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.view.vo; +package com.taobao.csp.sentinel.dashboard.domain.vo; import java.util.ArrayList; import java.util.List; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/HealthCheck.java b/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/HealthCheck.java deleted file mode 100755 index 2afb48c7..00000000 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/view/HealthCheck.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 1999-2018 Alibaba Group Holding Ltd. - * - * Licensed 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. - */ -package com.taobao.csp.sentinel.dashboard.view; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -@Controller -public class HealthCheck { - /** - * 健康检查 - */ - @GetMapping("/health") - public - @ResponseBody - String checkPreload() { - return "success"; - } -}