[SCB-2798]when using multiple registries instance may not get refresh… (#3836)

Author: liubao68

foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/MicroserviceInstances.java

@@ -17,6 +17,15 @@
 
 package org.apache.servicecomb.registry.api.registry;
 
+import java.nio.charset.StandardCharsets;
+
+import javax.crypto.Mac;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.digest.HmacAlgorithms;
+import org.apache.commons.codec.digest.HmacUtils;
+import org.apache.commons.lang3.StringUtils;
+
 public class MicroserviceInstances {
   private boolean microserviceNotExist;
 
@@ -71,8 +80,16 @@ public void mergeMicroserviceInstances(MicroserviceInstances other) {
 
   private void mergeRevision(MicroserviceInstances other) {
     if (!other.isMicroserviceNotExist() && other.needRefresh) {
-      this.revision = other.getRevision();
+      Mac mac = HmacUtils.getInitializedMac(HmacAlgorithms.HMAC_SHA_1, stringToBytes(this.revision));
+      this.revision = Base64.encodeBase64String(mac.doFinal(stringToBytes(other.revision)));
+    }
+  }
+
+  private byte[] stringToBytes(String input) {
+    if (StringUtils.isEmpty(input)) {
+      input = "@";
     }
+    return input.getBytes(StandardCharsets.UTF_8);
   }
 
   private void mergeMicroserviceNotExist(boolean microserviceNotExist) {

service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckerMock.java

@@ -197,8 +197,8 @@ MicroserviceInstances findServiceInstances(String appId, String serviceName,
     instanceCacheResult.setMicroserviceName(microserviceName);
     instanceCacheResult.setStatus(Status.UNKNOWN);
     instanceCacheResult.setPulledInstances(new ArrayList<>());
-    instanceCacheResult.setDetail(
-        "revision is different, will be synchronized in next pull. local revision=first, remote revision=second");
+    instanceCacheResult.setDetail("revision is different, will be synchronized in next pull. "
+        + "local revision=Fv/f6YTFogBi3MiMIkVuh2DZLvU=, remote revision=second");
     expectedSummary.getProducers().add(instanceCacheResult);
     expectedSummary.setStatus(Status.UNKNOWN);