Merge branch 'master' into nacos

.github/ISSUE_TEMPLATE/bug_report.md → .github/ISSUE_TEMPLATE/bug_report_en.md

@@ -1,34 +1,36 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-- [ ] 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://github.com/ctripcorp/apollo/wiki/%E9%83%A8%E7%BD%B2&%E5%BC%80%E5%8F%91%E9%81%87%E5%88%B0%E7%9A%84%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98) of this repository and believe that this is not a duplicate.
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. 
-2. 
-3. 
-4. 
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-### Additional Details & Logs
-
-- Version
-- Error logs
-- Configuration
-- Platform and Operating System
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+---
+
+<!-- The content in here will not be show。To forbid duplication，easier search in the feature，before you create an issue，please check the following. If your question is a newer/beginner's，recommand to https://github.com/ctripcorp/apollo/discussions to ask it. -->
+
+- [ ] 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://github.com/ctripcorp/apollo/wiki/%E9%83%A8%E7%BD%B2&%E5%BC%80%E5%8F%91%E9%81%87%E5%88%B0%E7%9A%84%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98) of this repository and believe that this is not a duplicate.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. 
+2. 
+3. 
+4. 
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+### Additional Details & Logs
+
+- Version
+- Error logs
+- Configuration
+- Platform and Operating System

.github/ISSUE_TEMPLATE/bug_report_zh.md

@@ -0,0 +1,41 @@
+---
+name: 报告Bug/使用疑问
+about: 提交Apollo Bug/使用疑问，使用这个模板
+title: ''
+labels: ''
+assignees: ''
+---
+
+<!-- 这段文字不会显示在你的内容中。为了避免重复的信息，方便后续的检索，在提issue之前，请检查如下事项。如果是比较新手级别的问题，推荐到讨论区https://github.com/ctripcorp/apollo/discussions 提问 -->
+
+- [ ] 我已经检查过[discussions](https://github.com/ctripcorp/apollo/discussions)
+- [ ] 我已经搜索过[issues](https://github.com/ctripcorp/apollo/issues)
+- [ ] 我已经仔细检查过[FAQ](https://github.com/ctripcorp/apollo/wiki/%E9%83%A8%E7%BD%B2&%E5%BC%80%E5%8F%91%E9%81%87%E5%88%B0%E7%9A%84%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98)
+
+**描述bug**
+
+简洁明了地描述一下bug
+
+**复现**
+
+通过如下步骤可以复现：
+
+1. 
+2. 
+3. 
+4. 
+
+**期望**
+
+简介明了地描述你希望正常情况下应该发生什么
+
+**截图**
+
+如果可以，附上截图来描述你的问题
+
+### 额外的细节和日志
+
+- 版本：
+- 错误日志
+- 配置：
+- 平台和操作系统

.github/ISSUE_TEMPLATE/feature_request.md → .github/ISSUE_TEMPLATE/feature_request_en.md

@@ -1,20 +1,20 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request_zh.md

@@ -0,0 +1,25 @@
+---
+name: 请求特性
+about: 给这个项目提一些建议、想法
+title: ''
+labels: ''
+assignees: ''
+---
+
+**你的特性请求和某个问题有关吗？请描述**
+
+清晰简洁地描述这个问题是什么。即，当碰到xxx时，总是感觉很麻烦
+
+
+
+**清晰简洁地描述一下你希望的解决方案**
+
+
+
+**清晰简洁地描述一下这个特性的备选方案**
+
+
+
+**其它背景**
+
+在这里添加和这个特性请求有关的背景说明、截图

README.md

@@ -1,4 +1,4 @@
-<img src="https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/logo/logo-simple.png" alt="apollo-logo" width="60%">
+<img src="https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/logo/logo-simple.png" alt="apollo-logo" width="40%">
 
 # Apollo - A reliable configuration management system
 
@@ -8,7 +8,6 @@
 [![codecov.io](https://codecov.io/github/ctripcorp/apollo/coverage.svg?branch=master)](https://codecov.io/github/ctripcorp/apollo?branch=master)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
-
 Apollo（阿波罗）是携程框架部门研发的分布式配置中心，能够集中化管理应用不同环境、不同集群的配置，配置修改后能够实时推送到应用端，并且具备规范的权限、流程治理等特性，适用于微服务配置管理场景。
 
 服务端基于Spring Boot和Spring Cloud开发，打包后可以直接运行，不需要额外安装Tomcat等应用容器。
@@ -17,9 +16,9 @@ Java客户端不依赖任何框架，能够运行于所有Java运行时环境，
 
 .Net客户端不依赖任何框架，能够运行于所有.Net运行时环境。
 
-更多产品介绍参见[Apollo配置中心介绍](https://github.com/ctripcorp/apollo/wiki/Apollo%E9%85%8D%E7%BD%AE%E4%B8%AD%E5%BF%83%E4%BB%8B%E7%BB%8D)
+更多产品介绍参见[Apollo配置中心介绍](https://ctripcorp.github.io/apollo/#/zh/design/apollo-introduction)
 
-本地快速部署请参见[Quick Start](https://github.com/ctripcorp/apollo/wiki/Quick-Start)
+本地快速部署请参见[Quick Start](https://ctripcorp.github.io/apollo/#/zh/deployment/quick-start)
 
 演示环境（Demo）:
 - [106.54.227.205](http://106.54.227.205/)
@@ -71,37 +70,37 @@ Java客户端不依赖任何框架，能够运行于所有Java运行时环境，
   * Apollo还提供了打包脚本，一键就可以生成所有需要的安装包，并且支持自定义运行时参数
 
 # Usage
-  1. [应用接入指南](https://github.com/ctripcorp/apollo/wiki/Apollo%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97)
-  2. [Java客户端使用指南](https://github.com/ctripcorp/apollo/wiki/Java%E5%AE%A2%E6%88%B7%E7%AB%AF%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97)
-  3. [.Net客户端使用指南](https://github.com/ctripcorp/apollo/wiki/.Net%E5%AE%A2%E6%88%B7%E7%AB%AF%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97)
-  4. [其它语言客户端接入指南](https://github.com/ctripcorp/apollo/wiki/%E5%85%B6%E5%AE%83%E8%AF%AD%E8%A8%80%E5%AE%A2%E6%88%B7%E7%AB%AF%E6%8E%A5%E5%85%A5%E6%8C%87%E5%8D%97)
-  5. [Apollo开放平台接入指南](https://github.com/ctripcorp/apollo/wiki/Apollo%E5%BC%80%E6%94%BE%E5%B9%B3%E5%8F%B0)
+  1. [应用接入指南](https://ctripcorp.github.io/apollo/#/zh/usage/apollo-user-guide)
+  2. [Java客户端使用指南](https://ctripcorp.github.io/apollo/#/zh/usage/java-sdk-user-guide)
+  3. [.Net客户端使用指南](https://ctripcorp.github.io/apollo/#/zh/usage/dotnet-sdk-user-guide)
+  4. [其它语言客户端接入指南](https://ctripcorp.github.io/apollo/#/zh/usage/other-language-client-user-guide)
+  5. [Apollo开放平台接入指南](https://ctripcorp.github.io/apollo/#/zh/usage/apollo-open-api-platform)
   6. [Apollo使用场景和示例代码](https://github.com/ctripcorp/apollo-use-cases)
-  7. [Apollo实践案例](https://github.com/ctripcorp/apollo/wiki/Apollo-%E5%AE%9E%E8%B7%B5%E6%A1%88%E4%BE%8B)
-  8. [Apollo安全相关最佳实践](https://github.com/ctripcorp/apollo/wiki/Apollo%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97#71-%E5%AE%89%E5%85%A8%E7%9B%B8%E5%85%B3)
+  7. [Apollo实践案例](https://ctripcorp.github.io/apollo/#/zh/usage/apollo-user-practices)
+  8. [Apollo安全相关最佳实践](https://ctripcorp.github.io/apollo/#/zh/usage/apollo-user-guide?id=_71-%e5%ae%89%e5%85%a8%e7%9b%b8%e5%85%b3)
 
 # Design
-  * [Apollo配置中心设计](https://github.com/ctripcorp/apollo/wiki/Apollo%E9%85%8D%E7%BD%AE%E4%B8%AD%E5%BF%83%E8%AE%BE%E8%AE%A1)
-  * [Apollo核心概念之“Namespace”](https://github.com/ctripcorp/apollo/wiki/Apollo%E6%A0%B8%E5%BF%83%E6%A6%82%E5%BF%B5%E4%B9%8B%E2%80%9CNamespace%E2%80%9D)
+  * [Apollo配置中心设计](https://ctripcorp.github.io/apollo/#/zh/design/apollo-design)
+  * [Apollo核心概念之“Namespace”](https://ctripcorp.github.io/apollo/#/zh/design/apollo-core-concept-namespace)
   * [Apollo配置中心架构剖析](https://mp.weixin.qq.com/s/-hUaQPzfsl9Lm3IqQW3VDQ)
   * [Apollo源码解析](http://www.iocoder.cn/categories/Apollo/)（据说Apollo非常适合作为初学者第一个通读源码学习的分布式中间件产品）
 
 # Development
-  * [Apollo开发指南](https://github.com/ctripcorp/apollo/wiki/Apollo%E5%BC%80%E5%8F%91%E6%8C%87%E5%8D%97)
+  * [Apollo开发指南](https://ctripcorp.github.io/apollo/#/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://github.com/ctripcorp/apollo/wiki/Quick-Start)
-  * [分布式部署指南](https://github.com/ctripcorp/apollo/wiki/%E5%88%86%E5%B8%83%E5%BC%8F%E9%83%A8%E7%BD%B2%E6%8C%87%E5%8D%97)
+  * [Quick Start](https://ctripcorp.github.io/apollo/#/zh/deployment/quick-start)
+  * [分布式部署指南](https://ctripcorp.github.io/apollo/#/zh/deployment/distributed-deployment-guide)
 
 # Release Notes
   * [版本发布历史](https://github.com/ctripcorp/apollo/releases)
 
 # FAQ
-  * [常见问题回答](https://github.com/ctripcorp/apollo/wiki/FAQ)
-  * [部署&开发遇到的常见问题](https://github.com/ctripcorp/apollo/wiki/%E9%83%A8%E7%BD%B2&%E5%BC%80%E5%8F%91%E9%81%87%E5%88%B0%E7%9A%84%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98)
+  * [常见问题回答](https://ctripcorp.github.io/apollo/#/zh/faq/faq)
+  * [部署&开发遇到的常见问题](https://ctripcorp.github.io/apollo/#/zh/faq/common-issues-in-deployment-and-development-phase)
 
 # Presentation
   * [携程开源配置中心Apollo的设计与实现](http://www.itdks.com/dakalive/detail/3420)
@@ -529,6 +528,8 @@ The project is licensed under the [Apache 2 license](https://github.com/ctripcor
 </tr>
 <tr>
 <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jidouauto.png" alt="极豆车联网"></td>
+<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ipalfish.png" alt="伴鱼少儿英语"></td>
+<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/iqboard.png" alt="锐达科技"></td>
 </tr>
 </table>
 

apollo-adminservice/src/main/scripts/startup.sh

@@ -118,7 +118,7 @@ fi
 
 # For Docker environment, start in foreground mode
 if [[ -n "$APOLLO_RUN_MODE" ]] && [[ "$APOLLO_RUN_MODE" == "Docker" ]]; then
-    $javaexe -Dsun.misc.URLClassPath.disableJarChecking=true $JAVA_OPTS -jar $PATH_TO_JAR
+    exec $javaexe -Dsun.misc.URLClassPath.disableJarChecking=true $JAVA_OPTS -jar $PATH_TO_JAR
 else
     if [[ -f $SERVICE_NAME".jar" ]]; then
       rm -rf $SERVICE_NAME".jar"

apollo-configservice/src/main/scripts/startup.sh

@@ -118,7 +118,7 @@ fi
 
 # For Docker environment, start in foreground mode
 if [[ -n "$APOLLO_RUN_MODE" ]] && [[ "$APOLLO_RUN_MODE" == "Docker" ]]; then
-    $javaexe -Dsun.misc.URLClassPath.disableJarChecking=true $JAVA_OPTS -jar $PATH_TO_JAR
+    exec $javaexe -Dsun.misc.URLClassPath.disableJarChecking=true $JAVA_OPTS -jar $PATH_TO_JAR
 else
     if [[ -f $SERVICE_NAME".jar" ]]; then
         rm -rf $SERVICE_NAME".jar"

apollo-portal/src/main/scripts/startup.sh

@@ -118,7 +118,7 @@ fi
 
 # For Docker environment, start in foreground mode
 if [[ -n "$APOLLO_RUN_MODE" ]] && [[ "$APOLLO_RUN_MODE" == "Docker" ]]; then
-    $javaexe -Dsun.misc.URLClassPath.disableJarChecking=true $JAVA_OPTS -jar $PATH_TO_JAR
+    exec $javaexe -Dsun.misc.URLClassPath.disableJarChecking=true $JAVA_OPTS -jar $PATH_TO_JAR
 else
     if [[ -f $SERVICE_NAME".jar" ]]; then
       rm -rf $SERVICE_NAME".jar"

docs/_coverpage.md

@@ -8,4 +8,4 @@
 - Great authentication, authorization and audit control
 
 [GitHub](https://github.com/ctripcorp/apollo/)
-[快速开始](zh/deployment/quick-start.md)
+[Get Started](zh/README)