Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: typo fix #5272

Merged
merged 1 commit into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apollo-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<artifactId>commons-lang3</artifactId>
</dependency>

<!-- Micrometer core dependecy -->
<!-- Micrometer core dependency -->
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ static class PortalWebMvcConfig extends WebMvcConfig {
@Override
public void customize(TomcatServletWebServerFactory factory) {
final String relaxedChars = "<>[\\]^`{|}";
final String tomcatRelaxedpathcharsProperty = "relaxedPathChars";
final String tomcatRelaxedquerycharsProperty = "relaxedQueryChars";
final String tomcatRelaxedPathCharsProperty = "relaxedPathChars";
final String tomcatRelaxedQueryCharsProperty = "relaxedQueryChars";
factory.addConnectorCustomizers(connector -> {
connector.setProperty(tomcatRelaxedpathcharsProperty, relaxedChars);
connector.setProperty(tomcatRelaxedquerycharsProperty, relaxedChars);
connector.setProperty(tomcatRelaxedPathCharsProperty, relaxedChars);
connector.setProperty(tomcatRelaxedQueryCharsProperty, relaxedChars);
});
}
}
Expand Down
2 changes: 1 addition & 1 deletion docs/en/client/other-language-client-user-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ Once you have the notifications Map, you can request services. Here we describe
If the notificationId is found to be older than the server, the latest notificationId of the corresponding namespace, HttpStatus 200, will be returned directly.
5. After the client gets the server side return, determine the return HttpStatus .
6. If the returned HttpStatus is 304, that the configuration has not changed, re-execute step 1.
7. If the returned HttpStauts is 200, the configuration has changed, for the change of namespace to pull configuration from the server again, see [1.3 Read configuration from Apollo through the Http interface without cache](en/client/other-language-client-user-guide?id=_13-reading-configuration-from-apollo-via-http-interface-without-cache). Also update the notificationId in the notifications map. re-run step 1.
7. If the returned HttpStatus is 200, the configuration has changed, for the change of namespace to pull configuration from the server again, see [1.3 Read configuration from Apollo through the Http interface without cache](en/client/other-language-client-user-guide?id=_13-reading-configuration-from-apollo-via-http-interface-without-cache). Also update the notificationId in the notifications map. re-run step 1.


### 1.4.2 Http interface description
Expand Down
2 changes: 1 addition & 1 deletion docs/zh/client/other-language-client-user-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ Apollo提供了基于Http long polling的配置更新推送通知,第三方客
4. 如果传过来的notifications信息中发现有notificationId比服务端老,则直接返回对应namespace的最新notificationId, HttpStatus 200。
5. 客户端拿到服务端返回后,判断返回的HttpStatus
6. 如果返回的HttpStatus是304,说明配置没有变化,重新执行第1步
7. 如果返回的HttpStauts是200,说明配置有变化,针对变化的namespace重新去服务端拉取配置,参见[1.3 通过不带缓存的Http接口从Apollo读取配置](#_13-%E9%80%9A%E8%BF%87%E4%B8%8D%E5%B8%A6%E7%BC%93%E5%AD%98%E7%9A%84http%E6%8E%A5%E5%8F%A3%E4%BB%8Eapollo%E8%AF%BB%E5%8F%96%E9%85%8D%E7%BD%AE)。同时更新notifications map中的notificationId。重新执行第1步。
7. 如果返回的HttpStatus是200,说明配置有变化,针对变化的namespace重新去服务端拉取配置,参见[1.3 通过不带缓存的Http接口从Apollo读取配置](#_13-%E9%80%9A%E8%BF%87%E4%B8%8D%E5%B8%A6%E7%BC%93%E5%AD%98%E7%9A%84http%E6%8E%A5%E5%8F%A3%E4%BB%8Eapollo%E8%AF%BB%E5%8F%96%E9%85%8D%E7%BD%AE)。同时更新notifications map中的notificationId。重新执行第1步。


### 1.4.2 Http接口说明
Expand Down
4 changes: 2 additions & 2 deletions scripts/openapi/bash/openapi-usage-example.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# Chinese reference website https://www.apolloconfig.com/#/zh/portal/apollo-open-api-platform
# English reference website https://www.apolloconfig.com/#/en/portal/apollo-open-api-platform

# export global varialbes
# export global variables
export APOLLO_PORTAL_ADDRESS=http://106.54.227.205
export APOLLO_OPENAPI_TOKEN=284fe833cbaeecf2764801aa73965080b184fc88
export CURL_OPTIONS=""
Expand Down Expand Up @@ -80,7 +80,7 @@ printf "\n"
item_update ${APOLLO_ENV} ${APOLLO_APP_ID} default application ${temp_item_key} ${temp_item_value} "openapi-update-item" ${APOLLO_USER}
printf "\n\n"

echo "show Update an item of a namespace, if item doesn's exist, create it"
echo "show Update an item of a namespace, if item doesn't exist, create it"
sleep 1
temp_item_key="openapi-usage-item_update_create_if_not_exists-key-$(date +%s)"
temp_item_value="openapi-usage-item_update_create_if_not_exists-value-$(date +%s)"
Expand Down
2 changes: 1 addition & 1 deletion scripts/openapi/bash/openapi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ BODY
}

#######################################
# Update an item of a namespace, if item doesn's exist, create it.
# Update an item of a namespace, if item doesn't exist, create it.
# 修改配置,当配置不存在时自动创建
# Arguments:
# env
Expand Down
Loading