Fixed the issue of subscription failure when specifying service groups in agent service discovery

Author: chenzhiguo

joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/registry/ServiceId.java

@@ -65,12 +65,12 @@ public ServiceId(String service, String group, boolean interfaceMode) {
         this(null, service, group, null, interfaceMode);
     }
 
-    public ServiceId(String namespace, String service, String group) {
-        this(namespace, service, group, null, false);
+    public ServiceId(String service, String group, String catalog, boolean interfaceMode) {
+        this(null, service, group, catalog, interfaceMode);
     }
 
-    public ServiceId(String namespace, String service, String group, boolean interfaceMode) {
-        this(namespace, service, group, null, interfaceMode);
+    public ServiceId(String namespace, String service, String group) {
+        this(namespace, service, group, null, false);
     }
 
     public ServiceId(String namespace, String service, String group, String catalog, boolean interfaceMode) {
@@ -139,23 +139,26 @@ public boolean match(ServiceId target, String defaultGroup) {
     /**
      * Determines if two service IDs match according to the specified matching rules.
      *
-     * @param source the source service ID to match against (may be null)
-     * @param target the target service ID to check (may be null)
-     * @param defaultGroup the default group name to use when source group is empty (may be null)
+     * @param source the source service ID to match against (maybe null)
+     * @param target the target service ID to check (maybe null)
+     * @param defaultGroup the default group name to use when source group is empty (maybe null)
      * @return true if the service IDs match according to the rules, false otherwise
      */
     public static boolean match(ServiceId source, ServiceId target, String defaultGroup) {
-        String sourceService = source == null ? null : source.getService();
-        String targetService = target == null ? null : target.getService();
+        if (source == null || target == null) {
+            return false;
+        }
+        String sourceService = source.getService();
+        String targetService = target.getService();
         if (sourceService == null || !sourceService.equalsIgnoreCase(targetService)) {
             return false;
         }
-        String sourceGroup = source == null ? null : source.getGroup();
-        String targetGroup = target == null ? null : target.getGroup();
-        if (!DEFAULT_GROUP_BIPREDICATE.test(sourceGroup, defaultGroup)) {
-            return DEFAULT_GROUP_BIPREDICATE.test(targetGroup, defaultGroup);
+        String sourceGroup = source.getGroup();
+        String targetGroup = target.getGroup();
+        if (DEFAULT_GROUP_BIPREDICATE.test(sourceGroup, defaultGroup) || DEFAULT_GROUP_BIPREDICATE.test(targetGroup, defaultGroup)) {
+            return true;
         }
-        return sourceGroup.equalsIgnoreCase(targetGroup);
+        return sourceGroup == null ? targetGroup == null : sourceGroup.equalsIgnoreCase(targetGroup);
     }
 
     /**
@@ -186,4 +189,4 @@ public static String getServiceName(String serviceNameWithGroup, String splitter
         return index < 0 || index >= parts.size() ? StringUtils.EMPTY_STRING : parts.get(index);
     }
 
-}
+}

joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/registry/ServiceInstance.java

@@ -62,7 +62,7 @@ public ServiceInstance(String namespace,
                            int port,
                            int weight,
                            Map<String, String> metadata) {
-        super(namespace, service, group, interfaceMode);
+        super(namespace, service, group, null, interfaceMode);
         this.id = id;
         this.framework = framework;
         this.version = version;

joylive-implement/joylive-service/joylive-service-nacos/src/main/java/com/jd/live/agent/implement/service/registry/nacos/NacosRegistry.java

@@ -333,7 +333,7 @@ protected static class InstanceListener implements EventListener {
         public void onEvent(Event event) {
             if (event instanceof NamingEvent) {
                 NamingEvent e = (NamingEvent) event;
-                ServiceId id = new ServiceId(e.getServiceName(), e.getGroupName(), interfaceMode);
+                ServiceId id = new ServiceId(e.getServiceName(), null, e.getGroupName(), interfaceMode);
                 consumer.accept(new RegistryEvent(id, toList(e.getInstances(), NacosEndpoint::new), Constants.DEFAULT_GROUP));
             }
         }