Skip to content

Commit 35458f8

Browse files
galaxy-seagalaxy-sea
authoredSep 25, 2022
Maybe remove Chinese characters (#607)
·
2.0.1.0-2021.0.9-RC21.8.0-2021.0.3
1 parent 7ea533b commit 35458f8

File tree

16 files changed

+42
-41
lines changed

16 files changed

+42
-41
lines changed
 

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
- [Optimize: remove discovery module useless code](https://github.com/Tencent/spring-cloud-tencent/pull/595)
66
- [Optimize: remove useless code for rest template router](https://github.com/Tencent/spring-cloud-tencent/pull/601)
77
- [Optimize: optimize configuration conditional & optimize config data tips](https://github.com/Tencent/spring-cloud-tencent/pull/603)
8+
- [Optimize: Maybe remove Chinese characters](https://github.com/Tencent/spring-cloud-tencent/pull/607)

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributing
22
---
3-
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.
3+
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.
44

55
[Tencent Open Source Incentive Program](https://opensource.tencent.com/contribution) Encourage developers to participate and contribute, and look forward to your joining.
66

‎README-zh.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ You can build this project with command:
113113
- [Actuator Endpoint Extension](https://github.com/Tencent/spring-cloud-tencent/wiki/Actuator-Endpoint-%E6%89%A9%E5%B1%95)
114114

115115
- 最佳实践
116-
- [Multi-feature environment](https://github.com/Tencent/spring-cloud-tencent/wiki/多特性环境)
116+
- [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)
117117
- [Multi-registration and multi-discovery](https://github.com/Tencent/spring-cloud-tencent/wiki/Multi-registration-and-multi-discovery)
118118

119119
- 开发文档

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ You can build this project with command:
115115
- [Actuator Endpoint Extension](https://github.com/Tencent/spring-cloud-tencent/wiki/Actuator-Endpoint-%E6%89%A9%E5%B1%95)
116116

117117
- Best Practices
118-
- [Multi-feature environment](https://github.com/Tencent/spring-cloud-tencent/wiki/多特性环境)
118+
- [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)
119119
- [Multi-registration and multi-discovery](https://github.com/Tencent/spring-cloud-tencent/wiki/Multi-registration-and-multi-discovery)
120120

121121
- Development documentation

‎changes/changes-1.7.0.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
- [Optimize router label resolver spi](https://github.com/Tencent/spring-cloud-tencent/pull/524)
2323
- [Code optimization for rpc-enhancement module](https://github.com/Tencent/spring-cloud-tencent/pull/526)
2424
- [Feature: Optimized configuration update](https://github.com/Tencent/spring-cloud-tencent/pull/528)
25-
- [Feature：support pushGateway push metrics](https://github.com/Tencent/spring-cloud-tencent/pull/529)
25+
- [Feature: support pushGateway push metrics](https://github.com/Tencent/spring-cloud-tencent/pull/529)
2626
- [Feature: remove location metadata](https://github.com/Tencent/spring-cloud-tencent/pull/536)
2727
- [Feature: remove location metadata](https://github.com/Tencent/spring-cloud-tencent/pull/542)
2828
- [add feature-env plugin & add spring cloud gateway staining plugin](https://github.com/Tencent/spring-cloud-tencent/pull/533)

‎spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/annotation/PolarisConfigAnnotationProcessor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
/**
4242
* {@link PolarisConfigAnnotationProcessor} implementation for spring .
43-
* <p>This source file was reference from：
43+
* <p>This source file was reference from:
4444
* <code><a href=https://github.com/apolloconfig/apollo/blob/master/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/annotation/ApolloAnnotationProcessor.java>
4545
* ApolloAnnotationProcessor</a></code>
4646
* @author <a href="mailto:iskp.me@gmail.com">Palmer Xu</a> 2022-06-07

‎spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/annotation/PolarisConfigKVFileChangeListener.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
/**
2828
* Configuring the change listener annotation.
29-
* <p>This source file was reference from：
29+
* <p>This source file was reference from:
3030
* <code><a href=https://github.com/apolloconfig/apollo/blob/master/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/annotation/ApolloAnnotationProcessor.java>
3131
* ApolloAnnotationProcessor</a></code>
3232
* @author Palmer Xu 2022-05-31

‎spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/configdata/PolarisConfigDataLoader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
* Load {@link ConfigData} via {@link PolarisConfigDataLoader}
5353
*
5454
* @author wlx
55-
* @date 2022/7/5 11:14 下午
55+
* @date 2022/7/5 11:14 PM
5656
*/
5757
public class PolarisConfigDataLoader implements ConfigDataLoader<PolarisConfigDataResource> {
5858

‎spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/configdata/PolarisConfigDataResource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* A polaris configData resource from which {@link ConfigData} can be loaded.
3131
*
3232
* @author wlx
33-
* @date 2022/7/5 11:13 下午
33+
* @date 2022/7/5 11:13 PM
3434
*/
3535
public class PolarisConfigDataResource extends ConfigDataResource {
3636

‎spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/configdata/PolarisImportExceptionFailureAnalyzer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/**
88
* Class for most {@code FailureAnalyzer} implementations, to analyze ImportException when
99
* miss Polaris configData config.
10-
* <p>Refer to the Nacos project implementation：
10+
* <p>Refer to the Nacos project implementation:
1111
* <code><a href=https://github.com/alibaba/spring-cloud-alibaba/blob/2021.x/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/configdata/NacosConfigDataMissingEnvironmentPostProcessor.java>
1212
* ImportExceptionFailureAnalyzer</a></code>
1313
*

‎spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/listener/PolarisConfigListenerContext.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
/**
5151
* Polaris Config Listener Context Defined .
52-
* <p>This source file was reference from：
52+
* <p>This source file was reference from:
5353
* <code><a href=https://github.com/apolloconfig/apollo/blob/master/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfig.java>
5454
* AbstractConfig</a></code>
5555
* @author Palmer Xu 2022-06-06

‎spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/util/OkHttpUtil.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ public static boolean get(String url, Map<String, String> headers) {
6262

6363
if (response.isSuccessful() && Objects.nonNull(response.body())) {
6464
String result = response.body().string();
65-
LOGGER.debug("exec get request, url: {} success，response data: {}", url, result);
65+
LOGGER.debug("exec get request, url: {} success, response data: {}", url, result);
6666
return true;
6767
}
6868
}
6969
catch (Exception e) {
70-
LOGGER.error("exec get request，url: {} failed!", url, e);
70+
LOGGER.error("exec get request, url: {} failed!", url, e);
7171
}
7272
return false;
7373
}

‎spring-cloud-tencent-examples/metadata-transfer-example/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
This example shows how to use ```spring-cloud-starter-tencent-metadata-transfer``` in Spring Cloud project for its
66
features.
77

8-
This example contains ```metadata-frontend```、```metadata-middle```、```metadata-backend```.
8+
This example contains ```metadata-frontend```, ```metadata-middle```, ```metadata-backend```.
99

1010
## Instruction
1111

@@ -55,7 +55,7 @@ Execute under ```spring-cloud-tencent-examples/metadata-transfer-example```
5555
mvn clean package
5656
```
5757

58-
Then find the jars under ```metadata-frontend```、```metadata-middle```、```metadata-backend```, and run it:
58+
Then find the jars under ```metadata-frontend```, ```metadata-middle```, ```metadata-backend```, and run it:
5959

6060
```
6161
java -jar ${app.jar}

‎spring-cloud-tencent-examples/polaris-config-data-example/src/main/java/com/tencent/cloud/polaris/config/example/PolarisConfigDataExampleApplication.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
/**
77
* @author wlx
8-
* @date 2022/7/6 9:15 下午
8+
* @date 2022/7/6 9:15 PM
99
*/
1010
@SpringBootApplication
1111
public class PolarisConfigDataExampleApplication {

‎spring-cloud-tencent-examples/polaris-router-featureenv-example/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ By default, the applications point to the official Polaris experience environmen
3232
registration data at the experience site after a successful launch.
3333

3434
- Console address: http://14.116.241.63:8080/
35-
- Account：polaris
35+
- Account: polaris
3636
- Password: polaris
3737

3838
## III. Testing
@@ -89,7 +89,7 @@ Simulate a real-world scenario, assuming that the client request has a uid reque
8989

9090
**Configure coloring rules**
9191

92-
Polaris Configuration Address：http://14.116.241.63:8080/#/filegroup-detail?group=featureenv-gateway&namespace=default
92+
Polaris Configuration Address: http://14.116.241.63:8080/#/filegroup-detail?group=featureenv-gateway&namespace=default
9393

9494
Modify the `rule/staining.json` configuration file and fill in the following rule:
9595

‎spring-cloud-tencent-examples/polaris-router-grayrelease-example/README.md

+24-24
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ This project shows how to use Spring Cloud Tencent route and transitive feature
1010

1111
![](https://qcloudimg.tencent-cloud.cn/raw/488182fd3001b3e77d9450e2c8798ff3.png)
1212

13-
Incoming requests dispatched from Gateway service to 3 environments：
13+
Incoming requests dispatched from Gateway service to 3 environments:
1414
- gray1(match uid=1), env=green(green environment)
1515
- gray2(match uid=2), env=purple(purple environment)
16-
- baseline（stable environment, match all other requests）, env=blue(blue environment)
16+
- baseline(stable environment, match all other requests), env=blue(blue environment)
1717

1818
## How to access
1919

@@ -26,8 +26,8 @@ Incoming requests dispatched from Gateway service to 3 environments：
2626

2727
2. start router-grayrelease-gateway application
2828

29-
- Launch by IDE：Start the main class `GrayReleaseGatewayApplication`.
30-
- Launch by Jar：Execute `mvn clean package` to compile with jar package, then use `java -jar router-grayrelease-gateway-${verion}.jar` to launch application.
29+
- Launch by IDE: Start the main class `GrayReleaseGatewayApplication`.
30+
- Launch by Jar: Execute `mvn clean package` to compile with jar package, then use `java -jar router-grayrelease-gateway-${verion}.jar` to launch application.
3131

3232
3. add the route rule
3333

@@ -136,22 +136,22 @@ Incoming requests dispatched from Gateway service to 3 environments：
136136

137137
- polaris server address: polaris_address=grpc://127.0.0.1:8091
138138
- pushgateway address: prometheus_address=127.0.0.1:9091
139-
- env tag：SCT_METADATA_CONTENT_env=blue
140-
- transitive tag：SCT_METADATA_CONTENT_TRANSITIVE=env
139+
- env tag: SCT_METADATA_CONTENT_env=blue
140+
- transitive tag: SCT_METADATA_CONTENT_TRANSITIVE=env
141141

142142
2. start router-grayrelease-frontend application
143143

144-
- Launch by IDE：Start the main class `GrayReleaseFrontApplication`.
145-
- Launch by Jar：Execute `mvn clean package` to compile with jar package, then use `java -jar router-grayrelease-frontend-${verion}.jar` to launch application.
144+
- Launch by IDE: Start the main class `GrayReleaseFrontApplication`.
145+
- Launch by Jar: Execute `mvn clean package` to compile with jar package, then use `java -jar router-grayrelease-frontend-${verion}.jar` to launch application.
146146

147147
#### Start gray1 environment (green)
148148

149149
1. add environment variables
150150

151151
- polaris server address: polaris_address=grpc://127.0.0.1:8091
152152
- pushgateway address: prometheus_address=127.0.0.1:9091
153-
- env tag：SCT_METADATA_CONTENT_env=green
154-
- transitive tag：SCT_METADATA_CONTENT_TRANSITIVE=env
153+
- env tag: SCT_METADATA_CONTENT_env=green
154+
- transitive tag: SCT_METADATA_CONTENT_TRANSITIVE=env
155155

156156
2. start router-grayrelease-frontend application (same as previous instruction)
157157

@@ -163,8 +163,8 @@ Incoming requests dispatched from Gateway service to 3 environments：
163163

164164
- polaris server address: polaris_address=grpc://127.0.0.1:8091
165165
- pushgateway address: prometheus_address=127.0.0.1:9091
166-
- env tag：SCT_METADATA_CONTENT_env=purple
167-
- transitive tag：SCT_METADATA_CONTENT_TRANSITIVE=env
166+
- env tag: SCT_METADATA_CONTENT_env=purple
167+
- transitive tag: SCT_METADATA_CONTENT_TRANSITIVE=env
168168

169169
2. start router-grayrelease-frontend application (same as previous instruction)
170170

@@ -182,22 +182,22 @@ You can find the instances with different tags in polaris console.
182182

183183
- polaris server address: polaris_address=grpc://127.0.0.1:8091
184184
- pushgateway address: prometheus_address=127.0.0.1:9091
185-
- env tag：SCT_METADATA_CONTENT_env=blue
186-
- transitive tag：SCT_METADATA_CONTENT_TRANSITIVE=env
185+
- env tag: SCT_METADATA_CONTENT_env=blue
186+
- transitive tag: SCT_METADATA_CONTENT_TRANSITIVE=env
187187

188188
2. start router-grayrelease-middle application
189189

190-
- Launch by IDE：Start the main class `GrayReleaseMiddleApplication`.
191-
- Launch by Jar：Execute `mvn clean package` to compile with jar package, then use `java -jar router-grayrelease-middle-${verion}.jar` to launch application.
190+
- Launch by IDE: Start the main class `GrayReleaseMiddleApplication`.
191+
- Launch by Jar: Execute `mvn clean package` to compile with jar package, then use `java -jar router-grayrelease-middle-${verion}.jar` to launch application.
192192

193193
#### Start gray2 environment (purple)
194194

195195
1. add environment variables
196196

197197
- polaris server address: polaris_address=grpc://127.0.0.1:8091
198198
- pushgateway address: prometheus_address=127.0.0.1:9091
199-
- env tag：SCT_METADATA_CONTENT_env=purple
200-
- transitive tag：SCT_METADATA_CONTENT_TRANSITIVE=env
199+
- env tag: SCT_METADATA_CONTENT_env=purple
200+
- transitive tag: SCT_METADATA_CONTENT_TRANSITIVE=env
201201

202202
2. start router-grayrelease-middle application (same as previous instruction)
203203

@@ -209,22 +209,22 @@ You can find the instances with different tags in polaris console.
209209

210210
- polaris server address: polaris_address=grpc://127.0.0.1:8091
211211
- pushgateway address: prometheus_address=127.0.0.1:9091
212-
- env tag：SCT_METADATA_CONTENT_env=blue
213-
- transitive tag：SCT_METADATA_CONTENT_TRANSITIVE=env
212+
- env tag: SCT_METADATA_CONTENT_env=blue
213+
- transitive tag: SCT_METADATA_CONTENT_TRANSITIVE=env
214214

215215
2. start router-grayrelease-backend application
216216

217-
- Launch by IDE：Start the main class `GrayReleaseBackendApplication`.
218-
- Launch by Jar：Execute `mvn clean package` to compile with jar package, then use `java -jar router-grayrelease-backend-${verion}.jar` to launch application.
217+
- Launch by IDE: Start the main class `GrayReleaseBackendApplication`.
218+
- Launch by Jar: Execute `mvn clean package` to compile with jar package, then use `java -jar router-grayrelease-backend-${verion}.jar` to launch application.
219219

220220
#### Start gray1 environment (green)
221221

222222
1. add environment variables
223223

224224
- polaris server address: polaris_address=grpc://127.0.0.1:8091
225225
- pushgateway address: prometheus_address=127.0.0.1:9091
226-
- env tag：SCT_METADATA_CONTENT_env=green
227-
- transitive tag：SCT_METADATA_CONTENT_TRANSITIVE=env
226+
- env tag: SCT_METADATA_CONTENT_env=green
227+
- transitive tag: SCT_METADATA_CONTENT_TRANSITIVE=env
228228

229229
2. start router-grayrelease-backend application (same as previous instruction)
230230

0 commit comments

Comments
 (0)
Please sign in to comment.