Added nacos service discovery support

apollo-adminservice/pom.xml

@@ -59,6 +59,10 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>com.alibaba.boot</groupId>
+			<artifactId>nacos-discovery-spring-boot-starter</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>

apollo-adminservice/src/main/config/application-github.properties

@@ -2,3 +2,6 @@
 spring.datasource.url = ${spring_datasource_url}
 spring.datasource.username = ${spring_datasource_username}
 spring.datasource.password = ${spring_datasource_password}
+
+#nacos discovery
+#nacos.discovery.server-addr=127.0.0.1:8848

apollo-adminservice/src/main/resources/application-nacosDiscovery.properties

@@ -0,0 +1,7 @@
+eureka.client.enabled=false
+spring.cloud.discovery.enabled=false
+#nacos enabled
+nacos.discovery.register.enabled=true
+nacos.discovery.auto-register=true
+nacos.discovery.register.serviceName=apollo-adminservice
+nacos.discovery.register.metadata.apollo.serviceName=apollo-adminservice

apollo-configservice/pom.xml

@@ -65,6 +65,10 @@
 			</exclusions>
 		</dependency>
 		<!-- end of eureka -->
+		<dependency>
+			<groupId>com.alibaba.boot</groupId>
+			<artifactId>nacos-discovery-spring-boot-starter</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>

apollo-configservice/src/main/config/application-github.properties

@@ -2,3 +2,6 @@
 spring.datasource.url = ${spring_datasource_url}
 spring.datasource.username = ${spring_datasource_username}
 spring.datasource.password = ${spring_datasource_password}
+
+#nacos discovery
+#nacos.discovery.server-addr=127.0.0.1:8848

apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/KubernetesHomePageController.java → apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/HomePageController.java

@@ -11,14 +11,14 @@
 
 
 /**
- * For kubernetes discovery service, there is no eureka home page, so we need to add a default one
+ * For kubernetes,nacos discovery service, there is no eureka home page, so we need to add a default one
  */
-@Profile({"kubernetes"})
+@Profile({"kubernetes","nacosDiscovery"})
 @RestController
-public class KubernetesHomePageController {
+public class HomePageController {
   private final DiscoveryService discoveryService;
 
-  public KubernetesHomePageController(DiscoveryService discoveryService) {
+  public HomePageController(DiscoveryService discoveryService) {
     this.discoveryService = discoveryService;
   }
 

apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/ServiceController.java

@@ -29,9 +29,7 @@ public List<ServiceDTO> getMetaService() {
   }
 
   @RequestMapping("/config")
-  public List<ServiceDTO> getConfigService(
-      @RequestParam(value = "appId", defaultValue = "") String appId,
-      @RequestParam(value = "ip", required = false) String clientIp) {
+  public List<ServiceDTO> getConfigService() {
     return discoveryService.getServiceInstances(ServiceNameConsts.APOLLO_CONFIGSERVICE);
   }
 

apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/DefaultDiscoveryService.java

@@ -17,7 +17,7 @@
  * Default discovery service for Eureka
  */
 @Service
-@ConditionalOnMissingProfile({"kubernetes"})
+@ConditionalOnMissingProfile({"kubernetes","nacosDiscovery"})
 public class DefaultDiscoveryService implements DiscoveryService {
 
   private final EurekaClient eurekaClient;

apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryService.java

@@ -0,0 +1,53 @@
+package com.ctrip.framework.apollo.metaservice.service;
+
+import com.alibaba.nacos.api.annotation.NacosInjected;
+import com.alibaba.nacos.api.exception.NacosException;
+import com.alibaba.nacos.api.naming.NamingService;
+import com.alibaba.nacos.api.naming.pojo.Instance;
+import com.ctrip.framework.apollo.core.dto.ServiceDTO;
+import com.google.common.collect.Lists;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author : kl
+ * Service discovery nacos implementation
+ **/
+@Service
+@Profile({"nacosDiscovery"})
+public class NacosDiscoveryService implements DiscoveryService {
+
+    private static final String SERVICE_NAME_METADATA_KEY = "apollo.serviceName";
+
+    @NacosInjected
+    private NamingService namingService;
+
+    @Override
+    public List<ServiceDTO> getServiceInstances(String serviceId) {
+        try {
+            List<Instance> instances = namingService.getAllInstances(serviceId);
+            List<ServiceDTO> serviceDTOList = Lists.newLinkedList();
+            instances.forEach(instance -> {
+                ServiceDTO serviceDTO = this.toServiceDTO(instance);
+                serviceDTOList.add(serviceDTO);
+            });
+            return serviceDTOList;
+        } catch (NacosException e) {
+            e.printStackTrace();
+        }
+        return Collections.emptyList();
+    }
+
+    private ServiceDTO toServiceDTO(Instance instance) {
+        ServiceDTO service = new ServiceDTO();
+        String appName = instance.getMetadata().get(SERVICE_NAME_METADATA_KEY);
+        service.setAppName(appName);
+        service.setInstanceId(instance.getInstanceId());
+        String homePageUrl = "http://" + instance.getIp() + ":" + instance.getPort() + "/";
+        service.setHomepageUrl(homePageUrl);
+        return service;
+    }
+}

apollo-configservice/src/main/resources/application-nacosDiscovery.properties

@@ -0,0 +1,8 @@
+apollo.eureka.server.enabled=false
+eureka.client.enabled=false
+spring.cloud.discovery.enabled=false
+#nacos enabled
+nacos.discovery.register.enabled=true
+nacos.discovery.auto-register=true
+nacos.discovery.register.serviceName=apollo-configservice
+nacos.discovery.register.metadata.apollo.serviceName=apollo-configservice

apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/controller/KubernetesHomePageControllerTest.java → apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/controller/HomePageControllerTest.java

@@ -16,16 +16,16 @@
 import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
-public class KubernetesHomePageControllerTest {
+public class HomePageControllerTest {
 
   @Mock
   private DiscoveryService discoveryService;
 
-  private KubernetesHomePageController homePageController;
+  private HomePageController homePageController;
 
   @Before
   public void setUp() throws Exception {
-    homePageController = new KubernetesHomePageController(discoveryService);
+    homePageController = new HomePageController(discoveryService);
   }
 
   @Test

apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/controller/ServiceControllerTest.java

@@ -42,7 +42,7 @@ public void testGetConfigService() {
     when(discoveryService.getServiceInstances(ServiceNameConsts.APOLLO_CONFIGSERVICE))
         .thenReturn(someServices);
 
-    assertEquals(someServices, serviceController.getConfigService(someAppId, someClientIp));
+    assertEquals(someServices, serviceController.getConfigService());
   }
 
   @Test

docs/zh/deployment/distributed-deployment-guide.md

@@ -522,6 +522,22 @@ pro.meta=http://apollo.xxx.com
 
 >注2: meta service地址也可以填入IP，0.11.0版本之前只支持填入一个IP。从0.11.0版本开始支持填入以逗号分隔的多个地址（[PR #1214](https://github.com/ctripcorp/apollo/pull/1214)），如`http://1.1.1.1:8080,http://2.2.2.2:8080`，不过生产环境还是建议使用域名（走slb），因为机器扩容、缩容等都可能导致IP列表的变化。
 
+###### 2.2.1.1.2.5 启用外部nacos服务注册中心替换内置eureka
+启用外部的nacos服务注册中心分两步走，configService和adminService的操作一样，如下：
+- 1、修改VM options，激活nacosDiscovery的profile，如：
+```shell
+-Dapollo_profile=github,auth,nacosDiscovery
+```
+- 2、前往application-github.properties配置nacos连接地址，如：
+```properties
+#nacos discovery
+nacos.discovery.server-addr=127.0.0.1:8848
+```
+也可采用VM options的方式配置，如：
+```
+-Dnacos.discovery.server-addr=127.0.0.1:8848
+```
+
 #### 2.2.1.2 通过源码构建
 
 ##### 2.2.1.2.1 配置数据库连接信息

pom.xml

@@ -83,6 +83,7 @@
 		<javax.activation.version>1.1.1</javax.activation.version>
 		<javax.mail.version>1.6.2</javax.mail.version>
 		<javassist.version>3.23.1-GA</javassist.version>
+		<nacos.discovery.version>0.2.7</nacos.discovery.version>
 		<!-- Plugins Version -->
 		<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
 		<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
@@ -261,6 +262,11 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
+			<dependency>
+				<groupId>com.alibaba.boot</groupId>
+				<artifactId>nacos-discovery-spring-boot-starter</artifactId>
+				<version>${nacos.discovery.version}</version>
+			</dependency>
 			<!--third party -->
 			<dependency>
 				<groupId>org.slf4j</groupId>