Merge pull request alibaba#245 from alibaba/master

Merge branch 'master' into develop

README.md

@@ -65,7 +65,7 @@ For more details, see [quick-start.](https://nacos.io/en-us/docs/quick-start.htm
 
 * [Quick start with dubbo](https://nacos.io/en-us/docs/use-nacos-with-dubbo.html)
 
-* [quick start with spring cloud](https://nacos.io/en-us/docs/quick-start-spring-cloud.html)
+* [Quick start with spring cloud](https://nacos.io/en-us/docs/quick-start-spring-cloud.html)
 
 * [Quick start with kubernetes](https://nacos.io/en-us/docs/use-nacos-with-kubernetes.html)
 
@@ -74,19 +74,27 @@ For more details, see [quick-start.](https://nacos.io/en-us/docs/quick-start.htm
 
 You can view the full documentation from the [Nacos website](https://nacos.io/en-us/docs/what-is-nacos.html).
 
-## Other Related Project Repositories
 
-* [nacos-spring-project](https://github.com/nacos-group/nacos-spring-project) provides the integration functionality for Spring.
-* [nacos-sync](https://github.com/nacos-group/nacos-sync) is a tool to synchronize the service registration information from other tools like eureka, zookeeper, etc, to Nacos.
-* [spring-cloud-alibaba](https://github.com/spring-cloud-incubator/spring-cloud-alibaba) provides the one-stop solution for application development over Alibaba middleware which includes Nacos.
+## Contributing
 
-### Contact
+Contributors are welcome to join Nacos project. 
 
-* #### Gitter-[Nacos Gitter](https://gitter.im/alibaba/nacos)
+ - Contributing guide (constructing): describe general contributing procedure for Nacos project, such as issue submitting, milestone plan, etc.
+ - Developing guide (constructing): describe detailed developing procedure including how to fork, choosing correct branch, PR review procedure, etc.
 
-* #### Weibo-[Nacos Weibo](https://weibo.com/u/6574374908)
+## Other Related Project Repositories
+
+* [nacos-spring-project](https://github.com/nacos-group/nacos-spring-project) provides the integration functionality for Spring.
+* [nacos-group](https://github.com/nacos-group) is the reposity that hosts the eco tools for Nacos, such as SDK, synchronization tool, etc.
+* [spring-cloud-alibaba](https://github.com/spring-cloud-incubator/spring-cloud-alibaba) provides the one-stop solution for application development over Alibaba middleware which includes Nacos.
 
-* #### Segmentfault-[Nacos Segmentfault](https://segmentfault.com/t/nacos)
+## Contact
 
-* #### Mailing list-[nacos\_[email protected]](mailto:[email protected]).
+* [Gitter](https://gitter.im/alibaba/nacos): Nacos's IM tool for community messaging, collaboration and discovery.
+* [Twitter](https://twitter.com/nacos2): Follow along for latest nacos news on Twitter.
+* [Weibo](https://weibo.com/u/6574374908): Follow along for latest nacos news on Weibo (Twitter of China version).
+* [User Mail Group]([email protected]): Nacos usage general discussion.
+* [Dev Mail Group]([email protected]): Nacos developer discussion (APIs, feature design, etc).
+* [Commit Mail Group]([email protected]): Commits notice, very high frequency.
+* [Nacos Segmentfault](https://segmentfault.com/t/nacos): Get latest notice and prompt help from Segmentfault.
 

naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java

@@ -102,7 +102,7 @@ public String register(HttpServletRequest request) throws Exception {
             mockHttpRequest.addParameter("cluster", StringUtils.EMPTY);
             mockHttpRequest.addParameter("defIPPort", cluster.getString("defaultPort"));
             mockHttpRequest.addParameter("defCkport", cluster.getString("defaultCheckPort"));
-            mockHttpRequest.addParameter("ipPort4Check", cluster.getString("userIPPort4Check"));
+            mockHttpRequest.addParameter("ipPort4Check", cluster.getString("useIPPort4Check"));
             mockHttpRequest.addParameter("clusterMetadata", cluster.getString("metadata"));
 
         }

naming/src/main/java/com/alibaba/nacos/naming/core/VirtualClusterDomain.java

@@ -496,11 +496,18 @@ public void update(Domain dom) {
             enableHealthCheck = vDom.getEnableHealthCheck();
         }
 
+        if (enableClientBeat != vDom.getEnableClientBeat().booleanValue()) {
+            Loggers.SRV_LOG.info("[DOM-UPDATE] dom: " + name + ", enableClientBeat: " + enableClientBeat + " -> " + vDom.getEnableClientBeat());
+            enableClientBeat = vDom.getEnableClientBeat();
+        }
+
         if (enabled != vDom.getEnabled().booleanValue()) {
             Loggers.SRV_LOG.info("[DOM-UPDATE] dom: " + name + ", enabled: " + enabled + " -> " + vDom.getEnabled());
             enabled = vDom.getEnabled();
         }
 
+        metadata = vDom.getMetadata();
+
         updateOrAddCluster(vDom.getClusterMap().values());
         remvDeadClusters(this, vDom);
         recalculateChecksum();