Merge branch 'upstream-develop'

# Conflicts:
#	api/src/main/java/com/alibaba/nacos/api/naming/listener/Event.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
#	config/src/main/java/com/alibaba/nacos/config/server/utils/RunningConfigUtils.java

api/src/main/java/com/alibaba/nacos/api/naming/NamingFactory.java

@@ -21,7 +21,7 @@
 import com.alibaba.nacos.api.exception.NacosException;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class NamingFactory {
 

api/src/main/java/com/alibaba/nacos/api/naming/NamingService.java

@@ -24,7 +24,7 @@
 import java.util.List;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public interface NamingService {
 

api/src/main/java/com/alibaba/nacos/api/naming/listener/Event.java

@@ -17,8 +17,7 @@
 
 /**
  * event interface
- *
- * @author dungu.zpf
+ * @author <a href="mailto:[email protected]">nkorange</a>
  */
 public interface Event {
 }

api/src/main/java/com/alibaba/nacos/api/naming/listener/NamingEvent.java

@@ -20,7 +20,7 @@
 import com.alibaba.nacos.api.naming.pojo.Instance;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class NamingEvent implements Event {
 

api/src/main/java/com/alibaba/nacos/api/naming/pojo/AbstractHealthChecker.java

@@ -25,7 +25,7 @@
 import java.util.Objects;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public abstract class AbstractHealthChecker implements Cloneable {
 

api/src/main/java/com/alibaba/nacos/api/naming/pojo/Cluster.java

@@ -21,7 +21,7 @@
 import java.util.Map;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class Cluster {
 

api/src/main/java/com/alibaba/nacos/api/naming/pojo/Instance.java

@@ -22,7 +22,7 @@
 import java.util.Map;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class Instance {
 

api/src/main/java/com/alibaba/nacos/api/naming/pojo/ListView.java

@@ -20,7 +20,7 @@
 import java.util.List;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class ListView<T> {
 

api/src/main/java/com/alibaba/nacos/api/naming/pojo/Service.java

@@ -19,7 +19,7 @@
 import java.util.Map;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class Service {
 

api/src/main/java/com/alibaba/nacos/api/naming/pojo/ServiceInfo.java

@@ -22,7 +22,7 @@
 import java.util.List;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class ServiceInfo {
 

client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java

@@ -42,7 +42,7 @@
 import java.util.Properties;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 @SuppressWarnings("PMD.ServiceOrDaoClassShouldEndWithImplRule")
 public class NacosNamingService implements NamingService {

client/src/main/java/com/alibaba/nacos/client/naming/backups/FailoverReactor.java

@@ -33,7 +33,7 @@
 import java.util.concurrent.*;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class FailoverReactor {
 

client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatInfo.java

@@ -20,7 +20,7 @@
 import java.util.Map;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class BeatInfo {
 

client/src/main/java/com/alibaba/nacos/client/naming/cache/ConcurrentDiskUtil.java

@@ -30,7 +30,7 @@
 import com.alibaba.nacos.client.naming.utils.LogUtils;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class ConcurrentDiskUtil {
 

client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java

@@ -74,7 +74,7 @@ public HostReactor(EventDispatcher eventDispatcher, NamingProxy serverProxy, Str
     private ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
         @Override
         public Thread newThread(Runnable r) {
-            Thread thread = new Thread(r, "com.vipserver.client.updater");
+            Thread thread = new Thread(r, "com.alibaba.nacos.client.naming.updater");
             thread.setDaemon(true);
 
             return thread;

client/src/main/java/com/alibaba/nacos/client/naming/core/ProtectMode.java

@@ -16,7 +16,7 @@
 package com.alibaba.nacos.client.naming.core;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class ProtectMode {
 

client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java

@@ -31,15 +31,13 @@
 import java.util.zip.GZIPInputStream;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class HttpClient {
 
-    public static final int TIME_OUT_MILLIS = Integer.parseInt(
-        System.getProperty("com.taobao.vipserver.ctimeout", "50000"));
-    public static final int CON_TIME_OUT_MILLIS = Integer.parseInt(
-        System.getProperty("com.taobao.vipserver.ctimeout", "3000"));
-    private static final boolean ENABLE_HTTPS = Boolean.parseBoolean(System.getProperty("tls.enable", "false"));
+    public static final int TIME_OUT_MILLIS = Integer.getInteger("com.alibaba.nacos.client.naming.ctimeout", 50000);
+    public static final int CON_TIME_OUT_MILLIS = Integer.getInteger("com.alibaba.nacos.client.naming.ctimeout", 3000);
+    private static final boolean ENABLE_HTTPS = Boolean.getBoolean("com.alibaba.nacos.client.naming.tls.enable");
 
     static {
         // limit max redirection
@@ -55,19 +53,17 @@ public static String getPrefix() {
 
     }
 
-    public static HttpResult httpGet(String url, List<String> headers, Map<String, String> paramValues,
-                                     String encoding) {
+    public static HttpResult httpGet(String url, List<String> headers, Map<String, String> paramValues, String encoding) {
         return request(url, headers, paramValues, encoding, "GET");
     }
 
-    public static HttpResult request(String url, List<String> headers, Map<String, String> paramValues, String encoding,
-                                     String method) {
+    public static HttpResult request(String url, List<String> headers, Map<String, String> paramValues, String encoding, String method) {
         HttpURLConnection conn = null;
         try {
             String encodedContent = encodingParams(paramValues, encoding);
             url += (null == encodedContent) ? "" : ("?" + encodedContent);
 
-            conn = (HttpURLConnection)new URL(url).openConnection();
+            conn = (HttpURLConnection) new URL(url).openConnection();
 
             conn.setConnectTimeout(CON_TIME_OUT_MILLIS);
             conn.setReadTimeout(TIME_OUT_MILLIS);
@@ -80,7 +76,7 @@ public static HttpResult request(String url, List<String> headers, Map<String, S
             try {
                 if (conn != null) {
                     LogUtils.LOG.warn("failed to request " + conn.getURL() + " from "
-                        + InetAddress.getByName(conn.getURL().getHost()).getHostAddress());
+                            + InetAddress.getByName(conn.getURL().getHost()).getHostAddress());
                 }
             } catch (Exception e1) {
                 LogUtils.LOG.error("NA", "failed to request ", e1);
@@ -102,7 +98,7 @@ private static HttpResult getResult(HttpURLConnection conn) throws IOException {
 
         InputStream inputStream;
         if (HttpURLConnection.HTTP_OK == respCode
-            || HttpURLConnection.HTTP_NOT_MODIFIED == respCode) {
+                || HttpURLConnection.HTTP_NOT_MODIFIED == respCode) {
             inputStream = conn.getInputStream();
         } else {
             inputStream = conn.getErrorStream();
@@ -153,12 +149,12 @@ private static void setHeaders(HttpURLConnection conn, List<String> headers, Str
         }
 
         conn.addRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset="
-            + encoding);
+                + encoding);
         conn.addRequestProperty("Accept-Charset", encoding);
     }
 
     private static String encodingParams(Map<String, String> params, String encoding)
-        throws UnsupportedEncodingException {
+            throws UnsupportedEncodingException {
         StringBuilder sb = new StringBuilder();
         if (null == params || params.isEmpty()) {
             return null;

client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java

@@ -34,7 +34,7 @@
 import java.util.concurrent.TimeUnit;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class NamingProxy {
 
@@ -71,7 +71,7 @@ public NamingProxy(String namespace, String endpoint, String serverList) {
             @Override
             public Thread newThread(Runnable r) {
                 Thread t = new Thread(r);
-                t.setName("com.taobao.vipserver.serverlist.updater");
+                t.setName("com.alibaba.nacos.client.naming.serverlist.updater");
                 t.setDaemon(true);
                 return t;
             }
@@ -90,7 +90,7 @@ public void run() {
     public List<String> getServerListFromEndpoint() {
 
         try {
-            String urlString = "http://" + endpoint + "/vipserver/serverlist";
+            String urlString = "http://" + endpoint + "/nacos/serverlist";
 
             List<String> headers = Arrays.asList("Client-Version", UtilAndComs.VERSION,
                 "Accept-Encoding", "gzip,deflate,sdch",
@@ -135,7 +135,7 @@ private void refreshSrvIfNeed() {
             List<String> list = getServerListFromEndpoint();
 
             if (CollectionUtils.isEmpty(list)) {
-                throw new Exception("Can not acquire vipserver list");
+                throw new Exception("Can not acquire Nacos list");
             }
 
             if (!CollectionUtils.isEqualCollection(list, serversFromEndpoint)) {

client/src/main/java/com/alibaba/nacos/client/naming/utils/Chooser.java

@@ -20,7 +20,7 @@
 import java.util.List;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class Chooser<K, T> {
 

client/src/main/java/com/alibaba/nacos/client/naming/utils/GenericPoller.java

@@ -20,7 +20,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class GenericPoller<T> implements Poller<T> {
 

client/src/main/java/com/alibaba/nacos/client/naming/utils/IoUtils.java

@@ -24,7 +24,7 @@
 import java.util.zip.GZIPInputStream;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class IoUtils {
 

client/src/main/java/com/alibaba/nacos/client/naming/utils/NetUtils.java

@@ -30,7 +30,7 @@ public static String localIP() {
                 return LOCAL_IP;
             }
 
-            String ip = System.getProperty("com.taobao.vipserver.localIP", InetAddress.getLocalHost().getHostAddress());
+            String ip = System.getProperty("com.alibaba.nacos.client.naming.local.ip", InetAddress.getLocalHost().getHostAddress());
 
             return LOCAL_IP = ip;
         } catch (UnknownHostException e) {

client/src/main/java/com/alibaba/nacos/client/naming/utils/Pair.java

@@ -16,7 +16,7 @@
 package com.alibaba.nacos.client.naming.utils;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class Pair<T> {
 

client/src/main/java/com/alibaba/nacos/client/naming/utils/Poller.java

@@ -18,7 +18,7 @@
 import java.util.List;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public interface Poller<T> {
     /**

client/src/main/java/com/alibaba/nacos/client/naming/utils/StringUtils.java

@@ -22,7 +22,7 @@
 import java.util.Locale;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class StringUtils {
     public static boolean isEmpty(String str) {

client/src/test/java/com/alibaba/nacos/client/NamingTest.java

@@ -25,7 +25,7 @@
 import java.util.Map;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class NamingTest {
 

common/src/main/java/com/alibaba/nacos/common/util/SystemUtils.java

@@ -155,7 +155,7 @@ private static String getClusterConfFilePath() {
     public static List<String> readClusterConf() throws IOException {
         List<String> instanceList = new ArrayList<String>();
         List<String> lines = IoUtils.readLines(
-            new InputStreamReader(new FileInputStream(new File(CLUSTER_CONF_FILE_PATH)), UTF_8));
+                new InputStreamReader(new FileInputStream(new File(CLUSTER_CONF_FILE_PATH)), UTF_8));
         String comment = "#";
         for (String line : lines) {
             String instance = line.trim();

common/src/main/java/com/alibaba/nacos/common/util/UuidUtil.java

@@ -18,7 +18,7 @@
 import java.util.UUID;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf[email protected]">nkorange</a>
  */
 public class UuidUtil {