Merge branch 'master' of git.yfzx.zjtys.com.cn:912-system/monitor/inspect

src/main/java/com/zjty/inspect/aop/AopIntercept.java

@@ -32,7 +32,7 @@ public class AopIntercept {
         this.user = user;
     }
 
-    @Pointcut("execution(* com.zjty.inspect.inspect.Inspector.inspect(..))")
+    @Pointcut("@annotation(com.zjty.inspect.aop.AuthAnnotation)")
     public void doPointCut() {
     }
 

src/main/java/com/zjty/inspect/controller/RuleController.java

@@ -39,7 +39,7 @@ public class RuleController {
     @PostMapping
     @ApiOperation("新增规则")
     public ResponseEntity rule(@RequestBody Rule rule){
-        Rule rule1 = ruleService.addRulePlugs(rule);
+        Rule rule1 = ruleService.addRulePlus(rule);
         if(rule1!=null){
             return ResponseEntity.ok(rule1);
         }
@@ -53,7 +53,7 @@ public class RuleController {
     @PostMapping(value = "/update")
     @ApiOperation("修改规则")
     public ResponseEntity update(@RequestBody Rule rule){
-        ruleService.upRulePlugs(rule);
+        ruleService.upRulePlus(rule);
         return ResponseEntity.ok(200);
     }
     /**
@@ -64,7 +64,7 @@ public class RuleController {
     @ApiOperation("根据数据封装删除规则")
     @DeleteMapping
     public ResponseEntity deleteByQo(@RequestBody String id){
-        ruleService.deleteRulePlugs(id);
+        ruleService.deleteRulePlus(id);
         return ResponseEntity.ok(200);
     }
 

src/main/java/com/zjty/inspect/service/RuleService.java

@@ -17,8 +17,8 @@ public interface RuleService {
      * @param ruleQo 规则封装类
      */
     public void addRule(RuleQo ruleQo);
-    public Rule addRulePlugs(Rule rule);
-    public void addListRulePlugs(List<Rule> rules);
+    public Rule addRulePlus(Rule rule);
+    public void addListRulePlus(List<Rule> rules);
 
     public void addRule(List<Rule> rules);
     /**
@@ -26,14 +26,14 @@ public interface RuleService {
      * @param ruleQo 规则封装类
      */
     public void upRule(RuleQo ruleQo);
-    public void upRulePlugs(Rule rule);
+    public void upRulePlus(Rule rule);
     public String exportData();
     /**
      * 删除规则
      * @param ruleQo 规则封装类
      */
     public void deleteRule(RuleQo ruleQo);
-    public void deleteRulePlugs(String id);
+    public void deleteRulePlus(String id);
 
     /**
      * 查询所有规则