优化handle rule推送的bug

Author: saleson

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/event/listener/HandleRuleEventlistener.java

@@ -1,12 +1,17 @@
 package cn.springcloud.gray.event.listener;
 
+import cn.springcloud.gray.GrayClientHolder;
 import cn.springcloud.gray.handle.HandleRuleManager;
+import cn.springcloud.gray.local.InstanceLocalInfo;
 import cn.springlcoud.gray.event.HandleRuleEvent;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author saleson
  * @date 2020-05-31 16:41
  */
+@Slf4j
 public class HandleRuleEventlistener extends AbstractGrayEventListener<HandleRuleEvent> {
 
     private HandleRuleManager handleRuleManager;
@@ -17,6 +22,16 @@ public HandleRuleEventlistener(HandleRuleManager handleRuleManager) {
 
     @Override
     protected void onUpdate(HandleRuleEvent event) {
+        InstanceLocalInfo instanceLocalInfo = GrayClientHolder.getInstanceLocalInfo();
+        if (!StringUtils.equals(instanceLocalInfo.getServiceId(), event.getModuleId())) {
+            log.info("HandleRuleEvent.moduleId!=instanceLocalInfo.serviceId, HandleRuleEvent - 6 : {}", event);
+            return;
+        }
+        if (!StringUtils.equals(instanceLocalInfo.getServiceId(), event.getResource()) &&
+                !StringUtils.equals(instanceLocalInfo.getInstanceId(), event.getResource())) {
+            log.info("HandleRuleEvent.resource ont in [instanceLocalInfo.serviceId, instanceLocalInfo.instanceId], HandleRuleEvent - 6 : {}", event);
+            return;
+        }
         handleRuleManager.putHandleRuleDefinition(event.getHandleRuleDefinition());
     }
 

spring-cloud-gray-event/src/main/java/cn/springlcoud/gray/event/HandleRuleEvent.java

@@ -10,8 +10,11 @@
 @Data
 public class HandleRuleEvent extends GrayEvent {
 
+    private static final long serialVersionUID = -5723492249160514681L;
     private HandleRuleDefinition handleRuleDefinition;
 
+    private String moduleId;
+    private String resource;
 
     @Override
     public String getSourceId() {

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/event/triggering/converter/HandleRuleEventConverter.java

@@ -31,6 +31,8 @@ protected HandleRuleEvent convertModifyData(HandleRule handleRule) {
 
     private HandleRuleEvent toEvent(TriggerType triggerType, HandleRule handleRule) {
         HandleRuleEvent event = new HandleRuleEvent();
+        event.setModuleId(handleRule.getModuleId());
+        event.setResource(handleRule.getResource());
         HandleRuleDefinition definition = grayModule.toHandleRuleDefinition(handleRule);
         event.setHandleRuleDefinition(definition);
         event.setTriggerType(triggerType);