瀏覽代碼

docs: fix markdown code blocks by change 4 back quote to 3 back quote (#4631)

Ho Xuan Phuong Dong _ CICT CTU 2 年之前
父節點
當前提交
b435050782

+ 1 - 1
docs/en/deployment/deployment-architecture.md

@@ -901,7 +901,7 @@ flowchart LR
 	
 	
 	idc2-JVM8070 --> idc2-c1-jvm-8090
 	idc2-JVM8070 --> idc2-c1-jvm-8090
 	idc2-JVM8070 --> idc2-c2-jvm-8090
 	idc2-JVM8070 --> idc2-c2-jvm-8090
-````
+```
 
 
 Each server room has its own set of Portal, Config Service, Admin Service
 Each server room has its own set of Portal, Config Service, Admin Service
 
 

+ 37 - 37
docs/en/deployment/distributed-deployment-guide.md

@@ -509,7 +509,7 @@ Remember to set a JVM memory according to the actual environment in scripts/star
 
 
 ```bash
 ```bash
 export JAVA_OPTS="-server -Xms6144m -Xmx6144m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=4096m -XX:MaxNewSize=4096m -XX:SurvivorRatio=18"
 export JAVA_OPTS="-server -Xms6144m -Xmx6144m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=4096m -XX:MaxNewSize=4096m -XX:SurvivorRatio=18"
-````
+```
 
 
 > Note 1: If you need to modify the JVM parameters, you can modify the `JAVA_OPTS` section of scripts/startup.sh.
 > Note 1: If you need to modify the JVM parameters, you can modify the `JAVA_OPTS` section of scripts/startup.sh.
 
 
@@ -529,7 +529,7 @@ Remember to set a JVM memory according to the actual environment in scripts/star
 
 
 ```bash
 ```bash
 export JAVA_OPTS="-server -Xms2560m -Xmx2560m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1024m -XX:MaxNewSize=1024m -XX:SurvivorRatio=22"
 export JAVA_OPTS="-server -Xms2560m -Xmx2560m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1024m -XX:MaxNewSize=1024m -XX:SurvivorRatio=22"
-````
+```
 
 
 > Note 1: If you need to modify the JVM parameters, you can modify the `JAVA_OPTS` section of scripts/startup.sh.
 > Note 1: If you need to modify the JVM parameters, you can modify the `JAVA_OPTS` section of scripts/startup.sh.
 
 
@@ -545,7 +545,7 @@ Remember to set a JVM memory according to the actual environment in startup.sh.
 
 
 ```bash
 ```bash
 export JAVA_OPTS="-server -Xms4096m -Xmx4096m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1536m -XX:MaxNewSize=1536m -XX:SurvivorRatio=22"
 export JAVA_OPTS="-server -Xms4096m -Xmx4096m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1536m -XX:MaxNewSize=1536m -XX:SurvivorRatio=22"
-````
+```
 
 
 > Note 1: If you need to modify the JVM parameters, you can modify the `JAVA_OPTS` section of scripts/startup.sh.
 > Note 1: If you need to modify the JVM parameters, you can modify the `JAVA_OPTS` section of scripts/startup.sh.
 
 
@@ -1000,7 +1000,7 @@ The following table lists the configurable parameters of the apollo-service-char
 
 
 ###### 2.4.1.3.4.1 The host of ConfigDB is the IP outside the k8s cluster
 ###### 2.4.1.3.4.1 The host of ConfigDB is the IP outside the k8s cluster
 
 
-````yaml
+```yaml
 configdb:
 configdb:
   host: 1.2.3.4
   host: 1.2.3.4
   dbName: ApolloConfigDBName
   dbName: ApolloConfigDBName
@@ -1009,11 +1009,11 @@ configdb:
   connectionStringProperties: characterEncoding=utf8&useSSL=false
   connectionStringProperties: characterEncoding=utf8&useSSL=false
   service:
   service:
     enabled: true
     enabled: true
-````
+```
 
 
 ###### 2.4.1.3.4.2 The host of ConfigDB is the domain name outside the k8s cluster
 ###### 2.4.1.3.4.2 The host of ConfigDB is the domain name outside the k8s cluster
 
 
-````yaml
+```yaml
 configdb:
 configdb:
   host: xxx.mysql.rds.aliyuncs.com
   host: xxx.mysql.rds.aliyuncs.com
   dbName: ApolloConfigDBName
   dbName: ApolloConfigDBName
@@ -1023,42 +1023,42 @@ configdb:
   service:
   service:
     enabled: true
     enabled: true
     type: ExternalName
     type: ExternalName
-````
+```
 
 
 ###### 2.4.1.3.4.3 The host of ConfigDB is a service in the k8s cluster
 ###### 2.4.1.3.4.3 The host of ConfigDB is a service in the k8s cluster
 
 
-````yaml
+```yaml
 configdb:
 configdb:
   host: apollodb-mysql.mysql
   host: apollodb-mysql.mysql
   dbName: ApolloConfigDBName
   dbName: ApolloConfigDBName
   userName: someUserName
   userName: someUserName
   password: somePassword
   password: somePassword
   connectionStringProperties: characterEncoding=utf8&useSSL=false
   connectionStringProperties: characterEncoding=utf8&useSSL=false
-````
+```
 
 
 ###### 2.4.1.3.4.4 Specify the apollo-configservice address returned by Meta Server
 ###### 2.4.1.3.4.4 Specify the apollo-configservice address returned by Meta Server
 
 
 If apollo-client cannot directly access the service of apollo-configservice (for example, it is not in the same k8s cluster), you can refer to the following example to specify the address returned by Meta Server to apollo-client (for example, it can be accessed through nodeport)
 If apollo-client cannot directly access the service of apollo-configservice (for example, it is not in the same k8s cluster), you can refer to the following example to specify the address returned by Meta Server to apollo-client (for example, it can be accessed through nodeport)
 
 
-````yaml
+```yaml
 configService:
 configService:
   config:
   config:
     configServiceUrlOverride: http://1.2.3.4:12345
     configServiceUrlOverride: http://1.2.3.4:12345
-````
+```
 
 
 ###### 2.4.1.3.4.5 Specify the apollo-adminservice address returned by Meta Server
 ###### 2.4.1.3.4.5 Specify the apollo-adminservice address returned by Meta Server
 
 
 If apollo-portal cannot directly access the service of apollo-adminservice (for example, it is not in the same k8s cluster), you can refer to the following example to specify the address returned by Meta Server to apollo-portal (for example, it can be accessed through nodeport)
 If apollo-portal cannot directly access the service of apollo-adminservice (for example, it is not in the same k8s cluster), you can refer to the following example to specify the address returned by Meta Server to apollo-portal (for example, it can be accessed through nodeport)
 
 
-````yaml
+```yaml
 configService:
 configService:
   config:
   config:
     adminServiceUrlOverride: http://1.2.3.4:23456
     adminServiceUrlOverride: http://1.2.3.4:23456
-````
+```
 
 
 ###### 2.4.1.3.4.6 Expose apollo-configservice service in the form of Ingress configuration custom path `/config`
 ###### 2.4.1.3.4.6 Expose apollo-configservice service in the form of Ingress configuration custom path `/config`
 
 
-````yaml
+```yaml
 # use /config as root, should specify configService.config.contextPath as /config
 # use /config as root, should specify configService.config.contextPath as /config
 configService:
 configService:
   config:
   config:
@@ -1068,11 +1068,11 @@ configService:
     hosts:
     hosts:
       - paths:
       - paths:
           - /config
           - /config
-````
+```
 
 
 ###### 2.4.1.3.4.7 Expose apollo-adminservice service in the form of Ingress configuration custom path `/admin`
 ###### 2.4.1.3.4.7 Expose apollo-adminservice service in the form of Ingress configuration custom path `/admin`
 
 
-````yaml
+```yaml
 # use /admin as root, should specify adminService.config.contextPath as /admin
 # use /admin as root, should specify adminService.config.contextPath as /admin
 adminService:
 adminService:
   config:
   config:
@@ -1082,7 +1082,7 @@ adminService:
     hosts:
     hosts:
       - paths:
       - paths:
           - /admin
           - /admin
-````
+```
 
 
 #### 2.4.1.4 Deploy apollo-portal
 #### 2.4.1.4 Deploy apollo-portal
 
 
@@ -1102,13 +1102,13 @@ $ helm install apollo-portal \
     --set replicaCount=1 \
     --set replicaCount=1 \
     -n your-namespace \
     -n your-namespace \
     apollo/apollo-portal
     apollo/apollo-portal
-````
+```
 
 
 General deployment recommendations are configured through values.yaml:
 General deployment recommendations are configured through values.yaml:
 
 
 ```bash
 ```bash
 $ helm install apollo-portal -f values.yaml -n your-namespace apollo/apollo-portal
 $ helm install apollo-portal -f values.yaml -n your-namespace apollo/apollo-portal
-````
+```
 
 
 > For more configuration item descriptions, please refer to [2.4.1.4.3 Configuration item description](
 > For more configuration item descriptions, please refer to [2.4.1.4.3 Configuration item description](
 
 
@@ -1173,7 +1173,7 @@ The following table lists the configurable parameters of the apollo-portal chart
 
 
 ###### 2.4.1.4.4.1 The host of PortalDB is the IP outside the k8s cluster
 ###### 2.4.1.4.4.1 The host of PortalDB is the IP outside the k8s cluster
 
 
-````yaml
+```yaml
 portaldb:
 portaldb:
   host: 1.2.3.4
   host: 1.2.3.4
   dbName: ApolloPortalDBName
   dbName: ApolloPortalDBName
@@ -1182,11 +1182,11 @@ portaldb:
   connectionStringProperties: characterEncoding=utf8&useSSL=false
   connectionStringProperties: characterEncoding=utf8&useSSL=false
   service:
   service:
     enabled: true
     enabled: true
-````
+```
 
 
 ###### 2.4.1.4.4.2 The host of PortalDB is the domain name outside the k8s cluster
 ###### 2.4.1.4.4.2 The host of PortalDB is the domain name outside the k8s cluster
 
 
-````yaml
+```yaml
 portaldb:
 portaldb:
   host: xxx.mysql.rds.aliyuncs.com
   host: xxx.mysql.rds.aliyuncs.com
   dbName: ApolloPortalDBName
   dbName: ApolloPortalDBName
@@ -1196,49 +1196,49 @@ portaldb:
   service:
   service:
     enabled: true
     enabled: true
     type: ExternalName
     type: ExternalName
-````
+```
 
 
 ###### 2.4.1.4.4.3 The host of PortalDB is a service in the k8s cluster
 ###### 2.4.1.4.4.3 The host of PortalDB is a service in the k8s cluster
 
 
-````yaml
+```yaml
 portaldb:
 portaldb:
   host: apollodb-mysql.mysql
   host: apollodb-mysql.mysql
   dbName: ApolloPortalDBName
   dbName: ApolloPortalDBName
   userName: someUserName
   userName: someUserName
   password: somePassword
   password: somePassword
   connectionStringProperties: characterEncoding=utf8&useSSL=false
   connectionStringProperties: characterEncoding=utf8&useSSL=false
-````
+```
 
 
 ###### 2.4.1.4.4.4 Configure environment information
 ###### 2.4.1.4.4.4 Configure environment information
 
 
-````yaml
+```yaml
 config:
 config:
   envs: dev, pro
   envs: dev, pro
   metaServers:
   metaServers:
     dev: http://apollo-service-dev-apollo-configservice:8080
     dev: http://apollo-service-dev-apollo-configservice:8080
     pro: http://apollo-service-pro-apollo-configservice:8080
     pro: http://apollo-service-pro-apollo-configservice:8080
-````
+```
 
 
 ###### 2.4.1.4.4.5 Expose services as Load Balancer
 ###### 2.4.1.4.4.5 Expose services as Load Balancer
 
 
-````yaml
+```yaml
 service:
 service:
   type: LoadBalancer
   type: LoadBalancer
-````
+```
 
 
 ###### 2.4.1.4.4.6 Expose services as Ingress
 ###### 2.4.1.4.4.6 Expose services as Ingress
 
 
-````yaml
+```yaml
 ingress:
 ingress:
   enabled: true
   enabled: true
   hosts:
   hosts:
     - paths:
     - paths:
         - /
         - /
-````
+```
 
 
 ###### 2.4.1.4.4.7 Expose services in the form of Ingress configuration custom path `/apollo`
 ###### 2.4.1.4.4.7 Expose services in the form of Ingress configuration custom path `/apollo`
 
 
-````yaml
+```yaml
 # use /apollo as root, should specify config.contextPath as /apollo
 # use /apollo as root, should specify config.contextPath as /apollo
 ingress:
 ingress:
   enabled: true
   enabled: true
@@ -1250,11 +1250,11 @@ config:
   ...
   ...
   contextPath: /apollo
   contextPath: /apollo
   ...
   ...
-````
+```
 
 
 ###### 2.4.1.4.4.8 Expose services in the form of Ingress configuration session affinity
 ###### 2.4.1.4.4.8 Expose services in the form of Ingress configuration session affinity
 
 
-````yaml
+```yaml
 ingress:
 ingress:
   enabled: true
   enabled: true
   annotations:
   annotations:
@@ -1268,11 +1268,11 @@ ingress:
     - host: xxx.somedomain.com # host is required to make session affinity work
     - host: xxx.somedomain.com # host is required to make session affinity work
       paths:
       paths:
         - /
         - /
-````
+```
 
 
 ###### 2.4.1.4.4.9 Enable LDAP support
 ###### 2.4.1.4.4.9 Enable LDAP support
 
 
-````yaml
+```yaml
 config:
 config:
   ...
   ...
   profiles: github,ldap
   profiles: github,ldap
@@ -1293,7 +1293,7 @@ config:
           loginId: "uid"
           loginId: "uid"
           userDisplayName: "cn"
           userDisplayName: "cn"
           email: "mail"
           email: "mail"
-````
+```
 
 
 #### 2.4.1.5 Building a Docker image from source
 #### 2.4.1.5 Building a Docker image from source
 
 

+ 1 - 1
docs/en/deployment/quick-start.md

@@ -24,7 +24,7 @@ Sample output.
 java version "1.8.0_74"
 java version "1.8.0_74"
 Java(TM) SE Runtime Environment (build 1.8.0_74-b02)
 Java(TM) SE Runtime Environment (build 1.8.0_74-b02)
 Java HotSpot(TM) 64-Bit Server VM (build 25.74-b02, mixed mode)
 Java HotSpot(TM) 64-Bit Server VM (build 25.74-b02, mixed mode)
-````
+```
 
 
 Windows users please make sure that JAVA_HOME environment variable is set.
 Windows users please make sure that JAVA_HOME environment variable is set.
 
 

+ 6 - 6
docs/en/design/apollo-core-concept-namespace.md

@@ -173,33 +173,33 @@ As you can see in the above code example, the Client Namespace is mapped to a Co
 
 
 So the Namespace code that monitors the application in application A is as follows:
 So the Namespace code that monitors the application in application A is as follows:
 
 
-````java
+```java
 Config appConfig = ConfigService.getAppConfig();
 Config appConfig = ConfigService.getAppConfig();
 appConfig.addChangeListener(new ConfigChangeListener() {
 appConfig.addChangeListener(new ConfigChangeListener() {
   public void onChange(ConfigChangeEvent changeEvent) {
   public void onChange(ConfigChangeEvent changeEvent) {
     //do something
     //do something
   }
   }
 })
 })
-````
+```
 
 
 The Namespace code for monitoring NS-Private in application A is as follows:
 The Namespace code for monitoring NS-Private in application A is as follows:
 
 
-````java
+```java
 Config privateConfig = ConfigService.getConfig("NS-Private");
 Config privateConfig = ConfigService.getConfig("NS-Private");
 privateConfig.addChangeListener(new ConfigChangeListener() {
 privateConfig.addChangeListener(new ConfigChangeListener() {
   public void onChange(ConfigChangeEvent changeEvent) {
   public void onChange(ConfigChangeEvent changeEvent) {
     //do something
     //do something
   }
   }
 })
 })
-````
+```
 
 
 The Namespace code for monitoring NS-Public in application A, application B, and application C is as follows:
 The Namespace code for monitoring NS-Public in application A, application B, and application C is as follows:
 
 
-````java
+```java
 Config publicConfig = ConfigService.getConfig("NS-Public");
 Config publicConfig = ConfigService.getConfig("NS-Public");
 publicConfig.addChangeListener(new ConfigChangeListener() {
 publicConfig.addChangeListener(new ConfigChangeListener() {
   public void onChange(ConfigChangeEvent changeEvent) {
   public void onChange(ConfigChangeEvent changeEvent) {
     //do something
     //do something
   }
   }
 })
 })
-````
+```

+ 8 - 8
docs/en/design/apollo-introduction.md

@@ -138,11 +138,11 @@ Fill in the release information:
 
 
 After the configuration is released, it can be obtained on the client side. Taking Java as an example, the sample code for obtaining the configuration is as follows. Apollo client also supports integration with Spring. For more client usage instructions, please refer to [Java Client Usage Guide](en/usage/java-sdk-user-guide) and [.Net Client Usage Guide](en/usage/dotnet-sdk-user-guide).
 After the configuration is released, it can be obtained on the client side. Taking Java as an example, the sample code for obtaining the configuration is as follows. Apollo client also supports integration with Spring. For more client usage instructions, please refer to [Java Client Usage Guide](en/usage/java-sdk-user-guide) and [.Net Client Usage Guide](en/usage/dotnet-sdk-user-guide).
 
 
-````java
+```java
 Config config = ConfigService.getAppConfig();
 Config config = ConfigService.getAppConfig();
 Integer defaultRequestTimeout = 200;
 Integer defaultRequestTimeout = 200;
 Integer requestTimeout = config.getIntProperty("requestTimeout", defaultRequestTimeout);
 Integer requestTimeout = config.getIntProperty("requestTimeout", defaultRequestTimeout);
-````
+```
 
 
 ## 3.6 Client monitoring configuration changes
 ## 3.6 Client monitoring configuration changes
 
 
@@ -150,7 +150,7 @@ By obtaining the configuration code above, the application can obtain the latest
 
 
 However, in some scenarios, the application also needs to be notified when the configuration changes, such as the switching of database connections, so Apollo also provides the function of monitoring configuration changes. The Java example is as follows:
 However, in some scenarios, the application also needs to be notified when the configuration changes, such as the switching of database connections, so Apollo also provides the function of monitoring configuration changes. The Java example is as follows:
 
 
-````java
+```java
 Config config = ConfigService.getAppConfig();
 Config config = ConfigService.getAppConfig();
 config.addChangeListener(new ConfigChangeListener() {
 config.addChangeListener(new ConfigChangeListener() {
   @Override
   @Override
@@ -164,26 +164,26 @@ config.addChangeListener(new ConfigChangeListener() {
      }
      }
   }
   }
 });
 });
-````
+```
 
 
 ## 3.7 Spring integration example
 ## 3.7 Spring integration example
 
 
 Apollo and Spring can also be easily integrated. You only need to mark `@EnableApolloConfig` to get configuration information through `@Value`:
 Apollo and Spring can also be easily integrated. You only need to mark `@EnableApolloConfig` to get configuration information through `@Value`:
 
 
-````java
+```java
 @Configuration
 @Configuration
 @EnableApolloConfig
 @EnableApolloConfig
 public class AppConfig {}
 public class AppConfig {}
-````
+```
 
 
-````java
+```java
 @Component
 @Component
 public class SomeBean {
 public class SomeBean {
     //The value of timeout will be updated automatically
     //The value of timeout will be updated automatically
     @Value("${request.timeout:200}")
     @Value("${request.timeout:200}")
     private int timeout;
     private int timeout;
 }
 }
-````
+```
 
 
 # 4. Apollo in depth
 # 4. Apollo in depth
 
 

+ 1 - 1
docs/en/development/portal-how-to-enable-email-service.md

@@ -61,7 +61,7 @@ The following are the template content styles for publishing emails and rolling
 
 
 ```html
 ```html
 <html><head><style type="text/css">.table{width:100%;max-width:100%;margin-bottom:20px;border-collapse:collapse;background-color:transparent}td {padding:8px;line-height:1.42857143;vertical-align:top;border:1px solid #ddd;border-top:1px solid #ddd}.table-bordered{border:1px solid #ddd}</style>< /head><body><h3>Post basic information</h3><table class="table table-bordered"><tr><td width="10%"><b>AppId</b></td ><td width="15%">#{appId}</td><td width="10%"><b>Environment</b></td><td width="15%">#{ env}</td><td width="10%"><b>cluster</b></td><td width="15%">#{clusterName}</td><td width="10 %"><b>Namespace</b></td><td width="15%">#{namespaceName}</td></tr><tr><td><b>Publisher</b ></td><td>#{operator}</td><td><b>release time</b></td><td>#{releaseTime}</td><td><b>release Title</b></td><td>#{releaseTitle}</td><td><b>Comment</b></td><td>#{releaseComment}</td></tr> </table>#{diffModule}#{rulesModule}<br><a href="#{apollo.portal.address}/config/history.html?#/appid=#{appId}&env=#{env}&clusterName =#{clusterName}&namespaceName=#{namespaceName}&releaseHistoryId=#{ releaseHistoryId}">Click to view detailed release information</a><br><br>If you have any questions about using Apollo, please check <a href="http://conf.ctripcorp.com/display/FRAM/Apollo"> document</a>, or reply directly to this email inquiry. </body></html>
 <html><head><style type="text/css">.table{width:100%;max-width:100%;margin-bottom:20px;border-collapse:collapse;background-color:transparent}td {padding:8px;line-height:1.42857143;vertical-align:top;border:1px solid #ddd;border-top:1px solid #ddd}.table-bordered{border:1px solid #ddd}</style>< /head><body><h3>Post basic information</h3><table class="table table-bordered"><tr><td width="10%"><b>AppId</b></td ><td width="15%">#{appId}</td><td width="10%"><b>Environment</b></td><td width="15%">#{ env}</td><td width="10%"><b>cluster</b></td><td width="15%">#{clusterName}</td><td width="10 %"><b>Namespace</b></td><td width="15%">#{namespaceName}</td></tr><tr><td><b>Publisher</b ></td><td>#{operator}</td><td><b>release time</b></td><td>#{releaseTime}</td><td><b>release Title</b></td><td>#{releaseTitle}</td><td><b>Comment</b></td><td>#{releaseComment}</td></tr> </table>#{diffModule}#{rulesModule}<br><a href="#{apollo.portal.address}/config/history.html?#/appid=#{appId}&env=#{env}&clusterName =#{clusterName}&namespaceName=#{namespaceName}&releaseHistoryId=#{ releaseHistoryId}">Click to view detailed release information</a><br><br>If you have any questions about using Apollo, please check <a href="http://conf.ctripcorp.com/display/FRAM/Apollo"> document</a>, or reply directly to this email inquiry. </body></html>
-````
+```
 
 
 > Note: To use this template, you need to configure apollo.portal.address in the system parameters of the portal to point to the address of the apollo portal
 > Note: To use this template, you need to configure apollo.portal.address in the system parameters of the portal to point to the address of the apollo portal
 
 

+ 4 - 4
docs/en/development/portal-how-to-implement-user-login-function.md

@@ -124,7 +124,7 @@ LOG_DIR=/opt/logs/100003173
 SERVER_PORT=8070
 SERVER_PORT=8070
 
 
 export JAVA_OPTS="$JAVA_OPTS -Dspring.profiles.active=github,ldap"
 export JAVA_OPTS="$JAVA_OPTS -Dspring.profiles.active=github,ldap"
-````
+```
 
 
 ### 2. Active Directory access method
 ### 2. Active Directory access method
 
 
@@ -164,7 +164,7 @@ LOG_DIR=/opt/logs/100003173
 SERVER_PORT=8070
 SERVER_PORT=8070
 
 
 export JAVA_OPTS="$JAVA_OPTS -Dspring.profiles.active=github,ldap"
 export JAVA_OPTS="$JAVA_OPTS -Dspring.profiles.active=github,ldap"
-````
+```
 
 
 ### 3. ApacheDS access method
 ### 3. ApacheDS access method
 
 
@@ -230,7 +230,7 @@ LOG_DIR=/opt/logs/100003173
 SERVER_PORT=8070
 SERVER_PORT=8070
 
 
 export JAVA_OPTS="$JAVA_OPTS -Dspring.profiles.active=github,ldap"
 export JAVA_OPTS="$JAVA_OPTS -Dspring.profiles.active=github,ldap"
-````
+```
 
 
 ## Implementation 3: Access to OIDC
 ## Implementation 3: Access to OIDC
 
 
@@ -406,7 +406,7 @@ LOG_DIR=/opt/logs/100003173
 SERVER_PORT=8070
 SERVER_PORT=8070
 
 
 export JAVA_OPTS="$JAVA_OPTS -Dspring.profiles.active=github,oidc"
 export JAVA_OPTS="$JAVA_OPTS -Dspring.profiles.active=github,oidc"
-````
+```
 
 
 ### 3. Configure apollo-portal to enable https
 ### 3. Configure apollo-portal to enable https
 
 

+ 2 - 2
docs/en/misc/apollo-benchmark.md

@@ -6,10 +6,10 @@ Many people are concerned about the performance and reliability of Apollo. The f
 4C12G
 4C12G
 
 
 #### 1.2 JVM parameters
 #### 1.2 JVM parameters
-````
+```
 -Xms6144m -Xmx6144m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=4096m -XX:MaxNewSize=4096m -XX:SurvivorRatio=8
 -Xms6144m -Xmx6144m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=4096m -XX:MaxNewSize=4096m -XX:SurvivorRatio=8
 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:MaxTenuringThreshold=9 -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:+ UseCMSInitiatingOccupancyOnly -XX:+ScavengeBeforeFullGC -XX:+UseCMSCompactAtFullCollection -XX:+CMSParallelRemarkEnabled -XX: CMSFullGCsBeforeCompaction=9 -XX:CMSInitiatingOccupancyFraction=60 -XX:+CMSClassUnloadingEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+ CMSPermGenSweepingEnabled -XX:CMSInitiatingPermOccupancyFraction=70 -XX:+ExplicitGCInvokesConcurrent -XX:+PrintGCDetails -XX:+ PrintGCDateStamps -XX:+PrintGCApplicationConcurrentTime -XX:+PrintHeapAtGC -XX:+HeapDumpOnOutOfMemoryError -XX:- OmitStackTraceInFastThrow -Duser.timezone=Asia/Shanghai -Dclient.encoding.override=UTF-8 -Dfile.encoding=UTF-8 -Djava.security.egd= file:/dev/./urandom
 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:MaxTenuringThreshold=9 -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:+ UseCMSInitiatingOccupancyOnly -XX:+ScavengeBeforeFullGC -XX:+UseCMSCompactAtFullCollection -XX:+CMSParallelRemarkEnabled -XX: CMSFullGCsBeforeCompaction=9 -XX:CMSInitiatingOccupancyFraction=60 -XX:+CMSClassUnloadingEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+ CMSPermGenSweepingEnabled -XX:CMSInitiatingPermOccupancyFraction=70 -XX:+ExplicitGCInvokesConcurrent -XX:+PrintGCDetails -XX:+ PrintGCDateStamps -XX:+PrintGCApplicationConcurrentTime -XX:+PrintHeapAtGC -XX:+HeapDumpOnOutOfMemoryError -XX:- OmitStackTraceInFastThrow -Duser.timezone=Asia/Shanghai -Dclient.encoding.override=UTF-8 -Dfile.encoding=UTF-8 -Djava.security.egd= file:/dev/./urandom
-````
+```
 #### 1.3 JVM Versions
 #### 1.3 JVM Versions
 1.8.0_60
 1.8.0_60
 
 

+ 30 - 30
docs/en/usage/java-sdk-user-guide.md

@@ -601,7 +601,7 @@ If <apollo:config> does not specify an order, then the default is the lowest pri
         <property name="batch" value="${batch:200}"/>
         <property name="batch" value="${batch:200}"/>
     </bean>
     </bean>
 </beans>
 </beans>
-````
+```
 
 
 #### 3.2.1.2 Java-based configuration (recommended)
 #### 3.2.1.2 Java-based configuration (recommended)
 
 
@@ -621,7 +621,7 @@ public class AppConfig {
     return new TestJavaConfigBean();
     return new TestJavaConfigBean();
   }
   }
 }
 }
-````
+```
 
 
 2. Inject multiple namespace configuration into Spring
 2. Inject multiple namespace configuration into Spring
 
 
@@ -768,7 +768,7 @@ WebClient can be based on multiple implementations (reactor netty httpclient, je
 
 
 ###### Reactor netty httpclient
 ###### Reactor netty httpclient
 
 
-````xml
+```xml
 <dependencies>
 <dependencies>
    <dependency>
    <dependency>
       <groupId>com.ctrip.framework.apollo</groupId>
       <groupId>com.ctrip.framework.apollo</groupId>
@@ -786,11 +786,11 @@ WebClient can be based on multiple implementations (reactor netty httpclient, je
       <artifactId>reactor-netty-http</artifactId>
       <artifactId>reactor-netty-http</artifactId>
    </dependency>
    </dependency>
 </dependencies>
 </dependencies>
-````
+```
 
 
 ###### Jetty reactive httpclient
 ###### Jetty reactive httpclient
 
 
-````xml
+```xml
 <dependencies>
 <dependencies>
     <dependency>
     <dependency>
         <groupId>com.ctrip.framework.apollo</groupId>
         <groupId>com.ctrip.framework.apollo</groupId>
@@ -808,13 +808,13 @@ WebClient can be based on multiple implementations (reactor netty httpclient, je
        <artifactId>jetty-reactive-httpclient</artifactId>
        <artifactId>jetty-reactive-httpclient</artifactId>
     </dependency>
     </dependency>
 </dependencies>
 </dependencies>
-````
+```
 
 
 ###### Apache httpclient5
 ###### Apache httpclient5
 
 
 Spring boot does not specify the version of apache httpclient5, so you need to manually specify the version here
 Spring boot does not specify the version of apache httpclient5, so you need to manually specify the version here
 
 
-````xml
+```xml
 <dependencies>
 <dependencies>
     <dependency>
     <dependency>
         <groupId>com.ctrip.framework.apollo</groupId>
         <groupId>com.ctrip.framework.apollo</groupId>
@@ -838,7 +838,7 @@ Spring boot does not specify the version of apache httpclient5, so you need to m
        <version>5.1</version>
        <version>5.1</version>
     </dependency>
     </dependency>
 </dependencies>
 </dependencies>
-````
+```
 
 
 ##### 3.2.1.5.2 Configure `app.id`, `env`, `apollo.meta` (or `apollo.config-service`), `apollo.cluster` as described above
 ##### 3.2.1.5.2 Configure `app.id`, `env`, `apollo.meta` (or `apollo.config-service`), `apollo.cluster` as described above
 
 
@@ -846,10 +846,10 @@ Spring boot does not specify the version of apache httpclient5, so you need to m
 
 
 The default namespace is used here as an example. Please refer to 3.2.1.4.3 for the configuration of namespace.
 The default namespace is used here as an example. Please refer to 3.2.1.4.3 for the configuration of namespace.
 
 
-````properties
+```properties
 spring.config.import=apollo://application
 spring.config.import=apollo://application
 apollo.client.extension.enabled=true
 apollo.client.extension.enabled=true
-````
+```
 
 
 ##### 3.2.1.5.4 Provide implementation of spi
 ##### 3.2.1.5.4 Provide implementation of spi
 
 
@@ -870,16 +870,16 @@ If you need to turn off the automatic update function of placeholder at runtime,
 
 
 2. By setting the `apollo.autoUpdateInjectedSpringProperties` property in META-INF/app.properties, such as
 2. By setting the `apollo.autoUpdateInjectedSpringProperties` property in META-INF/app.properties, such as
 
 
-````properties
+```properties
 app.id=SampleApp
 app.id=SampleApp
 apollo.autoUpdateInjectedSpringProperties=false
 apollo.autoUpdateInjectedSpringProperties=false
-````
+```
 
 
 #### 3.2.2.1 XML usage
 #### 3.2.2.1 XML usage
 
 
 Suppose I have a TestXmlBean with two configuration items that need to be injected:
 Suppose I have a TestXmlBean with two configuration items that need to be injected:
 
 
-````java
+```java
 public class TestXmlBean {
 public class TestXmlBean {
   private int timeout;
   private int timeout;
   private int batch;
   private int batch;
@@ -900,11 +900,11 @@ public class TestXmlBean {
     return batch;
     return batch;
   }
   }
 }
 }
-````
+```
 
 
 Then, I will use the following way to define in XML (assuming that the default application namespace of the application has timeout and batch configuration items):
 Then, I will use the following way to define in XML (assuming that the default application namespace of the application has timeout and batch configuration items):
 
 
-````xml
+```xml
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -917,13 +917,13 @@ Then, I will use the following way to define in XML (assuming that the default a
         <property name="batch" value="${batch:200}"/>
         <property name="batch" value="${batch:200}"/>
     </bean>
     </bean>
 </beans>
 </beans>
-````
+```
 
 
 #### 3.2.2.2 How to use Java Config
 #### 3.2.2.2 How to use Java Config
 
 
 Suppose I have a TestJavaConfigBean, which can also be injected using @Value through Java Config:
 Suppose I have a TestJavaConfigBean, which can also be injected using @Value through Java Config:
 
 
-````java
+```java
 public class TestJavaConfigBean {
 public class TestJavaConfigBean {
   @Value("${timeout:100}")
   @Value("${timeout:100}")
   private int timeout;
   private int timeout;
@@ -942,11 +942,11 @@ public class TestJavaConfigBean {
     return batch;
     return batch;
   }
   }
 }
 }
-````
+```
 
 
 In the Configuration class, use it in the following way (assuming the default application namespace of the application has `timeout` and `batch` configuration items):
 In the Configuration class, use it in the following way (assuming the default application namespace of the application has `timeout` and `batch` configuration items):
 
 
-````java
+```java
 @Configuration
 @Configuration
 @EnableApolloConfig
 @EnableApolloConfig
 public class AppConfig {
 public class AppConfig {
@@ -955,7 +955,7 @@ public class AppConfig {
     return new TestJavaConfigBean();
     return new TestJavaConfigBean();
   }
   }
 }
 }
-````
+```
 
 
 #### 3.2.2.3 How to use ConfigurationProperties
 #### 3.2.2.3 How to use ConfigurationProperties
 
 
@@ -963,7 +963,7 @@ Spring Boot provides [@ConfigurationProperties](http://docs.spring.io/spring-boo
 
 
 Apollo also supports this method. The following example will inject `redis.cache.expireSeconds` and `redis.cache.commandTimeout` into the `expireSeconds` and `commandTimeout` fields of SampleRedisConfig respectively.
 Apollo also supports this method. The following example will inject `redis.cache.expireSeconds` and `redis.cache.commandTimeout` into the `expireSeconds` and `commandTimeout` fields of SampleRedisConfig respectively.
 
 
-````java
+```java
 @ConfigurationProperties(prefix = "redis.cache")
 @ConfigurationProperties(prefix = "redis.cache")
 public class SampleRedisConfig {
 public class SampleRedisConfig {
   private int expireSeconds;
   private int expireSeconds;
@@ -977,11 +977,11 @@ public class SampleRedisConfig {
     this.commandTimeout = commandTimeout;
     this.commandTimeout = commandTimeout;
   }
   }
 }
 }
-````
+```
 
 
 In the Configuration class, use it in the following way (assuming the default application namespace of the application has `redis.cache.expireSeconds` and `redis.cache.commandTimeout` configuration items):
 In the Configuration class, use it in the following way (assuming the default application namespace of the application has `redis.cache.expireSeconds` and `redis.cache.commandTimeout` configuration items):
 
 
-````java
+```java
 @Configuration
 @Configuration
 @EnableApolloConfig
 @EnableApolloConfig
 public class AppConfig {
 public class AppConfig {
@@ -990,7 +990,7 @@ public class AppConfig {
     return new SampleRedisConfig();
     return new SampleRedisConfig();
   }
   }
 }
 }
-````
+```
 
 
 It should be noted that if `@ConfigurationProperties` needs to automatically update the injected value when the Apollo configuration changes, you need to use [EnvironmentChangeEvent](https://cloud.spring.io/spring-cloud-static/spring-cloud.html#_environment_changes) or [RefreshScope](https://cloud.spring.io/spring-cloud-static/spring-cloud.html#_refresh_scope). For related code implementation, please refer to [ZuulPropertiesRefresher.java](https://github.com/ctripcorp/apollo-use-cases/blob/master/spring-cloud-zuul/src/main/java/com/ctrip/framework/apollo/use/cases/spring/cloud/zuul/ZuulPropertiesRefresher.java#L48) and [SampleRedisConfig.java](https://github.com/apolloconfig/apollo-demo-java/blob/main/spring-boot-demo/src/main/java/com/apolloconfig/apollo/demo/springboot/config/SampleRedisConfig.java) and [SpringBootApolloRefreshConfig.java](https://github.com/apolloconfig/apollo-demo-java/blob/main/spring-boot-demo/src/main/java/com/apolloconfig/apollo/demo/springboot/refresh/SpringBootApolloRefreshConfig.java)
 It should be noted that if `@ConfigurationProperties` needs to automatically update the injected value when the Apollo configuration changes, you need to use [EnvironmentChangeEvent](https://cloud.spring.io/spring-cloud-static/spring-cloud.html#_environment_changes) or [RefreshScope](https://cloud.spring.io/spring-cloud-static/spring-cloud.html#_refresh_scope). For related code implementation, please refer to [ZuulPropertiesRefresher.java](https://github.com/ctripcorp/apollo-use-cases/blob/master/spring-cloud-zuul/src/main/java/com/ctrip/framework/apollo/use/cases/spring/cloud/zuul/ZuulPropertiesRefresher.java#L48) and [SampleRedisConfig.java](https://github.com/apolloconfig/apollo-demo-java/blob/main/spring-boot-demo/src/main/java/com/apolloconfig/apollo/demo/springboot/config/SampleRedisConfig.java) and [SpringBootApolloRefreshConfig.java](https://github.com/apolloconfig/apollo-demo-java/blob/main/spring-boot-demo/src/main/java/com/apolloconfig/apollo/demo/springboot/refresh/SpringBootApolloRefreshConfig.java)
 
 
@@ -1007,7 +1007,7 @@ Apollo also adds several new Annotations to simplify usage in the Spring environ
 
 
 Example of usage is as follows:
 Example of usage is as follows:
 
 
-````java
+```java
 public class TestApolloAnnotationBean {
 public class TestApolloAnnotationBean {
   @ApolloConfig
   @ApolloConfig
   private Config config; //inject config for namespace application
   private Config config; //inject config for namespace application
@@ -1067,11 +1067,11 @@ public class TestApolloAnnotationBean {
     private int someInt;
     private int someInt;
   }
   }
 }
 }
-````
+```
 
 
 Use it in the Configuration class as follows:
 Use it in the Configuration class as follows:
 
 
-````java
+```java
 @Configuration
 @Configuration
 @EnableApolloConfig
 @EnableApolloConfig
 public class AppConfig {
 public class AppConfig {
@@ -1080,7 +1080,7 @@ public class AppConfig {
     return new TestApolloAnnotationBean();
     return new TestApolloAnnotationBean();
   }
   }
 }
 }
-````
+```
 
 
 ### 3.2.4 Existing configuration migration
 ### 3.2.4 Existing configuration migration
 
 
@@ -1099,7 +1099,7 @@ After the application is connected to Apollo, these configurations can be easily
 
 
 Such as:
 Such as:
 
 
-````properties
+```properties
 spring.application.name=reservation-service
 spring.application.name=reservation-service
 server.port = 8080
 server.port = 8080
 
 
@@ -1112,7 +1112,7 @@ eureka.client.fetchRegistry = true
 eureka.client.eurekaServiceUrlPollIntervalSeconds = 60
 eureka.client.eurekaServiceUrlPollIntervalSeconds = 60
 
 
 eureka.instance.preferIpAddress = true
 eureka.instance.preferIpAddress = true
-````
+```
 
 
 ![text-mode-spring-boot-config-sample](https://cdn.jsdelivr.net/gh/apolloconfig/apollo@master/doc/images/text-mode-spring-boot-config-sample.png )
 ![text-mode-spring-boot-config-sample](https://cdn.jsdelivr.net/gh/apolloconfig/apollo@master/doc/images/text-mode-spring-boot-config-sample.png )
 
 

+ 2 - 2
docs/zh/misc/apollo-benchmark.md

@@ -6,10 +6,10 @@
 4C12G
 4C12G
 
 
 #### 1.2 JVM参数
 #### 1.2 JVM参数
-````
+```
 -Xms6144m -Xmx6144m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=4096m -XX:MaxNewSize=4096m -XX:SurvivorRatio=8
 -Xms6144m -Xmx6144m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=4096m -XX:MaxNewSize=4096m -XX:SurvivorRatio=8
 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:MaxTenuringThreshold=9 -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+ScavengeBeforeFullGC -XX:+UseCMSCompactAtFullCollection -XX:+CMSParallelRemarkEnabled -XX:CMSFullGCsBeforeCompaction=9 -XX:CMSInitiatingOccupancyFraction=60 -XX:+CMSClassUnloadingEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+CMSPermGenSweepingEnabled -XX:CMSInitiatingPermOccupancyFraction=70 -XX:+ExplicitGCInvokesConcurrent -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationConcurrentTime -XX:+PrintHeapAtGC -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow -Duser.timezone=Asia/Shanghai -Dclient.encoding.override=UTF-8 -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom
 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:MaxTenuringThreshold=9 -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+ScavengeBeforeFullGC -XX:+UseCMSCompactAtFullCollection -XX:+CMSParallelRemarkEnabled -XX:CMSFullGCsBeforeCompaction=9 -XX:CMSInitiatingOccupancyFraction=60 -XX:+CMSClassUnloadingEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+CMSPermGenSweepingEnabled -XX:CMSInitiatingPermOccupancyFraction=70 -XX:+ExplicitGCInvokesConcurrent -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationConcurrentTime -XX:+PrintHeapAtGC -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow -Duser.timezone=Asia/Shanghai -Dclient.encoding.override=UTF-8 -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom
-````
+```
 #### 1.3 JVM版本
 #### 1.3 JVM版本
 1.8.0_60
 1.8.0_60