Merge branch 'develop' into develop_console

README.md

@@ -13,7 +13,7 @@
 
 Nacos (official site: [nacos.io](https://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/docs/latest/ecology/use-nacos-with-dubbo/), [Spring Cloud RESTFul service](https://nacos.io/docs/latest/ecology/use-nacos-with-spring-cloud/) or [Kubernetes service](https://nacos.io/docs/latest/quickstart/quick-start-kubernetes/).
 
 Nacos provides four major functions.
 
@@ -68,23 +68,23 @@ On the **Windows** platform, run the following command to start server with stan
 startup.cmd -m standalone
 ```
 
-For more details, see [quick-start.](https://nacos.io/en-us/docs/quick-start.html)
+For more details, see [quick-start.](https://nacos.io/docs/latest/quickstart/quick-start/)
 
 ## Quick start for other open-source projects:
-* [Quick start with Nacos command and console](https://nacos.io/en-us/docs/quick-start.html)
+* [Quick start with Nacos command and console](https://nacos.io/docs/latest/quickstart/quick-start/)
 
-* [Quick start with dubbo](https://nacos.io/en-us/docs/use-nacos-with-dubbo.html)
+* [Quick start with dubbo](https://nacos.io/docs/latest/ecology/use-nacos-with-dubbo/)
 
-* [Quick start with spring cloud](https://nacos.io/en-us/docs/quick-start-spring-cloud.html)
+* [Quick start with spring cloud](https://nacos.io/docs/latest/ecology/use-nacos-with-spring-cloud/)
 
-* [Quick start with kubernetes](https://nacos.io/en-us/docs/use-nacos-with-kubernetes.html)
+* [Quick start with kubernetes](https://nacos.io/docs/latest/quickstart/quick-start-kubernetes/)
 
 
 ## Documentation
 
-You can view the full documentation from the [Nacos website](https://nacos.io/en-us/docs/v2/what-is-nacos.html).
+You can view the full documentation from the [Nacos website](https://nacos.io/docs/latest/overview/).
 
-You can also read this online eBook from the [NACOS ARCHITECTURE & PRINCIPLES](https://www.yuque.com/nacos/ebook/kbyo6n).
+You can also read this online eBook from the [NACOS ARCHITECTURE & PRINCIPLES](https://nacos.io/docs/ebook/kbyo6n/).
 
 All the latest and long-term notice can also be found here from [GitHub notice issue](https://github.com/alibaba/nacos/labels/notice).
 

auth/src/main/java/com/alibaba/nacos/auth/config/AuthErrorCode.java

@@ -27,10 +27,10 @@ public enum AuthErrorCode {
      * invalid auth type.
      */
     INVALID_TYPE(50001,
-            "Invalid auth type, Please set `nacos.core.auth.system.type`, detail: https://nacos.io/zh-cn/docs/v2/plugin/auth-plugin.html"),
+            "Invalid auth type, Please set `nacos.core.auth.system.type`, detail: https://nacos.io/docs/latest/manual/admin/auth/"),
 
     EMPTY_IDENTITY(50002,
-            "Empty identity, Please set `nacos.core.auth.server.identity.key` and `nacos.core.auth.server.identity.value`, detail: https://nacos.io/zh-cn/docs/v2/guide/user/auth.html");
+            "Empty identity, Please set `nacos.core.auth.server.identity.key` and `nacos.core.auth.server.identity.value`, detail: https://nacos.io/docs/latest/manual/admin/auth/");
 
     private final Integer code;
 

console-ui/src/config.js

@@ -27,12 +27,12 @@ module.exports = {
       {
         key: 'home', // 用作顶部菜单的选中
         text: 'HOME',
-        link: 'https://nacos.io/en-us/index.html',
+        link: 'https://https://nacos.io/en/',
       },
       {
         key: 'docs',
         text: 'DOCS',
-        link: 'https://nacos.io/en/docs/latest/what-is-nacos/',
+        link: 'https://nacos.io/en/docs/latest/overview/',
       },
       {
         key: 'blog',
@@ -42,7 +42,7 @@ module.exports = {
       {
         key: 'community',
         text: 'COMMUNITY',
-        link: 'https://nacos.io/en/news/',
+        link: 'https://nacos.io/en/blog/community/',
       },
       {
         key: 'enterprise',
@@ -92,12 +92,12 @@ module.exports = {
       {
         key: 'home',
         text: '首页',
-        link: 'https://nacos.io/zh-cn/',
+        link: 'https://nacos.io/',
       },
       {
         key: 'docs',
         text: '文档',
-        link: 'https://nacos.io/docs/latest/what-is-nacos/',
+        link: 'https://nacos.io/docs/latest/overview/',
       },
       {
         key: 'blog',
@@ -107,7 +107,7 @@ module.exports = {
       {
         key: 'community',
         text: '社区',
-        link: 'https://nacos.io/news/',
+        link: 'https://nacos.io/blog/community/',
       },
       {
         key: 'enterprise',

distribution/conf/announcement_en-US.conf

@@ -1 +1 @@
-Authentication has not been enabled in cluster, please refer to <a href="https://nacos.io/en-us/docs/v2/guide/user/auth.html">Documentation</a> to enable~
+Authentication has not been enabled in cluster, please refer to <a href="https://nacos.io/en/docs/latest/manual/admin/auth/">Documentation</a> to enable~

distribution/conf/announcement_zh-CN.conf

@@ -1 +1 @@
-当前集群没有开启鉴权，请参考<a href="https://nacos.io/zh-cn/docs/v2/guide/user/auth.html">文档</a>开启鉴权~
+当前集群没有开启鉴权，请参考<a href="https://nacos.io/docs/latest/manual/admin/auth/">文档</a>开启鉴权~

distribution/conf/console-guide.conf

@@ -1 +1 @@
-当前节点已关闭Nacos开源控制台使用，请修改application.properties中的nacos.console.ui.enabled参数为true打开开源控制台使用，详情查看<a href="https://nacos.io/zh-cn/docs/v2/guide/admin/console-guide.html">文档</a>中关于<code>关闭默认控制台部分</code>。
+当前节点已关闭Nacos开源控制台使用，请修改application.properties中的nacos.console.ui.enabled参数为true打开开源控制台使用，详情查看<a href="https://nacos.io/docs/latest/manual/admin/console/">文档</a>中关于<code>关闭默认控制台部分</code>。

plugin-default-impl/nacos-default-auth-plugin/src/main/java/com/alibaba/nacos/plugin/auth/impl/token/impl/JwtTokenManager.java

@@ -79,7 +79,7 @@ private void processProperties() {
             if (authConfigs.isAuthEnabled()) {
                 throw new IllegalArgumentException(
                         "the length of secret key must great than or equal 32 bytes; And the secret key  must be encoded by base64."
-                                + "Please see https://nacos.io/zh-cn/docs/v2/guide/user/auth.html", e);
+                                + "Please see https://nacos.io/docs/latest/manual/admin/auth/", e);
             }
         }
 
@@ -175,7 +175,7 @@ public Class<? extends Event> subscribeType() {
     private void checkJwtParser() {
         if (null == jwtParser) {
             throw new NacosRuntimeException(NacosException.INVALID_PARAM,
-                    "Please config `nacos.core.auth.plugin.nacos.token.secret.key`, detail see https://nacos.io/zh-cn/docs/v2/guide/user/auth.html");
+                    "Please config `nacos.core.auth.plugin.nacos.token.secret.key`, detail see https://nacos.io/docs/latest/manual/admin/auth/");
         }
     }
 }