Merge branch 'master' into dev/lepdou/1.10.0_export_config

CHANGES.md

@@ -21,8 +21,8 @@ Apollo 2.0.0
 * [Bump version to 2.0.0 and drop java 1.7 support](https://github.com/apolloconfig/apollo/pull/4015)
 * [Optimize home page style](https://github.com/apolloconfig/apollo/pull/4052)
 * [Support Java 17](https://github.com/apolloconfig/apollo/pull/4060)
+* [Optimize top navbar style](https://github.com/apolloconfig/apollo/pull/4073)
 * [Support export/import configs by apollo env](https://github.com/apolloconfig/apollo/pull/3947)
 
-
 ------------------
 All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/8?closed=1)

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 ## Contributing to apollo
 
-Apollo is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. If you want to contribute even something trivial please do not hesitate, but follow the guidelines below.
+Apollo is released under the non-restrictive Apache 2.0 license, and follows a very standard GitHub development process, using GitHub tracker for issues and merging pull requests into master. If you want to contribute even something trivial please do not hesitate, but follow the guidelines below.
 
 ### Sign the Contributor License Agreement
 

apollo-portal/src/main/resources/static/styles/common-style.css

@@ -1099,6 +1099,10 @@ table th {
     font-size: 14px;
 }
 
+#app-search-list {
+    width: 375px;
+}
+
 /*backTop component style*/
 .back-top {
     position: fixed;
@@ -1125,3 +1129,15 @@ table th {
 .back-top:active {
     opacity: .6;
 }
+
+.navbar-nav .nav-switch-lang {
+    width: 12px;
+    height: 12px;
+    margin-top: -4px;
+    margin-right: -5px;
+}
+
+.navbar-header .logo {
+    height: 35px;
+    margin-top: -4px
+}

apollo-portal/src/main/resources/static/views/common/nav.html

@@ -30,10 +30,10 @@
                  ng-show="viewMode == 2 && showSideBar"
                  ng-click="showSideBar = !showSideBar">
             <a class="navbar-brand logo" href="{{ '/' | prefixPath }}">
-                <img src="{{ '/img/logo-simple.png' | prefixPath }}" style="height:45px; margin-top: -13px">
+                <img class="logo" src="{{ '/img/logo-simple.png' | prefixPath }}">
             </a>
         </div>
-        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+        <div class="collapse navbar-collapse">
 
             <ul class="nav navbar-nav navbar-right">
                 <li>
@@ -43,6 +43,7 @@
                 </li>
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+                        <img class="nav-switch-lang" style="" src="{{ '/img/language.png' | prefixPath }}">
                         <span class="glyphicon .glyphicon-glyphicon-font"></span>&nbsp;Language<span class="caret"></span></a>
 
                     <ul class="dropdown-menu">
@@ -90,7 +91,7 @@
 
             <div class="navbar-form navbar-right form-inline" role="search">
                 <div class="form-group app-search-list">
-                    <select id="app-search-list" style="width: 350px"></select>
+                    <select id="app-search-list"></select>
                 </div>
             </div>
         </div>

docs/_coverpage.md

@@ -1,4 +1,4 @@
-<img src="https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/logo/logo-simple.png" alt="apollo-logo" width="30%">
+<img src="https://cdn.jsdelivr.net/gh/apolloconfig/apollo@master/doc/images/logo/logo-simple.png" alt="apollo-logo" width="30%">
 
 > A reliable configuration management system
 

docs/en/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="40%">
+<img src="https://cdn.jsdelivr.net/gh/apolloconfig/apollo@master/doc/images/logo/logo-simple.png" alt="apollo-logo" width="40%">
 
 # Introduction
 
@@ -82,15 +82,15 @@ Demo Environment:
 # Development
 * [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)
+    * [Eclipse Code Style](https://github.com/apolloconfig/apollo/blob/master/apollo-buildtools/style/eclipse-java-google-style.xml)
+    * [Intellij Code Style](https://github.com/apolloconfig/apollo/blob/master/apollo-buildtools/style/intellij-java-google-style.xml)
 
 # Deployment
 * [Quick Start](zh/deployment/quick-start)
 * [Distributed Deployment Guide](zh/deployment/distributed-deployment-guide)
 
 # Release Notes
-* [Releases](https://github.com/ctripcorp/apollo/releases)
+* [Releases](https://github.com/apolloconfig/apollo/releases)
 
 # FAQ
 * [FAQ](zh/faq/faq)
@@ -108,8 +108,8 @@ Demo Environment:
 
 # Community
   * [Apollo Team](en/community/team)
-  * [Community Governance](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md)
-  * [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md)
+  * [Community Governance](https://github.com/apolloconfig/apollo/blob/master/GOVERNANCE.md)
+  * [Contributing Guide](https://github.com/apolloconfig/apollo/blob/master/CONTRIBUTING.md)
 
 # License
-The project is licensed under the [Apache 2 license](https://github.com/ctripcorp/apollo/blob/master/LICENSE).
+The project is licensed under the [Apache 2 license](https://github.com/apolloconfig/apollo/blob/master/LICENSE).

docs/en/_navbar.md

@@ -1,7 +1,7 @@
 - Community
   - [Team](en/community/team.md)
-  - [Community Governance](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md)
-  - [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md)
+  - [Community Governance](en/governance.md)
+  - [Contributing Guide](en/contributing.md)
   - [Acknowledgements](en/community/thank-you.md)
 
 - Translations

docs/en/_sidebar.md

@@ -16,8 +16,8 @@
 - Development Document
   - [Apollo Development Guide](en/development/apollo-development-guide.md)
   - 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)
+    - [Eclipse Code Style](https://github.com/apolloconfig/apollo/blob/master/apollo-buildtools/style/eclipse-java-google-style.xml)
+    - [Intellij Code Style](https://github.com/apolloconfig/apollo/blob/master/apollo-buildtools/style/intellij-java-google-style.xml)
   - [Portal Implement User Login Function](en/development/portal-how-to-implement-user-login-function.md)
   - [Portal Enable Email Service](en/development/portal-how-to-enable-email-service.md)
   - [Portal Enable Session Store](en/development/portal-how-to-enable-session-store.md)
@@ -39,11 +39,11 @@
   - [Common Issues In Deployment & Development Phase](en/faq/common-issues-in-deployment-and-development-phase.md)
 
 - Other
-   - [Release History](https://github.com/ctripcorp/apollo/releases)
+   - [Release History](https://github.com/apolloconfig/apollo/releases)
    - [Apollo Benchmark](en/misc/apollo-benchmark.md)
 
 - Community
   - [Team](en/community/team.md)
-  - [Community Governance](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md)
-  - [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md)
+  - [Community Governance](en/governance.md)
+  - [Contributing Guide](en/contributing.md)
   - [Acknowledgements](en/community/thank-you.md)

docs/en/community/team.md

@@ -2,23 +2,23 @@
 
 The Apollo team is comprised of Members and Contributors. Members have direct access to the source of Apollo project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. All contributions to Apollo are greatly appreciated, whether for trivial cleanups, big new features or other material rewards.
 
-For more information about the community governance model, please refer [GOVERNANCE.md](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md).
+For more information about the community governance model, please refer [GOVERNANCE.md](https://github.com/apolloconfig/apollo/blob/master/GOVERNANCE.md).
 
 ## Members
 
 Members include Project Management Committee members and committers. The list is in alphabet order.
 
 ### Project Management Committee
 
-| Github ID  | Name       | Organization |
+| GitHub ID  | Name       | Organization |
 | ---------- | ---------- | ------------ |
 | JaredTan95 | Jared Tan  | DaoCloud     |
 | kezhenxu94 | Zhenxu Ke  | Tetrate      |
 | nobodyiam  | Jason Song | Ant Group    |
 | zouyx      | Joe Zou    | Shein        |
 
 ### Committer
-| Github ID   | Name          | Organization |
+| GitHub ID   | Name          | Organization |
 | ----------- | ------------- | ------------ |
 | Anilople    | Xiaoquan Wang | Some Bank    |
 | Accelerater | Zhuohao Li    | Daocloud     |
@@ -38,4 +38,4 @@ Members include Project Management Committee members and committers. The list is
 
 ## Becoming a Committer
 
-Please refer [How to become a Committer](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md#how-to-become-a-committer).
+Please refer [How to become a Committer](https://github.com/apolloconfig/apollo/blob/master/GOVERNANCE.md#how-to-become-a-committer).

docs/index.html

@@ -67,6 +67,15 @@
         '/en/.*/_navbar.md': '/en/_navbar.md',
         '/zh/(.*)': 'zh/$1',
         '/en/(.*)': 'en/$1',
+        '.*?/governance':
+                'https://raw.githubusercontent.com/apolloconfig/apollo/master/GOVERNANCE.md',
+        '.*?/contributing':
+                'https://raw.githubusercontent.com/apolloconfig/apollo/master/CONTRIBUTING.md',
+      },
+      nameLink: {
+        '/zh/': '#/zh/',
+        '/en/': '#/en/',
+        '/': '#/',
       },
       auto2top: true,
       // Only coverpage is loaded when visiting the home page.
@@ -78,7 +87,7 @@
       maxLevel: 6,
       subMaxLevel: 5,
       name: 'Apollo',
-      repo: 'https://github.com/ctripcorp/apollo/',
+      repo: 'https://github.com/apolloconfig/apollo/',
       search: {
         noData: {
           '/zh/': '没有结果!',
@@ -91,6 +100,7 @@
           '/en/': 'Search',
           '/': '搜索',
         },
+        pathNamespaces: ['/zh', '/en']
       },
       // click to copy.
       copyCode: {
@@ -136,7 +146,7 @@
                 .replace('raw.githubusercontent.com', 'github.com')
                 .replace(/\/master/, '/blob/master')
             } else {
-              url = 'https://github.com/ctripcorp/apollo/blob/master/docs/' + vm.route.file
+              url = 'https://github.com/apolloconfig/apollo/blob/master/docs/' + vm.route.file
             }
             var editHtml = '[:memo: Edit Document](' + url + ')\n\n'
 
@@ -162,7 +172,7 @@
   <!-- Medium's image zoom -->
   <script src="//cdn.jsdelivr.net/npm/docsify/lib/plugins/zoom-image.min.js"></script>
   <!-- Add a simple Click to copy button to all preformatted code blocks to effortlessly allow users to copy example code from your docs -->
-  <script src="//cdn.jsdelivr.net/npm/docsify-copy-code"></script>
+  <script src="//cdn.jsdelivr.net/npm/docsify-copy-code@2.1.1/dist/docsify-copy-code.min.js"></script>
   <!-- docsify-pagination -->
   <script src="//cdn.jsdelivr.net/npm/docsify-pagination/dist/docsify-pagination.min.js"></script>
 

docs/zh/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="40%">
+<img src="https://cdn.jsdelivr.net/gh/apolloconfig/apollo@master/doc/images/logo/logo-simple.png" alt="apollo-logo" width="40%">
 
 # Introduction
 
@@ -15,13 +15,14 @@ Java客户端不依赖任何框架，能够运行于所有Java运行时环境，
 本地快速部署请参见[Quick Start](zh/deployment/quick-start)
 
 演示环境（Demo）:
+
 - [http://106.54.227.205](http://106.54.227.205/)
 - 账号/密码:apollo/admin
 
-> 如访问github速度缓慢，可以访问[gitee镜像](https://gitee.com/nobodyiam/apollo)，不定期同步
+> 如访问GitHub速度缓慢，可以访问[Gitee镜像](https://gitee.com/apolloconfig/apollo)，不定期同步
 
 # Screenshots
-![配置界面](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/apollo-home-screenshot.jpg)
+![配置界面](https://cdn.jsdelivr.net/gh/apolloconfig/apollo@master/doc/images/apollo-home-screenshot.jpg)
 
 # Features
 * **统一管理不同环境、不同集群的配置**
@@ -83,8 +84,8 @@ Java客户端不依赖任何框架，能够运行于所有Java运行时环境，
 # Development
   - [Apollo开发指南](zh/development/apollo-development-guide.md)
   - 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)
+    - [Eclipse Code Style](https://github.com/apolloconfig/apollo/blob/master/apollo-buildtools/style/eclipse-java-google-style.xml)
+    - [Intellij Code Style](https://github.com/apolloconfig/apollo/blob/master/apollo-buildtools/style/intellij-java-google-style.xml)
   - [Portal实现用户登录功能](zh/development/portal-how-to-implement-user-login-function.md)
   - [Portal接入邮件服务](zh/development/portal-how-to-enable-email-service.md)
   - [Portal启用webhook通知](zh/development/portal-how-to-enable-webhook-notification.md)
@@ -96,7 +97,7 @@ Java客户端不依赖任何框架，能够运行于所有Java运行时环境，
   - [分布式部署指南](zh/deployment/distributed-deployment-guide.md)
 
 # Release Notes
-  * [版本发布历史](https://github.com/ctripcorp/apollo/releases)
+  * [版本发布历史](https://github.com/apolloconfig/apollo/releases)
 
 # FAQ
   * [常见问题回答](zh/faq/faq.md)
@@ -123,19 +124,19 @@ Java客户端不依赖任何框架，能够运行于所有Java运行时环境，
   </thead>
   <tbody>
     <tr>
-      <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/tech-support/tech-support-qq-2.png" alt="tech-support-qq-2"></td>
-      <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/tech-support/tech-support-qq-5.png" alt="tech-support-qq-5"></td>
-      <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/tech-support/tech-support-qq-4.png" alt="tech-support-qq-4"></td>
-      <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/tech-support/tech-support-qq-3.png" alt="tech-support-qq-3"></td>
-      <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/tech-support/tech-support-qq-1.png" alt="tech-support-qq-1"></td>
+      <td><img src="https://cdn.jsdelivr.net/gh/apolloconfig/apollo-community@master/images/tech-support/tech-support-qq-2.png" alt="tech-support-qq-2"></td>
+      <td><img src="https://cdn.jsdelivr.net/gh/apolloconfig/apollo-community@master/images/tech-support/tech-support-qq-5.png" alt="tech-support-qq-5"></td>
+      <td><img src="https://cdn.jsdelivr.net/gh/apolloconfig/apollo-community@master/images/tech-support/tech-support-qq-4.png" alt="tech-support-qq-4"></td>
+      <td><img src="https://cdn.jsdelivr.net/gh/apolloconfig/apollo-community@master/images/tech-support/tech-support-qq-3.png" alt="tech-support-qq-3"></td>
+      <td><img src="https://cdn.jsdelivr.net/gh/apolloconfig/apollo-community@master/images/tech-support/tech-support-qq-1.png" alt="tech-support-qq-1"></td>
     </tr>
   </tbody>
 </table>
 
 # 社区
   * [团队](zh/community/team)
-  * [社区治理](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md)
-  * [贡献指南](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md)
+  * [社区治理](https://github.com/apolloconfig/apollo/blob/master/GOVERNANCE.md)
+  * [贡献指南](https://github.com/apolloconfig/apollo/blob/master/CONTRIBUTING.md)
 
 # License
-The project is licensed under the [Apache 2 license](https://github.com/ctripcorp/apollo/blob/master/LICENSE).
+The project is licensed under the [Apache 2 license](https://github.com/apolloconfig/apollo/blob/master/LICENSE).

docs/zh/_navbar.md

@@ -1,7 +1,7 @@
 - 社区
   - [团队](zh/community/team.md)
-  - [社区治理](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md)
-  - [贡献指南](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md)
+  - [社区治理](zh/governance.md)
+  - [贡献指南](zh/contributing.md)
   - [致谢](zh/community/thank-you.md)
 
 - Translations

docs/zh/_sidebar.md

@@ -15,8 +15,8 @@
 - 开发文档
   - [Apollo开发指南](zh/development/apollo-development-guide.md)
   - 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)
+    - [Eclipse Code Style](https://github.com/apolloconfig/apollo/blob/master/apollo-buildtools/style/eclipse-java-google-style.xml)
+    - [Intellij Code Style](https://github.com/apolloconfig/apollo/blob/master/apollo-buildtools/style/intellij-java-google-style.xml)
   - [Portal实现用户登录功能](zh/development/portal-how-to-implement-user-login-function.md)
   - [Portal接入邮件服务](zh/development/portal-how-to-enable-email-service.md)
   - [Portal 共享 session](zh/development/portal-how-to-enable-session-store.md)
@@ -39,12 +39,12 @@
   - [部署&开发遇到的常见问题](zh/faq/common-issues-in-deployment-and-development-phase.md)
 
 - 其它
-   - [版本历史](https://github.com/ctripcorp/apollo/releases)
+   - [版本历史](https://github.com/apolloconfig/apollo/releases)
    - [Apollo性能测试报告](zh/misc/apollo-benchmark.md)
 
 - 社区
   - [团队](zh/community/team.md)
-  - [社区治理](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md)
-  - [贡献指南](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md)
+  - [社区治理](zh/governance.md)
+  - [贡献指南](zh/contributing.md)
   - [致谢](zh/community/thank-you.md)