[shenyu] branch master updated: [ISSUE #3796] [fix] Shenyu client registration by consul only register 1 metadata (#3797)

[xiaoyu]

This is an automated email from the ASF dual-hosted git repository.

xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git


The following commit(s) were added to refs/heads/master by this push:
     new ab80a8384 [ISSUE #3796] [fix] Shenyu client registration by consul 
only register 1 metadata (#3797)
ab80a8384 is described below

commit ab80a8384cf0c6ded47f11a7680a6fae5a7c5446
Author: Han Gao <dhan...@hotmail.com>
AuthorDate: Wed Aug 3 14:21:41 2022 +0800

    [ISSUE #3796] [fix] Shenyu client registration by consul only register 1 
metadata (#3797)
    
    * [fix] Shenyu client registration by consul only register 1 metadata
    
    * fix style issue
---
 .../consul/ConsulClientRegisterRepository.java     | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git 
a/shenyu-register-center/shenyu-register-client/shenyu-register-client-consul/src/main/java/org/apache/shenyu/register/client/consul/ConsulClientRegisterRepository.java
 
b/shenyu-register-center/shenyu-register-client/shenyu-register-client-consul/src/main/java/org/apache/shenyu/register/client/consul/ConsulClientRegisterRepository.java
index 198f204e6..16f233e1d 100644
--- 
a/shenyu-register-center/shenyu-register-client/shenyu-register-client-consul/src/main/java/org/apache/shenyu/register/client/consul/ConsulClientRegisterRepository.java
+++ 
b/shenyu-register-center/shenyu-register-client/shenyu-register-client-consul/src/main/java/org/apache/shenyu/register/client/consul/ConsulClientRegisterRepository.java
@@ -19,15 +19,19 @@ package org.apache.shenyu.register.client.consul;
 
 import com.ecwid.consul.v1.ConsulClient;
 import com.ecwid.consul.v1.agent.model.NewService;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Objects;
 import java.util.Properties;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shenyu.common.constant.Constants;
+
 import static org.apache.shenyu.common.constant.Constants.PATH_SEPARATOR;
 import static 
org.apache.shenyu.common.constant.DefaultPathConstants.SELECTOR_JOIN_RULE;
+
 import org.apache.shenyu.common.enums.RpcTypeEnum;
 import org.apache.shenyu.common.exception.ShenyuException;
 import org.apache.shenyu.common.utils.ContextPathUtils;
@@ -49,8 +53,6 @@ public class ConsulClientRegisterRepository implements 
ShenyuClientRegisterRepos
 
     private static final char SEPARATOR = '-';
 
-    private static MetaDataRegisterDTO metaDataRegisterDTO;
-
     private ConsulClient consulClient;
 
     private NewService service;
@@ -131,7 +133,8 @@ public class ConsulClientRegisterRepository implements 
ShenyuClientRegisterRepos
 
     @Override
     public void persistInterface(final MetaDataRegisterDTO metadata) {
-        metaDataRegisterDTO = metadata;
+        registerMetadata(metadata);
+        LogUtils.info(LOGGER, "{} Consul client register success: {}", 
metadata.getRpcType(), metadata);
     }
 
     /**
@@ -142,19 +145,12 @@ public class ConsulClientRegisterRepository implements 
ShenyuClientRegisterRepos
     @Override
     public void persistURI(final URIRegisterDTO registerDTO) {
         registerURI(registerDTO);
-        registerMetadata(metaDataRegisterDTO);
-        LogUtils.info(LOGGER, "{} Consul client register success: {}", 
metaDataRegisterDTO.getRpcType(), metaDataRegisterDTO);
+        LogUtils.info(LOGGER, "{} Consul client register success: {}", 
registerDTO.getRpcType(), registerDTO);
     }
 
     @Override
     public void close() {
-        try {
-            consulClient.agentServiceDeregister(this.service.getId());
-        } finally {
-            metaDataRegisterDTO.setTimeMillis(System.currentTimeMillis());
-            registerMetadata(metaDataRegisterDTO);
-            LogUtils.info(LOGGER, "{} Consul client deregister success: {}", 
metaDataRegisterDTO.getRpcType(), metaDataRegisterDTO);
-        }
+        consulClient.agentServiceDeregister(this.service.getId());
     }
 
     private void registerMetadata(final MetaDataRegisterDTO metadata) {
@@ -171,7 +167,7 @@ public class ConsulClientRegisterRepository implements 
ShenyuClientRegisterRepos
         this.service.getMeta().put(Constants.URI, 
GsonUtils.getInstance().toJson(metadata));
         consulClient.agentServiceRegister(this.service);
     }
-    
+
     private String buildMetadataNodeName(final MetaDataRegisterDTO metadata) {
         String nodeName;
         String rpcType = metadata.getRpcType();