Merge pull request alibaba#4119 from alibaba/develop

Master upgrade 1.4.0
leviYX · Nov 2, 2020 · c0ffb1d · c0ffb1d
2 parents a341b65 + 83daa1a
commit c0ffb1d
Show file tree

Hide file tree

Showing 428 changed files with 12,838 additions and 3,613 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -0,0 +1,23 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-18.04]
+        java: [8, 8.0.192, 11, 11.0.9]
+      fail-fast: false
+      max-parallel: 2          
+    name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK
+      uses: actions/setup-java@v1
+      with:
+        java-version: ${{ matrix.java }}
+    - name: Test with Maven
+      run: mvn test -B --file pom.xml
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 
-<img src="doc/Nacos_Logo.png" width="50%" height="50%" />
+<img src="doc/Nacos_Logo.png" width="50%" syt height="50%" />
 
 # Nacos: Dynamic  *Na*ming and *Co*nfiguration *S*ervice
 
@@ -12,48 +12,48 @@
 
 Nacos (official site: [http://nacos.io](http://nacos.io)) 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](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).
+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 functions.
 
 * **Service Discovery and Service Health Check** 
 
-    Nacos makes it simple for services to register themselves and to discover other services via a DNS or HTTP interface. Nacos also provides real-time healthchecks of services to prevent sending requests to unhealthy hosts or service instance.
+    Nacos makes it simple for services to register themselves and to discover other services via a DNS or HTTP interface. Nacos also provides real-time health checks of services to prevent sending requests to unhealthy hosts or service instances.
 
 * **Dynamic Configuration Management**
 
-  Dynamic Configuration Service allows you to manage configurations of all services in a centralized and dynamic manner across all environments. Nacos eliminates the need to redeploy applications and services when configurations are updated, which makes configuration changes more efficient and agile.
+    Dynamic Configuration Service allows you to manage configurations of all services in a centralized and dynamic manner across all environments. Nacos eliminates the need to redeploy applications and services when configurations are updated, which makes configuration changes more efficient and agile.
 
 * **Dynamic DNS Service**
-
-   Nacos supports weighted routing, making it easier for you to implement mid-tier load balancing, flexible routing policies, flow control, and simple DNS resolution services in the production environment within your data center. It helps you to implement DNS-based service discovery easily and prevent applications from coupling to vendor-specific service discovery APIs.
+    
+    Nacos supports weighted routing, making it easier for you to implement mid-tier load balancing, flexible routing policies, flow control, and simple DNS resolution services in the production environment within your data center. It helps you to implement DNS-based service discovery easily and prevent applications from coupling to vendor-specific service discovery APIs.
 
 * **Service and MetaData Management**
 
-	Nacos provides an easy-to-use service dashboard to help you manage your services metadata, configuration, kubernetes DNS, service health and metrics statistics.
+    Nacos provides an easy-to-use service dashboard to help you manage your services metadata, configuration, kubernetes DNS, service health and metrics statistics.
 
 
 ## Quick Start
 It is super easy to get started with your first project.
 
 #### Step 1: Download the binary package 
 
-You can download the package from the  [latest stable release](https://github.com/alibaba/nacos/releases).  
+You can download the package from the [latest stable release](https://github.com/alibaba/nacos/releases).  
 
-Take release nacos-server-1.0.0.zip for example.
-```
+Take release `nacos-server-1.0.0.zip` for example:
+```sh
 unzip nacos-server-1.0.0.zip
 cd nacos/bin 
 ``` 
 
 #### Step 2: Start Server
 
 On the **Linux/Unix/Mac** platform, run the following command to start server with standalone mode: 
-```
+```sh
 sh startup.sh -m standalone
 ```
 
-On the **Windows** platform, run the following command to start server with standalone mode.  Alternatively, you can also double-click the startup.cmd to run NacosServer.
+On the **Windows** platform, run the following command to start server with standalone mode.  Alternatively, you can also double-click the `startup.cmd` to run NacosServer.
 ```
 cmd startup.cmd -m standalone
 ```
@@ -74,7 +74,7 @@ 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).
 
-All the latest and long-term notice can also be found here from [Github notice issue](https://github.com/alibaba/nacos/labels/notice)
+All the latest and long-term notice can also be found here from [Github notice issue](https://github.com/alibaba/nacos/labels/notice).
 
 
 ## Contributing
@@ -84,7 +84,7 @@ Contributors are welcomed to join Nacos project. Please check [CONTRIBUTING](./C
 ## 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.
+* [nacos-group](https://github.com/nacos-group) is the repository 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.
 
 ## Contact

diff --git a/address/pom.xml b/address/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>nacos-all</artifactId>
         <groupId>com.alibaba.nacos</groupId>
-        <version>1.3.2</version>
+        <version>1.4.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/address/src/main/java/com/alibaba/nacos/address/auth/AddressServerAuthManager.java b/address/src/main/java/com/alibaba/nacos/address/auth/AddressServerAuthManager.java
@@ -16,10 +16,10 @@
 
 package com.alibaba.nacos.address.auth;
 
-import com.alibaba.nacos.core.auth.AccessException;
-import com.alibaba.nacos.core.auth.AuthManager;
-import com.alibaba.nacos.core.auth.Permission;
-import com.alibaba.nacos.core.auth.User;
+import com.alibaba.nacos.auth.AuthManager;
+import com.alibaba.nacos.auth.exception.AccessException;
+import com.alibaba.nacos.auth.model.Permission;
+import com.alibaba.nacos.auth.model.User;
 
 /**
  * Address server auth manager.

diff --git a/...c/main/java/com/alibaba/nacos/address/configuration/AddressServerSpringConfiguration.java b/...c/main/java/com/alibaba/nacos/address/configuration/AddressServerSpringConfiguration.java
@@ -17,7 +17,7 @@
 package com.alibaba.nacos.address.configuration;
 
 import com.alibaba.nacos.address.auth.AddressServerAuthManager;
-import com.alibaba.nacos.core.auth.AuthManager;
+import com.alibaba.nacos.auth.AuthManager;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

diff --git a/api/pom.xml b/api/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.3.2</version>
+        <version>1.4.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/api/src/main/java/com/alibaba/nacos/api/common/ResponseCode.java b/api/src/main/java/com/alibaba/nacos/api/common/ResponseCode.java
@@ -24,6 +24,7 @@
  * <li> Global and common code starts with 10001.
  * <li> Naming module code starts with 20001.
  * <li> Config module code starts with 30001.
+ * <li> Core module code starts with 40001.
  *
  * @author nkorange
  * @since 1.2.0

diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/NamingMaintainService.java b/api/src/main/java/com/alibaba/nacos/api/naming/NamingMaintainService.java
@@ -167,4 +167,10 @@ void updateService(String serviceName, String groupName, float protectThreshold,
      */
     void updateService(Service service, AbstractSelector selector) throws NacosException;
 
+    /**
+     * Shutdown the resource service.
+     *
+     * @throws NacosException exception.
+     */
+    void shutDown() throws NacosException;
 }
diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Cluster.java b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Cluster.java
@@ -19,6 +19,7 @@
 import com.alibaba.nacos.api.naming.pojo.healthcheck.AbstractHealthChecker;
 import com.alibaba.nacos.api.naming.pojo.healthcheck.impl.Tcp;
 
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -31,7 +32,9 @@
  * @author nkorange
  */
 @SuppressWarnings("checkstyle:abbreviationaswordinname")
-public class Cluster {
+public class Cluster implements Serializable {
+
+    private static final long serialVersionUID = -7196138840047197271L;
 
     /**
      * Name of belonging service.

diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Instance.java b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Instance.java
@@ -22,6 +22,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -33,7 +34,9 @@
  * @author nkorange
  */
 @JsonInclude(Include.NON_NULL)
-public class Instance {
+public class Instance implements Serializable {
+
+    private static final long serialVersionUID = -742906310567291979L;
 
     /**
      * unique id of this instance.

diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Service.java b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Service.java
@@ -16,6 +16,7 @@
 
 package com.alibaba.nacos.api.naming.pojo;
 
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,7 +30,9 @@
  *
  * @author nkorange
  */
-public class Service {
+public class Service implements Serializable {
+
+    private static final long serialVersionUID = -3470985546826874460L;
 
     /**
      * service name.

diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/healthcheck/AbstractHealthChecker.java b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/healthcheck/AbstractHealthChecker.java
@@ -25,6 +25,8 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
 
+import java.io.Serializable;
+
 /**
  * Abstract health checker.
  *
@@ -34,7 +36,9 @@
 @JsonSubTypes({@JsonSubTypes.Type(name = Http.TYPE, value = Http.class),
         @JsonSubTypes.Type(name = Mysql.TYPE, value = Mysql.class),
         @JsonSubTypes.Type(name = Tcp.TYPE, value = Tcp.class)})
-public abstract class AbstractHealthChecker implements Cloneable {
+public abstract class AbstractHealthChecker implements Cloneable, Serializable {
+
+    private static final long serialVersionUID = 3848305577423336421L;
 
     @JsonIgnore
     protected final String type;

diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/utils/NamingUtils.java b/api/src/main/java/com/alibaba/nacos/api/naming/utils/NamingUtils.java
@@ -28,6 +28,9 @@
 public class NamingUtils {
 
     public static String getGroupedName(final String serviceName, final String groupName) {
+        if (StringUtils.isBlank(serviceName)) {
+            throw new IllegalArgumentException("Param 'serviceName' is illegal, serviceName is blank");
+        }
         final String resultGroupedName = groupName + Constants.SERVICE_INFO_SPLITER + serviceName;
         return resultGroupedName.intern();
     }
@@ -51,4 +54,25 @@ public static String getGroupName(final String serviceNameWithGroup) {
         }
         return serviceNameWithGroup.split(Constants.SERVICE_INFO_SPLITER)[0];
     }
+
+    /**
+     * check combineServiceName format. the serviceName can't be blank. some relational logic in {@link
+     * com.alibaba.nacos.naming.web.DistroFilter#doFilter}, it will handle combineServiceName in some case, you should
+     * know it.
+     * <pre>
+     * serviceName = "@@"; the length = 0; illegal
+     * serviceName = "group@@"; the length = 1; illegal
+     * serviceName = "@@serviceName"; the length = 2; legal
+     * serviceName = "group@@serviceName"; the length = 2; legal
+     * </pre>
+     *
+     * @param combineServiceName such as: groupName@@serviceName
+     */
+    public static void checkServiceNameFormat(String combineServiceName) {
+        String[] split = combineServiceName.split(Constants.SERVICE_INFO_SPLITER);
+        if (split.length <= 1) {
+            throw new IllegalArgumentException(
+                    "Param 'serviceName' is illegal, it should be format as 'groupName@@serviceName'");
+        }
+    }
 }
diff --git a/api/src/main/java/com/alibaba/nacos/api/selector/AbstractSelector.java b/api/src/main/java/com/alibaba/nacos/api/selector/AbstractSelector.java
@@ -20,14 +20,18 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
 
+import java.io.Serializable;
+
 /**
  * Abstract selector that only contains a type.
  *
  * @author nkorange
  * @since 0.7.0
  */
 @JsonTypeInfo(use = Id.NAME, property = "type", defaultImpl = NoneSelector.class)
-public abstract class AbstractSelector {
+public abstract class AbstractSelector implements Serializable {
+
+    private static final long serialVersionUID = 4530233098102379229L;
 
     /**
      * The type of this selector, each child class should announce its own unique type.

diff --git a/auth/pom.xml b/auth/pom.xml
@@ -0,0 +1,87 @@
+<?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>1.4.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>nacos-auth</artifactId>
+    <packaging>jar</packaging>
+    <name>nacos-auth ${project.version}</name>
+    <url>http://nacos.io</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>nacos-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>nacos-sys</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-jackson</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>