wms / wms4_xinxiangweiliang · Commits

Commit b9c0240c4dfa023f07ade6da3a1768e69e3e3e7b

Authored by zhangdaiscott
1 parent 59326ab5

JeecgBoot3.2.0 版本发布

Inline Side-by-side
Showing 8 changed files with 13 additions and 9 deletions
jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthorityRuleController.java
  View file @b9c0240
... ... @@ -6,6 +6,7 @@ import java.util.List;
6 6  
7 7 import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
8 8 import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType;
  9 +import com.alibaba.csp.sentinel.dashboard.controller.base.BaseRuleController;
9 10 import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider;
10 11 import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher;
11 12 import com.alibaba.csp.sentinel.slots.block.RuleConstant;
... ... @@ -37,7 +38,7 @@ import org.springframework.web.bind.annotation.RestController;
37 38 */
38 39 @RestController
39 40 @RequestMapping(value = "/authority")
40   -public class AuthorityRuleController extends BaseRuleController{
  41 +public class AuthorityRuleController extends BaseRuleController {
41 42  
42 43 private final Logger logger = LoggerFactory.getLogger(AuthorityRuleController.class);
43 44  
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DegradeController.java
  View file @b9c0240
... ... @@ -6,6 +6,7 @@ import java.util.List;
6 6  
7 7 import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
8 8 import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType;
  9 +import com.alibaba.csp.sentinel.dashboard.controller.base.BaseRuleController;
9 10 import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository;
10 11 import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider;
11 12 import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher;
... ... @@ -37,7 +38,7 @@ import org.springframework.web.bind.annotation.RestController;
37 38 */
38 39 @RestController
39 40 @RequestMapping("/degrade")
40   -public class DegradeController extends BaseRuleController{
  41 +public class DegradeController extends BaseRuleController {
41 42  
42 43 private final Logger logger = LoggerFactory.getLogger(DegradeController.class);
43 44  
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ParamFlowRuleController.java
  View file @b9c0240
... ... @@ -5,6 +5,7 @@ import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
5 5 import com.alibaba.csp.sentinel.dashboard.auth.AuthService;
6 6 import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType;
7 7 import com.alibaba.csp.sentinel.dashboard.client.CommandNotFoundException;
  8 +import com.alibaba.csp.sentinel.dashboard.controller.base.BaseRuleController;
8 9 import com.alibaba.csp.sentinel.dashboard.datasource.entity.SentinelVersion;
9 10 import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity;
10 11 import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement;
... ... @@ -25,7 +26,6 @@ import java.util.Date;
25 26 import java.util.List;
26 27 import java.util.Optional;
27 28 import java.util.concurrent.ExecutionException;
28   -
29 29 /**
30 30 * 热点参数规则控制器
31 31 *
... ... @@ -34,7 +34,7 @@ import java.util.concurrent.ExecutionException;
34 34 */
35 35 @RestController
36 36 @RequestMapping(value = "/paramFlow")
37   -public class ParamFlowRuleController extends BaseRuleController{
  37 +public class ParamFlowRuleController extends BaseRuleController {
38 38  
39 39 private final Logger logger = LoggerFactory.getLogger(ParamFlowRuleController.class);
40 40  
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/SystemController.java
  View file @b9c0240
... ... @@ -6,6 +6,7 @@ import java.util.List;
6 6  
7 7 import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
8 8 import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType;
  9 +import com.alibaba.csp.sentinel.dashboard.controller.base.BaseRuleController;
9 10 import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository;
10 11 import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider;
11 12 import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher;
... ... @@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.GetMapping;
22 23 import org.springframework.web.bind.annotation.RequestMapping;
23 24 import org.springframework.web.bind.annotation.RestController;
24 25  
  26 +
25 27 /**
26 28 * 系统规则控制器
27 29 *
... ... @@ -30,7 +32,7 @@ import org.springframework.web.bind.annotation.RestController;
30 32 */
31 33 @RestController
32 34 @RequestMapping("/system")
33   -public class SystemController extends BaseRuleController{
  35 +public class SystemController extends BaseRuleController {
34 36  
35 37 private final Logger logger = LoggerFactory.getLogger(SystemController.class);
36 38  
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/base/BaseRuleController.java
  View file @b9c0240
1   -package com.alibaba.csp.sentinel.dashboard.controller;
  1 +package com.alibaba.csp.sentinel.dashboard.controller.base;
2 2  
3 3 import java.util.concurrent.TimeUnit;
4 4  
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayApiController.java
  View file @b9c0240
... ... @@ -2,7 +2,7 @@ package com.alibaba.csp.sentinel.dashboard.controller.gateway;
2 2  
3 3 import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
4 4 import com.alibaba.csp.sentinel.dashboard.auth.AuthService;
5   -import com.alibaba.csp.sentinel.dashboard.controller.BaseRuleController;
  5 +import com.alibaba.csp.sentinel.dashboard.controller.base.BaseRuleController;
6 6 import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity;
7 7 import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiPredicateItemEntity;
8 8 import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo;
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayFlowRuleController.java
  View file @b9c0240
... ... @@ -2,7 +2,7 @@ package com.alibaba.csp.sentinel.dashboard.controller.gateway;
2 2  
3 3 import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
4 4 import com.alibaba.csp.sentinel.dashboard.auth.AuthService;
5   -import com.alibaba.csp.sentinel.dashboard.controller.BaseRuleController;
  5 +import com.alibaba.csp.sentinel.dashboard.controller.base.BaseRuleController;
6 6 import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.GatewayFlowRuleEntity;
7 7 import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.GatewayParamFlowItemEntity;
8 8 import com.alibaba.csp.sentinel.dashboard.domain.Result;
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java
  View file @b9c0240
... ... @@ -21,7 +21,7 @@ import java.util.List;
21 21 import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
22 22 import com.alibaba.csp.sentinel.dashboard.auth.AuthService;
23 23 import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType;
24   -import com.alibaba.csp.sentinel.dashboard.controller.BaseRuleController;
  24 +import com.alibaba.csp.sentinel.dashboard.controller.base.BaseRuleController;
25 25 import com.alibaba.csp.sentinel.util.StringUtil;
26 26  
27 27 import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity;
... ...