add nacos support & change dubbo version to 2.7.3

pom.xml

@@ -16,11 +16,12 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<netty.version>4.1.35.Final</netty.version>
+		<netty.version>4.1.39.Final</netty.version>
 		<slf4j.version>1.7.26</slf4j.version>
 		<log4j.version>1.2.17</log4j.version>
 		<curator.version>2.12.0</curator.version>
 		<dubbo.version>2.7.3</dubbo.version>
+		<nacos.version>1.1.3</nacos.version>
 	</properties>
 
 	<dependencyManagement>
@@ -60,6 +61,11 @@
 				<artifactId>fastjson</artifactId>
 				<version>1.2.54</version>
 			</dependency>
+			<dependency>
+				<groupId>com.alibaba.nacos</groupId>
+				<artifactId>nacos-client</artifactId>
+				<version>${nacos.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -119,6 +125,18 @@
 			<artifactId>fastjson</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>com.alibaba.nacos</groupId>
+			<artifactId>nacos-client</artifactId>
+			<version>${nacos.version}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>guava</artifactId>
+					<groupId>com.google.guava</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
 	</dependencies>
 
 	<build>

src/main/java/org/apache/dubbo/proxy/Config.java

@@ -64,6 +64,8 @@ MetadataCollector getMetadataCollector() {
             URL metadataUrl = URL.valueOf(metadataAddress);
             metaDataCollector = ExtensionLoader.getExtensionLoader(MetadataCollector.class).
                     getExtension(metadataUrl.getProtocol());
+            metaDataCollector.setUrl(metadataUrl);
+            metaDataCollector.init();
         }
         return metaDataCollector;
     }

src/main/java/org/apache/dubbo/proxy/metadata/impl/NacosMetadataCollector.java

@@ -0,0 +1,90 @@
+package org.apache.dubbo.proxy.metadata.impl;
+
+
+import org.apache.dubbo.proxy.metadata.MetadataCollector;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.metadata.identifier.MetadataIdentifier;
+
+import com.alibaba.nacos.api.NacosFactory;
+import com.alibaba.nacos.api.config.ConfigService;
+import com.alibaba.nacos.api.exception.NacosException;
+import org.apache.dubbo.proxy.utils.Constants;
+
+import java.util.Properties;
+
+import static com.alibaba.nacos.api.PropertyKeyConst.SERVER_ADDR;
+
+public class NacosMetadataCollector implements MetadataCollector {
+    private static final Logger logger = LoggerFactory.getLogger(NacosMetadataCollector.class);
+    private ConfigService configService;
+    private String group;
+    private URL url;
+    private final static String DEFAULT_ROOT = "dubbo";
+    @Override
+    public void setUrl(URL url) {
+        this.url = url;
+    }
+
+    @Override
+    public URL getUrl() {
+        return url;
+    }
+
+    @Override
+    public void init() {
+        group = url.getParameter(Constants.GROUP_KEY, DEFAULT_ROOT);
+
+        configService = buildConfigService(url);
+    }
+
+    private ConfigService buildConfigService(URL url) {
+        Properties nacosProperties = buildNacosProperties(url);
+        try {
+            configService = NacosFactory.createConfigService(nacosProperties);
+        } catch (NacosException e) {
+            if (logger.isErrorEnabled()) {
+                logger.error(e.getErrMsg(), e);
+            }
+            throw new IllegalStateException(e);
+        }
+        return configService;
+    }
+
+    private Properties buildNacosProperties(URL url) {
+        Properties properties = new Properties();
+        setServerAddr(url, properties);
+        return properties;
+    }
+
+    private void setServerAddr(URL url, Properties properties) {
+
+        String serverAddr = url.getHost() + // Host
+                ":" +
+                url.getPort() // Port
+                ;
+        properties.put(SERVER_ADDR, serverAddr);
+    }
+
+    @Override
+    public String getProviderMetaData(MetadataIdentifier key) {
+        return getMetaData(key);
+    }
+
+//    @Override
+    public String getConsumerMetaData(MetadataIdentifier key) {
+        return getMetaData(key);
+    }
+
+    private String getMetaData(MetadataIdentifier identifier) {
+        try {
+            return configService.getConfig(identifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.UNIQUE_KEY),
+                    group, 1000 * 10);
+        } catch (NacosException e) {
+            logger.warn("Failed to get " + identifier + " from nacos, cause: " + e.getMessage(), e);
+        }
+        return null;
+    }
+}
+

src/main/java/org/apache/dubbo/proxy/service/GenericInvoke.java

@@ -50,7 +50,9 @@ public static Object genericCall(String interfaceName, String group,
             logger.info("dubbo generic invoke, service is {}, method is {} , paramTypes is {} , paramObjs is {} , svc" +
                             " is {}.", interfaceName
                     , methodName,paramTypes,paramObjs,svc);
-            return svc.$invoke(methodName, paramTypes, paramObjs);
+            Object obj = svc.$invoke(methodName, paramTypes, paramObjs);
+            logger.debug("invoke ret: {}",obj);
+            return obj;
         } catch (Exception e) {
             logger.error("Generic invoke failed",e);
             if (e instanceof RpcException) {

src/main/java/org/apache/dubbo/proxy/worker/RequestWorker.java

@@ -117,7 +117,7 @@ private boolean writeResponse(ChannelHandlerContext ctx, Object result) {
     }
 
     private String[] getTypesFromMetadata(String application, String interfaze, String group, String version, String methodName, int paramLen) {
-        MetadataIdentifier identifier = new MetadataIdentifier(interfaze, version, group, Constants.PROVIDER_SIDE, application);
+        MetadataIdentifier identifier = new MetadataIdentifier(interfaze, version, null, Constants.PROVIDER_SIDE, application);
         String metadata = metadataCollector.getProviderMetaData(identifier);
         FullServiceDefinition serviceDefinition = JSON.parseObject(metadata, FullServiceDefinition.class);
         List<MethodDefinition> methods = serviceDefinition.getMethods();

src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.proxy.metadata.MetadataCollector

@@ -1 +1,2 @@
 zookeeper=org.apache.dubbo.proxy.metadata.impl.ZookeeperMetadataCollector
+nacos=org.apache.dubbo.proxy.metadata.impl.NacosMetadataCollector

src/main/resources/application.yml

@@ -1,8 +1,8 @@
 netty.port: 8000
 business.thread.count: 100
-proxy.registry.address: zookeeper://127.0.0.1:2181
+proxy.registry.address: nacos://127.0.0.1:8848
 proxy.registry.group: dubbo
-proxy.metadata-report.address: zookeeper://127.0.0.1:2181
+proxy.metadata-report.address: nacos://127.0.0.1:8848