From 9e09a4cf0c651214aa3224c3f5821e280a3e3464 Mon Sep 17 00:00:00 2001 From: Tinie13 <157440339+Tinie13@users.noreply.github.com> Date: Thu, 25 Jan 2024 17:25:38 +0800 Subject: [PATCH 01/66] Develop astro nacos (#528) * fixed:Optimization of directory structure --- README.md | 36 ++++++++++++++++++++++++++++++------ README.zh_CN.md | 36 ++++++++++++++++++++++++++++++------ 2 files changed, 60 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index e061b48eeab..d7e9e68c842 100644 --- a/README.md +++ b/README.md @@ -22,16 +22,40 @@ Node.js version >= 18.14.1 Inside of your Astro + Starlight project, you'll see the following folders and files: ``` -. -├── public/ -├── src/ + +├── public/ # Static Assest +│ ├── font/ +│ ├── img/ +├── src/ # Source Directory │ ├── assets/ +│ ├── components/ # Common Components +│ │ ├── cloud/ +│ │ ├── common/ # General Components +│ │ ├── contributors/ +│ │ ├── home/ # Homepage Components +│ │ ├── icon/ +│ │ ├── markdownSet/ +│ │ ├── starlight/ │ ├── content/ -│ │ ├── docs/ +│ │ ├── blog/ # Blog Directory +│ │ ├── docs/ # Docs Directory +│ │ ├── download/ # Download Directory │ │ └── config.ts +│ ├── helpers/ +│ ├── i18n/ # International entry configuration +│ │ └── en/ +│ │ └── zh-cn/ +│ ├── layouts/ # Basic layout of the project +│ ├── pages/ +│ ├── style/ +│ └── consts.ts # Project Constant Management │ └── env.d.ts -├── astro.config.mjs -├── package.json +│ └── util.ts # General utility functions +├── template/ # 404 and other universal page templates +├── astro.config.mjs # Astro profile +├── package.json +├── tailwind.config.json # tailwindcss profile +├── themeColor.json └── tsconfig.json ``` diff --git a/README.zh_CN.md b/README.zh_CN.md index 8c91d30eceb..125dc7219a8 100644 --- a/README.zh_CN.md +++ b/README.zh_CN.md @@ -22,16 +22,40 @@ Node.js 版本 >= 18.14.1 在 Astro + Starlight 项目中,您将看到以下文件夹和文件: ``` -. -├── public/ -├── src/ + +├── public/ # 静态资源 +│ ├── font/ +│ ├── img/ +├── src/ # 源代码目录 │ ├── assets/ +│ ├── components/ # 公共组件 +│ │ ├── cloud/ +│ │ ├── common/ # 通用组件 +│ │ ├── contributors/ +│ │ ├── home/ # 首页组件 +│ │ ├── icon/ +│ │ ├── markdownSet/ +│ │ ├── starlight/ │ ├── content/ -│ │ ├── docs/ +│ │ ├── blog/ # 博客目录 +│ │ ├── docs/ # 文档目录 +│ │ ├── download/ # 下载目录 │ │ └── config.ts +│ ├── helpers/ +│ ├── i18n/ # 国际化词条配置 +│ │ └── en/ +│ │ └── zh-cn/ +│ ├── layouts/ # 项目基础布局 +│ ├── pages/ +│ ├── style/ +│ └── consts.ts # 项目常量管理 │ └── env.d.ts -├── astro.config.mjs -├── package.json +│ └── util.ts # 通用工具函数 +├── template/ # 404等通用页面模板 +├── astro.config.mjs # Astro 配置文件 +├── package.json +├── tailwind.config.json #tailwindcss配置文件 +├── themeColor.json └── tsconfig.json ``` From 59357a308b93c47f7e34fe47ffaa7f83b332b2b3 Mon Sep 17 00:00:00 2001 From: Hazel0928 <55099364+Hazel0928@users.noreply.github.com> Date: Fri, 26 Jan 2024 12:36:19 +0800 Subject: [PATCH 02/66] fix 404 + aem (#529) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 🐛 fix blog * fix: 🐛 fix define * feat: 🎸 fix 404 + aem * fix: 🐛 fix markdown slug --- src/components/starlight/Head.astro | 4 ++- .../starlight/TableOfContentsList.astro | 2 +- src/content/blog/release-203.md | 2 +- src/content/blog/release-210.md | 2 +- src/content/blog/release-nacos100.md | 2 +- .../latest/en/upgrading/200-compatibility.md | 2 +- .../next/en/upgrading/200-compatibility.md | 2 +- .../docs/v1/en/quick-start-spring-boot.md | 4 +-- .../docs/v1/en/quick-start-spring-cloud.md | 4 +-- src/content/docs/v1/en/quick-start-spring.md | 4 +-- src/content/docs/v1/zh-cn/faq.md | 2 +- .../docs/v1/zh-cn/quick-start-spring-boot.md | 4 +-- .../docs/v1/zh-cn/quick-start-spring-cloud.md | 4 +-- .../docs/v1/zh-cn/quick-start-spring.md | 4 +-- .../docs/v1/zh-cn/system-configurations.md | 2 +- .../v2/en/upgrading/version2-compatibility.md | 2 +- .../zh-cn/upgrading/version2-compatibility.md | 2 +- src/content/download/en/nacos-server.mdx | 2 +- src/content/download/en/release-history.mdx | 34 +++++++++---------- src/content/download/zh-cn/nacos-server.mdx | 2 +- .../download/zh-cn/release-history.mdx | 34 +++++++++---------- src/i18n/en/ui.ts | 2 +- src/i18n/zh-cn/ui.ts | 2 +- 23 files changed, 63 insertions(+), 61 deletions(-) diff --git a/src/components/starlight/Head.astro b/src/components/starlight/Head.astro index 1cec0b9173e..bf1038b6d85 100644 --- a/src/components/starlight/Head.astro +++ b/src/components/starlight/Head.astro @@ -151,7 +151,7 @@ const head = createHead(headDefaults, config.head, data.head); t.type = 'text/javascript'; t.async = true; t.src = - '//g.alicdn.com/aes/??tracker/3.3.4/index.js,tracker-plugin-pv/3.0.5/index.js,tracker-plugin-event/3.0.0/index.js,tracker-plugin-autolog/3.0.3/index.js,tracker-plugin-survey/3.0.3/index.js'; + '//g.alicdn.com/aes/??tracker/3.3.4/index.js,tracker-plugin-pv/3.0.5/index.js,tracker-plugin-event/3.0.0/index.js,tracker-plugin-autolog/3.0.3/index.js,tracker-plugin-survey/3.0.3/index.js,tracker-plugin-jserror/3.0.3/index.js,tracker-plugin-resourceError/3.0.3/index.js'; t.onload = function () { if (window.location.hostname !== 'nacos.io') { return; @@ -173,6 +173,8 @@ const head = createHead(headDefaults, config.head, data.head); aes.use(AESPluginEvent, window.AESPluginEventConfig || {}), aes.use(AESPluginSurvey, window.AESPluginEventConfig || {}), aes.use(AESPluginAutolog, window.AESPluginAutologConfig || {}), + aes.use(AESPluginJSError, window.AESPluginJSError || {}), + aes.use(AESPluginResourceError, window.AESPluginResourceError || {}), ]; }; setTimeout(function () { diff --git a/src/components/starlight/TableOfContentsList.astro b/src/components/starlight/TableOfContentsList.astro index 0db1df94f2b..1d95b8f2d61 100644 --- a/src/components/starlight/TableOfContentsList.astro +++ b/src/components/starlight/TableOfContentsList.astro @@ -17,7 +17,7 @@ const { toc, isMobile = false, depth = 0 } = Astro.props; { toc.map((heading) => (
  • - + {heading.text} {heading.children.length > 0 && ( diff --git a/src/content/blog/release-203.md b/src/content/blog/release-203.md index 21287b58b09..8e0eaf0d446 100644 --- a/src/content/blog/release-203.md +++ b/src/content/blog/release-203.md @@ -74,7 +74,7 @@ Nacos服务端支持从1.X平滑升级到Nacos2.0.X;由于Nacos2.0对服务发 比如接口`/nacos/v1/ns/upgrade/ops/metrics`, 可以快速的查看到当前节点的状态,如当前1.X模式的服务数,实例数;2.0模式的服务数,实例数;双写任务遗留量;对应模式缺失的服务名等等内容,帮助用户快速定位升级问题。 -更多升级相关信息请查看 [Nacos 2.0 升级文档](https://nacos.io/zh-cn/docs/2.0.0-upgrading.html) +更多升级相关信息请查看 [Nacos 2.0 升级文档](https://nacos.io/docs/latest/upgrading/200-upgrading/) ## 客户端支持2.0 diff --git a/src/content/blog/release-210.md b/src/content/blog/release-210.md index 992af5d2eed..6d55a3ac09c 100644 --- a/src/content/blog/release-210.md +++ b/src/content/blog/release-210.md @@ -82,7 +82,7 @@ Nacos目前的鉴权实现也已经重构成默认的鉴权插件,社区所贡 ### 默认关闭兼容1.X服务端升级 默认关闭支持服务端从 1.X 版本升级的能力是Nacos2.1.0版本的另一个重要改动。在2.0.X版本中,数据结构进行了一些重新设计,导致和1.X的数据无法直接兼容,为了方便社区用户从1.X平滑升级到Nacos2.0版本,Nacos2.0版本除了兼容1.X的openAPI外,还新增了双写数据等逻辑;但这部分逻辑对系统资源有较大的损耗,并且由于机制较为复杂,导致部分直接使用2.0版本的用户可能会遇到一些版本切换的疑问。因此在Nacos2.1版本中,我们默认关闭了兼容1.X服务端平滑升级能功能,关闭该功能后直接部署2.1版本将不会再从1.X模式进行检测和升级,而是直接运行在2.X的数据模式下,同时也支持2.0版本直接升级2.1版本。 -若是希望从Nacos1.X直接升级到Nacos2.1.0版本,则需要在application.properties文件中设置配置`nacos.core.support.upgrade.from.1x=true`,此时Nacos2.1版本会和Nacos2.0版本一样,以1.X的数据模式启动,并开始自动升级检测,待全集群数据一致,且准备完毕后,切换至2.0数据模式,更多升级相关的内容,请参考文档[升级文档](https://nacos.io/zh-cn/docs/2.0.0-upgrading.html)。 +若是希望从Nacos1.X直接升级到Nacos2.1.0版本,则需要在application.properties文件中设置配置`nacos.core.support.upgrade.from.1x=true`,此时Nacos2.1版本会和Nacos2.0版本一样,以1.X的数据模式启动,并开始自动升级检测,待全集群数据一致,且准备完毕后,切换至2.0数据模式,更多升级相关的内容,请参考文档[升级文档](https://nacos.io/docs/latest/upgrading/200-upgrading/)。 ### About Nacos diff --git a/src/content/blog/release-nacos100.md b/src/content/blog/release-nacos100.md index 96699814a73..6e8e28a806d 100644 --- a/src/content/blog/release-nacos100.md +++ b/src/content/blog/release-nacos100.md @@ -122,7 +122,7 @@ Nacos 1.0.0 支持了 MySQL 8.0 驱动。您只需要将8.0版本的驱动jar包 服务发现和配置管理的完整 API 列表会发布到官网 -*地址:https://nacos.io/zh-cn/docs/open-api.html* +*地址:https://nacos.io/docs/latest/open-api/* 除了核心功能外,也包含部分运维接口,方便开发者进行集成。同时对于 Nacos 的数据模型、集群模型、架构设计及模块设计文档进行了更新 diff --git a/src/content/docs/latest/en/upgrading/200-compatibility.md b/src/content/docs/latest/en/upgrading/200-compatibility.md index ae2ab514e08..794cfe20c37 100644 --- a/src/content/docs/latest/en/upgrading/200-compatibility.md +++ b/src/content/docs/latest/en/upgrading/200-compatibility.md @@ -18,7 +18,7 @@ After discussion and development in the community, the core features of Nacos 2. 2.0.0 has released and welcome to use. -2.0.0 support to smoothly upgrade and downgrade with Nacos1.X server, please refer to [Nacos2.0 upgrade document](./2.0.0-upgrading.md) for details. +2.0.0 support to smoothly upgrade and downgrade with Nacos1.X server, please refer to [Nacos2.0 upgrade document](./200-upgrading.md) for details. ## Benchmark for Nacos 2.0.0 diff --git a/src/content/docs/next/en/upgrading/200-compatibility.md b/src/content/docs/next/en/upgrading/200-compatibility.md index ae2ab514e08..794cfe20c37 100644 --- a/src/content/docs/next/en/upgrading/200-compatibility.md +++ b/src/content/docs/next/en/upgrading/200-compatibility.md @@ -18,7 +18,7 @@ After discussion and development in the community, the core features of Nacos 2. 2.0.0 has released and welcome to use. -2.0.0 support to smoothly upgrade and downgrade with Nacos1.X server, please refer to [Nacos2.0 upgrade document](./2.0.0-upgrading.md) for details. +2.0.0 support to smoothly upgrade and downgrade with Nacos1.X server, please refer to [Nacos2.0 upgrade document](./200-upgrading.md) for details. ## Benchmark for Nacos 2.0.0 diff --git a/src/content/docs/v1/en/quick-start-spring-boot.md b/src/content/docs/v1/en/quick-start-spring-boot.md index ff9f6480c8b..67a1bd8b4dc 100644 --- a/src/content/docs/v1/en/quick-start-spring-boot.md +++ b/src/content/docs/v1/en/quick-start-spring-boot.md @@ -75,7 +75,7 @@ public class ConfigController { 5. Start `NacosConfigApplication`and call `curl http://localhost:8080/config/get`. You will get a return message of `false`, as no configuration has been published so far. -6. Call [Nacos Open API](https://nacos.io/zh-cn/docs/open-api.html) to publish a configuration to the Nacos server. Assume the dataId is `example`, and the content is `useLocalCache=true`. +6. Call [Nacos Open API](https://nacos.io/docs/latest/open-api/) to publish a configuration to the Nacos server. Assume the dataId is `example`, and the content is `useLocalCache=true`. ``` curl -X POST "http://127.0.0.1:8848/nacos/v1/cs/configs?dataId=example&group=DEFAULT_GROUP&content=useLocalCache=true" @@ -136,7 +136,7 @@ public class NacosDiscoveryApplication { 4. Start `NacosDiscoveryApplication`and call `curl http://localhost:8080/discovery/get?serviceName=example`,you will get a return value of an empty JSON array `[]`. -5. Call [Nacos Open API](https://nacos.io/zh-cn/docs/open-api.html) to register a service called `example` to the Nacos server. +5. Call [Nacos Open API](https://nacos.io/docs/latest/open-api/) to register a service called `example` to the Nacos server. ``` curl -X POST 'http://127.0.0.1:8848/nacos/v1/ns/instance?serviceName=example&ip=127.0.0.1&port=8080' diff --git a/src/content/docs/v1/en/quick-start-spring-cloud.md b/src/content/docs/v1/en/quick-start-spring-cloud.md index 57e857b472d..b3858b51120 100644 --- a/src/content/docs/v1/en/quick-start-spring-cloud.md +++ b/src/content/docs/v1/en/quick-start-spring-cloud.md @@ -77,7 +77,7 @@ public class ConfigController { ``` -5. Call [Nacos Open API](https://nacos.io/zh-cn/docs/open-api.html) to publish a configuration to the Nacos server. Assume the dataId is `example.properties`,and the content is `useLocalCache=true`. +5. Call [Nacos Open API](https://nacos.io/docs/latest/open-api/) to publish a configuration to the Nacos server. Assume the dataId is `example.properties`,and the content is `useLocalCache=true`. ``` curl -X POST "http://127.0.0.1:8848/nacos/v1/cs/configs?dataId=example.properties&group=DEFAULT_GROUP&content=useLocalCache=true" @@ -85,7 +85,7 @@ curl -X POST "http://127.0.0.1:8848/nacos/v1/cs/configs?dataId=example.propertie 6. Run `NacosConfigApplication`and call `curl http://localhost:8080/config/get`,You will get a returned value of `true`. -7. Call [Nacos Open API](https://nacos.io/zh-cn/docs/open-api.html) again to publish an updated configuration to the Nacos server. Assume the dataId is`example.properties`,and the content is `useLocalCache=false`. +7. Call [Nacos Open API](https://nacos.io/docs/latest/open-api/) again to publish an updated configuration to the Nacos server. Assume the dataId is`example.properties`,and the content is `useLocalCache=false`. ``` curl -X POST "http://127.0.0.1:8848/nacos/v1/cs/configs?dataId=example.properties&group=DEFAULT_GROUP&content=useLocalCache=false" diff --git a/src/content/docs/v1/en/quick-start-spring.md b/src/content/docs/v1/en/quick-start-spring.md index 3ab21881c2b..3368f0d8cc8 100644 --- a/src/content/docs/v1/en/quick-start-spring.md +++ b/src/content/docs/v1/en/quick-start-spring.md @@ -67,7 +67,7 @@ public class ConfigController { 4. Start Tomcat and call `curl http://localhost:8080/config/get` to get configuration information. Because no configuration has been published, a `false`message is returned. -5. Now you can call [Nacos Open API](https://nacos.io/zh-cn/docs/open-api.html) to publish a configruation to the Nacos server. Assume the dataId is `example`, and content is `useLocalCache=true`. +5. Now you can call [Nacos Open API](https://nacos.io/docs/latest/open-api/) to publish a configruation to the Nacos server. Assume the dataId is `example`, and content is `useLocalCache=true`. ``` curl -X POST "http://127.0.0.1:8848/nacos/v1/cs/configs?dataId=example&group=DEFAULT_GROUP&content=useLocalCache=true" @@ -123,7 +123,7 @@ public class DiscoveryController { 4. Start Tomcat and call `curl http://localhost:8080/discovery/get?serviceName=example`, and the return value is an empty JSON array `[]`. -5. Call [Nacos Open API](https://nacos.io/zh-cn/docs/open-api.html) to register a service called `example`to the Nacos Server. +5. Call [Nacos Open API](https://nacos.io/docs/latest/open-api/) to register a service called `example`to the Nacos Server. ``` curl -X POST 'http://127.0.0.1:8848/nacos/v1/ns/instance?serviceName=example&ip=127.0.0.1&port=8080' diff --git a/src/content/docs/v1/zh-cn/faq.md b/src/content/docs/v1/zh-cn/faq.md index 84c823436aa..b5fa01de93c 100644 --- a/src/content/docs/v1/zh-cn/faq.md +++ b/src/content/docs/v1/zh-cn/faq.md @@ -122,7 +122,7 @@ Nacos完善支持了Sping技术栈,具体可以参考[Nacos Spring](https://na

    不使用Nacos SDK如何访问Nacos

    -Nacos的网络交互都是基于Http协议实现的,提供了[Open-API](https://nacos.io/zh-cn/docs/open-api.html)可以很容易实现Nacos的访问。 +Nacos的网络交互都是基于Http协议实现的,提供了[Open-API](https://nacos.io/docs/latest/open-api/)可以很容易实现Nacos的访问。

    Nacos对多语言的支持

    diff --git a/src/content/docs/v1/zh-cn/quick-start-spring-boot.md b/src/content/docs/v1/zh-cn/quick-start-spring-boot.md index ea666be39c7..f0ecd5b7bbe 100644 --- a/src/content/docs/v1/zh-cn/quick-start-spring-boot.md +++ b/src/content/docs/v1/zh-cn/quick-start-spring-boot.md @@ -72,7 +72,7 @@ public class ConfigController { 5. 启动 `NacosConfigApplication`,调用 `curl http://localhost:8080/config/get`,返回内容是 `false`。 -6. 通过调用 [Nacos Open API](https://nacos.io/zh-cn/docs/open-api.html) 向 Nacos server 发布配置:dataId 为`example`,内容为`useLocalCache=true` +6. 通过调用 [Nacos Open API](https://nacos.io/docs/latest/open-api/) 向 Nacos server 发布配置:dataId 为`example`,内容为`useLocalCache=true` ``` curl -X POST "http://127.0.0.1:8848/nacos/v1/cs/configs?dataId=example&group=DEFAULT_GROUP&content=useLocalCache=true" @@ -131,7 +131,7 @@ public class NacosDiscoveryApplication { 4. 启动 `NacosDiscoveryApplication`,调用 `curl http://localhost:8080/discovery/get?serviceName=example`,此时返回为空 JSON 数组`[]`。 -5. 通过调用 [Nacos Open API](https://nacos.io/zh-cn/docs/open-api.html) 向 Nacos server 注册一个名称为 `example` 服务 +5. 通过调用 [Nacos Open API](https://nacos.io/docs/latest/open-api/) 向 Nacos server 注册一个名称为 `example` 服务 ``` curl -X POST 'http://127.0.0.1:8848/nacos/v1/ns/instance?serviceName=example&ip=127.0.0.1&port=8080' diff --git a/src/content/docs/v1/zh-cn/quick-start-spring-cloud.md b/src/content/docs/v1/zh-cn/quick-start-spring-cloud.md index 7cf7cf94e64..c4c9b778e8c 100644 --- a/src/content/docs/v1/zh-cn/quick-start-spring-cloud.md +++ b/src/content/docs/v1/zh-cn/quick-start-spring-cloud.md @@ -75,7 +75,7 @@ public class ConfigController { ``` -5. 首先通过调用 [Nacos Open API](https://nacos.io/zh-cn/docs/open-api.html) 向 Nacos Server 发布配置:dataId 为`example.properties`,内容为`useLocalCache=true` +5. 首先通过调用 [Nacos Open API](https://nacos.io/docs/latest/open-api/) 向 Nacos Server 发布配置:dataId 为`example.properties`,内容为`useLocalCache=true` ``` curl -X POST "http://127.0.0.1:8848/nacos/v1/cs/configs?dataId=example.properties&group=DEFAULT_GROUP&content=useLocalCache=true" @@ -83,7 +83,7 @@ curl -X POST "http://127.0.0.1:8848/nacos/v1/cs/configs?dataId=example.propertie 6. 运行 `NacosConfigApplication`,调用 `curl http://localhost:8080/config/get`,返回内容是 `true`。 -7. 再次调用 [Nacos Open API](https://nacos.io/zh-cn/docs/open-api.html) 向 Nacos server 发布配置:dataId 为`example.properties`,内容为`useLocalCache=false` +7. 再次调用 [Nacos Open API](https://nacos.io/docs/latest/open-api/) 向 Nacos server 发布配置:dataId 为`example.properties`,内容为`useLocalCache=false` ``` curl -X POST "http://127.0.0.1:8848/nacos/v1/cs/configs?dataId=example.properties&group=DEFAULT_GROUP&content=useLocalCache=false" diff --git a/src/content/docs/v1/zh-cn/quick-start-spring.md b/src/content/docs/v1/zh-cn/quick-start-spring.md index 6c0157ba43e..f58a18e4382 100644 --- a/src/content/docs/v1/zh-cn/quick-start-spring.md +++ b/src/content/docs/v1/zh-cn/quick-start-spring.md @@ -64,7 +64,7 @@ public class ConfigController { 4. 启动 Tomcat,调用 `curl http://localhost:8080/config/get`尝试获取配置信息。由于此时还未发布过配置,所以返回内容是 `false`。 -5. 通过调用 [Nacos Open API](https://nacos.io/zh-cn/docs/open-api.html) 向 Nacos Server 发布配置:dataId 为`example`,内容为`useLocalCache=true` +5. 通过调用 [Nacos Open API](https://nacos.io/docs/latest/open-api/) 向 Nacos Server 发布配置:dataId 为`example`,内容为`useLocalCache=true` ``` curl -X POST "http://127.0.0.1:8848/nacos/v1/cs/configs?dataId=example&group=DEFAULT_GROUP&content=useLocalCache=true" @@ -118,7 +118,7 @@ public class DiscoveryController { 4. 启动 Tomcat,调用 `curl http://localhost:8080/discovery/get?serviceName=example`,此时返回为空 JSON 数组`[]`。 -5. 通过调用 [Nacos Open API](https://nacos.io/zh-cn/docs/open-api.html) 向 Nacos server 注册一个名称为 `example` 服务。 +5. 通过调用 [Nacos Open API](https://nacos.io/docs/latest/open-api/) 向 Nacos server 注册一个名称为 `example` 服务。 ``` curl -X POST 'http://127.0.0.1:8848/nacos/v1/ns/instance?serviceName=example&ip=127.0.0.1&port=8080' diff --git a/src/content/docs/v1/zh-cn/system-configurations.md b/src/content/docs/v1/zh-cn/system-configurations.md index f1cef471378..e6b1bef8bb0 100644 --- a/src/content/docs/v1/zh-cn/system-configurations.md +++ b/src/content/docs/v1/zh-cn/system-configurations.md @@ -34,7 +34,7 @@ JAVA_OPT="${JAVA_OPT} -Dnacos.home=${BASE_DIR}" |nacos.naming.distro.batchSyncKeyCount| 同步任务每批的key的数目 | 正整数 | 1000 | >= 1.0.2 | |nacos.naming.distro.syncRetryDelay| 同步任务失败的重试间隔,单位为毫秒 | 正整数 | 5000 | >= 1.0.2 | -除了上面列到的在`application.properties`里配置的属性,还有一些可以在运行时调用接口来进行调节,这些参数都在[Open API](https://nacos.io/zh-cn/docs/open-api.html)里的```查看系统当前数据指标```这个API里有声明。 +除了上面列到的在`application.properties`里配置的属性,还有一些可以在运行时调用接口来进行调节,这些参数都在[Open API](https://nacos.io/docs/latest/open-api/)里的```查看系统当前数据指标```这个API里有声明。 ### Config模块 diff --git a/src/content/docs/v2/en/upgrading/version2-compatibility.md b/src/content/docs/v2/en/upgrading/version2-compatibility.md index ae2ab514e08..509c8514854 100644 --- a/src/content/docs/v2/en/upgrading/version2-compatibility.md +++ b/src/content/docs/v2/en/upgrading/version2-compatibility.md @@ -18,7 +18,7 @@ After discussion and development in the community, the core features of Nacos 2. 2.0.0 has released and welcome to use. -2.0.0 support to smoothly upgrade and downgrade with Nacos1.X server, please refer to [Nacos2.0 upgrade document](./2.0.0-upgrading.md) for details. +2.0.0 support to smoothly upgrade and downgrade with Nacos1.X server, please refer to [Nacos2.0 upgrade document](./version2-upgrading.md) for details. ## Benchmark for Nacos 2.0.0 diff --git a/src/content/docs/v2/zh-cn/upgrading/version2-compatibility.md b/src/content/docs/v2/zh-cn/upgrading/version2-compatibility.md index a8440e78152..0adb31cfc04 100644 --- a/src/content/docs/v2/zh-cn/upgrading/version2-compatibility.md +++ b/src/content/docs/v2/zh-cn/upgrading/version2-compatibility.md @@ -16,7 +16,7 @@ Nacos代码当前保存在develop分支中,启动方式与Nacos 1.x相同( 经过社区的讨论和开发, Nacos 基于长连接的2.0.0版本的核心功能已开发完成,目前2.0.0正式版本已发布,欢迎大家使用。 -2.0.0支持Nacos1.X服务端的平滑升降级的能力,详情请查看[Nacos2.0升级文档](./2.0.0-upgrading.md) 。 +2.0.0支持Nacos1.X服务端的平滑升降级的能力,详情请查看[Nacos2.0升级文档](./version2-upgrading.md) 。 ## Nacos 2.0.0版本压测 diff --git a/src/content/download/en/nacos-server.mdx b/src/content/download/en/nacos-server.mdx index 44bd570b86f..e5aa5614b72 100644 --- a/src/content/download/en/nacos-server.mdx +++ b/src/content/download/en/nacos-server.mdx @@ -45,7 +45,7 @@ The Nacos 1.x has already stopped functional maintenance, please upgrade to the | Version | Binary Link | Docker Image | CheckSum | Release Notes | Reference Docs | | ------- | ------------------------------------------------------------ | ------------------------------------------------------------ | -------------------------------- | ------------------------------------------------ | ------------------------------------------------ | -| 1.4.7 | [1.4.7.zip](https://download.nacos.io/nacos-server/nacos-server-1.4.7.zip) | [nacos/nacos-server:1.4.7](https://hub.docker.com/r/nacos/nacos-server/tags?page=1&name=1.4.7) | 8a91f939ee59665d97be031faeac5cf7 | [1.4.7 Release Notes](https://github.com/alibaba/nacos/releases/tag/1.4.7) | [1.4.7 Quick Start](/docs/v1/quickstart/quick-start) | +| 1.4.7 | [1.4.7.zip](https://download.nacos.io/nacos-server/nacos-server-1.4.7.zip) | [nacos/nacos-server:1.4.7](https://hub.docker.com/r/nacos/nacos-server/tags?page=1&name=1.4.7) | 8a91f939ee59665d97be031faeac5cf7 | [1.4.7 Release Notes](https://github.com/alibaba/nacos/releases/tag/1.4.7) | [1.4.7 Quick Start](/docs/v1/quick-start) | - Please upgrade to the latest version as soon as possible. For version upgrade, please refer to the [upgrade guide](/docs/v2/upgrading/version2-upgrading) diff --git a/src/content/download/en/release-history.mdx b/src/content/download/en/release-history.mdx index 4950326ae38..eda764cedb4 100644 --- a/src/content/download/en/release-history.mdx +++ b/src/content/download/en/release-history.mdx @@ -35,20 +35,20 @@ Date format is: YYYY-MM-DD | Release Date | Version | Required Java Version | Links | |-------------------------|---------------|-----------------------|----------------------------------------------| -|2023-03-25 | [1.4.6](https://github.com/alibaba/nacos/releases/download/1.4.6/nacos-server-1.4.6.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.4.6), [reference documentation](/docs/v1/quickstart/quick-start) | -|2023-03-17 | [1.4.5](https://github.com/alibaba/nacos/releases/download/1.4.5/nacos-server-1.4.5.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.4.5), [reference documentation](/docs/v1/quickstart/quick-start) | -|2022-08-08 | [1.4.4](https://github.com/alibaba/nacos/releases/download/1.4.4/nacos-server-1.4.4.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.4.4), [reference documentation](/docs/v1/quickstart/quick-start) | -|2022-01-27 | [1.4.3](https://github.com/alibaba/nacos/releases/download/1.4.3/nacos-server-1.4.3.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.4.3), [reference documentation](/docs/v1/quickstart/quick-start) | -|2021-04-29 | [1.4.2](https://github.com/alibaba/nacos/releases/download/1.4.2/nacos-server-1.4.2.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.4.2), [reference documentation](/docs/v1/quickstart/quick-start) | -|2021-01-15 | [1.4.1](https://github.com/alibaba/nacos/releases/download/1.4.1/nacos-server-1.4.1.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.4.1), [reference documentation](/docs/v1/quickstart/quick-start) | -|2020-11-02 | [1.4.0](https://github.com/alibaba/nacos/releases/download/1.4.0/nacos-server-1.4.0.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.4.0), [reference documentation](/docs/v1/quickstart/quick-start) | -|2020-08-04 | [1.3.2](https://github.com/alibaba/nacos/releases/download/1.3.2/nacos-server-1.3.2.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.3.2), [reference documentation](/docs/v1/quickstart/quick-start) | -|2020-07-10 | [1.3.1](https://github.com/alibaba/nacos/releases/download/1.3.1/nacos-server-1.3.1.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.3.1), [reference documentation](/docs/v1/quickstart/quick-start) | -|2020-06-05 | [1.3.0](https://github.com/alibaba/nacos/releases/download/1.3.0/nacos-server-1.3.0.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.3.0), [reference documentation](/docs/v1/quickstart/quick-start) | -|2020-03-31 | [1.2.1](https://github.com/alibaba/nacos/releases/download/1.2.1/nacos-server-1.2.1.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.2.1), [reference documentation](/docs/v1/quickstart/quick-start) | -|2020-03-04 | [1.2.0](https://github.com/alibaba/nacos/releases/download/1.2.0/nacos-server-1.2.0.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.2.0), [reference documentation](/docs/v1/quickstart/quick-start) | -|2019-10-24 | [1.1.4](https://github.com/alibaba/nacos/releases/download/1.1.4/nacos-server-1.1.4.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.1.4), [reference documentation](/docs/v1/quickstart/quick-start) | -|2019-08-06 | [1.1.3](https://github.com/alibaba/nacos/releases/download/1.1.3/nacos-server-1.1.3.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.1.3), [reference documentation](/docs/v1/quickstart/quick-start) | -|2019-07-06 | [1.1.0](https://github.com/alibaba/nacos/releases/download/1.1.0/nacos-server-1.1.0.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.1.0), [reference documentation](/docs/v1/quickstart/quick-start) | -|2019-06-12 | [1.0.1](https://github.com/alibaba/nacos/releases/download/1.0.1/nacos-server-1.0.1.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.0.1), [reference documentation](/docs/v1/quickstart/quick-start) | -|2019-04-10 | [1.0.0](https://github.com/alibaba/nacos/releases/download/1.0.0/nacos-server-1.0.0.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.0.0), [reference documentation](/docs/v1/quickstart/quick-start) | \ No newline at end of file +|2023-03-25 | [1.4.6](https://github.com/alibaba/nacos/releases/download/1.4.6/nacos-server-1.4.6.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.4.6), [reference documentation](/docs/v1/quick-start) | +|2023-03-17 | [1.4.5](https://github.com/alibaba/nacos/releases/download/1.4.5/nacos-server-1.4.5.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.4.5), [reference documentation](/docs/v1/quick-start) | +|2022-08-08 | [1.4.4](https://github.com/alibaba/nacos/releases/download/1.4.4/nacos-server-1.4.4.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.4.4), [reference documentation](/docs/v1/quick-start) | +|2022-01-27 | [1.4.3](https://github.com/alibaba/nacos/releases/download/1.4.3/nacos-server-1.4.3.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.4.3), [reference documentation](/docs/v1/quick-start) | +|2021-04-29 | [1.4.2](https://github.com/alibaba/nacos/releases/download/1.4.2/nacos-server-1.4.2.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.4.2), [reference documentation](/docs/v1/quick-start) | +|2021-01-15 | [1.4.1](https://github.com/alibaba/nacos/releases/download/1.4.1/nacos-server-1.4.1.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.4.1), [reference documentation](/docs/v1/quick-start) | +|2020-11-02 | [1.4.0](https://github.com/alibaba/nacos/releases/download/1.4.0/nacos-server-1.4.0.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.4.0), [reference documentation](/docs/v1/quick-start) | +|2020-08-04 | [1.3.2](https://github.com/alibaba/nacos/releases/download/1.3.2/nacos-server-1.3.2.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.3.2), [reference documentation](/docs/v1/quick-start) | +|2020-07-10 | [1.3.1](https://github.com/alibaba/nacos/releases/download/1.3.1/nacos-server-1.3.1.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.3.1), [reference documentation](/docs/v1/quick-start) | +|2020-06-05 | [1.3.0](https://github.com/alibaba/nacos/releases/download/1.3.0/nacos-server-1.3.0.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.3.0), [reference documentation](/docs/v1/quick-start) | +|2020-03-31 | [1.2.1](https://github.com/alibaba/nacos/releases/download/1.2.1/nacos-server-1.2.1.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.2.1), [reference documentation](/docs/v1/quick-start) | +|2020-03-04 | [1.2.0](https://github.com/alibaba/nacos/releases/download/1.2.0/nacos-server-1.2.0.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.2.0), [reference documentation](/docs/v1/quick-start) | +|2019-10-24 | [1.1.4](https://github.com/alibaba/nacos/releases/download/1.1.4/nacos-server-1.1.4.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.1.4), [reference documentation](/docs/v1/quick-start) | +|2019-08-06 | [1.1.3](https://github.com/alibaba/nacos/releases/download/1.1.3/nacos-server-1.1.3.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.1.3), [reference documentation](/docs/v1/quick-start) | +|2019-07-06 | [1.1.0](https://github.com/alibaba/nacos/releases/download/1.1.0/nacos-server-1.1.0.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.1.0), [reference documentation](/docs/v1/quick-start) | +|2019-06-12 | [1.0.1](https://github.com/alibaba/nacos/releases/download/1.0.1/nacos-server-1.0.1.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.0.1), [reference documentation](/docs/v1/quick-start) | +|2019-04-10 | [1.0.0](https://github.com/alibaba/nacos/releases/download/1.0.0/nacos-server-1.0.0.zip) | Java 8 | [release notes](https://github.com/alibaba/nacos/releases/tag/1.0.0), [reference documentation](/docs/v1/quick-start) | \ No newline at end of file diff --git a/src/content/download/zh-cn/nacos-server.mdx b/src/content/download/zh-cn/nacos-server.mdx index 9e2cde101d2..c7f991f07fe 100644 --- a/src/content/download/zh-cn/nacos-server.mdx +++ b/src/content/download/zh-cn/nacos-server.mdx @@ -44,7 +44,7 @@ Nacos 1.x 已经停止功能维护,请尽快升级到 2.x 版本。 | 版本 | 二进制包下载 | Docker 镜像 | MD5 | 发布说明 | 参考文档 | | ------- | ------------------------------------------------------------ | ------------------------------------------------------------ | -------------------------------- | ------------------------------------------------ | ------------------------------------------------ | -| 1.4.7 | [1.4.7.zip](https://download.nacos.io/nacos-server/nacos-server-1.4.7.zip) | [nacos/nacos-server:1.4.7](https://hub.docker.com/r/nacos/nacos-server/tags?page=1&name=1.4.7) | 8a91f939ee59665d97be031faeac5cf7 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.4.7) | [快速开始](/docs/v1/quickstart/quick-start) | +| 1.4.7 | [1.4.7.zip](https://download.nacos.io/nacos-server/nacos-server-1.4.7.zip) | [nacos/nacos-server:1.4.7](https://hub.docker.com/r/nacos/nacos-server/tags?page=1&name=1.4.7) | 8a91f939ee59665d97be031faeac5cf7 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.4.7) | [快速开始](/docs/v1/quick-start) | - 请尽可能的升级到最新已发布版本,版本升级请参考 [升级指南](/docs/v2/upgrading/version2-upgrading) diff --git a/src/content/download/zh-cn/release-history.mdx b/src/content/download/zh-cn/release-history.mdx index eff3c82f067..05c60cc0302 100644 --- a/src/content/download/zh-cn/release-history.mdx +++ b/src/content/download/zh-cn/release-history.mdx @@ -35,20 +35,20 @@ Nacos Server 只维护最新的GA 发布版本,当前最新版本是 2.3.0。 | 发布时间 | 版本 | Java版本要求 | 相关链接 | |-------------------------|---------------|-----------------------|----------------------------------------------| -|2023-03-25 | [1.4.6](https://github.com/alibaba/nacos/releases/download/1.4.6/nacos-server-1.4.6.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.4.6) [参考文档](/docs/v1/quickstart/quick-start) | -|2023-03-17 | [1.4.5](https://github.com/alibaba/nacos/releases/download/1.4.5/nacos-server-1.4.5.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.4.5) [参考文档](/docs/v1/quickstart/quick-start) | -|2022-08-08 | [1.4.4](https://github.com/alibaba/nacos/releases/download/1.4.4/nacos-server-1.4.4.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.4.4) [参考文档](/docs/v1/quickstart/quick-start) | -|2022-01-27 | [1.4.3](https://github.com/alibaba/nacos/releases/download/1.4.3/nacos-server-1.4.3.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.4.3) [参考文档](/docs/v1/quickstart/quick-start) | -|2021-04-29 | [1.4.2](https://github.com/alibaba/nacos/releases/download/1.4.2/nacos-server-1.4.2.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.4.2) [参考文档](/docs/v1/quickstart/quick-start) | -|2021-01-15 | [1.4.1](https://github.com/alibaba/nacos/releases/download/1.4.1/nacos-server-1.4.1.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.4.1) [参考文档](/docs/v1/quickstart/quick-start) | -|2020-11-02 | [1.4.0](https://github.com/alibaba/nacos/releases/download/1.4.0/nacos-server-1.4.0.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.4.0) [参考文档](/docs/v1/quickstart/quick-start) | -|2020-08-04 | [1.3.2](https://github.com/alibaba/nacos/releases/download/1.3.2/nacos-server-1.3.2.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.3.2) [参考文档](/docs/v1/quickstart/quick-start) | -|2020-07-10 | [1.3.1](https://github.com/alibaba/nacos/releases/download/1.3.1/nacos-server-1.3.1.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.3.1) [参考文档](/docs/v1/quickstart/quick-start) | -|2020-06-05 | [1.3.0](https://github.com/alibaba/nacos/releases/download/1.3.0/nacos-server-1.3.0.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.3.0) [参考文档](/docs/v1/quickstart/quick-start) | -|2020-03-31 | [1.2.1](https://github.com/alibaba/nacos/releases/download/1.2.1/nacos-server-1.2.1.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.2.1) [参考文档](/docs/v1/quickstart/quick-start) | -|2020-03-04 | [1.2.0](https://github.com/alibaba/nacos/releases/download/1.2.0/nacos-server-1.2.0.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.2.0) [参考文档](/docs/v1/quickstart/quick-start) | -|2019-10-24 | [1.1.4](https://github.com/alibaba/nacos/releases/download/1.1.4/nacos-server-1.1.4.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.1.4) [参考文档](/docs/v1/quickstart/quick-start) | -|2019-08-06 | [1.1.3](https://github.com/alibaba/nacos/releases/download/1.1.3/nacos-server-1.1.3.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.1.3) [参考文档](/docs/v1/quickstart/quick-start) | -|2019-07-06 | [1.1.0](https://github.com/alibaba/nacos/releases/download/1.1.0/nacos-server-1.1.0.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.1.0) [参考文档](/docs/v1/quickstart/quick-start) | -|2019-06-12 | [1.0.1](https://github.com/alibaba/nacos/releases/download/1.0.1/nacos-server-1.0.1.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.0.1) [参考文档](/docs/v1/quickstart/quick-start) | -|2019-04-10 | [1.0.0](https://github.com/alibaba/nacos/releases/download/1.0.0/nacos-server-1.0.0.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.0.0) [参考文档](/docs/v1/quickstart/quick-start) | \ No newline at end of file +|2023-03-25 | [1.4.6](https://github.com/alibaba/nacos/releases/download/1.4.6/nacos-server-1.4.6.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.4.6) [参考文档](/docs/v1/quick-start) | +|2023-03-17 | [1.4.5](https://github.com/alibaba/nacos/releases/download/1.4.5/nacos-server-1.4.5.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.4.5) [参考文档](/docs/v1/quick-start) | +|2022-08-08 | [1.4.4](https://github.com/alibaba/nacos/releases/download/1.4.4/nacos-server-1.4.4.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.4.4) [参考文档](/docs/v1/quick-start) | +|2022-01-27 | [1.4.3](https://github.com/alibaba/nacos/releases/download/1.4.3/nacos-server-1.4.3.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.4.3) [参考文档](/docs/v1/quick-start) | +|2021-04-29 | [1.4.2](https://github.com/alibaba/nacos/releases/download/1.4.2/nacos-server-1.4.2.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.4.2) [参考文档](/docs/v1/quick-start) | +|2021-01-15 | [1.4.1](https://github.com/alibaba/nacos/releases/download/1.4.1/nacos-server-1.4.1.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.4.1) [参考文档](/docs/v1/quick-start) | +|2020-11-02 | [1.4.0](https://github.com/alibaba/nacos/releases/download/1.4.0/nacos-server-1.4.0.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.4.0) [参考文档](/docs/v1/quick-start) | +|2020-08-04 | [1.3.2](https://github.com/alibaba/nacos/releases/download/1.3.2/nacos-server-1.3.2.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.3.2) [参考文档](/docs/v1/quick-start) | +|2020-07-10 | [1.3.1](https://github.com/alibaba/nacos/releases/download/1.3.1/nacos-server-1.3.1.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.3.1) [参考文档](/docs/v1/quick-start) | +|2020-06-05 | [1.3.0](https://github.com/alibaba/nacos/releases/download/1.3.0/nacos-server-1.3.0.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.3.0) [参考文档](/docs/v1/quick-start) | +|2020-03-31 | [1.2.1](https://github.com/alibaba/nacos/releases/download/1.2.1/nacos-server-1.2.1.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.2.1) [参考文档](/docs/v1/quick-start) | +|2020-03-04 | [1.2.0](https://github.com/alibaba/nacos/releases/download/1.2.0/nacos-server-1.2.0.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.2.0) [参考文档](/docs/v1/quick-start) | +|2019-10-24 | [1.1.4](https://github.com/alibaba/nacos/releases/download/1.1.4/nacos-server-1.1.4.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.1.4) [参考文档](/docs/v1/quick-start) | +|2019-08-06 | [1.1.3](https://github.com/alibaba/nacos/releases/download/1.1.3/nacos-server-1.1.3.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.1.3) [参考文档](/docs/v1/quick-start) | +|2019-07-06 | [1.1.0](https://github.com/alibaba/nacos/releases/download/1.1.0/nacos-server-1.1.0.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.1.0) [参考文档](/docs/v1/quick-start) | +|2019-06-12 | [1.0.1](https://github.com/alibaba/nacos/releases/download/1.0.1/nacos-server-1.0.1.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.0.1) [参考文档](/docs/v1/quick-start) | +|2019-04-10 | [1.0.0](https://github.com/alibaba/nacos/releases/download/1.0.0/nacos-server-1.0.0.zip) | Java 8 | [发布说明](https://github.com/alibaba/nacos/releases/tag/1.0.0) [参考文档](/docs/v1/quick-start) | \ No newline at end of file diff --git a/src/i18n/en/ui.ts b/src/i18n/en/ui.ts index 4fbe0a577ee..8a0cbf5515f 100644 --- a/src/i18n/en/ui.ts +++ b/src/i18n/en/ui.ts @@ -47,7 +47,7 @@ export default { 'home.title': 'Dynamic service discovery, configuration management and service management platform Nacos', 'home.description': 'Nacos by providing simple and easy to use dynamic service discovery, service configuration, service sharing and management and other service infrastructure, to help users in the cloud native era, in the private cloud, hybrid cloud or public cloud and all cloud environments, better build, deliver, manage their own microservice platform, faster reuse and combination of business services, faster delivery of business innovation value, So as to win the market for users', 'home.introduce.about': 'ABOUT NACOS', - 'home.introduce.title': 'An easy-to-use dynamic service discovery, configuration and service management platform for building cloud native applications', + 'home.introduce.title': 'Nacos Website | Nacos Official Community | Nacos Download', 'home.introduce.nacos.code': 'VIEW ON GITHUB', 'home.introduce.nacos.manual': 'MANUAL', 'home.introduce.nacos.notes': 'Released on Nov 30, 2023', diff --git a/src/i18n/zh-cn/ui.ts b/src/i18n/zh-cn/ui.ts index 508f056ee8e..330df2c7659 100644 --- a/src/i18n/zh-cn/ui.ts +++ b/src/i18n/zh-cn/ui.ts @@ -47,7 +47,7 @@ export default { 'home.title': '动态服务发现、配置管理和服务管理平台 Nacos', 'home.description': 'Nacos 通过提供简单易用的动态服务发现、服务配置、服务共享与管理等服务基础设施,帮助用户在云原生时代,在私有云、混合云或者公有云等所有云环境中,更好的构建、交付、管理自己的微服务平台,更快的复用和组合业务服务,更快的交付商业创新的价值,从而为用户赢得市场。', 'home.introduce.about': '关于 NACOS', - 'home.introduce.title': '一个更易于构建云原生应用的动态服务发现、配置管理和服务管理平台', + 'home.introduce.title': ' Nacos官网 | Nacos 官方社区 | Nacos 下载', 'home.introduce.nacos.code': '前往 GitHub', 'home.introduce.nacos.manual': '手册', 'home.introduce.nacos.notes': '发布于2023年11月30日', From 11a7a6b0f27e8c49e5c0f12fbba37e10947d9358 Mon Sep 17 00:00:00 2001 From: Hazel0928 <55099364+Hazel0928@users.noreply.github.com> Date: Fri, 26 Jan 2024 13:41:55 +0800 Subject: [PATCH 03/66] =?UTF-8?q?fix:=20=F0=9F=90=9B=20fix=20=E6=96=87?= =?UTF-8?q?=E6=A1=88=20(#530)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/en/ui.ts | 2 +- src/i18n/zh-cn/ui.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/en/ui.ts b/src/i18n/en/ui.ts index 8a0cbf5515f..4fbe0a577ee 100644 --- a/src/i18n/en/ui.ts +++ b/src/i18n/en/ui.ts @@ -47,7 +47,7 @@ export default { 'home.title': 'Dynamic service discovery, configuration management and service management platform Nacos', 'home.description': 'Nacos by providing simple and easy to use dynamic service discovery, service configuration, service sharing and management and other service infrastructure, to help users in the cloud native era, in the private cloud, hybrid cloud or public cloud and all cloud environments, better build, deliver, manage their own microservice platform, faster reuse and combination of business services, faster delivery of business innovation value, So as to win the market for users', 'home.introduce.about': 'ABOUT NACOS', - 'home.introduce.title': 'Nacos Website | Nacos Official Community | Nacos Download', + 'home.introduce.title': 'An easy-to-use dynamic service discovery, configuration and service management platform for building cloud native applications', 'home.introduce.nacos.code': 'VIEW ON GITHUB', 'home.introduce.nacos.manual': 'MANUAL', 'home.introduce.nacos.notes': 'Released on Nov 30, 2023', diff --git a/src/i18n/zh-cn/ui.ts b/src/i18n/zh-cn/ui.ts index 330df2c7659..e579d89c220 100644 --- a/src/i18n/zh-cn/ui.ts +++ b/src/i18n/zh-cn/ui.ts @@ -47,7 +47,7 @@ export default { 'home.title': '动态服务发现、配置管理和服务管理平台 Nacos', 'home.description': 'Nacos 通过提供简单易用的动态服务发现、服务配置、服务共享与管理等服务基础设施,帮助用户在云原生时代,在私有云、混合云或者公有云等所有云环境中,更好的构建、交付、管理自己的微服务平台,更快的复用和组合业务服务,更快的交付商业创新的价值,从而为用户赢得市场。', 'home.introduce.about': '关于 NACOS', - 'home.introduce.title': ' Nacos官网 | Nacos 官方社区 | Nacos 下载', + 'home.introduce.title': ' 一个更易于构建云原生应用的动态服务发现、配置管理和服务管理平台', 'home.introduce.nacos.code': '前往 GitHub', 'home.introduce.nacos.manual': '手册', 'home.introduce.nacos.notes': '发布于2023年11月30日', From 2b37dad200575c3b7325748e373a066d31ac28e1 Mon Sep 17 00:00:00 2001 From: jimin Date: Fri, 26 Jan 2024 17:03:16 +0800 Subject: [PATCH 04/66] optimize: add robots (#533) --- robots.txt | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 robots.txt diff --git a/robots.txt b/robots.txt new file mode 100644 index 00000000000..3583de9cf16 --- /dev/null +++ b/robots.txt @@ -0,0 +1,43 @@ +User-agent: Googlebot +Disallow: +User-agent: googlebot-image +Disallow: +User-agent: googlebot-mobile +Disallow: +User-agent: MSNBot +Disallow: +User-agent: Slurp +Disallow: +User-agent: Teoma +Disallow: +User-agent: twiceler +Disallow: +User-agent: Gigabot +Disallow: +User-agent: Scrubby +Disallow: +User-agent: Robozilla +Disallow: +User-agent: Nutch +Disallow: +User-agent: ia_archiver +Disallow: +User-agent: baiduspider +Disallow: +User-agent: naverbot +Disallow: +User-agent: yeti +Disallow: +User-agent: yahoo-mmcrawler +Disallow: +User-agent: psbot +Disallow: +User-agent: asterias +Disallow: +User-agent: yahoo-blogs/v3.9 +Disallow: +User-agent: * +Disallow: +Disallow: /cgi-bin/ +Disallow: /bin/ +Sitemap: https://nacos.io/sitemap.xml \ No newline at end of file From e2350ad4d2bbbd661f37d9c73ab8356de0f6577c Mon Sep 17 00:00:00 2001 From: jimin Date: Fri, 26 Jan 2024 17:08:14 +0800 Subject: [PATCH 05/66] optimize: add CNAME (#534) --- CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100644 CNAME diff --git a/CNAME b/CNAME new file mode 100644 index 00000000000..bd6f8d2e66f --- /dev/null +++ b/CNAME @@ -0,0 +1 @@ +nacos.io \ No newline at end of file From 68ef5cb2998113f2641151b771ada287b5ca9ce9 Mon Sep 17 00:00:00 2001 From: jimin Date: Fri, 26 Jan 2024 17:11:55 +0800 Subject: [PATCH 06/66] optimize: add license file (#535) --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000000..f49a4e16e68 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. \ No newline at end of file From d646402c10ee3be85d3c17b8ce0cc281aa54dab4 Mon Sep 17 00:00:00 2001 From: helloyonger <87457323+helloyonger@users.noreply.github.com> Date: Fri, 26 Jan 2024 17:14:48 +0800 Subject: [PATCH 07/66] =?UTF-8?q?feat:=20=E3=80=90=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E3=80=91=20=E9=97=AE=E9=A2=98=E6=94=B6=E6=95=9B=20(#5?= =?UTF-8?q?32)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: wb-tag781554 --- src/components/home/ExploreFeatures.astro | 10 +++++++-- src/components/home/HomeIntroduce.astro | 26 +++++++++++++++++++++-- src/i18n/en/ui.ts | 2 ++ src/i18n/zh-cn/ui.ts | 2 ++ 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/src/components/home/ExploreFeatures.astro b/src/components/home/ExploreFeatures.astro index b991ed57969..4666df73d0d 100644 --- a/src/components/home/ExploreFeatures.astro +++ b/src/components/home/ExploreFeatures.astro @@ -17,7 +17,7 @@ const t = useTranslations(Astro); {t('home.features.1.summary')} -
    +
    {t('home.features.1.explain')}
    @@ -29,7 +29,7 @@ const t = useTranslations(Astro); {t('home.features.2.summary')} -
    +
    {t('home.features.2.explain')}
    @@ -132,6 +132,9 @@ customElements.define("explore-features", ExploreFeatures); width: 100%; height: 1rem; } + .bottom-features .discovery .hover-title { + bottom: .5rem; + } .bottom-features .item { width: 100%; height: 20rem; @@ -174,6 +177,9 @@ customElements.define("explore-features", ExploreFeatures); height: 100%; width: 1rem; } + .bottom-features .discovery .hover-title { + bottom: .5rem; + } .bottom-features .item { /* width: 31.25rem; */ flex: 1; diff --git a/src/components/home/HomeIntroduce.astro b/src/components/home/HomeIntroduce.astro index 1c73352521e..b00ebfaf902 100644 --- a/src/components/home/HomeIntroduce.astro +++ b/src/components/home/HomeIntroduce.astro @@ -24,10 +24,14 @@ const ifzh = isChinese(Astro); @@ -111,6 +115,12 @@ const ifzh = isChinese(Astro); overflow: hidden; /* border-bottom: 1px solid theme('colors.gray.12'); */ } + .top-section .notes .pc-version-intro { + display: inline; + } + .top-section .notes .mobile-version-intro { + display: none; + } .top-section .shortcut button { height: 3rem; min-height: 3rem; @@ -187,6 +197,12 @@ const ifzh = isChinese(Astro); font-size: 1.875rem; line-height: 2.25rem; } + .top-section .notes .pc-version-intro { + display: none; + } + .top-section .notes .mobile-version-intro { + display: inline; + } .top-section .shortcut button { height: 2rem; min-height: 2rem; @@ -220,6 +236,12 @@ const ifzh = isChinese(Astro); .bottom-section { width: 100%; } + .top-section .notes .pc-version-intro { + display: none; + } + .top-section .notes .mobile-version-intro { + display: inline; + } .bottom-section .desc div { overflow: hidden; display: -webkit-box; diff --git a/src/i18n/en/ui.ts b/src/i18n/en/ui.ts index 4fbe0a577ee..8836c166f2e 100644 --- a/src/i18n/en/ui.ts +++ b/src/i18n/en/ui.ts @@ -52,7 +52,9 @@ export default { 'home.introduce.nacos.manual': 'MANUAL', 'home.introduce.nacos.notes': 'Released on Nov 30, 2023', 'home.introduce.nacos.release.note.1': 'Release Note of V2.3.0', + 'home.introduce.nacos.release.note.1.mobile': 'V2.3.0', 'home.introduce.nacos.release.note.2': 'Release Note of V1.4.6', + 'home.introduce.nacos.release.note.2.mobile': 'V1.4.6', 'home.introduce.nacos.define': 'Nacos /nɑ:kəʊs/, acronym for Naming and Configuration Service, is a dynamic service discovery, configuration management, and service management platform that makes it easier to build cloud-native applications.', 'home.introduce.nacos.aim': 'We believe that everything is a service, with each service node envisioned as a planet and each service as a galaxy. Nacos is dedicated to helping establish connections among these services, and to conveniently aggregate and manage the entire expanse of this celestial space, aiming towards the vast ocean of stars.', 'home.nacos.edge.about': 'CORE FUNCTION', diff --git a/src/i18n/zh-cn/ui.ts b/src/i18n/zh-cn/ui.ts index e579d89c220..bf39e2fae9b 100644 --- a/src/i18n/zh-cn/ui.ts +++ b/src/i18n/zh-cn/ui.ts @@ -52,7 +52,9 @@ export default { 'home.introduce.nacos.manual': '手册', 'home.introduce.nacos.notes': '发布于2023年11月30日', 'home.introduce.nacos.release.note.1': 'V2.3.0 的版本说明', + 'home.introduce.nacos.release.note.1.mobile': 'V2.3.0', 'home.introduce.nacos.release.note.2': 'V1.4.6 的版本说明', + 'home.introduce.nacos.release.note.2.mobile': 'V1.4.6', 'home.introduce.nacos.define': 'Nacos /nɑ:kəʊs/ 是 Naming and Configuration Service 的首字母缩写,是一个更易于构建云原生应用的动态服务发现、配置管理和服务管理平台。', 'home.introduce.nacos.aim': '我们相信一切都是服务,每个服务节点被构想为一个星球,每个服务都是一个星系。Nacos 致力于帮助建立这些服务之间的连接,并方便地聚合和管理整个星空,旨在达到浩瀚星辰的广袤海洋。', 'home.nacos.edge.about': '核心功能', From 382f54a993efb6e25660d9de8f0d3b14e37ca7ce Mon Sep 17 00:00:00 2001 From: jimin Date: Fri, 26 Jan 2024 17:15:56 +0800 Subject: [PATCH 08/66] optimize: add CI workflow (#536) --- .github/workflows/CI.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/CI.yml diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml new file mode 100644 index 00000000000..14a9d0ae629 --- /dev/null +++ b/.github/workflows/CI.yml @@ -0,0 +1,24 @@ +name: CI + +on: [pull_request] + +jobs: + Build: + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [18.x] + + steps: + - uses: actions/checkout@v1 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - name: Npm install and build + run: | + npm install + npm run build --if-present + env: + CI: true \ No newline at end of file From c2e393b5c6f41b115160046a0f118bdb06aecbcd Mon Sep 17 00:00:00 2001 From: jimin Date: Fri, 26 Jan 2024 17:23:18 +0800 Subject: [PATCH 09/66] optimize: add PR template (#537) --- PULL_REQUEST_TEMPLATE.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 PULL_REQUEST_TEMPLATE.md diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000000..20baacfa3c8 --- /dev/null +++ b/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## What is the purpose of the change + +XXXXX + +## Brief changelog + +XXXXX + +Follow this checklist to help us incorporate your contribution quickly and easily: + +- [x] Make sure there is a [GITHUB_issue](https://github.com/nacos-group/nacos-group.github.io/issues) 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 `Fix UnknownException when host config not exist #XXX`. 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. +- [ ] Test your code locally by running `npm run build`, and make sure it works as expected. +- [ ] Make sure no files under build directory is added. +- [ ] If this contribution is large, please file an [Apache Individual Contributor License Agreement](http://www.apache.org/licenses/#clas). \ No newline at end of file From 8716d7e5cbdd87a184fe8024ebe571672620d971 Mon Sep 17 00:00:00 2001 From: mamba <371510756@qq.com> Date: Sat, 27 Jan 2024 00:43:15 +0800 Subject: [PATCH 10/66] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=86=85=E9=93=BE404=20=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?(#539)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../blog/announcement-nacos-security-problem-note.md | 2 +- src/content/blog/announcement-token-secret-key.md | 4 ++-- src/content/blog/cooperate-chengdu-dubbo.md | 2 +- src/content/blog/ecosystem-apisix.md | 2 +- src/content/blog/release-210.md | 7 ++++--- src/content/blog/release-212-and-220beta.md | 6 +++--- src/content/blog/release-220.md | 6 +++--- src/content/blog/release-230-beta.md | 6 +++--- src/content/blog/release-nacos05.md | 2 +- src/content/blog/release-nacos06.md | 2 +- src/content/blog/release-nacos08.md | 2 +- src/content/blog/release-nacos100.md | 9 +++++---- src/content/blog/release-nacos110.md | 2 +- 13 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/content/blog/announcement-nacos-security-problem-note.md b/src/content/blog/announcement-nacos-security-problem-note.md index 533a496f27c..806c18720b7 100644 --- a/src/content/blog/announcement-nacos-security-problem-note.md +++ b/src/content/blog/announcement-nacos-security-problem-note.md @@ -19,7 +19,7 @@ identity来设置服务端之间通信的安全认证,不再简单使用UA进 [download page](https://github.com/alibaba/nacos/releases/tag/1.4.1). -[document](https://nacos.io/zh-cn/docs/auth.html). +[document](https://nacos.io/docs/latest/guide/user/auth/). # 关于Nacos的部署建议 diff --git a/src/content/blog/announcement-token-secret-key.md b/src/content/blog/announcement-token-secret-key.md index 8fad100717d..639a89c2973 100644 --- a/src/content/blog/announcement-token-secret-key.md +++ b/src/content/blog/announcement-token-secret-key.md @@ -14,7 +14,7 @@ category: announcement > 说明:这两个默认值原意是为了方便新用户在快速搭建新集群进行使用时可以减少一些繁琐步骤,更简单的使用nacos,在实际部署时提供机制修改配置来提高安全性;随着社区用户对安全性要求提升,默认值可能会导致部分用户未修改直接使用时出现安全风险,因此Nacos社区去除了默认值,并在启动时进行校验,阻止启动提示用户配置。 -使用旧版本的用户请根据[文档](https://nacos.io/zh-cn/docs/v2/guide/user/auth.html)进行环境检查,查看是否使用了默认的`token.secret.key`、`nacos.core.auth.server.identity.key` 和 `nacos.core.auth.server.identity.value`,如仍然使用默认值,请参考文档内容尽快进行修改。 +使用旧版本的用户请根据[文档](https://nacos.io/docs/v2/guide/user/auth/)进行环境检查,查看是否使用了默认的`token.secret.key`、`nacos.core.auth.server.identity.key` 和 `nacos.core.auth.server.identity.value`,如仍然使用默认值,请参考文档内容尽快进行修改。 新部署环境请使用最新2.2.1版本部署,并根据文档设置`token.secret.key`、`nacos.core.auth.server.identity.key` 和 `nacos.core.auth.server.identity.value`,并尽快修改默认密码。 @@ -58,6 +58,6 @@ nacos.core.auth.plugin.nacos.token.expire.seconds=5 ### 解决方式 -按照[文档](https://nacos.io/zh-cn/docs/v2/guide/user/auth.html)提示,先开启userAgent白名单,在变更新`server.identity`后,立刻关闭userAgent白名单。 +按照[文档](https://nacos.io/docs/latest/guide/user/auth/)提示,先开启userAgent白名单,在变更新`server.identity`后,立刻关闭userAgent白名单。 或保证变更`server.identity`期间,不进行业务应用的变更。 diff --git a/src/content/blog/cooperate-chengdu-dubbo.md b/src/content/blog/cooperate-chengdu-dubbo.md index 960d5e03cec..89fa3cb809e 100644 --- a/src/content/blog/cooperate-chengdu-dubbo.md +++ b/src/content/blog/cooperate-chengdu-dubbo.md @@ -61,5 +61,5 @@ Nacos强调社区化的发展与社区的多样性,采取PMC和Committer机制 画外音:我们准备了40个Nacos限量版纪念品,用于奖励参与“Nacos有奖活动”的开发者。 活动链接: -https://nacos.io/zh-cn/docs/activity.html +https://nacos.io/activity/ diff --git a/src/content/blog/ecosystem-apisix.md b/src/content/blog/ecosystem-apisix.md index 5aa604d6451..dd8e1049b1c 100644 --- a/src/content/blog/ecosystem-apisix.md +++ b/src/content/blog/ecosystem-apisix.md @@ -50,7 +50,7 @@ Apache APISIX + Nacos 可以将各个微服务节点中与业务无关的各项 - 操作系统 Centos 7.9。 - 已安装 Apache APISIX 12.1.0,详情请参考:[Apache APISIX how-to-bulid](https://apisix.apache.org/zh/docs/apisix/how-to-buildhttps://apisix.apache.org/zh/docs/apisix/how-to-build)。 -- 已安装 Nacos 2.0.4 及以上版本,详情请参考:[quick start](https://nacos.io/zh-cn/docs/quick-start.html)。 +- 已安装 Nacos 2.0.4 及以上版本,详情请参考:[quick start](https://nacos.io/docs/v2/quickstart/quick-start/)。 - 已安装 Node.js,详情请参考:[node.js Installation](https://github.com/nodejs/help/wiki/Installation)。 ## 步骤一:服务注册 diff --git a/src/content/blog/release-210.md b/src/content/blog/release-210.md index 6d55a3ac09c..d64d5d0112f 100644 --- a/src/content/blog/release-210.md +++ b/src/content/blog/release-210.md @@ -73,16 +73,17 @@ category: release #### 鉴权 自从Nacos 1.2 版本加入鉴权功能后,社区对鉴权功能的讨论一直持续。原因是Nacos目前的鉴权系统设计为防止错用及用户隔离。但社区中对鉴权能力的要求不局限于此,为了满足不同的用户对鉴权程度的不同要求。Nacos社区希望设计一套用于鉴权的API,并将其注入到网络请求的流程中。 -Nacos目前的鉴权实现也已经重构成默认的鉴权插件,社区所贡献的LADP也已改造完成,使用方式和以前一致;如果需要开发自定义的鉴权插件,可以参考文档[鉴权插件](https://nacos.io/zh-cn/docs/auth-plugin.html)实现。 +Nacos目前的鉴权实现也已经重构成默认的鉴权插件,社区所贡献的LADP也已改造完成,使用方式和以前一致;如果需要开发自定义的鉴权插件,可以参考文档[鉴权插件](https://nacos.io/docs/v2/plugin/auth-plugin/)实现。 #### 加解密 -在Nacos社区中,许多用户关注配置中某些敏感信息的安全性问题。除了通过鉴权,社区也希望能对配置内容中的敏感信息进行加密。由于用户和开发者所使用或对接的算法和加解密系统可能不同,因此Nacos社区设计了一套用于加解密的API,并将其注入到发布和查询配置的工作流程中。 更多加解密插件的细节可以参考文档[配置加密插件](https://nacos.io/zh-cn/docs/config-encryption.html)。 +在Nacos社区中,许多用户关注配置中某些敏感信息的安全性问题。除了通过鉴权,社区也希望能对配置内容中的敏感信息进行加密。由于用户和开发者所使用或对接的算法和加解密系统可能不同,因此Nacos社区设计了一套用于加解密的API,并将其注入到发布和查询配置的工作流程中。 更多加解密插件的细节可以参考文档[配置加密插件](https://nacos.io/docs/v2/plugin/config-encryption-plugin/)。 ### 默认关闭兼容1.X服务端升级 默认关闭支持服务端从 1.X 版本升级的能力是Nacos2.1.0版本的另一个重要改动。在2.0.X版本中,数据结构进行了一些重新设计,导致和1.X的数据无法直接兼容,为了方便社区用户从1.X平滑升级到Nacos2.0版本,Nacos2.0版本除了兼容1.X的openAPI外,还新增了双写数据等逻辑;但这部分逻辑对系统资源有较大的损耗,并且由于机制较为复杂,导致部分直接使用2.0版本的用户可能会遇到一些版本切换的疑问。因此在Nacos2.1版本中,我们默认关闭了兼容1.X服务端平滑升级能功能,关闭该功能后直接部署2.1版本将不会再从1.X模式进行检测和升级,而是直接运行在2.X的数据模式下,同时也支持2.0版本直接升级2.1版本。 -若是希望从Nacos1.X直接升级到Nacos2.1.0版本,则需要在application.properties文件中设置配置`nacos.core.support.upgrade.from.1x=true`,此时Nacos2.1版本会和Nacos2.0版本一样,以1.X的数据模式启动,并开始自动升级检测,待全集群数据一致,且准备完毕后,切换至2.0数据模式,更多升级相关的内容,请参考文档[升级文档](https://nacos.io/docs/latest/upgrading/200-upgrading/)。 + +若是希望从Nacos1.X直接升级到Nacos2.1.0版本,则需要在application.properties文件中设置配置`nacos.core.support.upgrade.from.1x=true`,此时Nacos2.1版本会和Nacos2.0版本一样,以1.X的数据模式启动,并开始自动升级检测,待全集群数据一致,且准备完毕后,切换至2.0数据模式,更多升级相关的内容,请参考文档[升级文档](https://nacos.io/docs/v2/upgrading/200-upgrading/)。 ### About Nacos diff --git a/src/content/blog/release-212-and-220beta.md b/src/content/blog/release-212-and-220beta.md index ce7c8076e58..c41fefb5857 100644 --- a/src/content/blog/release-212-and-220beta.md +++ b/src/content/blog/release-212-and-220beta.md @@ -14,7 +14,7 @@ category: release 2.1.2 主要增强了控制台的UI效果,变更了控制台的样式,使得内容更加紧凑美观; -另外2.1.2对客户端大小进行了优化,大幅降低了客户端的jar包大小,同时还提供了纯净版java-client,方便没有依赖gRPC或希望使用非shaded版本客户端用户使用,可以到[Java SDK](/zh-cn/docs/v2/guide/user/sdk)中查看纯净版使用方式。 +另外2.1.2对客户端大小进行了优化,大幅降低了客户端的jar包大小,同时还提供了纯净版java-client,方便没有依赖gRPC或希望使用非shaded版本客户端用户使用,可以到[Java SDK](https://nacos.io/docs/latest/guide/user/sdk/)中查看纯净版使用方式。 最后2.1.2修复了许多旧版本的问题,提高了稳定性。具体变更内容可参考变更日志: @@ -65,9 +65,9 @@ category: release 首先,2.2.0将会删除旧的冗余代码,即1.X模式服务发现和双写相关代码。删除后,2.2.0版本将无法从Nacos 1.X服务器升级,只能从至少2.0.0版本升级。此更改不会影响对1.X客户端请求的适配,用户仍然可以使用1.X客户端链接2.2.0版本服务端。 -其次,2.2.0将会合并部分阿里巴巴编程之夏2022和开源之夏2022的课题结果,例如[V2版本的 openAPI](/zh-cn/docs/v2/guide/user/open-api) 和 [数据源插件](/zh-cn/docs/v2/plugin/datasource-plugin)。其他课题也将在未来版本中发布。 +其次,2.2.0将会合并部分阿里巴巴编程之夏2022和开源之夏2022的课题结果,例如[V2版本的 openAPI](https://nacos.io/docs/v2/guide/user/open-api/) 和 [数据源插件](https://nacos.io/docs/v2/plugin/datasource-plugin/)。其他课题也将在未来版本中发布。 -最后,2.2.0增强了在2.1.1版本被列为beta功能的`轨迹追踪插件`和`批量注册`,这使它们更易于使用。关于如何开发和使用`轨迹追踪插件`,可以参考[插件文档](/zh-cn/docs/v2/plugin/trace-plugin)进行开发。 +最后,2.2.0增强了在2.1.1版本被列为beta功能的`轨迹追踪插件`和`批量注册`,这使它们更易于使用。关于如何开发和使用`轨迹追踪插件`,可以参考[插件文档](https://nacos.io/docs/v2/plugin/trace-plugin/)进行开发。 由于这个版本中有许多重要的变化,所以社区计划做一个预发布的BETA版本。根据BETA测试的结果,下一个版本计划是BETA2或GA版本,欢迎广大用户积极[下载](https://github.com/alibaba/nacos/releases/tag/2.2.0-BETA)试用测试,帮助社区尽早发现问题。 diff --git a/src/content/blog/release-220.md b/src/content/blog/release-220.md index 912600e8bea..bec3ba640b9 100644 --- a/src/content/blog/release-220.md +++ b/src/content/blog/release-220.md @@ -20,14 +20,14 @@ Nacos社区于10月分发布了2.2.0-BETA版本,根据近1个多月的社区 首先,2.2.0将会删除旧的冗余代码,即1.X模式服务发现和双写相关代码。删除后,2.2.0版本将无法从Nacos 1.X服务器升级,只能从至少2.0.0版本升级。此更改不会影响对1.X客户端请求的适配,用户仍然可以使用1.X客户端链接2.2.0版本服务端。 -其次,2.2.0添加了数个新的插件支持,例如 [数据源插件](/zh-cn/docs/v2/plugin/datasource-plugin)、[自定义环境变量插件](/zh-cn/docs/v2/plugin/custom-environment-plugin)和`限流管控插件`。 +其次,2.2.0添加了数个新的插件支持,例如 [数据源插件](https://nacos.io/docs/v2/plugin/datasource-plugin/)、[自定义环境变量插件](https://nacos.io/docs/v2/plugin/custom-environment-plugin/)和`限流管控插件`。 -其中[自定义环境变量插件](/zh-cn/docs/v2/plugin/custom-environment-plugin)是社区需求配置加密数据库密码的需求的升级抽象插件,允许通过插件的方式对nacos服务端启动时的配置进行特殊处理,比如可以配置数据库密码为密文,在插件中进行解密,以此来支持配置加密数据库密码以及后续可能有的其他关于配置特殊处理的需求。 +其中[自定义环境变量插件](https://nacos.io/docs/v2/plugin/custom-environment-plugin/)是社区需求配置加密数据库密码的需求的升级抽象插件,允许通过插件的方式对nacos服务端启动时的配置进行特殊处理,比如可以配置数据库密码为密文,在插件中进行解密,以此来支持配置加密数据库密码以及后续可能有的其他关于配置特殊处理的需求。 `限流管控插件`是将早期开源之夏项目中的连接限流模块进行插件化改造后的插件,可提供用户以扩展的方式编写限流管控能力,以保护Nacos服务端在高压下运行的稳定性。 > 由于限流管控插件的改造还未完全完成,目前将不会发布插件SPI至maven仓库中,想要尝试的开发者或用户可以根据Nacos 源代码中 plugin/control 下的SPI先行拓展使用,帮助社区更早的发现问题。 -最后,2.2.0增强了在2.1.1版本被列为beta功能的`轨迹追踪插件`和`批量注册`,这使它们更易于使用。关于如何开发和使用`轨迹追踪插件`,可以参考[插件文档](/zh-cn/docs/v2/plugin/trace-plugin)进行开发。 +最后,2.2.0增强了在2.1.1版本被列为beta功能的`轨迹追踪插件`和`批量注册`,这使它们更易于使用。关于如何开发和使用`轨迹追踪插件`,可以参考[插件文档](https://nacos.io/docs/v2/plugin/trace-plugin/)进行开发。 2.2.0 版本具体变更内容可参考变更日志: diff --git a/src/content/blog/release-230-beta.md b/src/content/blog/release-230-beta.md index 88482c1ac74..dd643a10779 100644 --- a/src/content/blog/release-230-beta.md +++ b/src/content/blog/release-230-beta.md @@ -15,7 +15,7 @@ category: release 2.2.0版本加入ALPHA版本的反脆弱插件后,社区经过多次重构和修改,提升抽象度和稳定性,终于在2.3.0版本中正式公布了Nacos的反脆弱插件,用于避免Nacos集群在大量请求和连接时导致的容量问题而引发更大规模的故障。 -默认反脆弱实现插件的使用以及自定义反脆弱插件的开发可参考文档[反脆弱插件](/zh-cn/docs/v2/plugin/control-plugin.html). +默认反脆弱实现插件的使用以及自定义反脆弱插件的开发可参考文档[反脆弱插件](https://nacos.io/docs/v2/plugin/control-plugin/). ### Nacos 配置变更插件 @@ -23,7 +23,7 @@ Nacos配置管理作为Nacos的核心功能,一直受到开发人员、运维 由于Nacos配置管理本身对配置内容是不感知的,且各个用户公司的审计、通知系统也各不相同,因此Nacos为了能够更广阔的适配各个用户的诉求,在去年的开源之夏中制定了配置变更插件的课题,希望以插件化的形式,来满足对配置变更过程的介入。 -经过同学和导师长期的努力,该插件在2.3.0版本发布,用户可以开发自定义插件,在配置变更前和变更完成后,分别对接公司的审计系统和通知系统,并在变更前进行更多的校验操作,如格式校验,配置名字的规范化等。同时Nacos社区也提供了默认插件的实现,可接入webhook进行配置变更的通知以及导入配置的文件名校验等;详情可参考文档[配置变更插件](/zh-cn/docs/v2/plugin/config-change-plugin.html) +经过同学和导师长期的努力,该插件在2.3.0版本发布,用户可以开发自定义插件,在配置变更前和变更完成后,分别对接公司的审计系统和通知系统,并在变更前进行更多的校验操作,如格式校验,配置名字的规范化等。同时Nacos社区也提供了默认插件的实现,可接入webhook进行配置变更的通知以及导入配置的文件名校验等;详情可参考文档[配置变更插件](https://nacos.io/docs/v2/plugin/config-change-plugin/) ### Nacos 请求参数校验 @@ -31,7 +31,7 @@ Nacos配置管理作为Nacos的核心功能,一直受到开发人员、运维 在2.3.0版本中,Nacos明确了参数校验规则,在服务端实现了统一的参数校验逻辑并添加了参数校验层,根据校验规则对客户端向服务端发送的请求进行校验。用户可以选择开启参数校验功能,开启后Nacos将会对客户端向服务端发送的请求中的部分参数进行参数校验,确保参数的合法性,避免由于错误使用,导致的不符合预期以及性能问题。 -详细情况可参考文档[参数校验规则](/zh-cn/docs/v2/guide/user/parameters-check.html) +详细情况可参考文档[参数校验规则](https://nacos.io/docs/v2/guide/user/parameters-check/) ### Nacos 能力协商 diff --git a/src/content/blog/release-nacos05.md b/src/content/blog/release-nacos05.md index 13e4230b561..188e92e71e3 100644 --- a/src/content/blog/release-nacos05.md +++ b/src/content/blog/release-nacos05.md @@ -108,7 +108,7 @@ Nacos支持服务、集群和实例多级别的元数据信息,与服务实例 随着 [Spring Cloud for Alibaba 0.2.0 的发布](https://spring.io/blog/2018/10/30/spring-cloud-for-alibaba-0-2-0-released),Nacos Configuration, Nacos Service Discovery 和 Sentinel Circuite Breaker 都已一网而聚之。 -想了解如何在Spring Cloud中快速开始使用 Nacos 做配置中心和服务发现,可以点击[这里](https://nacos.io/zh-cn/docs/quick-start-spring-cloud.html)。 +想了解如何在Spring Cloud中快速开始使用 Nacos 做配置中心和服务发现,可以点击[这里](https://nacos.io/docs/latest/ecology/use-nacos-with-spring-cloud/)。 ## 持续优化用户体验 diff --git a/src/content/blog/release-nacos06.md b/src/content/blog/release-nacos06.md index f2de85a0e9d..a6197fca114 100644 --- a/src/content/blog/release-nacos06.md +++ b/src/content/blog/release-nacos06.md @@ -36,7 +36,7 @@ __Nacos__ 从 __v0.6__ 版本开始,支持 __Dubbo__ 注册中心和配置中 ### Dubbo融合Nacos -Nacos 作为 Dubbo 生态系统中重要的注册中心基础设施,其中 [dubbo-registry-nacos](https://github.com/dubbo/dubbo-registry-nacos) 是 Dubbo 融合 Nacos 注册中心的桥梁,它基于 Dubbo 强大的[注册中心 SPI ](http://dubbo.apache.org/zh-cn/docs/dev/impls/registry.html) 以及 Nacos Naming 服务,提供实时的服务注册和发现。目前 [dubbo-registry-nacos](https://github.com/dubbo/dubbo-registry-nacos) 处于 preview 阶段,最新的发布版本为 `0.0.2`,已测试最新的 Dubbo 以及 Dubbo OPS,推荐开发人员使用最新的 Dubbo `2.6.5` 以及 Nacos `0.6.1` ,确保享受最佳体验。如果您现在正在使用 Zookeeper 或者 Redis 作为注册中心的话,迁移到 Nacos 的部分也非常简单,以 Zookeeper 为例: +Nacos 作为 Dubbo 生态系统中重要的注册中心基础设施,其中 [dubbo-registry-nacos](https://github.com/dubbo/dubbo-registry-nacos) 是 Dubbo 融合 Nacos 注册中心的桥梁,它基于 Dubbo 强大的[注册中心 SPI ](https://cn.dubbo.apache.org/zh-cn/overview/mannual/java-sdk/reference-manual/spi/description/) 以及 Nacos Naming 服务,提供实时的服务注册和发现。目前 [dubbo-registry-nacos](https://github.com/dubbo/dubbo-registry-nacos) 处于 preview 阶段,最新的发布版本为 `0.0.2`,已测试最新的 Dubbo 以及 Dubbo OPS,推荐开发人员使用最新的 Dubbo `2.6.5` 以及 Nacos `0.6.1` ,确保享受最佳体验。如果您现在正在使用 Zookeeper 或者 Redis 作为注册中心的话,迁移到 Nacos 的部分也非常简单,以 Zookeeper 为例: * 场景一:外部化配置 diff --git a/src/content/blog/release-nacos08.md b/src/content/blog/release-nacos08.md index 73cb6c099d7..69bf03e5aa4 100644 --- a/src/content/blog/release-nacos08.md +++ b/src/content/blog/release-nacos08.md @@ -39,7 +39,7 @@ Nacos 通过micrometer统计了运行时的核心指标:

    grafana具备强大的的数据可视化能力,能将采集的数据展示出来,支持多种数据源。同时可对重要指标配置告警规则,数据达到阈值时可以通知相关负责人。
    Nacos官网提供了结合prometheus和grafana实现metrics监控


    ![](https://intranetproxy.alipay.com/skylark/lark/0/2019/png/53357/1548122164953-6011a9ee-a521-447c-a871-7ebcf10c2ce4.png#align=left&display=inline&height=417&linkTarget=_blank&originHeight=1584&originWidth=2832&size=0&width=746) -具体的详情可以参考官网[监控文档](https://nacos.io/zh-cn/docs/monitor-guide.html)。 +具体的详情可以参考官网[监控文档](https://nacos.io/docs/v1/guide/admin/monitor-guide/)。 ### ### Nacos-Sync 支持服务平滑迁移 diff --git a/src/content/blog/release-nacos100.md b/src/content/blog/release-nacos100.md index 6e8e28a806d..e614d1d2999 100644 --- a/src/content/blog/release-nacos100.md +++ b/src/content/blog/release-nacos100.md @@ -122,11 +122,12 @@ Nacos 1.0.0 支持了 MySQL 8.0 驱动。您只需要将8.0版本的驱动jar包 服务发现和配置管理的完整 API 列表会发布到官网 -*地址:https://nacos.io/docs/latest/open-api/* +*地址:https://nacos.io/docs/v1/open-api/* + 除了核心功能外,也包含部分运维接口,方便开发者进行集成。同时对于 Nacos 的数据模型、集群模型、架构设计及模块设计文档进行了更新 -*地址:https://nacos.io/zh-cn/docs/architecture.html* +*地址:https://nacos.io/docs/v1/architecture/* ### 性能测试报告发布 @@ -146,9 +147,9 @@ Nacos 1.0.0 进行了性能测试,针对服务发现和配置管理的读写 目前压测报告已经更新到官网: -*https:**//nacos.io/zh-cn/docs/nacos-naming-benchmark.html* +*https:**//nacos.io/docs/v1/nacos-naming-benchmark.html* -*https:**//nacos.io/zh-cn/docs/nacos-config-benchmark.html* +*https:**//nacos.io/docs/v1/nacos-config-benchmark/* diff --git a/src/content/blog/release-nacos110.md b/src/content/blog/release-nacos110.md index 34d0355e29b..b885c6f014a 100644 --- a/src/content/blog/release-nacos110.md +++ b/src/content/blog/release-nacos110.md @@ -212,7 +212,7 @@ Nacos 社区正在蓬勃发展,截止到发文为止,Nacos 已经有 9 个 为了能够与代码贡献者更方便的交流,我们组建了钉钉群“Nacos社区核心贡献小组(**23335652**)”,这个群里都是都是对Nacos贡献非常感兴趣的小伙伴,如果你也想成为Nacos贡献者,甚至成为Committer,欢迎加入这个群和群里的小伙伴一起切磋! -在Nacos官网 [nacos.io](http://nacos.io/) 中,已经添加[团队介绍页](https://nacos.io/zh-cn/docs/nacos-dev.html),里面包括Nacos的开发者角色定义及职责划分,同时包含了Naocs的开发者们介绍和靓照哦,欢迎大家加入Nacos社区,贡献社区。用Apache的话说,**“社区高于代码”!** +在Nacos官网 [nacos.io](http://nacos.io/) 中,已经添加[团队介绍页](https://nacos.io/docs/latest/community/nacos-dev/),里面包括Nacos的开发者角色定义及职责划分,同时包含了Naocs的开发者们介绍和靓照哦,欢迎大家加入Nacos社区,贡献社区。用Apache的话说,**“社区高于代码”!** ![](https://cdn.nlark.com/lark/0/2018/png/15914/1542704700864-a9d54856-9bf6-4176-b449-c13fa02c5800.png#align=left&display=inline&height=387&linkTarget=_blank&originHeight=888&originWidth=1716&width=748#align=left&display=inline&height=386&originHeight=888&originWidth=1716&status=done&width=746) From 1a1fc18121abd6a7a0f73afad630568ef118e2dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 27 Jan 2024 00:44:00 +0800 Subject: [PATCH 11/66] chore(deps): bump vite from 5.0.11 to 5.0.12 (#538) Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.0.11 to 5.0.12. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v5.0.12/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.0.12/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index cf4102983a2..9be44ced840 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7088,9 +7088,9 @@ } }, "node_modules/vite": { - "version": "5.0.11", - "resolved": "https://registry.npmmirror.com/vite/-/vite-5.0.11.tgz", - "integrity": "sha512-XBMnDjZcNAw/G1gEiskiM1v6yzM4GE5aMGvhWTlHAYYhxb7S3/V1s3m2LDHa8Vh6yIWYYB0iJwsEaS523c4oYA==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz", + "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==", "dependencies": { "esbuild": "^0.19.3", "postcss": "^8.4.32", @@ -7102,6 +7102,9 @@ "engines": { "node": "^18.0.0 || >=20.0.0" }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, "optionalDependencies": { "fsevents": "~2.3.3" }, From 681d70be903d93e328718964b9fa953ed2f75b97 Mon Sep 17 00:00:00 2001 From: mamba <371510756@qq.com> Date: Sat, 27 Jan 2024 11:28:52 +0800 Subject: [PATCH 12/66] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=9A=E5=AE=A2?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=86=85=E9=93=BE404=20=E9=97=AE=E9=A2=98&?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=96=87=E6=A1=88=20=E4=BF=AE=E6=94=B9=20(#5?= =?UTF-8?q?40)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 🎸 修复内容内链404 问题 * feat: 🎸 首页文案 修改 --- src/components/common/Footer.astro | 2 +- src/components/home/ExploreFeatures.astro | 6 +++--- src/components/home/NacosEBook.astro | 4 ++-- src/i18n/en/ui.ts | 11 +++-------- src/i18n/zh-cn/ui.ts | 12 +++--------- 5 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/components/common/Footer.astro b/src/components/common/Footer.astro index 8da3fa8a01e..7ae0dd1d136 100644 --- a/src/components/common/Footer.astro +++ b/src/components/common/Footer.astro @@ -96,7 +96,7 @@ import Button from '@components/common/Button.astro'; href="/download/nacos-server/" class="text-[.875rem] font-medium leading-5 tracking-normal mb-4 text-gray-04 no-underline" > - {t('commmon.footer.actions.download')} + {t('commmon.actions.download')}
  • diff --git a/src/components/home/ExploreFeatures.astro b/src/components/home/ExploreFeatures.astro index 4666df73d0d..2a9c64504ce 100644 --- a/src/components/home/ExploreFeatures.astro +++ b/src/components/home/ExploreFeatures.astro @@ -12,7 +12,7 @@ const t = useTranslations(Astro);
    -
    {t('home.features.1.title')}
    +
    1.
    {t('home.features.1.summary')}
    @@ -24,7 +24,7 @@ const t = useTranslations(Astro);
    - {t('home.features.2.title')} + 2.
    {t('home.features.2.summary')}
    @@ -37,7 +37,7 @@ const t = useTranslations(Astro);
    - {t('home.features.3.title')} + 3.
    {t('home.features.3.summary')} diff --git a/src/components/home/NacosEBook.astro b/src/components/home/NacosEBook.astro index 1b37ffeab8f..573ab855ebd 100644 --- a/src/components/home/NacosEBook.astro +++ b/src/components/home/NacosEBook.astro @@ -20,7 +20,7 @@ const t = useTranslations(Astro); class="rounded-3xl" href="/docs/ebook/kbyo6n.mdx/" > - {t('home.ebook.download')} + {t('commmon.actions.download')}
    @@ -34,7 +34,7 @@ const t = useTranslations(Astro); {t('home.ebook.nacos')}
    - +
    diff --git a/src/i18n/en/ui.ts b/src/i18n/en/ui.ts index 8836c166f2e..c22e1a7bac3 100644 --- a/src/i18n/en/ui.ts +++ b/src/i18n/en/ui.ts @@ -1,6 +1,5 @@ export default { // website - 'commmon.header.menu.docs': 'DOCS', 'commmon.header.menu.cloud': 'NACOS CLOUD', 'commmon.header.menu.comm': 'COMMUNITY', 'commmon.header.menu.demo': 'DEMO', @@ -42,7 +41,7 @@ export default { 'commmon.footer.actions.comm': 'Ebook', 'commmon.footer.actions.mse': 'Cloud Service MSE', 'commmon.footer.actions.edas': 'Cloud Service EDAS', - 'commmon.footer.actions.download': 'Download', + 'commmon.actions.download': 'Download', 'home.title': 'Dynamic service discovery, configuration management and service management platform Nacos', 'home.description': 'Nacos by providing simple and easy to use dynamic service discovery, service configuration, service sharing and management and other service infrastructure, to help users in the cloud native era, in the private cloud, hybrid cloud or public cloud and all cloud environments, better build, deliver, manage their own microservice platform, faster reuse and combination of business services, faster delivery of business innovation value, So as to win the market for users', @@ -57,7 +56,7 @@ export default { 'home.introduce.nacos.release.note.2.mobile': 'V1.4.6', 'home.introduce.nacos.define': 'Nacos /nɑ:kəʊs/, acronym for Naming and Configuration Service, is a dynamic service discovery, configuration management, and service management platform that makes it easier to build cloud-native applications.', 'home.introduce.nacos.aim': 'We believe that everything is a service, with each service node envisioned as a planet and each service as a galaxy. Nacos is dedicated to helping establish connections among these services, and to conveniently aggregate and manage the entire expanse of this celestial space, aiming towards the vast ocean of stars.', - 'home.nacos.edge.about': 'CORE FUNCTION', + 'home.nacos.edge.about': 'Main features', 'home.nacos.edge.title': 'Continue to enhance open source capabilities', 'home.nacos.edge.1.title': 'EASY', 'home.nacos.edge.1.description': 'One-stop solution for dynamic service discovery. Configuration management and dynamic DNS service 20+ out-of-the-box features for service-centric architectures Light-weight production-ready console', @@ -69,16 +68,12 @@ export default { 'home.nacos.edge.4.description': 'Supports rate throttling, big promotion plans, and multi-region active-active architectures Supports a variety of relevant internet-based use cases directly or with slight extension Traffic scheduling & service governance', 'home.ebook.resource': 'RESOURCES', 'home.ebook.nacos': 'E-Book Nacos', - 'home.ebook.download': 'DOWNLOAD', - 'home.features.about': 'CONTINUOUS EVOLUTION', + 'home.features.about': 'Core functions', 'home.features.title': 'Explore Our Features', - 'home.features.1.title': '1.', 'home.features.1.summary': 'Dynamic Configuration Service', 'home.features.1.explain': 'Dynamic Configuration Service allows you to manage configurations in all environments in a centralized, externalized, and dynamic approach. Dynamic configuration saves you from redeploying your applications and services when configuration is updated. You can implement stateless services and achieve on-demand scaling effortlessly.', - 'home.features.2.title': '2.', 'home.features.2.summary': 'Service Discovery and Management', 'home.features.2.explain': 'Dynamic Service Discovery is key to service-centric (for example microservice or cloud-native) architectures. Nacos supports both DNS-based and RPC-based (Dubbo, gRPC) service discovery, and provides real-time service health checks to prevent routing requests from being sent to unhealthy hosts or service instances. With Nacos, you can also implement circuit breakers for your services with ease.', - 'home.features.3.title': '3.', 'home.features.3.summary': 'Dynamic DNS Service', 'home.features.3.explain': 'By supporting weighted routing, Dynamic DNS Service helps you implement mid-tier load balancing, more flexible routing, traffic control and DNS resolution services in the production environment within your data center. Dynamic DNS Service also makes it easier for you to implement DNS-based service discovery, which minimizes the risk of coupling to vendor-specific service discovery APIs.', 'home.use.companies.about': 'SELECTION OF SOME COMPANIES', diff --git a/src/i18n/zh-cn/ui.ts b/src/i18n/zh-cn/ui.ts index bf39e2fae9b..d4bc1ffb79b 100644 --- a/src/i18n/zh-cn/ui.ts +++ b/src/i18n/zh-cn/ui.ts @@ -1,6 +1,5 @@ export default { // website - 'commmon.header.menu.docs': '文档', 'commmon.header.menu.cloud': '企业版 NACOS', 'commmon.header.menu.comm': '社区', 'commmon.header.menu.demo': '控制台样例', @@ -42,7 +41,7 @@ export default { 'commmon.footer.actions.comm': '电子书', 'commmon.footer.actions.mse': '云服务 MSE', 'commmon.footer.actions.edas': '云服务 EDAS', - 'commmon.footer.actions.download': '前往下载', + 'commmon.actions.download': '前往下载', 'home.title': '动态服务发现、配置管理和服务管理平台 Nacos', 'home.description': 'Nacos 通过提供简单易用的动态服务发现、服务配置、服务共享与管理等服务基础设施,帮助用户在云原生时代,在私有云、混合云或者公有云等所有云环境中,更好的构建、交付、管理自己的微服务平台,更快的复用和组合业务服务,更快的交付商业创新的价值,从而为用户赢得市场。', @@ -57,7 +56,7 @@ export default { 'home.introduce.nacos.release.note.2.mobile': 'V1.4.6', 'home.introduce.nacos.define': 'Nacos /nɑ:kəʊs/ 是 Naming and Configuration Service 的首字母缩写,是一个更易于构建云原生应用的动态服务发现、配置管理和服务管理平台。', 'home.introduce.nacos.aim': '我们相信一切都是服务,每个服务节点被构想为一个星球,每个服务都是一个星系。Nacos 致力于帮助建立这些服务之间的连接,并方便地聚合和管理整个星空,旨在达到浩瀚星辰的广袤海洋。', - 'home.nacos.edge.about': '核心功能', + 'home.nacos.edge.about': '主要特性', 'home.nacos.edge.title': '持续增强开源能力', 'home.nacos.edge.1.title': '易用', 'home.nacos.edge.1.description': '动态服务发现的一站式解决方案。配置管理和动态 DNS服务。提供 20 多项开箱即用的特性,适用于面向服务的架构。轻量级的生产就绪控制台。', @@ -69,16 +68,12 @@ export default { 'home.nacos.edge.4.description': '支持速率限制、大规模推广计划和多区域主动-主动架构。直接或稍作扩展支持各种相关的基于互联网的使用案例。流量调度和服务治理。', 'home.ebook.resource': '资源', 'home.ebook.nacos': 'Nacos 电子书', - 'home.ebook.download': '前往下载', - 'home.features.about': '持续演进', + 'home.features.about': '核心功能', 'home.features.title': '探索特性', - 'home.features.1.title': '1.', 'home.features.1.summary': '动态配置服务', 'home.features.1.explain': '动态配置服务让您能够以中心化、外部化和动态化的方式管理所有环境的配置。动态配置消除了配置变更时重新部署应用和服务的需要。配置中心化管理让实现无状态服务更简单,也让按需弹性扩展服务更容易。', - 'home.features.2.title': '2.', 'home.features.2.summary': '服务发现和管理', 'home.features.2.explain': '动态服务发现对以服务为中心的(例如微服务和云原生)应用架构方式非常关键。Nacos 支持 DNS-Based 和 RPC-Based(Dubbo、gRPC)模式的服务发现。Nacos 也提供实时健康检查,以防止将请求发往不健康的主机或服务实例。借助 Nacos,您可以更容易地为您的服务实现断路器。', - 'home.features.3.title': '3.', 'home.features.3.summary': '动态 DNS 服务', 'home.features.3.explain': '通过支持权重路由,动态 DNS 服务能让您轻松实现中间层负载均衡、更灵活的路由策略、流量控制以及简单数据中心内网的简单 DNS 解析服务。动态 DNS 服务还能让您更容易地实现以 DNS 协议为基础的服务发现,以消除耦合到厂商私有服务发现 API 上的风险。', 'home.use.companies.about': '服务千行百业,为企业创新提速', @@ -104,7 +99,6 @@ export default { 'home.solutions.card.keyword.grayscale':'全链路灰度能力', 'home.solutions.card.keyword.service_governance':'服务治理', - 'cloud.title': 'Nacos Cloud', 'cloud.description': 'Nacos Cloud 专为云原生应用设计,提供强大的服务发现、动态配置管理和服务管理功能,支持高效的应用开发和运维。', 'cloud.introduce.about': '关于 Nacos', From 0361e21adc2c14fde463625ffbadf363f57aace5 Mon Sep 17 00:00:00 2001 From: shonen <83808926@qq.com> Date: Sat, 27 Jan 2024 11:39:24 +0800 Subject: [PATCH 13/66] =?UTF-8?q?fix:=20fetch=E8=83=BD=E5=8A=9B=E5=B0=81?= =?UTF-8?q?=E8=A3=85=20#507=20(#531)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 3 ++ package.json | 1 + src/components/home/StarAndFork.astro | 8 ++- src/components/starlight/ContributeMenu.astro | 2 +- src/components/starlight/FeedbackButton.astro | 42 ++++++++++----- src/i18n/en/ui.ts | 1 + src/i18n/util.ts | 2 +- src/i18n/zh-cn/ui.ts | 1 + src/utils/sendFetch.ts | 53 +++++++++++++++++++ src/{ => utils}/util.ts | 0 tsconfig.json | 1 + virtual.d.ts | 1 + 12 files changed, 95 insertions(+), 20 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 src/utils/sendFetch.ts rename src/{ => utils}/util.ts (100%) diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000000..0a770118020 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "editor.tabSize": 2 +} \ No newline at end of file diff --git a/package.json b/package.json index 9a2fcea2f82..2285bfb16b8 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "lodash": "^4.17.21", "mdast-util-toc": "^7.0.0", "moment": "^2.29.4", + "qs": "^6.11.2", "rehype-external-links": "^3.0.0", "remark": "^15.0.1", "remark-html": "^16.0.1", diff --git a/src/components/home/StarAndFork.astro b/src/components/home/StarAndFork.astro index eb528bf2187..9378880acfe 100644 --- a/src/components/home/StarAndFork.astro +++ b/src/components/home/StarAndFork.astro @@ -2,10 +2,9 @@ import Star from "../icon/Star.astro"; import Fork from "../icon/Fork.astro"; import Button from '@components/common/Button.astro'; +import sendFetch from "@/utils/sendFetch" -const data = await fetch("https://api.github.com/repos/alibaba/nacos").then( - (r) => r.json() -); +const data = await sendFetch("https://api.github.com/repos/alibaba/nacos") const { stargazers_count: startCount = 0, forks_count: forkCount = 0 } = data || { stargazers_count: 0, forks_count: 0 }; --- @@ -40,5 +39,4 @@ const { stargazers_count: startCount = 0, forks_count: forkCount = 0 } = } } customElements.define("star-and-fork", StarAndFork); - - \ No newline at end of file + \ No newline at end of file diff --git a/src/components/starlight/ContributeMenu.astro b/src/components/starlight/ContributeMenu.astro index 1a766ba7868..514f31eb09e 100644 --- a/src/components/starlight/ContributeMenu.astro +++ b/src/components/starlight/ContributeMenu.astro @@ -1,5 +1,5 @@ --- -import { getLanguageFromURL } from "../../util"; +import { getLanguageFromURL } from "@/utils/util"; import LinkList from "../common/LinkList.astro"; export interface Props { diff --git a/src/components/starlight/FeedbackButton.astro b/src/components/starlight/FeedbackButton.astro index e6889fb3d1f..830322e987b 100644 --- a/src/components/starlight/FeedbackButton.astro +++ b/src/components/starlight/FeedbackButton.astro @@ -90,11 +90,19 @@ export interface Props {

    +
    + \ No newline at end of file diff --git a/src/i18n/en/ui.ts b/src/i18n/en/ui.ts index 87e57568fbc..c46c4979fa6 100644 --- a/src/i18n/en/ui.ts +++ b/src/i18n/en/ui.ts @@ -98,6 +98,10 @@ export default { 'home.solutions.card.keyword.lossless':'Application lossless online and offline', 'home.solutions.card.keyword.grayscale':'Full link grayscale capability', 'home.solutions.card.keyword.service_governance':'service governance', + 'home.contributors.members': 'MEMBERS', + 'home.contributors.our': 'Our', + 'home.contributors.community.stars': 'Community Stars', + 'home.contributors.learn.more': 'LEARN MORE', 'cloud.title': 'Nacos Cloud', 'cloud.description': 'Nacos Cloud is specifically designed for cloud-native applications, providing powerful features for service discovery, dynamic configuration management, and service management. It supports efficient application development and operations.', diff --git a/src/i18n/zh-cn/ui.ts b/src/i18n/zh-cn/ui.ts index 45b7449e4dd..fbd490e989f 100644 --- a/src/i18n/zh-cn/ui.ts +++ b/src/i18n/zh-cn/ui.ts @@ -98,6 +98,10 @@ export default { 'home.solutions.card.keyword.lossless':'应用无损上下线', 'home.solutions.card.keyword.grayscale':'全链路灰度能力', 'home.solutions.card.keyword.service_governance':'服务治理', + 'home.contributors.members': '贡献者', + 'home.contributors.our': '我们的', + 'home.contributors.community.stars': '贡献之星', + 'home.contributors.learn.more': '更多', 'cloud.title': 'Nacos Cloud', 'cloud.description': 'Nacos Cloud 专为云原生应用设计,提供强大的服务发现、动态配置管理和服务管理功能,支持高效的应用开发和运维。', diff --git a/src/pages/en/index.astro b/src/pages/en/index.astro index 6916214b42f..af261a2fe53 100644 --- a/src/pages/en/index.astro +++ b/src/pages/en/index.astro @@ -6,6 +6,7 @@ import NacosEBook from '@components/home/NacosEBook.astro'; import ExploreFeatures from '@components/home/ExploreFeatures.astro'; import HomeCardPlayer from '@components/home/HomeCardPlayer.astro'; import UseCompanies from '@components/home/UseCompanies.astro'; +import Contributors from '@components/home/Contributors.astro'; import HomeSolutionsCard from '@components/home/HomeSolutionsCard.astro'; import HomeFooter from '@components/common/Footer.astro'; import { useTranslations } from "@i18n/util"; @@ -23,6 +24,7 @@ const t = useTranslations(Astro); + diff --git a/src/pages/index.astro b/src/pages/index.astro index 8b9301e5e48..0d279268f6f 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -5,6 +5,7 @@ import ChooseReason from '@components/home/ChooseReason.astro'; import NacosEBook from '@components/home/NacosEBook.astro'; import ExploreFeatures from '@components/home/ExploreFeatures.astro'; import UseCompanies from '@components/home/UseCompanies.astro'; +import Contributors from '@components/home/Contributors.astro'; import HomeSolutionsCard from '@components/home/HomeSolutionsCard.astro'; import HomeFooter from '@components/common/Footer.astro'; import { useTranslations } from "@i18n/util"; @@ -21,6 +22,7 @@ const t = useTranslations(Astro); + From 1f8ac7570982d834e3bb42f6884196323a88c2d4 Mon Sep 17 00:00:00 2001 From: helloyonger <87457323+helloyonger@users.noreply.github.com> Date: Tue, 30 Jan 2024 13:37:42 +0800 Subject: [PATCH 17/66] =?UTF-8?q?feat:=E4=BF=AE=E6=AD=A3contributors?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=AD=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E8=AD=A6=E5=91=8A=20(#545)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/home/Contributors.astro | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/components/home/Contributors.astro b/src/components/home/Contributors.astro index 565e36b651a..32e929f8be3 100644 --- a/src/components/home/Contributors.astro +++ b/src/components/home/Contributors.astro @@ -50,15 +50,6 @@ const getBackgroundRandomColor = () => colorList[Math.floor(Math.random() * col
    - - \ No newline at end of file diff --git a/src/components/home/VideoCard.astro b/src/components/home/VideoCard.astro new file mode 100644 index 00000000000..aad09ed5f2f --- /dev/null +++ b/src/components/home/VideoCard.astro @@ -0,0 +1,124 @@ +--- +interface Props { + src: string; + classes?: string[]; + description: string; +} +const width = "24rem"; +const height = "14rem"; +const { src, description, classes = [] } = Astro.props; +--- + + +
    + +
    {description}
    +
    + + +
    + + + + diff --git a/src/i18n/en/ui.ts b/src/i18n/en/ui.ts index c46c4979fa6..fd257626428 100644 --- a/src/i18n/en/ui.ts +++ b/src/i18n/en/ui.ts @@ -43,7 +43,7 @@ export default { 'commmon.footer.actions.edas': 'Cloud Service EDAS', 'commmon.actions.download': 'Download', - 'home.title': 'Dynamic service discovery, configuration management and service management platform Nacos', + 'home.title': 'Nacos Website | Nacos Official Community | Nacos Download', 'home.description': 'Nacos by providing simple and easy to use dynamic service discovery, service configuration, service sharing and management and other service infrastructure, to help users in the cloud native era, in the private cloud, hybrid cloud or public cloud and all cloud environments, better build, deliver, manage their own microservice platform, faster reuse and combination of business services, faster delivery of business innovation value, So as to win the market for users', 'home.introduce.about': 'ABOUT NACOS', 'home.introduce.title': 'An easy-to-use dynamic service discovery, configuration and service management platform for building cloud native applications', @@ -55,8 +55,8 @@ export default { 'home.introduce.nacos.release.note.2': 'Release Note of V1.4.6', 'home.introduce.nacos.release.note.2.mobile': 'V1.4.6', 'home.introduce.nacos.define': 'Nacos /nɑ:kəʊs/, acronym for Naming and Configuration Service, is a dynamic service discovery, configuration management, and service management platform that makes it easier to build cloud-native applications.', - 'home.introduce.nacos.aim': 'We believe that everything is a service, with each service node envisioned as a planet and each service as a galaxy. Nacos is dedicated to helping establish connections among these services, and to conveniently aggregate and manage the entire expanse of this celestial space, aiming towards the vast ocean of stars.', 'home.nacos.edge.about': 'Main features', + 'home.introduce.nacos.aim': 'We believe that everything is a service, each service node is conceived as a planet, and each service is a galaxy. Nacos is committed to helping build connections between these services, helping every dream of the stars to fly through the clouds, on the cloud, better link the whole sky.', 'home.nacos.edge.title': 'Continue to enhance open source capabilities', 'home.nacos.edge.1.title': 'EASY', 'home.nacos.edge.1.description': 'One-stop solution for dynamic service discovery. Configuration management and dynamic DNS service 20+ out-of-the-box features for service-centric architectures Light-weight production-ready console', diff --git a/src/i18n/zh-cn/ui.ts b/src/i18n/zh-cn/ui.ts index fbd490e989f..086d4eefb2e 100644 --- a/src/i18n/zh-cn/ui.ts +++ b/src/i18n/zh-cn/ui.ts @@ -43,7 +43,7 @@ export default { 'commmon.footer.actions.edas': '云服务 EDAS', 'commmon.actions.download': '前往下载', - 'home.title': '动态服务发现、配置管理和服务管理平台 Nacos', + 'home.title': 'Nacos官网 | Nacos 官方社区 | Nacos 下载', 'home.description': 'Nacos 通过提供简单易用的动态服务发现、服务配置、服务共享与管理等服务基础设施,帮助用户在云原生时代,在私有云、混合云或者公有云等所有云环境中,更好的构建、交付、管理自己的微服务平台,更快的复用和组合业务服务,更快的交付商业创新的价值,从而为用户赢得市场。', 'home.introduce.about': '关于 NACOS', 'home.introduce.title': ' 一个更易于构建云原生应用的动态服务发现、配置管理和服务管理平台', @@ -55,8 +55,8 @@ export default { 'home.introduce.nacos.release.note.2': 'V1.4.6 的版本说明', 'home.introduce.nacos.release.note.2.mobile': 'V1.4.6', 'home.introduce.nacos.define': 'Nacos /nɑ:kəʊs/ 是 Naming and Configuration Service 的首字母缩写,是一个更易于构建云原生应用的动态服务发现、配置管理和服务管理平台。', - 'home.introduce.nacos.aim': '我们相信一切都是服务,每个服务节点被构想为一个星球,每个服务都是一个星系。Nacos 致力于帮助建立这些服务之间的连接,并方便地聚合和管理整个星空,旨在达到浩瀚星辰的广袤海洋。', 'home.nacos.edge.about': '主要特性', + 'home.introduce.nacos.aim': '我们相信一切都是服务,每个服务节点被构想为一个星球,每个服务都是一个星系。Nacos 致力于帮助建立这些服务之间的连接,助力每个面向星辰的梦想能够透过云层,飞在云上,更好的链接整片星空。', 'home.nacos.edge.title': '持续增强开源能力', 'home.nacos.edge.1.title': '易用', 'home.nacos.edge.1.description': '动态服务发现的一站式解决方案。配置管理和动态 DNS服务。提供 20 多项开箱即用的特性,适用于面向服务的架构。轻量级的生产就绪控制台。', From bdd024b52fa34cff42cdb166eba2aa07ed8bcdd5 Mon Sep 17 00:00:00 2001 From: helloyonger <87457323+helloyonger@users.noreply.github.com> Date: Wed, 31 Jan 2024 17:50:40 +0800 Subject: [PATCH 19/66] =?UTF-8?q?feat=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=E5=88=87=E6=8D=A2=E5=99=A8=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20&&=20=E8=A7=A3=E5=86=B3=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AFstarlight=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20(#548)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat:修正contributors页面中语法错误警告 * feat: 移动端翻译切换器样式调整 * feat: 解决移动端starlight组件样式问题 --- src/components/common/LanguageToggle.astro | 49 +++++++++++++--------- src/i18n/en/ui.ts | 1 + src/i18n/zh-cn/ui.ts | 1 + src/style/global.css | 20 +++++++++ 4 files changed, 52 insertions(+), 19 deletions(-) diff --git a/src/components/common/LanguageToggle.astro b/src/components/common/LanguageToggle.astro index 8b0a6e578bd..a02961c3c9d 100644 --- a/src/components/common/LanguageToggle.astro +++ b/src/components/common/LanguageToggle.astro @@ -4,35 +4,46 @@ interface Props { size?: 'large' | 'small'; lang: 'zh-cn' | 'en' | string; } +import { useTranslations } from "@i18n/util"; const { id, size = 'small', lang } = Astro.props; const initialState = lang === 'zh-cn' ? false : true; +const t = useTranslations(Astro); --- - - - + + + + + +
    diff --git a/src/pages/en/activity/activity-detail/[...page].astro b/src/pages/en/activity/activity-detail/[...page].astro new file mode 100644 index 00000000000..2497ceca898 --- /dev/null +++ b/src/pages/en/activity/activity-detail/[...page].astro @@ -0,0 +1,137 @@ +--- +import type { GetStaticPathsOptions } from "astro"; +import BaseLayout from "@layouts/BaseLayout.astro"; +import { getCollection } from "astro:content"; +import Pagination from "@components/common/Pagination.astro"; +import BlogCard from "@components/markdownSet/Card.astro"; +import { ACTIVITY_CATEGORY } from "src/consts"; +import BlogTop from "@components/markdownSet/BlogTop.astro"; +import BaseContainer from '@components/common/BaseContainer.astro'; +import { useTranslations } from '@i18n/util'; +const t = useTranslations(Astro); +interface Post { + slug: string; + body: string; + collection: string; + data: { + title: string; + description: string; + date: string; + keywords?: any[]; + }; +} + +// 分页数据在page参数中传递 +const { page } = Astro.props; + +const allPages = [...Array(page.lastPage).keys()].map((num) => { + return `/activity/activity-detail${num === 0 ? "" : `/${String(num + 1)}`}`; +}); + +export async function getStaticPaths({ paginate }: GetStaticPathsOptions) { + const posts = await getCollection("blog"); + + const sortedPosts = posts.sort( + (a, b) => + new Date(b.data.date).valueOf() - new Date(a.data.date).valueOf(), + ); + + const annoucePosts = sortedPosts.filter((post) => { + return post.data.category === "activity-detail"; + }); + return paginate(annoucePosts, { pageSize: 9 }); +} +--- + + + +
    + +
      + { + page.data.map((post) => ( +
      + +
      + )) + } +
    +
    + + +
    +
    + diff --git a/src/pages/en/activity/activity-preview/[...page].astro b/src/pages/en/activity/activity-preview/[...page].astro new file mode 100644 index 00000000000..8278f4fbe75 --- /dev/null +++ b/src/pages/en/activity/activity-preview/[...page].astro @@ -0,0 +1,139 @@ +--- +import type { GetStaticPathsOptions } from "astro"; +import BaseLayout from "@layouts/BaseLayout.astro"; +import { getCollection } from "astro:content"; +import Pagination from "@components/common/Pagination.astro"; +import BlogCard from "@components/markdownSet/Card.astro"; +import { ACTIVITY_CATEGORY } from "src/consts"; +import BlogTop from "@components/markdownSet/BlogTop.astro"; +import BaseContainer from '@components/common/BaseContainer.astro'; +import { useTranslations } from '@i18n/util'; +const t = useTranslations(Astro); +interface Post { + slug: string; + body: string; + collection: string; + data: { + title: string; + description: string; + date: string; + keywords?: any[]; + }; +} + +// 分页数据在page参数中传递 +const { page } = Astro.props; + +const posts = await getCollection("blog"); + +const allPages = [...Array(page.lastPage).keys()].map((num) => { + return `/activity/activity-preview${num === 0 ? "" : `/${String(num + 1)}`}`; +}); + +export async function getStaticPaths({ paginate }: GetStaticPathsOptions) { + const posts = await getCollection("blog"); + + const sortedPosts = posts.sort( + (a, b) => + new Date(b.data.date).valueOf() - new Date(a.data.date).valueOf(), + ); + + const ecosystemPosts = sortedPosts.filter((post) => { + return post.data.category === "activity-preview"; + }); + return paginate(ecosystemPosts, { pageSize: 9 }); +} +--- + + + +
    + +
      + { + page.data.map((post) => ( +
      + +
      + )) + } +
    +
    + + +
    +
    + diff --git a/src/pages/en/activity/all/[...page].astro b/src/pages/en/activity/all/[...page].astro new file mode 100644 index 00000000000..c1fb854135a --- /dev/null +++ b/src/pages/en/activity/all/[...page].astro @@ -0,0 +1,140 @@ +--- +import type { GetStaticPathsOptions } from "astro"; +import BaseLayout from "@layouts/BaseLayout.astro"; +import { getCollection } from "astro:content"; +import Pagination from "@components/common/Pagination.astro"; +import BlogCard from "@components/markdownSet/Card.astro"; +import { ACTIVITY_CATEGORY } from "src/consts"; +import BlogTop from "@components/markdownSet/BlogTop.astro"; +import BaseContainer from '@components/common/BaseContainer.astro'; +import { useTranslations } from '@i18n/util'; +const t = useTranslations(Astro); +interface Post { + slug: string; + body: string; + collection: string; + data: { + title: string; + description: string; + date: string; + keywords?: any[]; + }; +} + +// 分页数据在page参数中传递 +const { page } = Astro.props; + +const allPages = [...Array(page.lastPage).keys()].map((num) => { + return `/news/all${num === 0 ? "" : `/${String(num + 1)}`}`; +}); + +export async function getStaticPaths({ paginate }: GetStaticPathsOptions) { + const blogCategories = new Set(ACTIVITY_CATEGORY.map((item) => item.type)); + const posts = await getCollection("blog", (item) => + blogCategories.has(item.data.category), + ); + + const sortedPosts = posts.sort( + (a, b) => + new Date(b.data.date).valueOf() - new Date(a.data.date).valueOf(), + ); + return paginate(sortedPosts, { pageSize: 9 }); +} +--- + + + +
    + +
      + { + page.data.map((post) => ( +
      + +
      + )) + } +
    +
    + + +
    +
    + diff --git a/src/pages/en/activity/announcement/[...page].astro b/src/pages/en/activity/announcement/[...page].astro new file mode 100644 index 00000000000..ff022c03efb --- /dev/null +++ b/src/pages/en/activity/announcement/[...page].astro @@ -0,0 +1,140 @@ +--- +import type { GetStaticPathsOptions } from "astro"; +import BaseLayout from "@layouts/BaseLayout.astro"; +import { getCollection } from "astro:content"; +import Pagination from "@components/common/Pagination.astro"; +import BlogCard from "@components/markdownSet/Card.astro"; +import BlogTop from "@components/markdownSet/BlogTop.astro"; +import { ACTIVITY_CATEGORY } from "src/consts"; +import BaseContainer from '@components/common/BaseContainer.astro'; +import { useTranslations } from '@i18n/util'; +const t = useTranslations(Astro); + +interface Post { + slug: string; + body: string; + collection: string; + data: { + title: string; + description: string; + date: string; + keywords?: any[]; + }; +} + +// 分页数据在page参数中传递 +const { page } = Astro.props; + +const posts = await getCollection("blog"); + +const allPages = [...Array(page.lastPage).keys()].map((num) => { + return `/activity/announcement${num === 0 ? "" : `/${String(num + 1)}`}`; +}); + +export async function getStaticPaths({ paginate }: GetStaticPathsOptions) { + const posts = await getCollection("blog"); + + const sortedPosts = posts.sort( + (a, b) => + new Date(b.data.date).valueOf() - new Date(a.data.date).valueOf(), + ); + + const casePosts = sortedPosts.filter((post) => { + return post.data.category === "announcement"; + }); + return paginate(casePosts, { pageSize: 9 }); +} +--- + + + +
    + +
      + { + page.data.map((post) => ( +
      + +
      + )) + } +
    +
    + + +
    +
    + diff --git a/src/pages/en/activity/index.astro b/src/pages/en/activity/index.astro new file mode 100644 index 00000000000..7ae223d5431 --- /dev/null +++ b/src/pages/en/activity/index.astro @@ -0,0 +1,41 @@ +--- +import BaseLayout from "@layouts/BaseLayout.astro"; +import { getCollection } from "astro:content"; +import BlogTop from "@components/markdownSet/BlogTop.astro"; +import Footer from "@components/common/Footer.astro"; +import { ACTIVITY_CATEGORY } from "src/consts"; +import BlogContent from "@components/markdownSet/BlogContent.astro" +import { useTranslations } from '@i18n/util'; +const t = useTranslations(Astro); + +const blogCategories = new Set(ACTIVITY_CATEGORY.map(item => item.type)); + +const posts = await getCollection("blog", (item) => blogCategories.has(item.data.category)); + + +const sortedPosts = posts.sort((a, b) => new Date(b.data.date).valueOf() - new Date(a.data.date).valueOf()); + +const categoryPosts = ACTIVITY_CATEGORY.map(item => ({ + posts: item.type === "all" ? sortedPosts : sortedPosts.filter(post => post.data.category === item.type), + ...item, +})); + +--- + + + + +
    + +
    +
    +
    + diff --git a/src/pages/en/blog/[...slug].astro b/src/pages/en/blog/[...slug].astro index e45d42097ec..fb964fb0d22 100644 --- a/src/pages/en/blog/[...slug].astro +++ b/src/pages/en/blog/[...slug].astro @@ -1,16 +1,15 @@ --- -import { type CollectionEntry, getCollection } from 'astro:content'; -import BlogPost from '@components/markdownSet/MarkdownDetail.astro'; -import TocComponent from '@components/markdownSet/TocComponents/TocComponent.astro'; -import BaseLayout from '@layouts/BaseLayout.astro'; +import { type CollectionEntry, getCollection } from "astro:content"; +import BlogPost from "@components/markdownSet/MarkdownDetail.astro"; +import TocComponent from "@components/markdownSet/TocComponents/TocComponent.astro"; +import BaseLayout from "@layouts/BaseLayout.astro"; -import Sidebar from '@components/starlight/Sidebar.astro'; -import { useTranslations } from '@i18n/util'; -import { Pagination } from 'virtual:starlight/components'; +import Sidebar from "@components/starlight/Sidebar.astro"; +import { useTranslations } from "@i18n/util"; +import { Pagination } from "virtual:starlight/components"; const t = useTranslations(Astro); - export async function getStaticPaths() { const posts = await getCollection("blog"); return posts.map((post) => ({ @@ -20,11 +19,16 @@ export async function getStaticPaths() { } const blogArticle = { - article: 'blog.article.technical', - case: 'blog.article.case.best.practices', - ecosystem: 'blog.article.ecosystem.articles' - -} + 'article': "blog.article.technical", + 'case': "blog.article.case.best.practices", + 'ecosystem': "blog.article.ecosystem.articles", + 'announcement': "blog.activity.community.announcement", + 'release': "blog.activity.release.statement", + 'committer': "page.blog.news.personnel.promotion", + 'cooperate': "page.blog.news.community.cooperation", + "activity-preview": "blog.activity.preview.event", + "activity-detail": "blog.activity.detail.event", +}; type Props = CollectionEntry<"blog">; @@ -35,62 +39,74 @@ const { Content, headings } = await post.render(); const posts = await getCollection("blog"); const sortedPosts = posts.sort( - (a,b)=> new Date(b.data.date).valueOf() - new Date(a.data.date).valueOf() + (a, b) => new Date(b.data.date).valueOf() - new Date(a.data.date).valueOf(), ); -const articlePosts = [{ - type: 'group', - label: blogArticle[post.data.category] ? t(blogArticle[post.data.category]) : post.data.category, - entries: [] -}] - -let currentIndex - -sortedPosts.forEach((item) => { - if ( item.data.category === post.data.category ) { - if (post.id === item.id) currentIndex = articlePosts[0].entries.length +const articlePosts = [ + { + type: "group", + label: blogArticle[post.data.category] + ? t(blogArticle[post.data.category]) + : post.data.category, + entries: [], + }, +]; + +let currentIndex; + +sortedPosts.forEach((item) => { + if (item.data.category === post.data.category) { + if (post.id === item.id) currentIndex = articlePosts[0].entries.length; articlePosts[0].entries.push({ - type: 'link', + type: "link", label: item.data.title, href: `/en/blog/${item.slug}/`, isCurrent: post.id === item.id, - attrs: {} - }) + attrs: {}, + }); } }); -const prev = articlePosts[0].entries[currentIndex - 1] -const next = articlePosts[0].entries[currentIndex + 1] +const prev = articlePosts[0].entries[currentIndex - 1]; +const next = articlePosts[0].entries[currentIndex + 1]; --- - +
    - ); }) diff --git a/src/i18n/en/ui.ts b/src/i18n/en/ui.ts index 807921920e6..85ec9d42445 100644 --- a/src/i18n/en/ui.ts +++ b/src/i18n/en/ui.ts @@ -62,24 +62,24 @@ export default { 'home.nacos.edge.about': 'Main features', 'home.introduce.nacos.aim': 'We believe that everything is a service, each service node is conceived as a planet, and each service is a galaxy. Nacos is committed to helping build connections between these services, helping every dream of the stars to fly through the clouds, on the cloud, better link the whole sky.', 'home.nacos.edge.title': 'Continue to enhance open source capabilities', - 'home.nacos.edge.1.title': 'EASY', - 'home.nacos.edge.1.description': 'One-stop solution for dynamic service discovery. Configuration management and dynamic DNS service 20+ out-of-the-box features for service-centric architectures Light-weight production-ready console', - 'home.nacos.edge.2.title': 'ADAPTIVE', - 'home.nacos.edge.2.description': 'Seamlessly support kubernetes and spring cloud Easier to deploy and run on popular public cloud (for example AliCloud and AWS) Support multi-tenants and multi-environments', - 'home.nacos.edge.3.title': 'TIME-TESTED', - 'home.nacos.edge.3.description': 'Originated from time-tested internal products from Alibaba Group. Supports large-scale scenarios with millions of services Open-source product with enterprise-level SLA', - 'home.nacos.edge.4.title': 'VARIETY', - 'home.nacos.edge.4.description': 'Supports rate throttling, big promotion plans, and multi-region active-active architectures Supports a variety of relevant internet-based use cases directly or with slight extension Traffic scheduling & service governance', + 'home.nacos.edge.1.title': 'Easy to use', + 'home.nacos.edge.1.description': 'One-stop solution for dynamic service discovery, configuration management and dynamic DNS service
    20+ out-of-the-box features for service-centric architectures
    Light-weight production-ready console', + 'home.nacos.edge.2.title': 'More adaptive to cloud architectures', + 'home.nacos.edge.2.description': 'Seamlessly support kubernetes and spring cloud
    Easier to deploy and run on popular public cloud (for example AliCloud and AWS)
    Support multi-tenants and multi-environments', + 'home.nacos.edge.3.title': 'Production grade', + 'home.nacos.edge.3.description': 'Originated from time-tested internal products from Alibaba Group
    Supports large-scale scenarios with millions of services
    Open-source product with enterprise-level SLA', + 'home.nacos.edge.4.title': 'Rich internet application scenarios affinity', + 'home.nacos.edge.4.description': 'Supports rate throttling, big promotion plans, and multi-region active-active architectures
    Supports a variety of relevant internet-based use cases directly or with slight extension
    Traffic scheduling & service governance', 'home.ebook.resource': 'RESOURCES', 'home.ebook.nacos': 'E-Book Nacos', 'home.features.about': 'Core functions', 'home.features.title': 'Explore Our Features', 'home.features.1.summary': 'Dynamic Configuration Service', - 'home.features.1.explain': 'Dynamic Configuration Service allows you to manage configurations in all environments in a centralized, externalized, and dynamic approach. Dynamic configuration saves you from redeploying your applications and services when configuration is updated. You can implement stateless services and achieve on-demand scaling effortlessly.', + 'home.features.1.explain': 'Dynamic Configuration Service allows you to manage configurations in all environments in a centralized, externalized, and dynamic approach. Dynamic configuration saves you from redeploying your applications and services when configuration is updated. You can implement stateless services and achieve on-demand scaling effortlessly.', 'home.features.2.summary': 'Service Discovery and Management', - 'home.features.2.explain': 'Dynamic Service Discovery is key to service-centric (for example microservice or cloud-native) architectures. Nacos supports both DNS-based and RPC-based (Dubbo, gRPC) service discovery, and provides real-time service health checks to prevent routing requests from being sent to unhealthy hosts or service instances. With Nacos, you can also implement circuit breakers for your services with ease.', + 'home.features.2.explain': 'Dynamic Service Discovery is key to service-centric (for example microservice or cloud-native) architectures. Nacos supports both DNS-based and RPC-based (Dubbo, gRPC) service discovery, and provides real-time service health checks to pre vent routing requests from being sent to unhealthy hosts or service instances. With Nacos, you can also implement circuit breakers for your services with ease.', 'home.features.3.summary': 'Dynamic DNS Service', - 'home.features.3.explain': 'By supporting weighted routing, Dynamic DNS Service helps you implement mid-tier load balancing, more flexible routing, traffic control and DNS resolution services in the production environment within your data center. Dynamic DNS Service also makes it easier for you to implement DNS-based service discovery, which minimizes the risk of coupling to vendor-specific service discovery APIs.', + 'home.features.3.explain': 'By supporting weighted routing, Dynamic DNS Service helps you implement mid-tier load balancing, more flexible routing, traffic control and DNS resolution services in the production environment within your data center. Dynamic DNS Service also makes it easier for you to implement DNS-based service discovery, which minimizes the risk of coupling to vendor-specific service discovery APIs.', 'home.use.companies.about': 'SELECTION OF SOME COMPANIES', 'home.solutions.about': 'SOLUTIONS', 'home.solutions.card.1': 'Best Practices for High Availability in MSE Registration Configuration Center', diff --git a/src/i18n/zh-cn/ui.ts b/src/i18n/zh-cn/ui.ts index 050a8bf6814..8248b9f9108 100644 --- a/src/i18n/zh-cn/ui.ts +++ b/src/i18n/zh-cn/ui.ts @@ -62,13 +62,13 @@ export default { 'home.introduce.nacos.aim': '我们相信一切都是服务,每个服务节点被构想为一个星球,每个服务都是一个星系。Nacos 致力于帮助建立这些服务之间的连接,助力每个面向星辰的梦想能够透过云层,飞在云上,更好的链接整片星空。', 'home.nacos.edge.title': '持续增强开源能力', 'home.nacos.edge.1.title': '简单易用', - 'home.nacos.edge.1.description': '动态服务发现的一站式解决方案。配置管理和动态 DNS服务。提供 20 多项开箱即用的特性,适用于面向服务的架构。轻量级的生产就绪控制台。', + 'home.nacos.edge.1.description': '动态配置管理、服务发现和动态的一站式解决方案
    20多种开箱即用的以服务为中心的架构特性
    基本符合生产要求的轻量级易用控制台', 'home.nacos.edge.2.title': '更适应云架构', - 'home.nacos.edge.2.description': '无缝支持 Kubernetes 和 Spring Cloud,更容易在流行的公共云(例如阿里云和 AWS)上部署和运行,支持多租户和多环境。', + 'home.nacos.edge.2.description': '无缝支持 Kubernetes 和 Spring Cloud
    在主流公共云上更容易部署和运行(例如阿里云和 AWS )
    多租户和多环境支持', 'home.nacos.edge.3.title': '生产等级', - 'home.nacos.edge.3.description': '源自阿里巴巴集团经过时间验证的内部产品。支持具有数百万服务规模的大型场景。开源产品并提供企业级的服务级别协议(SLA)。', + 'home.nacos.edge.3.description': '脱胎于历经阿里巴巴10年生产验证的内部产品
    支持具有数百万服务的大规模场景
    具备企业级SLA的开源产品', 'home.nacos.edge.4.title': '丰富的应用场景', - 'home.nacos.edge.4.description': '支持速率限制、大规模推广计划和多区域主动-主动架构。直接或稍作扩展支持各种相关的基于互联网的使用案例。流量调度和服务治理。', + 'home.nacos.edge.4.description': '支持限流、大促销预案和异地多活
    直接支持或稍作扩展即可支持大量有用的互联网应用场景
    流量调度和服务治理', 'home.ebook.resource': '资源', 'home.ebook.nacos': 'Nacos 电子书', 'home.features.about': '核心功能', From 7128aadb24241ba43c0f87a779866b0ebe3377ef Mon Sep 17 00:00:00 2001 From: shonen <83808926@qq.com> Date: Sun, 4 Feb 2024 11:05:51 +0800 Subject: [PATCH 26/66] =?UTF-8?q?fix:(blog)=E4=BF=AE=E5=A4=8D=E5=8D=9A?= =?UTF-8?q?=E5=AE=A2=E6=96=87=E7=AB=A0=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20(#554)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 博客添加目录和上一页下一页,版本下载更换目录组件,添加上一页下一页 * fix: 版本下载同步修改en页面 * fix: 修复打包报错 * fix:(blog,news,activity): 添加国际化,修改样式问题 * fix: (blog) 增加国际化字条对应关系 * fix:(i18n) 修改国际化词条 * fix:(blog)修复博客文章样式问题 --- src/pages/blog/[...slug].astro | 16 ++++++++++++++++ src/pages/en/blog/[...slug].astro | 8 +++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/pages/blog/[...slug].astro b/src/pages/blog/[...slug].astro index 2170e030fd9..671968a20e7 100644 --- a/src/pages/blog/[...slug].astro +++ b/src/pages/blog/[...slug].astro @@ -80,6 +80,22 @@ const next = articlePosts[0].entries[currentIndex + 1] +
    + { + (prev || next) && ( + + ) + } +