Update docsy to 0.6.0 (#2141)

.github/workflows/build_and_deploy.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Build
         env:
           HUGO_ENV: production
-        run: hugo --minify
+        run: hugo mod clean && hugo --minify
       - name: Copy other files
         run: cp .htaccess ./public
       - name: Deploy
@@ -64,7 +64,7 @@ jobs:
       - name: Build
         env:
           HUGO_ENV: production
-        run: hugo --minify --config cn_config.toml
+        run: hugo mod clean && hugo --minify --config cn_config.toml
       - name: Copy other files
         run: cp .htaccess ./public
       - name: Deploy

.github/workflows/link_check.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Build
         env:
           HUGO_ENV: production
-        run: hugo --minify --baseURL /
+        run: hugo mod clean && hugo --minify --baseURL /
       - name: Cache Html Test Ref
         uses: ./.github/actions/always-upload-cache
         with:

.gitmodules

@@ -1,10 +1,4 @@
 
-[submodule "themes/docsy"]
-	path = themes/docsy
-	url = https://github.com/google/docsy.git
-[submodule ".github/themes/docsy"]
-	path = .github/themes/docsy
-	url = https://github.com/google/docsy.git
 [submodule ".github/actions/always-upload-cache"]
 	path = .github/actions/always-upload-cache
 	url = https://github.com/pat-s/always-upload-cache.git

.htaccess

@@ -16,19 +16,21 @@
 
   RewriteCond "%{HTTP:Accept-Language}" ^zh
   RewriteCond %{HTTP_HOST} !cn
+  RewriteCond %{HTTP_HOST} !static
   RewriteRule ^(.*)$ https://cn.dubbo.apache.org/$1 [L,R=302]
 
   RewriteCond %{SERVER_PORT} !^443$
   RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
 
   RewriteCond "%{HTTP:Accept-Language}" ^zh [NC]
-  RewriteRule ^/?(index\.html)?$ "/zh/index.html" [L,R=302]
+  RewriteRule ^/?(index\.html)?$ "/zh-cn/index.html" [L,R=302]
 
   RewriteRule ^/?(index\.html)?$ "/en/index.html" [L,R=302]
 
   RewriteCond "%{HTTP:Accept-Language}" ^zh [NC]
-  RewriteRule ^/?faq/?([\w\-/]+)?$ "/zh/docs3-v2/java-sdk/faq/$1" [L,R=302]
+  RewriteRule ^/?faq/?([\w\-/]+)?$ "/zh-cn/docs3-v2/java-sdk/faq/$1" [L,R=302]
 
   RewriteRule ^/?faq/?([\w\-/]+)?$ "/en/docs3-v2/java-sdk/faq/$1" [L,R=302]
 
+  RewriteRule ^/?zh/([\w\-/]+)?$ "/zh-cn/$1" [L,R=302]
 </IfModule>

.htmltest.yml

@@ -13,6 +13,7 @@ IgnoreURLs: [
   # edit page => always ignore
   "https://github.com/apache/dubbo-website/edit/master/content/.*",
   "https://github.com/apache/dubbo-website/new/master/content/.*",
+  "https://github.com/apache/dubbo-website/tree/master/content/.*",
   # docs external link might temporally unavailable => always ignore
   "http://javatar.iteye.com/.*",
   "https://www.baeldung.com/bdd-mockito",

cn_config.toml

@@ -1,14 +1,14 @@
 baseURL = "https://cn.dubbo.apache.org/"
 languageCode = "en-us"
 title = "Apache Dubbo"
-theme = ["docsy"]
+theme = ["github.com/google/docsy", "github.com/google/docsy/dependencies"]
 
 enableGitInfo = true
 enableRobotsTXT = true
 
 # Language settings
-contentDir = "content/zh"
-defaultContentLanguage = "zh"
+contentDir = "content/zh-cn"
+defaultContentLanguage = "zh-cn"
 defaultContentLanguageInSubdir = true
 # Useful when translating.
 enableMissingTranslationPlaceholders = true
@@ -62,11 +62,11 @@ contentDir = "content/en"
 # Weight used for sorting.
 weight = 1
 
-[languages.zh]
+[languages.zh-cn]
 title = "Apache Dubbo"
 description = "Apache Dubbo 官方网站"
 languageName = "中文"
-contentDir = "content/zh"
+contentDir = "content/zh-cn"
 #time_format_default = "02.01.2006"
 #time_format_blog = "02.01.2006"
 
@@ -118,6 +118,7 @@ offlineSearch = false
 github_repo = "https://github.com/apache/dubbo-website"
 # An optional link to a related project repo. For example, the sibling repository where your product code lives.
 github_project_repo = "https://github.com/apache/dubbo"
+github_branch = "master"
 
 # Specify a value here if your content directory is not in your repo's root directory
 # github_subdir = ""

config.toml

@@ -1,14 +1,14 @@
 baseURL = "https://dubbo.apache.org/"
 languageCode = "en-us"
 title = "Apache Dubbo"
-theme = ["docsy"]
+theme = ["github.com/google/docsy", "github.com/google/docsy/dependencies"]
 
 enableGitInfo = true
 enableRobotsTXT = true
 
 # Language settings
-contentDir = "content/zh"
-defaultContentLanguage = "zh"
+contentDir = "content/zh-cn"
+defaultContentLanguage = "zh-cn"
 defaultContentLanguageInSubdir = true
 # Useful when translating.
 enableMissingTranslationPlaceholders = true
@@ -62,11 +62,11 @@ contentDir = "content/en"
 # Weight used for sorting.
 weight = 1
 
-[languages.zh]
+[languages.zh-cn]
 title = "Apache Dubbo"
 description = "Apache Dubbo 官方网站"
 languageName = "中文"
-contentDir = "content/zh"
+contentDir = "content/zh-cn"
 #time_format_default = "02.01.2006"
 #time_format_blog = "02.01.2006"
 
@@ -118,6 +118,7 @@ offlineSearch = false
 github_repo = "https://github.com/apache/dubbo-website"
 # An optional link to a related project repo. For example, the sibling repository where your product code lives.
 github_project_repo = "https://github.com/apache/dubbo"
+github_branch = "master"
 
 # Specify a value here if your content directory is not in your repo's root directory
 # github_subdir = ""

content/en/docs/v2.7/user/configuration/configuration-load-process.md

@@ -30,7 +30,7 @@ The figure below shows the priority of configuration override, decreasing from t
 
 ![Override Priority](/imgs/blog/configuration.jpg)
 
-click here to view [Externalize configuration details](/zh/docsv2.7/user/configuration/config-center/)
+click here to view [Externalize configuration details](/zh-cn/docsv2.7/user/configuration/config-center/)
 
 
 ## Configuration Format
@@ -92,7 +92,7 @@ Next, let's look at the changes corresponding to `ServiceConfig, ReferenceConfig
 
 - XML
 
-Refer to [the sample](https://github.com/apache/dubbo-samples/tree/master/1-basic/dubbo-samples-basic)
+Refer to [the sample](https://github.com/apache/dubbo-samples/tree/master/1-basic/dubbo-samples-spring-xml)
 
 ```xml
   <!-- dubbo-provier.xml -->

content/en/docs3-v2/golang-sdk/preface/concept/registry.md

@@ -13,7 +13,7 @@ The server registers the interface information and sends its own address to the
 
 ![img](/imgs/architecture.png)
 
-For details about Dubbo service discovery, please refer to [Dubbo Official Website Concept Introduction](/zh/docs/concepts/service-discovery/)
+For details about Dubbo service discovery, please refer to [Dubbo Official Website Concept Introduction](/zh-cn/docs/concepts/service-discovery/)
 
 ## 2. Service discovery concept
 

content/en/docs3-v2/golang-sdk/tutorial/develop/interflow/call_java.md

@@ -153,7 +153,7 @@ Reference [dubbo-go-samples/helloworld](https://github.com/apache/dubbo-go-sampl
 
 #### Java-Server start
 
-1. Define Java PB file, please refer to [Dubbo Quick Start](/zh/docs/quick-start/)
+1. Define Java PB file, please refer to [Dubbo Quick Start](/zh-cn/docs/quick-start/)
 
 ```protobuf
 syntax = "proto3";
@@ -448,7 +448,7 @@ Reference [dubbo-go-samples/rpc/dubbo](https://github.com/apache/dubbo-go-sample
 
 #### Java-Server start
 
-1. Define the Java interface, parameters and return values, please refer to [Dubbo Quick Start](/zh/docs/quick-start/)
+1. Define the Java interface, parameters and return values, please refer to [Dubbo Quick Start](/zh-cn/docs/quick-start/)
 
 ```java
 package org.apache.dubbo;

content/en/docs3-v2/java-sdk/advanced-features-and-usage/performance/serialization.md

@@ -58,7 +58,7 @@ In production-oriented applications, I recommend Kryo as the preferred choice fo
 ## Enable Kryo and FST
 
 Using Kryo and FST is very simple, just add the corresponding dependencies first:
-More plugins: [Dubbo SPI Extensions](https://dubbo.apache.org/zh/release/dubbo-spi-extensions)
+More plugins: [Dubbo SPI Extensions](/zh-cn/release/dubbo-spi-extensions)
 
 ```xml
 <dependency>