diff --git a/CHANGELOG.md b/CHANGELOG.md index cad058091..b2d4d71aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,3 +4,4 @@ - [Optimize: remove discovery module useless code](https://github.com/Tencent/spring-cloud-tencent/pull/597) - [Fix issue 579:Report the labels in request when report the result of invocation by RestTemplate](https://github.com/Tencent/spring-cloud-tencent/pull/600) - [Optimize: optimize configuration conditional & optimize config data tips"](https://github.com/Tencent/spring-cloud-tencent/pull/605) +- [Optimize: Maybe remove Chinese characters](https://github.com/Tencent/spring-cloud-tencent/pull/609) \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c5b1e573f..86f23b37b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing --- -If you have good comments or suggestions, welcome to create [Issues](https://github.com/Tencent/spring-cloud-tencent/issues) or [Pull Requests](https://github.com/Tencent/spring-cloud-tencent/pulls)，contribute to the Spring Cloud Tencent open source community. Spring Cloud Tencent continues to recruit contributors, even if it is answering questions in the issue, or doing some simple bugfixes, it will be of great help to Spring Cloud Tencent. +If you have good comments or suggestions, welcome to create [Issues](https://github.com/Tencent/spring-cloud-tencent/issues) or [Pull Requests](https://github.com/Tencent/spring-cloud-tencent/pulls), contribute to the Spring Cloud Tencent open source community. Spring Cloud Tencent continues to recruit contributors, even if it is answering questions in the issue, or doing some simple bugfixes, it will be of great help to Spring Cloud Tencent. [Tencent Open Source Incentive Program](https://opensource.tencent.com/contribution) Encourage developers to participate and contribute, and look forward to your joining. diff --git a/README-zh.md b/README-zh.md index 9b435ff41..1e894d76e 100644 --- a/README-zh.md +++ b/README-zh.md @@ -113,7 +113,7 @@ You can build this project with command: - [Actuator Endpoint Extension](https://github.com/Tencent/spring-cloud-tencent/wiki/Actuator-Endpoint-%E6%89%A9%E5%B1%95) - 最佳实践 - - [Multi-feature environment](https://github.com/Tencent/spring-cloud-tencent/wiki/多特性环境) + - [Multi-feature environment](https://github.com/Tencent/spring-cloud-tencent/wiki/%E5%A4%9A%E7%89%B9%E6%80%A7%E7%8E%AF%E5%A2%83) - [Multi-registration and multi-discovery](https://github.com/Tencent/spring-cloud-tencent/wiki/Multi-registration-and-multi-discovery) - 开发文档 diff --git a/README.md b/README.md index 2cc606dcc..93a5c5e01 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ You can build this project with command: - [Actuator Endpoint Extension](https://github.com/Tencent/spring-cloud-tencent/wiki/Actuator-Endpoint-%E6%89%A9%E5%B1%95) - Best Practices - - [Multi-feature environment](https://github.com/Tencent/spring-cloud-tencent/wiki/多特性环境) + - [Multi-feature environment](https://github.com/Tencent/spring-cloud-tencent/wiki/%E5%A4%9A%E7%89%B9%E6%80%A7%E7%8E%AF%E5%A2%83) - [Multi-registration and multi-discovery](https://github.com/Tencent/spring-cloud-tencent/wiki/Multi-registration-and-multi-discovery) - Development documentation diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/annotation/PolarisConfigAnnotationProcessor.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/annotation/PolarisConfigAnnotationProcessor.java index 52704cc9b..e8e245e51 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/annotation/PolarisConfigAnnotationProcessor.java +++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/annotation/PolarisConfigAnnotationProcessor.java @@ -40,7 +40,7 @@ import static com.tencent.cloud.polaris.config.listener.PolarisConfigListenerCon /** * {@link PolarisConfigAnnotationProcessor} implementation for spring . - *

This source file was reference from： + *

This source file was reference from: * * ApolloAnnotationProcessor * @author Palmer Xu 2022-06-07 diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/annotation/PolarisConfigKVFileChangeListener.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/annotation/PolarisConfigKVFileChangeListener.java index d5e291996..eba43e819 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/annotation/PolarisConfigKVFileChangeListener.java +++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/annotation/PolarisConfigKVFileChangeListener.java @@ -26,7 +26,7 @@ import java.lang.annotation.Target; /** * Configuring the change listener annotation. - *

This source file was reference from： + *

This source file was reference from: * * ApolloAnnotationProcessor * @author Palmer Xu 2022-05-31 diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/listener/PolarisConfigListenerContext.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/listener/PolarisConfigListenerContext.java index 6bd266bf8..debefe712 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/listener/PolarisConfigListenerContext.java +++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/listener/PolarisConfigListenerContext.java @@ -49,7 +49,7 @@ import static com.tencent.polaris.configuration.api.core.ChangeType.MODIFIED; /** * Polaris Config Listener Context Defined . - *

This source file was reference from： + *

This source file was reference from: * * AbstractConfig * diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/util/OkHttpUtil.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/util/OkHttpUtil.java index 759b78c47..eef636736 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/util/OkHttpUtil.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/util/OkHttpUtil.java @@ -62,12 +62,12 @@ public final class OkHttpUtil { if (response.isSuccessful() && Objects.nonNull(response.body())) { String result = response.body().string(); - LOGGER.debug("exec get request, url: {} success，response data: {}", url, result); + LOGGER.debug("exec get request, url: {} success, response data: {}", url, result); return true; } } catch (Exception e) { - LOGGER.error("exec get request，url: {} failed!", url, e); + LOGGER.error("exec get request, url: {} failed!", url, e); } return false; } diff --git a/spring-cloud-tencent-examples/metadata-transfer-example/README.md b/spring-cloud-tencent-examples/metadata-transfer-example/README.md index 5fd736ba5..d2d524bf8 100644 --- a/spring-cloud-tencent-examples/metadata-transfer-example/README.md +++ b/spring-cloud-tencent-examples/metadata-transfer-example/README.md @@ -5,7 +5,7 @@ This example shows how to use ```spring-cloud-starter-tencent-metadata-transfer``` in Spring Cloud project for its features. -This example contains ```metadata-frontend```、```metadata-middle```、```metadata-backend```. +This example contains ```metadata-frontend```, ```metadata-middle```, ```metadata-backend```. ## Instruction @@ -55,7 +55,7 @@ Execute under ```spring-cloud-tencent-examples/metadata-transfer-example``` mvn clean package ``` -Then find the jars under ```metadata-frontend```、```metadata-middle```、```metadata-backend```, and run it: +Then find the jars under ```metadata-frontend```, ```metadata-middle```, ```metadata-backend```, and run it: ``` java -jar ${app.jar} diff --git a/spring-cloud-tencent-examples/polaris-router-featureenv-example/README.md b/spring-cloud-tencent-examples/polaris-router-featureenv-example/README.md index e0853aef2..8cf15c314 100644 --- a/spring-cloud-tencent-examples/polaris-router-featureenv-example/README.md +++ b/spring-cloud-tencent-examples/polaris-router-featureenv-example/README.md @@ -32,7 +32,7 @@ By default, the applications point to the official Polaris experience environmen registration data at the experience site after a successful launch. - Console address: http://14.116.241.63:8080/ - - Account：polaris + - Account: polaris - Password: polaris ## III. Testing @@ -89,7 +89,7 @@ Simulate a real-world scenario, assuming that the client request has a uid reque **Configure coloring rules** -Polaris Configuration Address：http://14.116.241.63:8080/#/filegroup-detail?group=featureenv-gateway&namespace=default +Polaris Configuration Address: http://14.116.241.63:8080/#/filegroup-detail?group=featureenv-gateway&namespace=default Modify the `rule/staining.json` configuration file and fill in the following rule: diff --git a/spring-cloud-tencent-examples/polaris-router-grayrelease-example/README.md b/spring-cloud-tencent-examples/polaris-router-grayrelease-example/README.md index 8ad68bbeb..4359bfcd8 100644 --- a/spring-cloud-tencent-examples/polaris-router-grayrelease-example/README.md +++ b/spring-cloud-tencent-examples/polaris-router-grayrelease-example/README.md @@ -10,10 +10,10 @@ This project shows how to use Spring Cloud Tencent route and transitive feature ![](https://qcloudimg.tencent-cloud.cn/raw/488182fd3001b3e77d9450e2c8798ff3.png) -Incoming requests dispatched from Gateway service to 3 environments： +Incoming requests dispatched from Gateway service to 3 environments: - gray1(match uid=1), env=green(green environment) - gray2(match uid=2), env=purple(purple environment) -- baseline（stable environment, match all other requests）, env=blue(blue environment) +- baseline(stable environment, match all other requests), env=blue(blue environment) ## How to access @@ -26,8 +26,8 @@ Incoming requests dispatched from Gateway service to 3 environments： 2. start router-grayrelease-gateway application - - Launch by IDE：Start the main class `GrayReleaseGatewayApplication`. - - Launch by Jar：Execute `mvn clean package` to compile with jar package, then use `java -jar router-grayrelease-gateway-${verion}.jar` to launch application. + - Launch by IDE: Start the main class `GrayReleaseGatewayApplication`. + - Launch by Jar: Execute `mvn clean package` to compile with jar package, then use `java -jar router-grayrelease-gateway-${verion}.jar` to launch application. 3. add the route rule @@ -136,13 +136,13 @@ Incoming requests dispatched from Gateway service to 3 environments： - polaris server address: polaris_address=grpc://127.0.0.1:8091 - pushgateway address: prometheus_address=127.0.0.1:9091 - - env tag：SCT_METADATA_CONTENT_env=blue - - transitive tag：SCT_METADATA_CONTENT_TRANSITIVE=env + - env tag: SCT_METADATA_CONTENT_env=blue + - transitive tag: SCT_METADATA_CONTENT_TRANSITIVE=env 2. start router-grayrelease-frontend application - - Launch by IDE：Start the main class `GrayReleaseFrontApplication`. - - Launch by Jar：Execute `mvn clean package` to compile with jar package, then use `java -jar router-grayrelease-frontend-${verion}.jar` to launch application. + - Launch by IDE: Start the main class `GrayReleaseFrontApplication`. + - Launch by Jar: Execute `mvn clean package` to compile with jar package, then use `java -jar router-grayrelease-frontend-${verion}.jar` to launch application. #### Start gray1 environment (green) @@ -150,8 +150,8 @@ Incoming requests dispatched from Gateway service to 3 environments： - polaris server address: polaris_address=grpc://127.0.0.1:8091 - pushgateway address: prometheus_address=127.0.0.1:9091 - - env tag：SCT_METADATA_CONTENT_env=green - - transitive tag：SCT_METADATA_CONTENT_TRANSITIVE=env + - env tag: SCT_METADATA_CONTENT_env=green + - transitive tag: SCT_METADATA_CONTENT_TRANSITIVE=env 2. start router-grayrelease-frontend application (same as previous instruction) @@ -163,8 +163,8 @@ Incoming requests dispatched from Gateway service to 3 environments： - polaris server address: polaris_address=grpc://127.0.0.1:8091 - pushgateway address: prometheus_address=127.0.0.1:9091 - - env tag：SCT_METADATA_CONTENT_env=purple - - transitive tag：SCT_METADATA_CONTENT_TRANSITIVE=env + - env tag: SCT_METADATA_CONTENT_env=purple + - transitive tag: SCT_METADATA_CONTENT_TRANSITIVE=env 2. start router-grayrelease-frontend application (same as previous instruction) @@ -182,13 +182,13 @@ You can find the instances with different tags in polaris console. - polaris server address: polaris_address=grpc://127.0.0.1:8091 - pushgateway address: prometheus_address=127.0.0.1:9091 - - env tag：SCT_METADATA_CONTENT_env=blue - - transitive tag：SCT_METADATA_CONTENT_TRANSITIVE=env + - env tag: SCT_METADATA_CONTENT_env=blue + - transitive tag: SCT_METADATA_CONTENT_TRANSITIVE=env 2. start router-grayrelease-middle application - - Launch by IDE：Start the main class `GrayReleaseMiddleApplication`. - - Launch by Jar：Execute `mvn clean package` to compile with jar package, then use `java -jar router-grayrelease-middle-${verion}.jar` to launch application. + - Launch by IDE: Start the main class `GrayReleaseMiddleApplication`. + - Launch by Jar: Execute `mvn clean package` to compile with jar package, then use `java -jar router-grayrelease-middle-${verion}.jar` to launch application. #### Start gray2 environment (purple) @@ -196,8 +196,8 @@ You can find the instances with different tags in polaris console. - polaris server address: polaris_address=grpc://127.0.0.1:8091 - pushgateway address: prometheus_address=127.0.0.1:9091 - - env tag：SCT_METADATA_CONTENT_env=purple - - transitive tag：SCT_METADATA_CONTENT_TRANSITIVE=env + - env tag: SCT_METADATA_CONTENT_env=purple + - transitive tag: SCT_METADATA_CONTENT_TRANSITIVE=env 2. start router-grayrelease-middle application (same as previous instruction) @@ -209,13 +209,13 @@ You can find the instances with different tags in polaris console. - polaris server address: polaris_address=grpc://127.0.0.1:8091 - pushgateway address: prometheus_address=127.0.0.1:9091 - - env tag：SCT_METADATA_CONTENT_env=blue - - transitive tag：SCT_METADATA_CONTENT_TRANSITIVE=env + - env tag: SCT_METADATA_CONTENT_env=blue + - transitive tag: SCT_METADATA_CONTENT_TRANSITIVE=env 2. start router-grayrelease-backend application - - Launch by IDE：Start the main class `GrayReleaseBackendApplication`. - - Launch by Jar：Execute `mvn clean package` to compile with jar package, then use `java -jar router-grayrelease-backend-${verion}.jar` to launch application. + - Launch by IDE: Start the main class `GrayReleaseBackendApplication`. + - Launch by Jar: Execute `mvn clean package` to compile with jar package, then use `java -jar router-grayrelease-backend-${verion}.jar` to launch application. #### Start gray1 environment (green) @@ -223,8 +223,8 @@ You can find the instances with different tags in polaris console. - polaris server address: polaris_address=grpc://127.0.0.1:8091 - pushgateway address: prometheus_address=127.0.0.1:9091 - - env tag：SCT_METADATA_CONTENT_env=green - - transitive tag：SCT_METADATA_CONTENT_TRANSITIVE=env + - env tag: SCT_METADATA_CONTENT_env=green + - transitive tag: SCT_METADATA_CONTENT_TRANSITIVE=env 2. start router-grayrelease-backend application (same as previous instruction)