Merge pull request #1 from alibaba/develop

Develop
alibaba · Oct 29, 2018 · b0a69c4 · b0a69c4
2 parents d99098d + 077c4cd
commit b0a69c4
Show file tree

Hide file tree

Showing 491 changed files with 64,879 additions and 5,939 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,43 @@
+---
+name: Bug report
+about: Describe this issue template's purpose here.
+
+---
+
+# Reporting bugs
+
+If any part of the Nacos project has bugs or documentation mistakes, please let us know by [opening an issue](https://github.com/alibaba/nacos/issues/new). We treat bugs and mistakes very seriously and believe no issue is too small, anyOne is implement. Before creating a bug report, please check that an issue reporting the same problem does not already exist.
+
+To make the bug report accurate and easy to understand, please try to create bug reports that are:
+
+- Specific. Include as much details as possible: which version, what environment, what configuration, etc. If the bug is related to running the Nacos server, please attach the Nacos log (the starting log with Nacos configuration is especially important).
+
+- Reproducible. Include the steps to reproduce the problem. We understand some issues might be hard to reproduce, please includes the steps that might lead to the problem. If possible, please attach the affected Nacos data dir and stack strace to the bug report.
+
+- Unique. Do not duplicate existing bug report.
+
+
+It may be worthwhile to read [Elika Etemad’s article on filing good bug reports](http://fantasai.inkedblade.net/style/talks/filing-good-bugs/) before creating a bug report.
+
+We might ask for further information to locate a bug. A duplicated bug report will be closed.
+
+
+
+# 报告错误
+
+如果Nacos项目的任何部分存在问题或文档问题，请通过[opening an issue](https://github.com/alibaba/nacos/issues/new)告诉我们。我们非常认真地对待错误和错误，在产品面前没有不重要的问题。不过在创建错误报告之前，请检查是否存在报告相同问题的issues。
+
+为了使错误报告准确且易于理解，请尝试创建以下错误报告：
+
+- 具体到细节。包括尽可能多的细节：哪个版本，什么环境，什么配置等。如果错误与运行Nacos服务器有关，请附加Nacos日志（具有Nacos配置的起始日志尤为重要）。
+
+- 可复现。包括重现问题的步骤。我们理解某些问题可能难以重现，请包括可能导致问题的步骤。如果可能，请将受影响的Nacos数据目录和堆栈strace附加到错误报告中。
+
+- 不重复。不要复制现有的错误报告。
+
+在创建错误报告之前，最好阅读下[Elika Etemad关于提交好错误报告的文章](http://fantasai.inkedblade.net/style/talks/filing-good-bugs/)，相信 会给你启发。
+
+我们可能会要求您提供更多信息以查找错误。将关闭重复的错误报告。
+
+[nacos-issue](https://github.com/alibaba/nacos/issues/new)
+[filing-good-bugs](http://fantasai.inkedblade.net/style/talks/filing-good-bugs/)
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,22 @@
+Please do not create a Pull Request without creating an issue first.
+
+## What is the purpose of the change
+
+XXXXX
+
+## Brief changelog
+
+XX
+
+## Verifying this change
+
+XXXX
+
+Follow this checklist to help us incorporate your contribution quickly and easily:
+
+* [ ] Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
+* [ ] Format the pull request title like `[ISSUE #123] Fix UnknownException when host config not exist`. Each commit in the pull request should have a meaningful subject line and body.
+* [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
+* [ ] Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in [test module](https://github.com/alibaba/nacos/tree/master/test).
+* [ ] Run `mvn -B clean apache-rat:check findbugs:findbugs` to make sure basic checks pass. Run `mvn clean install -DskipITs` to make sure unit-test pass. Run `mvn clean test-compile failsafe:integration-test`  to make sure integration-test pass.
+
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,5 @@ target
 .DS_Store
 /logs
 *.iml
+node_modules
+test/derby.log
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,10 @@
 notifications:
   email:
     recipients:
+      - xchaos8@126.com
       - nacos_dev@linux.alibaba.com
       - dev-nacos@googlegroups.com
+      - mw_configcenter@list.alibaba-inc.com
   on_success: change
   on_failure: always
 
@@ -23,7 +25,9 @@ before_install:
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then jdk_switcher use "$CUSTOM_JDK"; fi
 
 script:
-
+  - mvn -B clean apache-rat:check findbugs:findbugs
+  - mvn -Prelease-nacos clean install -U
+  - mvn clean package -Pit-test
 after_success:
-  - mvn clean install -Pit-test
+  - mvn clean package -Pit-test
   - mvn sonar:sonar -Psonar-apache
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,42 @@
+## 0.2.0 (Sept 17, 2018)
+
+#### FEATURES:
+
+* separate nacos-api from nacos client implementation
+* Cluster node health check abnormality
+* Stand-alone mode gets the change history list exception
+* Pulling does not exist configuration print io exception
+* Optimized log framework
+* Service Discovery: Client support getting server status.
+* Service Discovery: Client support get all service names of server.
+* Service Discovery: Client support get all subscribed services.
+
+
+#### IMPROVEMENTS:
+
+#### BUG FIXES:
+
+#### BREAKING CHANGES:
+
+
+
+## 0.1.0 (July 18, 2018)
+
+#### FEATURES:
+
+* Creating, deleting, modifying, and querying configurations: the core functionalities.
+* Multiple languages support: supports Java/Shell/HTTP OpenAPI.
+* Service Discovery: Basic service registry and discovery.
+* Service Discovery: Service load balancing using instance weights, protect threshold and instance health statuses.
+* Service Discovery: Supports four ways for health check: http, tcp, mysql and client heartbeat.
+* Service Discovery: CRUD operations on service instances through Java client and open API.
+* Service Discovery: Service subscribtion and push through Java client.
+* Nacos official website is coming. https://nacos.io/
+
+
+
+#### IMPROVEMENTS:
+
+#### BUG FIXES:
+
+#### BREAKING CHANGES:
diff --git a/README.md b/README.md
@@ -6,11 +6,11 @@
 
 -------
 <img src="doc/Nacos_Logo.png" width="50%" height="50%" />
-Nacos is an easy-to-use platform desgined for dynamic service discovery and configuration and service management. It helps you to build cloud native applications and microservices platform easily.
+Nacos is an easy-to-use platform designed for dynamic service discovery and configuration and service management. It helps you to build cloud native applications and microservices platform easily.
 
-Service is a first-class citizen in Nacos. Nacos supports almost all type of services，for example，[Dubbo/gRPC service](xx)、[Spring Cloud RESTFul service](xx) or [Kubernetes service](xx).
+Service is a first-class citizen in Nacos. Nacos supports almost all type of services，for example，[Dubbo/gRPC service](https://nacos.io/en-us/docs/use-nacos-with-dubbo.html)、[Spring Cloud RESTFul service](https://nacos.io/en-us/docs/use-nacos-with-springcloud.html) or [Kubernetes service](https://nacos.io/en-us/docs/use-nacos-with-kubernetes.html).
 
-Nacos provides four major funcations.
+Nacos provides four major functions.
 
 * **Service Discovery and Service Health Check** 
 
@@ -32,53 +32,57 @@ Nacos provides four major funcations.
 ### Quick Start
 It is super easy to get started with your first project.
 
-#### Download run package 
-[Download](http://nacos.oss-cn-hangzhou-zmf.aliyuncs.com/nacos-server-0.1.0.zip)
+1. #### Download run package 
+[Download](https://github.com/alibaba/nacos/releases/download/0.2.1/nacos-server-0.2.1.zip)
 
 ```
-unzip nacos-all.zip 
+unzip nacos-server-0.2.1.zip
 cd nacos/bin 
 ``` 
-#### Start Server
-##### Linux/Unix/Mac
 
-Run the following command to sart(standalone means non-cluster mode): 
+2. #### Start Server
+* ##### Linux/Unix/Mac
 
-`sh startup.sh -m standalone`
+```
+Run the following command to start (standalone means non-cluster mode): 
+
+sh startup.sh -m standalone
+```
 
-##### Windows
+* ##### Windows
+```
 Run the following command to start:
 
-`cmd startup.cmd`
+cmd startup.cmd
 
 Or double-click the startup.cmd to run NacosServer.
+```
 
-you can see detail in https://nacos.io/#/docs/quick-start.md
+For more details, see [quick-start.](https://nacos.io/en-us/docs/quick-start.html)
 
-Quick start for other open-source projects:
+3. #### Quick start for other open-source projects:
 
-[quick start with spring cloud](https://nacos.io/#/docs/use-nacos-with-springcloud.md)
+* [quick start with spring cloud](https://nacos.io/en-us/docs/use-nacos-with-springcloud.html)
 
-[quick start with dubbo](https://nacos.io/#/docs/use-nacos-with-dubbo.md)
+* [quick start with dubbo](https://nacos.io/en-us/docs/use-nacos-with-dubbo.html)
 
-[quick start with kubernetes](https://nacos.io/#/docs/use-nacos-with-kubernetes.md)
+* [quick start with kubernetes](https://nacos.io/en-us/docs/use-nacos-with-kubernetes.html)
 
-[more...](https://nacos.io/)
+* [more...](https://nacos.io/)
 
 ### Documentation
 
 You can view full documentation on the Nacos website:
 
-[nacos.io](https://nacos.io/#/docs/what-is-nacos.md)
+* [nacos.io](https://nacos.io/en-us/docs/what-is-nacos.html)
 
 ### Contact
 
-#### Nacos Gitter-[https://gitter.im/alibaba/nacos](https://gitter.im/alibaba/nacos)
+* #### Gitter-[Nacos Gitter](https://gitter.im/alibaba/nacos)
 
-#### Nacos weibo-[https://weibo.com/u/6574374908](https://weibo.com/u/6574374908)
+* #### Weibo-[Nacos Weibo](https://weibo.com/u/6574374908)
 
-#### Nacos segmentfault-[https://segmentfault.com/t/nacos](https://segmentfault.com/t/nacos)
+* #### Segmentfault-[Nacos Segmentfault](https://segmentfault.com/t/nacos)
 
-#### Mailing list
- [nacos\_dev@linux.alibaba.com](https://lark.alipay.com/nacos/nacosdocs/vl19q1).
+* #### Mailing list-[nacos\_dev@linux.alibaba.com](mailto:nacos_dev@linux.alibaba.com).
 
diff --git a/REPORTING-BUGS.md b/REPORTING-BUGS.md
@@ -0,0 +1,39 @@
+# How to Reporting bugs
+
+If any part of the Nacos project has bugs or documentation mistakes, please let us know by [opening an issue][Nacos-issue]. We treat bugs and mistakes very seriously and believe no issue is too small, anyOne is implement. Before creating a bug report, please check that an issue reporting the same problem does not already exist.
+
+To make the bug report accurate and easy to understand, please try to create bug reports that are:
+
+- Specific. Include as much details as possible: which version, what environment, what configuration, etc. If the bug is related to running the Nacos server, please attach the Nacos log (the starting log with Nacos configuration is especially important).
+
+- Reproducible. Include the steps to reproduce the problem. We understand some issues might be hard to reproduce, please includes the steps that might lead to the problem. If possible, please attach the affected Nacos data dir and stack strace to the bug report.
+
+- Unique. Do not duplicate existing bug report.
+
+
+It may be worthwhile to read [Elika Etemad’s article on filing good bug reports][filing-good-bugs] before creating a bug report.
+
+We might ask for further information to locate a bug. A duplicated bug report will be closed.
+
+[etcd-issue]: https://github.com/etcd-io/etcd/issues/new
+[filing-good-bugs]: http://fantasai.inkedblade.net/style/talks/filing-good-bugs/
+
+
+# 如何提交错误报告
+
+如果Nacos项目的任何部分存在问题或文档问题，请通过[opening an issue][Nacos-issue]告诉我们。我们非常认真地对待错误和错误，在产品面前没有不重要的问题。不过在创建错误报告之前，请检查是否存在报告相同问题的issues。
+
+为了使错误报告准确且易于理解，请尝试创建以下错误报告：
+
+- 具体到细节。包括尽可能多的细节：哪个版本，什么环境，什么配置等。如果错误与运行Nacos服务器有关，请附加Nacos日志（具有Nacos配置的起始日志尤为重要）。
+
+- 可复现。包括重现问题的步骤。我们理解某些问题可能难以重现，请包括可能导致问题的步骤。如果可能，请将受影响的Nacos数据目录和堆栈strace附加到错误报告中。
+
+- 不重复。不要复制现有的错误报告。
+
+在创建错误报告之前，最好阅读下[Elika Etemad关于提交好错误报告的文章] [归档好错误]，相信 会给你启发。
+
+我们可能会要求您提供更多信息以查找错误。将关闭重复的错误报告。
+
+[etcd-issue]：https：//github.com/etcd-io/etcd/issues/new
+[filing-good-bugs]：http：//fantasai.inkedblade.net/style/talks/filing-good-bugs/
diff --git a/api/pom.xml b/api/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 1999-2018 Alibaba Group Holding Ltd.
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<groupId>com.alibaba.nacos</groupId>
+		<artifactId>nacos-all</artifactId>
+		<version>0.3.0</version>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>nacos-api</artifactId>
+	<packaging>jar</packaging>
+
+	<name>nacos-api ${project.version}</name>
+	<url>http://maven.apache.org</url>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>7</source>
+					<target>7</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+</project>
diff --git a/...a/com/alibaba/nacos/api/NacosFactory.java → ...a/com/alibaba/nacos/api/NacosFactory.java b/...a/com/alibaba/nacos/api/NacosFactory.java → ...a/com/alibaba/nacos/api/NacosFactory.java
diff --git a/...m/alibaba/nacos/api/PropertyKeyConst.java → ...m/alibaba/nacos/api/PropertyKeyConst.java b/...m/alibaba/nacos/api/PropertyKeyConst.java → ...m/alibaba/nacos/api/PropertyKeyConst.java