diff --git a/.github/ISSUE_TEMPLATE/bug_report_en.md b/.github/ISSUE_TEMPLATE/bug_report_en.md index 1593f20482991c102027370894964e63e56bab5c..2fb4373ebbfa49a9b84496ac857ff6afafc6bc59 100644 --- a/.github/ISSUE_TEMPLATE/bug_report_en.md +++ b/.github/ISSUE_TEMPLATE/bug_report_en.md @@ -10,7 +10,7 @@ assignees: '' - [ ] I have checked the [discussions](https://github.com/ctripcorp/apollo/discussions) - [ ] I have searched the [issues](https://github.com/ctripcorp/apollo/issues) of this repository and believe that this is not a duplicate. -- [ ] I have checked the [FAQ](https://ctripcorp.github.io/apollo/#/zh/faq/common-issues-in-deployment-and-development-phase) of this repository and believe that this is not a duplicate. +- [ ] I have checked the [FAQ](https://www.apolloconfig.com/#/zh/faq/common-issues-in-deployment-and-development-phase) of this repository and believe that this is not a duplicate. **Describe the bug** A clear and concise description of what the bug is. diff --git a/.github/ISSUE_TEMPLATE/bug_report_zh.md b/.github/ISSUE_TEMPLATE/bug_report_zh.md index f89842e3d8406e50741c003bfd21123df1cc72ff..7f14ff8507428803cc813a476917cc2d98a4741c 100644 --- a/.github/ISSUE_TEMPLATE/bug_report_zh.md +++ b/.github/ISSUE_TEMPLATE/bug_report_zh.md @@ -10,7 +10,7 @@ assignees: '' - [ ] 我已经检查过[discussions](https://github.com/ctripcorp/apollo/discussions) - [ ] 我已经搜索过[issues](https://github.com/ctripcorp/apollo/issues) -- [ ] 我已经仔细检查过[FAQ](https://ctripcorp.github.io/apollo/#/zh/faq/common-issues-in-deployment-and-development-phase) +- [ ] 我已经仔细检查过[FAQ](https://www.apolloconfig.com/#/zh/faq/common-issues-in-deployment-and-development-phase) **描述bug** diff --git a/README.md b/README.md index 0607edfd9f1fbc67a835cc03a014eb1fdad6fb5e..5b5af2f8830f0d3fe252d0691cfdcc7e3b5511c5 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,9 @@ The Java SDK does not rely on any framework and can run in all Java runtime envi The .Net SDK does not rely on any framework and can run in all .Net runtime environments. -For more details of the product introduction, please refer [Introduction to Apollo Configuration Center](https://ctripcorp.github.io/apollo/#/zh/design/apollo-introduction). +For more details of the product introduction, please refer [Introduction to Apollo Configuration Center](https://www.apolloconfig.com/#/zh/design/apollo-introduction). -For local demo purpose, please refer [Quick Start](https://ctripcorp.github.io/apollo/#/zh/deployment/quick-start). +For local demo purpose, please refer [Quick Start](https://www.apolloconfig.com/#/zh/deployment/quick-start). Demo Environment: - [http://106.54.227.205](http://106.54.227.205/) @@ -69,38 +69,38 @@ Demo Environment: * Apollo also provides a packaging script, which can generate all required installation packages with just one click, and supports customization of runtime parameters # Usage - 1. [Apollo User Guide](https://ctripcorp.github.io/apollo/#/zh/usage/apollo-user-guide) - 2. [Java SDK User Guide](https://ctripcorp.github.io/apollo/#/zh/usage/java-sdk-user-guide) - 3. [.Net SDK user Guide](https://ctripcorp.github.io/apollo/#/zh/usage/dotnet-sdk-user-guide) - 4. [Third Party SDK User Guide](https://ctripcorp.github.io/apollo/#/zh/usage/third-party-sdks-user-guide) - 5. [Other Language Client User Guide](https://ctripcorp.github.io/apollo/#/zh/usage/other-language-client-user-guide) - 6. [Apollo Open APIs](https://ctripcorp.github.io/apollo/#/zh/usage/apollo-open-api-platform) + 1. [Apollo User Guide](https://www.apolloconfig.com/#/zh/usage/apollo-user-guide) + 2. [Java SDK User Guide](https://www.apolloconfig.com/#/zh/usage/java-sdk-user-guide) + 3. [.Net SDK user Guide](https://www.apolloconfig.com/#/zh/usage/dotnet-sdk-user-guide) + 4. [Third Party SDK User Guide](https://www.apolloconfig.com/#/zh/usage/third-party-sdks-user-guide) + 5. [Other Language Client User Guide](https://www.apolloconfig.com/#/zh/usage/other-language-client-user-guide) + 6. [Apollo Open APIs](https://www.apolloconfig.com/#/zh/usage/apollo-open-api-platform) 7. [Apollo Use Cases](https://github.com/ctripcorp/apollo-use-cases) - 8. [Apollo User Practices](https://ctripcorp.github.io/apollo/#/zh/usage/apollo-user-practices) - 9. [Apollo Security Best Practices](https://ctripcorp.github.io/apollo/#/zh/usage/apollo-user-guide?id=_71-%e5%ae%89%e5%85%a8%e7%9b%b8%e5%85%b3) + 8. [Apollo User Practices](https://www.apolloconfig.com/#/zh/usage/apollo-user-practices) + 9. [Apollo Security Best Practices](https://www.apolloconfig.com/#/zh/usage/apollo-user-guide?id=_71-%e5%ae%89%e5%85%a8%e7%9b%b8%e5%85%b3) # Design - * [Apollo Design](https://ctripcorp.github.io/apollo/#/zh/design/apollo-design) - * [Apollo Core Concept - Namespace](https://ctripcorp.github.io/apollo/#/zh/design/apollo-core-concept-namespace) + * [Apollo Design](https://www.apolloconfig.com/#/zh/design/apollo-design) + * [Apollo Core Concept - Namespace](https://www.apolloconfig.com/#/zh/design/apollo-core-concept-namespace) * [Apollo Architecture Analysis](https://mp.weixin.qq.com/s/-hUaQPzfsl9Lm3IqQW3VDQ) * [Apollo Source Code Explanation](http://www.iocoder.cn/categories/Apollo/) # Development - * [Apollo Development Guide](https://ctripcorp.github.io/apollo/#/zh/development/apollo-development-guide) + * [Apollo Development Guide](https://www.apolloconfig.com/#/zh/development/apollo-development-guide) * Code Styles * [Eclipse Code Style](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/eclipse-java-google-style.xml) * [Intellij Code Style](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/intellij-java-google-style.xml) # Deployment - * [Quick Start](https://ctripcorp.github.io/apollo/#/zh/deployment/quick-start) - * [Distributed Deployment Guide](https://ctripcorp.github.io/apollo/#/zh/deployment/distributed-deployment-guide) + * [Quick Start](https://www.apolloconfig.com/#/zh/deployment/quick-start) + * [Distributed Deployment Guide](https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide) # Release Notes * [Releases](https://github.com/ctripcorp/apollo/releases) # FAQ - * [FAQ](https://ctripcorp.github.io/apollo/#/zh/faq/faq) - * [Common Issues in Deployment & Development Phase](https://ctripcorp.github.io/apollo/#/zh/faq/common-issues-in-deployment-and-development-phase) + * [FAQ](https://www.apolloconfig.com/#/zh/faq/faq) + * [Common Issues in Deployment & Development Phase](https://www.apolloconfig.com/#/zh/faq/common-issues-in-deployment-and-development-phase) # Presentation * [Design and Implementation Details of Apollo](http://www.itdks.com/dakalive/detail/3420) diff --git a/apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/client/ApolloOpenApiClient.java b/apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/client/ApolloOpenApiClient.java index 6e9a195b6150ff5f227916e87ea67c6346fc3e43..ae1bfe650f85e7a285778c238d3f9e413fcea44f 100644 --- a/apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/client/ApolloOpenApiClient.java +++ b/apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/client/ApolloOpenApiClient.java @@ -30,7 +30,7 @@ import java.util.List; /** * This class contains collections of methods to access Apollo Open Api. *
- * For more information, please refer Apollo Wiki. + * For more information, please refer Apollo Wiki. * */ public class ApolloOpenApiClient { diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/config/PortalConfig.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/config/PortalConfig.java index 5c024ba8ca37c4d2a044b99d94b2fbd9a9243147..e494da172d678301e33803a0546fa4c3645d8b62 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/config/PortalConfig.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/config/PortalConfig.java @@ -228,7 +228,7 @@ public class PortalConfig extends RefreshableConfig { } public String wikiAddress() { - return getValue("wiki.address", "https://ctripcorp.github.io/apollo"); + return getValue("wiki.address", "https://www.apolloconfig.com"); } public boolean canAppAdminCreatePrivateNamespace() { diff --git a/apollo-portal/src/main/resources/static/namespace.html b/apollo-portal/src/main/resources/static/namespace.html index 3b51fdab2a588f73b86aa0955a548a60eb7a9386..5678b53a1aa4ea5c41b93b3bbd701ca91178da61 100644 --- a/apollo-portal/src/main/resources/static/namespace.html +++ b/apollo-portal/src/main/resources/static/namespace.html @@ -26,7 +26,7 @@
{{'Namespace.Title' | translate }} + href="https://www.apolloconfig.com/#/zh/design/apollo-core-concept-namespace"> {{'Namespace.UnderstandMore' | translate }}
diff --git a/apollo-portal/src/main/resources/static/system_info.html b/apollo-portal/src/main/resources/static/system_info.html index d18af351e6d3587ea9222e323b18160d0d40ba62..832cf7c070082840e7c8170ab48dba0c328649e0 100644 --- a/apollo-portal/src/main/resources/static/system_info.html +++ b/apollo-portal/src/main/resources/static/system_info.html @@ -28,11 +28,11 @@
{{'SystemInfo.SystemVersion' | translate }}: {{systemInfo.version}}
+ translate-value-wiki-url="https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide">
+ translate-value-wiki-url="https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide">
diff --git a/docs/en/README.md b/docs/en/README.md index 5f356c68a43eefa580c744c852482a3c50081557..f6f60f2167b05af184eccc626efb91468086044a 100644 --- a/docs/en/README.md +++ b/docs/en/README.md @@ -10,16 +10,16 @@ The Java SDK does not rely on any framework and can run in all Java runtime envi The .Net SDK does not rely on any framework and can run in all .Net runtime environments. -For more details of the product introduction, please refer [Introduction to Apollo Configuration Center](https://ctripcorp.github.io/apollo/#/zh/design/apollo-introduction). +For more details of the product introduction, please refer [Introduction to Apollo Configuration Center](zh/design/apollo-introduction). -For local demo purpose, please refer [Quick Start](https://ctripcorp.github.io/apollo/#/zh/deployment/quick-start). +For local demo purpose, please refer [Quick Start](zh/deployment/quick-start). Demo Environment: - [http://106.54.227.205](http://106.54.227.205/) - User/Password: apollo/admin # Screenshots -![Screenshot](https://raw.githubusercontent.com/ctripcorp/apollo/master/docs/en/images/apollo-home-screenshot.jpg) +![Screenshot](images/apollo-home-screenshot.jpg) # Features * **Unified management of the configurations of different environments and different clusters** @@ -63,38 +63,38 @@ Demo Environment: * Apollo also provides a packaging script, which can generate all required installation packages with just one click, and supports customization of runtime parameters # Usage -1. [Apollo User Guide](https://ctripcorp.github.io/apollo/#/zh/usage/apollo-user-guide) -2. [Java SDK User Guide](https://ctripcorp.github.io/apollo/#/zh/usage/java-sdk-user-guide) -3. [.Net SDK user Guide](https://ctripcorp.github.io/apollo/#/zh/usage/dotnet-sdk-user-guide) -4. [Third Party SDK User Guide](https://ctripcorp.github.io/apollo/#/zh/usage/third-party-sdks-user-guide) -5. [Other Language Client User Guide](https://ctripcorp.github.io/apollo/#/zh/usage/other-language-client-user-guide) -6. [Apollo Open APIs](https://ctripcorp.github.io/apollo/#/zh/usage/apollo-open-api-platform) +1. [Apollo User Guide](zh/usage/apollo-user-guide) +2. [Java SDK User Guide](zh/usage/java-sdk-user-guide) +3. [.Net SDK user Guide](zh/usage/dotnet-sdk-user-guide) +4. [Third Party SDK User Guide](zh/usage/third-party-sdks-user-guide) +5. [Other Language Client User Guide](zh/usage/other-language-client-user-guide) +6. [Apollo Open APIs](zh/usage/apollo-open-api-platform) 7. [Apollo Use Cases](https://github.com/ctripcorp/apollo-use-cases) -8. [Apollo User Practices](https://ctripcorp.github.io/apollo/#/zh/usage/apollo-user-practices) -9. [Apollo Security Best Practices](https://ctripcorp.github.io/apollo/#/zh/usage/apollo-user-guide?id=_71-%e5%ae%89%e5%85%a8%e7%9b%b8%e5%85%b3) +8. [Apollo User Practices](zh/usage/apollo-user-practices) +9. [Apollo Security Best Practices](zh/usage/apollo-user-guide?id=_71-%e5%ae%89%e5%85%a8%e7%9b%b8%e5%85%b3) # Design -* [Apollo Design](https://ctripcorp.github.io/apollo/#/zh/design/apollo-design) -* [Apollo Core Concept - Namespace](https://ctripcorp.github.io/apollo/#/zh/design/apollo-core-concept-namespace) +* [Apollo Design](zh/design/apollo-design) +* [Apollo Core Concept - Namespace](zh/design/apollo-core-concept-namespace) * [Apollo Architecture Analysis](https://mp.weixin.qq.com/s/-hUaQPzfsl9Lm3IqQW3VDQ) * [Apollo Source Code Explanation](http://www.iocoder.cn/categories/Apollo/) # Development -* [Apollo Development Guide](https://ctripcorp.github.io/apollo/#/zh/development/apollo-development-guide) +* [Apollo Development Guide](zh/development/apollo-development-guide) * Code Styles * [Eclipse Code Style](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/eclipse-java-google-style.xml) * [Intellij Code Style](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/intellij-java-google-style.xml) # Deployment -* [Quick Start](https://ctripcorp.github.io/apollo/#/zh/deployment/quick-start) -* [Distributed Deployment Guide](https://ctripcorp.github.io/apollo/#/zh/deployment/distributed-deployment-guide) +* [Quick Start](zh/deployment/quick-start) +* [Distributed Deployment Guide](zh/deployment/distributed-deployment-guide) # Release Notes * [Releases](https://github.com/ctripcorp/apollo/releases) # FAQ -* [FAQ](https://ctripcorp.github.io/apollo/#/zh/faq/faq) -* [Common Issues in Deployment & Development Phase](https://ctripcorp.github.io/apollo/#/zh/faq/common-issues-in-deployment-and-development-phase) +* [FAQ](zh/faq/faq) +* [Common Issues in Deployment & Development Phase](zh/faq/common-issues-in-deployment-and-development-phase) # Presentation * [Design and Implementation Details of Apollo](http://www.itdks.com/dakalive/detail/3420) diff --git a/docs/zh/README.md b/docs/zh/README.md index 585bdfc85fa862639ac14642082b7299858dba1c..0e98fd227b6916222d8309023db819401bcc6d63 100644 --- a/docs/zh/README.md +++ b/docs/zh/README.md @@ -15,7 +15,7 @@ Java客户端不依赖任何框架,能够运行于所有Java运行时环境, 本地快速部署请参见[Quick Start](zh/deployment/quick-start) 演示环境(Demo): -- [106.54.227.205](http://106.54.227.205/) +- [http://106.54.227.205](http://106.54.227.205/) - 账号/密码:apollo/admin > 如访问github速度缓慢,可以访问[gitee镜像](https://gitee.com/nobodyiam/apollo),不定期同步 @@ -67,11 +67,12 @@ Java客户端不依赖任何框架,能够运行于所有Java运行时环境, 1. [应用接入指南](zh/usage/apollo-user-guide) 2. [Java客户端使用指南](zh/usage/java-sdk-user-guide) 3. [.Net客户端使用指南](zh/usage/dotnet-sdk-user-guide) - 4. [其它语言客户端接入指南](zh/usage/other-language-client-user-guide) - 5. [Apollo开放平台接入指南](zh/usage/apollo-open-api-platform) - 6. [Apollo使用场景和示例代码](https://github.com/ctripcorp/apollo-use-cases) - 7. [Apollo实践案例](zh/usage/apollo-user-practices) - 8. [Apollo安全相关最佳实践](zh/usage/apollo-user-guide?id=_71-%e5%ae%89%e5%85%a8%e7%9b%b8%e5%85%b3) + 4. [Go、Python、NodeJS、PHP等客户端使用指南](zh/usage/third-party-sdks-user-guide) + 5. [其它语言客户端接入指南](zh/usage/other-language-client-user-guide) + 6. [Apollo开放平台接入指南](zh/usage/apollo-open-api-platform) + 7. [Apollo使用场景和示例代码](https://github.com/ctripcorp/apollo-use-cases) + 8. [Apollo实践案例](zh/usage/apollo-user-practices) + 9. [Apollo安全相关最佳实践](zh/usage/apollo-user-guide?id=_71-%e5%ae%89%e5%85%a8%e7%9b%b8%e5%85%b3) # Design - [Apollo配置中心设计](zh/design/apollo-design.md) diff --git a/docs/zh/deployment/distributed-deployment-guide.md b/docs/zh/deployment/distributed-deployment-guide.md index b9c93cfd7e69db1382ff2c4a1af2065111086d27..6f901b6cf55fce94efba56ce00c38d3ef2c38b3d 100644 --- a/docs/zh/deployment/distributed-deployment-guide.md +++ b/docs/zh/deployment/distributed-deployment-guide.md @@ -615,7 +615,7 @@ Apollo 1.7.0版本增加了基于Kubernetes原生服务发现的部署模式, #### 2.4.1.2 添加Apollo Helm Chart仓库 ```bash -$ helm repo add apollo https://ctripcorp.github.io/apollo/charts +$ helm repo add apollo https://www.apolloconfig.com/charts $ helm search repo apollo ``` diff --git a/scripts/helm/README.md b/scripts/helm/README.md index 1701d210ffc399841ef2aa226d6eafc087ca4543..1ebc8f1a7609c2f3dc11f4bf7a1278d855877636 100644 --- a/scripts/helm/README.md +++ b/scripts/helm/README.md @@ -14,7 +14,7 @@ The apollo-service and apollo-portal charts create deployments for apollo-config ## 3. Add Apollo Helm Chart Repository ```bash -$ helm repo add apollo https://ctripcorp.github.io/apollo/charts +$ helm repo add apollo https://www.apolloconfig.com/charts $ helm search repo apollo ```