From fe75b4d3f2c824d4f6add524d67c55abc6796f84 Mon Sep 17 00:00:00 2001
From: kl <632104866@QQ.com>
Date: Thu, 16 May 2019 11:07:18 +0800
Subject: [PATCH 01/16] add tech-support-qq-4.png

---
 doc/images/tech-support-qq-4.png | Bin 0 -> 7285 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 doc/images/tech-support-qq-4.png

diff --git a/doc/images/tech-support-qq-4.png b/doc/images/tech-support-qq-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..398a8c509bfe7c62ddba3b41593495eecce38b6d
GIT binary patch
literal 7285
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
U(wk7gb0UT!L`}B*nR)1c04zp~CjbBd

literal 0
HcmV?d00001


From 99bf97aef17d9656fdf54f8566f795b1340a61c1 Mon Sep 17 00:00:00 2001
From: kl <632104866@QQ.com>
Date: Thu, 16 May 2019 11:13:55 +0800
Subject: [PATCH 02/16] Update README.md

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 83a9be9aea8..70e5f61fa93 100644
--- a/README.md
+++ b/README.md
@@ -115,12 +115,14 @@ Java客户端不依赖任何框架，能够运行于所有Java运行时环境，
 # Support
 <table>
   <thead>
-    <th>Apollo配置中心技术支持③群<br />群号：742035428</th>
+    <th>Apollo配置中心技术支持④群<br />群号：516773934 </th>
+    <th>Apollo配置中心技术支持③群<br />群号：742035428（已满）</th>
     <th>Apollo配置中心技术支持②群<br />群号：904287263（已满）</th>
     <th>Apollo配置中心技术支持①群<br />群号：375526581（已满）</th>
   </thead>
   <tbody>
     <tr>
+       <td><img src="./doc/images/tech-support-qq-4.png" alt="tech-support-qq-4"></td>
       <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/tech-support-qq-3.png" alt="tech-support-qq-3"></td>
       <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/tech-support-qq-2.png" alt="tech-support-qq-2"></td>
       <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/tech-support-qq-1.png" alt="tech-support-qq-1"></td>

From d7d3fd908dfd11113fd891b581c1ebf43c60eb1a Mon Sep 17 00:00:00 2001
From: kl <chenkailing@xd.com>
Date: Fri, 11 Dec 2020 17:03:33 +0800
Subject: [PATCH 03/16] Enhance the user experience in the scenario of
 submitting duplicate keys

---
 .../txtresolver/PropertyResolver.java         | 19 ++++++++++---------
 .../directive/namespace-panel-directive.js    |  1 -
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java
index 89cdc9705da..bdea8b73666 100644
--- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java
+++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java
@@ -8,6 +8,7 @@
 import com.google.common.base.Strings;
 import org.springframework.stereotype.Component;
 
+import javax.validation.constraints.NotNull;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -35,9 +36,9 @@ public ItemChangeSets resolve(long namespaceId, String configText, List<ItemDTO>
     oldKeyMapItem.remove("");
 
     String[] newItems = configText.split(ITEM_SEPARATOR);
-
-    if (isHasRepeatKey(newItems)) {
-      throw new BadRequestException("config text has repeat key please check.");
+    Set<String> repeatKeys = new HashSet<>();
+    if (isHasRepeatKey(newItems,repeatKeys)) {
+      throw new BadRequestException(String.format("config text has repeat key please check.repeat keys:%s", repeatKeys.toString()));
     }
 
     ItemChangeSets changeSets = new ItemChangeSets();
@@ -72,24 +73,24 @@ public ItemChangeSets resolve(long namespaceId, String configText, List<ItemDTO>
     return changeSets;
   }
 
-  private boolean isHasRepeatKey(String[] newItems) {
+  private boolean isHasRepeatKey(String[] newItems,@NotNull Set<String> repeatKeys) {
     Set<String> keys = new HashSet<>();
     int lineCounter = 1;
-    int keyCount = 0;
     for (String item : newItems) {
       if (!isCommentItem(item) && !isBlankItem(item)) {
-        keyCount++;
         String[] kv = parseKeyValueFromItem(item);
         if (kv != null) {
-          keys.add(kv[0].toLowerCase());
+          String key = kv[0].toLowerCase();
+          if(!keys.add(key)){
+            repeatKeys.add(key);
+          }
         } else {
           throw new BadRequestException("line:" + lineCounter + " key value must separate by '='");
         }
       }
       lineCounter++;
     }
-
-    return keyCount > keys.size();
+    return !repeatKeys.isEmpty();
   }
 
   private String[] parseKeyValueFromItem(String item) {
diff --git a/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js b/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
index 66b5e46d0e3..7b4f88ae0cc 100644
--- a/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
+++ b/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
@@ -745,7 +745,6 @@ function directive($window, $translate, toastr, AppUtil, EventManager, Permissio
                         }
                     );
                 namespace.commited = true;
-                toggleTextEditStatus(namespace);
             }
 
             function syntaxCheck(namespace) {

From 5def448b7632b2992c7dda29c38750ff1368d0f9 Mon Sep 17 00:00:00 2001
From: chenkailing <632104866@qq.com>
Date: Sat, 12 Dec 2020 14:16:43 +0800
Subject: [PATCH 04/16] Modify the key-value conflict exception prompt, adjust
 the code style

---
 .../portal/component/txtresolver/PropertyResolver.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java
index bdea8b73666..10a614b69d1 100644
--- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java
+++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java
@@ -37,8 +37,8 @@ public ItemChangeSets resolve(long namespaceId, String configText, List<ItemDTO>
 
     String[] newItems = configText.split(ITEM_SEPARATOR);
     Set<String> repeatKeys = new HashSet<>();
-    if (isHasRepeatKey(newItems,repeatKeys)) {
-      throw new BadRequestException(String.format("config text has repeat key please check.repeat keys:%s", repeatKeys.toString()));
+    if (isHasRepeatKey(newItems, repeatKeys)) {
+      throw new BadRequestException(String.format("Config text has repeated keys: %s, please check your input.", repeatKeys.toString()));
     }
 
     ItemChangeSets changeSets = new ItemChangeSets();
@@ -73,7 +73,7 @@ public ItemChangeSets resolve(long namespaceId, String configText, List<ItemDTO>
     return changeSets;
   }
 
-  private boolean isHasRepeatKey(String[] newItems,@NotNull Set<String> repeatKeys) {
+  private boolean isHasRepeatKey(String[] newItems, @NotNull Set<String> repeatKeys) {
     Set<String> keys = new HashSet<>();
     int lineCounter = 1;
     for (String item : newItems) {

From e12a48053da87ef0f13982483a3a82f65fb2ea9f Mon Sep 17 00:00:00 2001
From: chenkailing <632104866@qq.com>
Date: Sat, 19 Dec 2020 18:37:05 +0800
Subject: [PATCH 05/16] Added nacos service discovery support

---
 apollo-adminservice/pom.xml                   |  4 ++
 .../main/config/application-github.properties |  3 ++
 .../application-nacosDiscovery.properties     |  7 +++
 apollo-configservice/pom.xml                  |  4 ++
 .../main/config/application-github.properties |  3 ++
 ...ontroller.java => HomePageController.java} |  8 +--
 .../controller/ServiceController.java         |  4 +-
 .../service/DefaultDiscoveryService.java      |  2 +-
 .../service/NacosDiscoveryService.java        | 53 +++++++++++++++++++
 .../application-nacosDiscovery.properties     |  8 +++
 ...rTest.java => HomePageControllerTest.java} |  6 +--
 .../controller/ServiceControllerTest.java     |  2 +-
 .../distributed-deployment-guide.md           | 16 ++++++
 pom.xml                                       |  6 +++
 14 files changed, 114 insertions(+), 12 deletions(-)
 create mode 100644 apollo-adminservice/src/main/resources/application-nacosDiscovery.properties
 rename apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/{KubernetesHomePageController.java => HomePageController.java} (79%)
 create mode 100644 apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryService.java
 create mode 100644 apollo-configservice/src/main/resources/application-nacosDiscovery.properties
 rename apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/controller/{KubernetesHomePageControllerTest.java => HomePageControllerTest.java} (88%)

diff --git a/apollo-adminservice/pom.xml b/apollo-adminservice/pom.xml
index 6be4094df23..eaa4a6b0bd2 100644
--- a/apollo-adminservice/pom.xml
+++ b/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>
diff --git a/apollo-adminservice/src/main/config/application-github.properties b/apollo-adminservice/src/main/config/application-github.properties
index f4c35e6d289..a9742e1e9dd 100644
--- a/apollo-adminservice/src/main/config/application-github.properties
+++ b/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
diff --git a/apollo-adminservice/src/main/resources/application-nacosDiscovery.properties b/apollo-adminservice/src/main/resources/application-nacosDiscovery.properties
new file mode 100644
index 00000000000..657581c67b0
--- /dev/null
+++ b/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
diff --git a/apollo-configservice/pom.xml b/apollo-configservice/pom.xml
index 52e4d12c41a..e1bbe3ab8ab 100644
--- a/apollo-configservice/pom.xml
+++ b/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>
diff --git a/apollo-configservice/src/main/config/application-github.properties b/apollo-configservice/src/main/config/application-github.properties
index f4c35e6d289..a9742e1e9dd 100644
--- a/apollo-configservice/src/main/config/application-github.properties
+++ b/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
diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/KubernetesHomePageController.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/HomePageController.java
similarity index 79%
rename from apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/KubernetesHomePageController.java
rename to apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/HomePageController.java
index 1625cf9d062..0a215e2a20a 100644
--- a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/KubernetesHomePageController.java
+++ b/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;
   }
 
diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/ServiceController.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/ServiceController.java
index 808142a4333..d71c3e1e123 100644
--- a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/ServiceController.java
+++ b/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);
   }
 
diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/DefaultDiscoveryService.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/DefaultDiscoveryService.java
index 17d8a618bca..d724b587d40 100644
--- a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/DefaultDiscoveryService.java
+++ b/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;
diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryService.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryService.java
new file mode 100644
index 00000000000..032858244a0
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/apollo-configservice/src/main/resources/application-nacosDiscovery.properties b/apollo-configservice/src/main/resources/application-nacosDiscovery.properties
new file mode 100644
index 00000000000..ea95b5275b5
--- /dev/null
+++ b/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
diff --git a/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/controller/KubernetesHomePageControllerTest.java b/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/controller/HomePageControllerTest.java
similarity index 88%
rename from apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/controller/KubernetesHomePageControllerTest.java
rename to apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/controller/HomePageControllerTest.java
index 96a405e6910..42c0d1f548d 100644
--- a/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/controller/KubernetesHomePageControllerTest.java
+++ b/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
diff --git a/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/controller/ServiceControllerTest.java b/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/controller/ServiceControllerTest.java
index bebb4809a2a..7d2e2f4c079 100644
--- a/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/controller/ServiceControllerTest.java
+++ b/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
diff --git a/docs/zh/deployment/distributed-deployment-guide.md b/docs/zh/deployment/distributed-deployment-guide.md
index d5d7297c068..03662b70489 100644
--- a/docs/zh/deployment/distributed-deployment-guide.md
+++ b/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 配置数据库连接信息
diff --git a/pom.xml b/pom.xml
index 798d6c2e2c5..8ba4d0463a0 100644
--- a/pom.xml
+++ b/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>

From da1b764fb1b02c35d69567588757e940cb85e52a Mon Sep 17 00:00:00 2001
From: kl <chenkailing@xd.com>
Date: Mon, 21 Dec 2020 17:16:34 +0800
Subject: [PATCH 06/16] add NacosDiscoveryServiceTest.java

---
 apollo-adminservice/pom.xml                   |  4 -
 .../application-nacosDiscovery.properties     |  3 +-
 apollo-biz/pom.xml                            |  4 +
 apollo-configservice/pom.xml                  |  4 -
 .../controller/HomePageController.java        |  2 +-
 .../controller/ServiceController.java         |  4 +-
 .../service/NacosDiscoveryService.java        | 14 ++--
 .../application-nacosDiscovery.properties     |  3 +-
 .../controller/ServiceControllerTest.java     |  2 +-
 .../service/NacosDiscoveryServiceTest.java    | 80 +++++++++++++++++++
 .../distributed-deployment-guide.md           |  8 +-
 11 files changed, 105 insertions(+), 23 deletions(-)
 create mode 100644 apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryServiceTest.java

diff --git a/apollo-adminservice/pom.xml b/apollo-adminservice/pom.xml
index eaa4a6b0bd2..6be4094df23 100644
--- a/apollo-adminservice/pom.xml
+++ b/apollo-adminservice/pom.xml
@@ -59,10 +59,6 @@
 				</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>
diff --git a/apollo-adminservice/src/main/resources/application-nacosDiscovery.properties b/apollo-adminservice/src/main/resources/application-nacosDiscovery.properties
index 657581c67b0..27eefec6726 100644
--- a/apollo-adminservice/src/main/resources/application-nacosDiscovery.properties
+++ b/apollo-adminservice/src/main/resources/application-nacosDiscovery.properties
@@ -3,5 +3,4 @@ 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
+nacos.discovery.register.service-name=apollo-adminservice
diff --git a/apollo-biz/pom.xml b/apollo-biz/pom.xml
index 986e5ff1433..cfabe71730d 100644
--- a/apollo-biz/pom.xml
+++ b/apollo-biz/pom.xml
@@ -24,6 +24,10 @@
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</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>
diff --git a/apollo-configservice/pom.xml b/apollo-configservice/pom.xml
index e1bbe3ab8ab..52e4d12c41a 100644
--- a/apollo-configservice/pom.xml
+++ b/apollo-configservice/pom.xml
@@ -65,10 +65,6 @@
 			</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>
diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/HomePageController.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/HomePageController.java
index 0a215e2a20a..7fa1020f7e2 100644
--- a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/HomePageController.java
+++ b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/HomePageController.java
@@ -11,7 +11,7 @@
 
 
 /**
- * For kubernetes,nacos discovery service, there is no eureka home page, so we need to add a default one
+ * For non-eureka discovery services such as kubernetes and nacos, there is no eureka home page, so we need to add a default one
  */
 @Profile({"kubernetes","nacosDiscovery"})
 @RestController
diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/ServiceController.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/ServiceController.java
index d71c3e1e123..84675fa066c 100644
--- a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/ServiceController.java
+++ b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/ServiceController.java
@@ -29,7 +29,9 @@ public List<ServiceDTO> getMetaService() {
   }
 
   @RequestMapping("/config")
-  public List<ServiceDTO> getConfigService() {
+  public List<ServiceDTO> getConfigService(
+          @RequestParam(value = "appId", defaultValue = "") String appId,
+          @RequestParam(value = "ip", required = false) String clientIp) {
     return discoveryService.getServiceInstances(ServiceNameConsts.APOLLO_CONFIGSERVICE);
   }
 
diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryService.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryService.java
index 032858244a0..444f40ba8a3 100644
--- a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryService.java
+++ b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryService.java
@@ -20,18 +20,21 @@
 @Profile({"nacosDiscovery"})
 public class NacosDiscoveryService implements DiscoveryService {
 
-    private static final String SERVICE_NAME_METADATA_KEY = "apollo.serviceName";
 
-    @NacosInjected
     private NamingService namingService;
 
+    @NacosInjected
+    public void setNamingService(NamingService namingService) {
+        this.namingService = namingService;
+    }
+
     @Override
     public List<ServiceDTO> getServiceInstances(String serviceId) {
         try {
-            List<Instance> instances = namingService.getAllInstances(serviceId);
+            List<Instance> instances = namingService.selectInstances(serviceId,true);
             List<ServiceDTO> serviceDTOList = Lists.newLinkedList();
             instances.forEach(instance -> {
-                ServiceDTO serviceDTO = this.toServiceDTO(instance);
+                ServiceDTO serviceDTO = this.toServiceDTO(instance, serviceId);
                 serviceDTOList.add(serviceDTO);
             });
             return serviceDTOList;
@@ -41,9 +44,8 @@ public List<ServiceDTO> getServiceInstances(String serviceId) {
         return Collections.emptyList();
     }
 
-    private ServiceDTO toServiceDTO(Instance instance) {
+    private ServiceDTO toServiceDTO(Instance instance, String appName) {
         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() + "/";
diff --git a/apollo-configservice/src/main/resources/application-nacosDiscovery.properties b/apollo-configservice/src/main/resources/application-nacosDiscovery.properties
index ea95b5275b5..7612bf4446e 100644
--- a/apollo-configservice/src/main/resources/application-nacosDiscovery.properties
+++ b/apollo-configservice/src/main/resources/application-nacosDiscovery.properties
@@ -4,5 +4,4 @@ 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
+nacos.discovery.register.service-name=apollo-configservice
diff --git a/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/controller/ServiceControllerTest.java b/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/controller/ServiceControllerTest.java
index 7d2e2f4c079..bebb4809a2a 100644
--- a/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/controller/ServiceControllerTest.java
+++ b/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());
+    assertEquals(someServices, serviceController.getConfigService(someAppId, someClientIp));
   }
 
   @Test
diff --git a/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryServiceTest.java b/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryServiceTest.java
new file mode 100644
index 00000000000..54bcfb1779c
--- /dev/null
+++ b/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryServiceTest.java
@@ -0,0 +1,80 @@
+package com.ctrip.framework.apollo.metaservice.service;
+
+import com.alibaba.nacos.api.naming.pojo.Instance;
+import com.alibaba.nacos.client.naming.NacosNamingService;
+import com.ctrip.framework.apollo.core.dto.ServiceDTO;
+import com.google.common.collect.Lists;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author kl (http://kailing.pub)
+ * @since 2020/12/21
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class NacosDiscoveryServiceTest {
+
+    private NacosDiscoveryService nacosDiscoveryService;
+
+    @Mock
+    private NacosNamingService nacosNamingService;
+
+    private String someServiceId;
+
+
+    @Before
+    public void setUp() throws Exception {
+        nacosDiscoveryService = new NacosDiscoveryService();
+        nacosDiscoveryService.setNamingService(nacosNamingService);
+        someServiceId = "someServiceId";
+    }
+
+    @Test
+    public void testGetServiceInstancesWithEmptyInstances() throws Exception {
+        assertTrue(nacosNamingService.selectInstances(someServiceId, true).isEmpty());
+    }
+
+
+    @Test
+    public void testGetServiceInstancesWithInvalidServiceId() {
+        assertTrue(nacosDiscoveryService.getServiceInstances(someServiceId).isEmpty());
+    }
+
+    @Test
+    public void testGetServiceInstances() throws Exception {
+        String someIp = "1.2.3.4";
+        int somePort = 8080;
+        String someInstanceId = "someInstanceId";
+        Instance someServiceInstance = mockServiceInstance(someServiceId, someInstanceId,
+                someIp,somePort);
+
+        when(nacosNamingService.selectInstances(someServiceId,true)).thenReturn(
+                Lists.newArrayList(someServiceInstance));
+
+        List<ServiceDTO> serviceDTOList = nacosDiscoveryService.getServiceInstances(someServiceId);
+
+        assertEquals(1, serviceDTOList.size());
+        assertEquals(serviceDTOList.get(0).getHomepageUrl(),"http://1.2.3.4:8080/");
+
+    }
+
+    private Instance mockServiceInstance(String serviceId, String instanceId, String ip, int port) {
+        Instance serviceInstance = mock(Instance.class);
+        when(serviceInstance.getServiceName()).thenReturn(serviceId);
+        when(serviceInstance.getInstanceId()).thenReturn(instanceId);
+        when(serviceInstance.getIp()).thenReturn(ip);
+        when(serviceInstance.getPort()).thenReturn(port);
+
+        return serviceInstance;
+    }
+
+}
diff --git a/docs/zh/deployment/distributed-deployment-guide.md b/docs/zh/deployment/distributed-deployment-guide.md
index 03662b70489..659f3d11f44 100644
--- a/docs/zh/deployment/distributed-deployment-guide.md
+++ b/docs/zh/deployment/distributed-deployment-guide.md
@@ -526,9 +526,13 @@ pro.meta=http://apollo.xxx.com
 启用外部的nacos服务注册中心分两步走，configService和adminService的操作一样，如下：
 - 1、修改VM options，激活nacosDiscovery的profile，如：
 ```shell
--Dapollo_profile=github,auth,nacosDiscovery
+-Dapollo_profile=github,nacosDiscovery
 ```
-- 2、前往application-github.properties配置nacos连接地址，如：
+也可采用环境变量配置方式激活配置，如：
+```shell
+export SPRING_PROFILES_ACTIVE=github,nacosDiscovery
+```
+- 2、前往`config`目录下的`application-github.properties`文件配置nacos连接地址，如：
 ```properties
 #nacos discovery
 nacos.discovery.server-addr=127.0.0.1:8848

From 02b65cbc7f421e22efd312759b784db989e47693 Mon Sep 17 00:00:00 2001
From: kl <chenkailing@xd.com>
Date: Mon, 21 Dec 2020 17:29:54 +0800
Subject: [PATCH 07/16] use logger print Nacosxception

---
 .../apollo/metaservice/service/NacosDiscoveryService.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryService.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryService.java
index 444f40ba8a3..aee893bdea1 100644
--- a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryService.java
+++ b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryService.java
@@ -6,6 +6,8 @@
 import com.alibaba.nacos.api.naming.pojo.Instance;
 import com.ctrip.framework.apollo.core.dto.ServiceDTO;
 import com.google.common.collect.Lists;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
@@ -20,6 +22,7 @@
 @Profile({"nacosDiscovery"})
 public class NacosDiscoveryService implements DiscoveryService {
 
+    private final static Logger logger = LoggerFactory.getLogger(NacosDiscoveryService.class);
 
     private NamingService namingService;
 
@@ -38,8 +41,8 @@ public List<ServiceDTO> getServiceInstances(String serviceId) {
                 serviceDTOList.add(serviceDTO);
             });
             return serviceDTOList;
-        } catch (NacosException e) {
-            e.printStackTrace();
+        } catch (NacosException ex) {
+            logger.error(ex.getMessage(),ex);
         }
         return Collections.emptyList();
     }

From 6ecfbe63ef708989bbc5c522f6a8cc411df53e49 Mon Sep 17 00:00:00 2001
From: kl <chenkailing@xd.com>
Date: Mon, 21 Dec 2020 17:59:45 +0800
Subject: [PATCH 08/16] Fix UnnecessaryStubbingException thrown by
 NacosDiscoveryServiceTest

---
 .../service/NacosDiscoveryServiceTest.java         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryServiceTest.java b/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryServiceTest.java
index 54bcfb1779c..9f490b43ced 100644
--- a/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryServiceTest.java
+++ b/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryServiceTest.java
@@ -9,6 +9,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
@@ -54,22 +55,21 @@ public void testGetServiceInstances() throws Exception {
         String someIp = "1.2.3.4";
         int somePort = 8080;
         String someInstanceId = "someInstanceId";
-        Instance someServiceInstance = mockServiceInstance(someServiceId, someInstanceId,
-                someIp,somePort);
+        Instance someServiceInstance = mockServiceInstance(someInstanceId, someIp, somePort);
 
-        when(nacosNamingService.selectInstances(someServiceId,true)).thenReturn(
+        when(nacosNamingService.selectInstances(someServiceId, true)).thenReturn(
                 Lists.newArrayList(someServiceInstance));
 
         List<ServiceDTO> serviceDTOList = nacosDiscoveryService.getServiceInstances(someServiceId);
-
+        ServiceDTO serviceDTO = serviceDTOList.get(0);
         assertEquals(1, serviceDTOList.size());
-        assertEquals(serviceDTOList.get(0).getHomepageUrl(),"http://1.2.3.4:8080/");
+        assertEquals(someServiceId, serviceDTO.getAppName());
+        assertEquals("http://1.2.3.4:8080/", serviceDTO.getHomepageUrl());
 
     }
 
-    private Instance mockServiceInstance(String serviceId, String instanceId, String ip, int port) {
+    private Instance mockServiceInstance(String instanceId, String ip, int port) {
         Instance serviceInstance = mock(Instance.class);
-        when(serviceInstance.getServiceName()).thenReturn(serviceId);
         when(serviceInstance.getInstanceId()).thenReturn(instanceId);
         when(serviceInstance.getIp()).thenReturn(ip);
         when(serviceInstance.getPort()).thenReturn(port);

From 03f6e354c8157afdbd1edf984321a03691f89429 Mon Sep 17 00:00:00 2001
From: chenkailing <632104866@qq.com>
Date: Mon, 21 Dec 2020 22:09:41 +0800
Subject: [PATCH 09/16] Nacosdiscovery is disabled by default

---
 .../src/main/config/application-github.properties            | 1 +
 .../src/main/config/application-github.properties            | 1 +
 docs/zh/deployment/distributed-deployment-guide.md           | 5 +++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apollo-adminservice/src/main/config/application-github.properties b/apollo-adminservice/src/main/config/application-github.properties
index a9742e1e9dd..52bf59649db 100644
--- a/apollo-adminservice/src/main/config/application-github.properties
+++ b/apollo-adminservice/src/main/config/application-github.properties
@@ -4,4 +4,5 @@ spring.datasource.username = ${spring_datasource_username}
 spring.datasource.password = ${spring_datasource_password}
 
 #nacos discovery
+nacos.discovery.enabled=false
 #nacos.discovery.server-addr=127.0.0.1:8848
diff --git a/apollo-configservice/src/main/config/application-github.properties b/apollo-configservice/src/main/config/application-github.properties
index a9742e1e9dd..52bf59649db 100644
--- a/apollo-configservice/src/main/config/application-github.properties
+++ b/apollo-configservice/src/main/config/application-github.properties
@@ -4,4 +4,5 @@ spring.datasource.username = ${spring_datasource_username}
 spring.datasource.password = ${spring_datasource_password}
 
 #nacos discovery
+nacos.discovery.enabled=false
 #nacos.discovery.server-addr=127.0.0.1:8848
diff --git a/docs/zh/deployment/distributed-deployment-guide.md b/docs/zh/deployment/distributed-deployment-guide.md
index 659f3d11f44..4aa1e2262b3 100644
--- a/docs/zh/deployment/distributed-deployment-guide.md
+++ b/docs/zh/deployment/distributed-deployment-guide.md
@@ -532,14 +532,15 @@ pro.meta=http://apollo.xxx.com
 ```shell
 export SPRING_PROFILES_ACTIVE=github,nacosDiscovery
 ```
-- 2、前往`config`目录下的`application-github.properties`文件配置nacos连接地址，如：
+- 2、前往`config`目录下的`application-github.properties`文件配置nacos，如：
 ```properties
 #nacos discovery
+nacos.discovery.enabled=true
 nacos.discovery.server-addr=127.0.0.1:8848
 ```
 也可采用VM options的方式配置，如：
 ```
--Dnacos.discovery.server-addr=127.0.0.1:8848
+-Dnacos.discovery.enabled=true -Dnacos.discovery.server-addr=127.0.0.1:8848
 ```
 
 #### 2.2.1.2 通过源码构建

From bdc9a5b591d87209ba7d08fe16385b2d80ed4649 Mon Sep 17 00:00:00 2001
From: chenkailing <632104866@qq.com>
Date: Wed, 30 Dec 2020 00:02:01 +0800
Subject: [PATCH 10/16] Isolate nacos service discovery dependencies through
 maven profile

---
 apollo-adminservice/pom.xml                   | 17 +++++++++++
 .../main/config/application-github.properties |  4 ---
 apollo-biz/pom.xml                            |  6 ++--
 apollo-configservice/pom.xml                  | 22 +++++++++++++++
 .../main/config/application-github.properties |  4 ---
 .../service/NacosDiscoveryServiceTest.java    |  4 +--
 pom.xml                                       | 28 +++++++++++++++----
 7 files changed, 65 insertions(+), 20 deletions(-)

diff --git a/apollo-adminservice/pom.xml b/apollo-adminservice/pom.xml
index 6be4094df23..c704f3b683b 100644
--- a/apollo-adminservice/pom.xml
+++ b/apollo-adminservice/pom.xml
@@ -139,4 +139,21 @@
 			</plugin>
 		</plugins>
 	</build>
+
+	<profiles>
+		<profile>
+			<id>nacos-discovery</id>
+			<dependencies>
+				<dependency>
+					<groupId>com.alibaba.boot</groupId>
+					<artifactId>nacos-discovery-spring-boot-starter</artifactId>
+				</dependency>
+				<dependency>
+					<groupId>com.alibaba</groupId>
+					<artifactId>fastjson</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+
 </project>
diff --git a/apollo-adminservice/src/main/config/application-github.properties b/apollo-adminservice/src/main/config/application-github.properties
index 52bf59649db..f4c35e6d289 100644
--- a/apollo-adminservice/src/main/config/application-github.properties
+++ b/apollo-adminservice/src/main/config/application-github.properties
@@ -2,7 +2,3 @@
 spring.datasource.url = ${spring_datasource_url}
 spring.datasource.username = ${spring_datasource_username}
 spring.datasource.password = ${spring_datasource_password}
-
-#nacos discovery
-nacos.discovery.enabled=false
-#nacos.discovery.server-addr=127.0.0.1:8848
diff --git a/apollo-biz/pom.xml b/apollo-biz/pom.xml
index cfabe71730d..1a44e1a404f 100644
--- a/apollo-biz/pom.xml
+++ b/apollo-biz/pom.xml
@@ -24,14 +24,12 @@
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</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>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+
 </project>
diff --git a/apollo-configservice/pom.xml b/apollo-configservice/pom.xml
index 52e4d12c41a..cc240a8e154 100644
--- a/apollo-configservice/pom.xml
+++ b/apollo-configservice/pom.xml
@@ -65,6 +65,11 @@
 			</exclusions>
 		</dependency>
 		<!-- end of eureka -->
+		<dependency>
+			<groupId>com.alibaba.nacos</groupId>
+			<artifactId>nacos-api</artifactId>
+			<version>${nacos-discovery-api.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
@@ -145,4 +150,21 @@
 			</plugin>
 		</plugins>
 	</build>
+
+	<profiles>
+		<profile>
+			<id>nacos-discovery</id>
+			<dependencies>
+				<dependency>
+					<groupId>com.alibaba.boot</groupId>
+					<artifactId>nacos-discovery-spring-boot-starter</artifactId>
+				</dependency>
+				<dependency>
+					<groupId>com.alibaba</groupId>
+					<artifactId>fastjson</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+
 </project>
diff --git a/apollo-configservice/src/main/config/application-github.properties b/apollo-configservice/src/main/config/application-github.properties
index 52bf59649db..f4c35e6d289 100644
--- a/apollo-configservice/src/main/config/application-github.properties
+++ b/apollo-configservice/src/main/config/application-github.properties
@@ -2,7 +2,3 @@
 spring.datasource.url = ${spring_datasource_url}
 spring.datasource.username = ${spring_datasource_username}
 spring.datasource.password = ${spring_datasource_password}
-
-#nacos discovery
-nacos.discovery.enabled=false
-#nacos.discovery.server-addr=127.0.0.1:8848
diff --git a/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryServiceTest.java b/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryServiceTest.java
index 9f490b43ced..3f01e7f134e 100644
--- a/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryServiceTest.java
+++ b/apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryServiceTest.java
@@ -1,7 +1,7 @@
 package com.ctrip.framework.apollo.metaservice.service;
 
+import com.alibaba.nacos.api.naming.NamingService;
 import com.alibaba.nacos.api.naming.pojo.Instance;
-import com.alibaba.nacos.client.naming.NacosNamingService;
 import com.ctrip.framework.apollo.core.dto.ServiceDTO;
 import com.google.common.collect.Lists;
 import org.junit.Before;
@@ -27,7 +27,7 @@ public class NacosDiscoveryServiceTest {
     private NacosDiscoveryService nacosDiscoveryService;
 
     @Mock
-    private NacosNamingService nacosNamingService;
+    private NamingService nacosNamingService;
 
     private String someServiceId;
 
diff --git a/pom.xml b/pom.xml
index 8ba4d0463a0..0bda40cce6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +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>
+		<nacos-discovery-api.version>1.4.0</nacos-discovery-api.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>
@@ -262,11 +262,6 @@
 					</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>
@@ -821,6 +816,27 @@
 				</dependency>
 			</dependencies>
 		</profile>
+		<profile>
+			<id>nacos-discovery</id>
+			<properties>
+				<nacos.discovery.version>0.2.7</nacos.discovery.version>
+				<fastjson.version>1.2.75</fastjson.version>
+			</properties>
+			<dependencyManagement>
+				<dependencies>
+					<dependency>
+						<groupId>com.alibaba.boot</groupId>
+						<artifactId>nacos-discovery-spring-boot-starter</artifactId>
+						<version>${nacos.discovery.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>com.alibaba</groupId>
+						<artifactId>fastjson</artifactId>
+						<version>${fastjson.version}</version>
+					</dependency>
+				</dependencies>
+			</dependencyManagement>
+		</profile>
 		<profile>
 			<!-- for ctrip development with logging capability -->
 			<id>ctrip-logging</id>

From 1cfe1e0f26187365f86e9e458b36b2356b8a7911 Mon Sep 17 00:00:00 2001
From: chenkailing <632104866@qq.com>
Date: Sat, 2 Jan 2021 20:57:56 +0800
Subject: [PATCH 11/16] Modify the nacos service discovery activation naming
 style

---
 apollo-biz/pom.xml                            |  2 --
 .../controller/HomePageController.java        |  2 +-
 .../controller/ServiceController.java         |  4 +--
 .../service/DefaultDiscoveryService.java      |  2 +-
 .../service/NacosDiscoveryService.java        |  2 +-
 ...=> application-nacos-discovery.properties} |  0
 .../distributed-deployment-guide.md           | 35 +++++++------------
 7 files changed, 18 insertions(+), 29 deletions(-)
 rename apollo-configservice/src/main/resources/{application-nacosDiscovery.properties => application-nacos-discovery.properties} (100%)

diff --git a/apollo-biz/pom.xml b/apollo-biz/pom.xml
index 1a44e1a404f..986e5ff1433 100644
--- a/apollo-biz/pom.xml
+++ b/apollo-biz/pom.xml
@@ -24,12 +24,10 @@
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
 		<!-- end of eureka -->
-
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-
 </project>
diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/HomePageController.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/HomePageController.java
index 7fa1020f7e2..5ead5fddcad 100644
--- a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/HomePageController.java
+++ b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/HomePageController.java
@@ -13,7 +13,7 @@
 /**
  * For non-eureka discovery services such as kubernetes and nacos, there is no eureka home page, so we need to add a default one
  */
-@Profile({"kubernetes","nacosDiscovery"})
+@Profile({"kubernetes","nacos-discovery"})
 @RestController
 public class HomePageController {
   private final DiscoveryService discoveryService;
diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/ServiceController.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/ServiceController.java
index 84675fa066c..808142a4333 100644
--- a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/ServiceController.java
+++ b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/ServiceController.java
@@ -30,8 +30,8 @@ public List<ServiceDTO> getMetaService() {
 
   @RequestMapping("/config")
   public List<ServiceDTO> getConfigService(
-          @RequestParam(value = "appId", defaultValue = "") String appId,
-          @RequestParam(value = "ip", required = false) String clientIp) {
+      @RequestParam(value = "appId", defaultValue = "") String appId,
+      @RequestParam(value = "ip", required = false) String clientIp) {
     return discoveryService.getServiceInstances(ServiceNameConsts.APOLLO_CONFIGSERVICE);
   }
 
diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/DefaultDiscoveryService.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/DefaultDiscoveryService.java
index d724b587d40..aa7b0dc6f12 100644
--- a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/DefaultDiscoveryService.java
+++ b/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","nacosDiscovery"})
+@ConditionalOnMissingProfile({"kubernetes","nacos-discovery"})
 public class DefaultDiscoveryService implements DiscoveryService {
 
   private final EurekaClient eurekaClient;
diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryService.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryService.java
index aee893bdea1..19f4629fb9e 100644
--- a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryService.java
+++ b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/NacosDiscoveryService.java
@@ -19,7 +19,7 @@
  * Service discovery nacos implementation
  **/
 @Service
-@Profile({"nacosDiscovery"})
+@Profile({"nacos-discovery"})
 public class NacosDiscoveryService implements DiscoveryService {
 
     private final static Logger logger = LoggerFactory.getLogger(NacosDiscoveryService.class);
diff --git a/apollo-configservice/src/main/resources/application-nacosDiscovery.properties b/apollo-configservice/src/main/resources/application-nacos-discovery.properties
similarity index 100%
rename from apollo-configservice/src/main/resources/application-nacosDiscovery.properties
rename to apollo-configservice/src/main/resources/application-nacos-discovery.properties
diff --git a/docs/zh/deployment/distributed-deployment-guide.md b/docs/zh/deployment/distributed-deployment-guide.md
index 4aa1e2262b3..6213fa15ab3 100644
--- a/docs/zh/deployment/distributed-deployment-guide.md
+++ b/docs/zh/deployment/distributed-deployment-guide.md
@@ -522,27 +522,6 @@ 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,nacosDiscovery
-```
-也可采用环境变量配置方式激活配置，如：
-```shell
-export SPRING_PROFILES_ACTIVE=github,nacosDiscovery
-```
-- 2、前往`config`目录下的`application-github.properties`文件配置nacos，如：
-```properties
-#nacos discovery
-nacos.discovery.enabled=true
-nacos.discovery.server-addr=127.0.0.1:8848
-```
-也可采用VM options的方式配置，如：
-```
--Dnacos.discovery.enabled=true -Dnacos.discovery.server-addr=127.0.0.1:8848
-```
-
 #### 2.2.1.2 通过源码构建
 
 ##### 2.2.1.2.1 配置数据库连接信息
@@ -624,7 +603,19 @@ META_SERVERS_OPTS="-Ddev_meta=$dev_meta -Dfat_meta=$fat_meta -Duat_meta=$uat_met
 
 位于`apollo-portal/target/`目录下的`apollo-portal-x.x.x-github.zip`
 
-### 2.2.2 部署Apollo服务端
+启用外部nacos服务注册中心替换内置eureka
+
+##### 2.2.1.2.7 启用外部nacos服务注册中心替换内置eureka
+
+1.修改build.sh,将maven命令更改为 
+```shell
+mvn clean package -Pgithub,nacos-discovery -DskipTests -pl apollo-configservice,apollo-adminservice -am -Dapollo_profile=github,nacos-discovery -Dspring_datasource_url=$apollo_config_db_url -Dspring_datasource_username=$apollo_config_db_username -Dspring_datasource_password=$apollo_config_db_password
+
+```
+2.在config目录下修改application-github.properties,添加nacos服务器地址
+```properties
+nacos.discovery.server-addr=127.0.0.1:8848
+```
 
 #### 2.2.2.1 部署apollo-configservice
 将对应环境的`apollo-configservice-x.x.x-github.zip`上传到服务器上，解压后执行scripts/startup.sh即可。如需停止服务，执行scripts/shutdown.sh.

From 3262be4a61ad61dbd1d0f76cd0817beaedd4539b Mon Sep 17 00:00:00 2001
From: chenkailing <632104866@qq.com>
Date: Sat, 2 Jan 2021 23:24:31 +0800
Subject: [PATCH 12/16] Modify nacos service discovery usage document

---
 docs/zh/deployment/distributed-deployment-guide.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/zh/deployment/distributed-deployment-guide.md b/docs/zh/deployment/distributed-deployment-guide.md
index 6213fa15ab3..993f4029d85 100644
--- a/docs/zh/deployment/distributed-deployment-guide.md
+++ b/docs/zh/deployment/distributed-deployment-guide.md
@@ -603,20 +603,20 @@ META_SERVERS_OPTS="-Ddev_meta=$dev_meta -Dfat_meta=$fat_meta -Duat_meta=$uat_met
 
 位于`apollo-portal/target/`目录下的`apollo-portal-x.x.x-github.zip`
 
-启用外部nacos服务注册中心替换内置eureka
-
 ##### 2.2.1.2.7 启用外部nacos服务注册中心替换内置eureka
 
-1.修改build.sh,将maven命令更改为 
+1.修改build.sh,/build.bat，将config-service和admin-service的maven编译命令更改为
 ```shell
 mvn clean package -Pgithub,nacos-discovery -DskipTests -pl apollo-configservice,apollo-adminservice -am -Dapollo_profile=github,nacos-discovery -Dspring_datasource_url=$apollo_config_db_url -Dspring_datasource_username=$apollo_config_db_username -Dspring_datasource_password=$apollo_config_db_password
 
 ```
-2.在config目录下修改application-github.properties,添加nacos服务器地址
+2.在config目录下修改application-github.properties，配置nacos服务器地址
 ```properties
 nacos.discovery.server-addr=127.0.0.1:8848
 ```
 
+### 2.2.2 部署Apollo服务端
+
 #### 2.2.2.1 部署apollo-configservice
 将对应环境的`apollo-configservice-x.x.x-github.zip`上传到服务器上，解压后执行scripts/startup.sh即可。如需停止服务，执行scripts/shutdown.sh.
 

From 1a87aeae5683f26833c3aed8963c360d508f9a12 Mon Sep 17 00:00:00 2001
From: Jason Song <nobodyiam@gmail.com>
Date: Sun, 3 Jan 2021 10:07:53 +0800
Subject: [PATCH 13/16] Update distributed-deployment-guide.md

---
 docs/zh/deployment/distributed-deployment-guide.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/zh/deployment/distributed-deployment-guide.md b/docs/zh/deployment/distributed-deployment-guide.md
index 993f4029d85..a706d31f012 100644
--- a/docs/zh/deployment/distributed-deployment-guide.md
+++ b/docs/zh/deployment/distributed-deployment-guide.md
@@ -605,11 +605,11 @@ META_SERVERS_OPTS="-Ddev_meta=$dev_meta -Dfat_meta=$fat_meta -Duat_meta=$uat_met
 
 ##### 2.2.1.2.7 启用外部nacos服务注册中心替换内置eureka
 
-1.修改build.sh,/build.bat，将config-service和admin-service的maven编译命令更改为
+1.修改build.sh/build.bat，将config-service和admin-service的maven编译命令更改为
 ```shell
 mvn clean package -Pgithub,nacos-discovery -DskipTests -pl apollo-configservice,apollo-adminservice -am -Dapollo_profile=github,nacos-discovery -Dspring_datasource_url=$apollo_config_db_url -Dspring_datasource_username=$apollo_config_db_username -Dspring_datasource_password=$apollo_config_db_password
-
 ```
+
 2.在config目录下修改application-github.properties，配置nacos服务器地址
 ```properties
 nacos.discovery.server-addr=127.0.0.1:8848
@@ -1194,4 +1194,4 @@ config:
 
 # 三、Portal 实现用户登录功能
 
-请参考[Portal 实现用户登录功能](zh/development/portal-how-to-implement-user-login-function)
\ No newline at end of file
+请参考[Portal 实现用户登录功能](zh/development/portal-how-to-implement-user-login-function)

From 0e308dffe84a0f74f7aa0f61f5b017bcdbd5df89 Mon Sep 17 00:00:00 2001
From: Jason Song <nobodyiam@gmail.com>
Date: Sun, 3 Jan 2021 10:08:47 +0800
Subject: [PATCH 14/16] Update HomePageController.java

---
 .../apollo/metaservice/controller/HomePageController.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/HomePageController.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/HomePageController.java
index 5ead5fddcad..e5dd63c7be4 100644
--- a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/HomePageController.java
+++ b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/HomePageController.java
@@ -13,7 +13,7 @@
 /**
  * For non-eureka discovery services such as kubernetes and nacos, there is no eureka home page, so we need to add a default one
  */
-@Profile({"kubernetes","nacos-discovery"})
+@Profile({"kubernetes", "nacos-discovery"})
 @RestController
 public class HomePageController {
   private final DiscoveryService discoveryService;

From fa710d26cc8e3f1e166e8a36958e70ee55179740 Mon Sep 17 00:00:00 2001
From: Jason Song <nobodyiam@gmail.com>
Date: Sun, 3 Jan 2021 10:09:18 +0800
Subject: [PATCH 15/16] Update DefaultDiscoveryService.java

---
 .../apollo/metaservice/service/DefaultDiscoveryService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/DefaultDiscoveryService.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/DefaultDiscoveryService.java
index aa7b0dc6f12..e142363b3a0 100644
--- a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/DefaultDiscoveryService.java
+++ b/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","nacos-discovery"})
+@ConditionalOnMissingProfile({"kubernetes", "nacos-discovery"})
 public class DefaultDiscoveryService implements DiscoveryService {
 
   private final EurekaClient eurekaClient;

From 4af2656e4d9d5c690b086e1f1a9c8c36b9b25fec Mon Sep 17 00:00:00 2001
From: Jason Song <nobodyiam@gmail.com>
Date: Sun, 3 Jan 2021 10:11:05 +0800
Subject: [PATCH 16/16] Update distributed-deployment-guide.md

---
 docs/zh/deployment/distributed-deployment-guide.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/zh/deployment/distributed-deployment-guide.md b/docs/zh/deployment/distributed-deployment-guide.md
index a706d31f012..df2c2859a92 100644
--- a/docs/zh/deployment/distributed-deployment-guide.md
+++ b/docs/zh/deployment/distributed-deployment-guide.md
@@ -605,12 +605,12 @@ META_SERVERS_OPTS="-Ddev_meta=$dev_meta -Dfat_meta=$fat_meta -Duat_meta=$uat_met
 
 ##### 2.2.1.2.7 启用外部nacos服务注册中心替换内置eureka
 
-1.修改build.sh/build.bat，将config-service和admin-service的maven编译命令更改为
+1. 修改build.sh/build.bat，将config-service和admin-service的maven编译命令更改为
 ```shell
 mvn clean package -Pgithub,nacos-discovery -DskipTests -pl apollo-configservice,apollo-adminservice -am -Dapollo_profile=github,nacos-discovery -Dspring_datasource_url=$apollo_config_db_url -Dspring_datasource_username=$apollo_config_db_username -Dspring_datasource_password=$apollo_config_db_password
 ```
 
-2.在config目录下修改application-github.properties，配置nacos服务器地址
+2. 在config目录下修改application-github.properties，配置nacos服务器地址
 ```properties
 nacos.discovery.server-addr=127.0.0.1:8848
 ```