diff --git a/apollo-common/pom.xml b/apollo-common/pom.xml
index 6fed9bf01ca..b061f7e002d 100644
--- a/apollo-common/pom.xml
+++ b/apollo-common/pom.xml
@@ -94,7 +94,7 @@
commons-lang3
-
+
io.micrometer
micrometer-core
diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/PortalOpenApiConfig.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/PortalOpenApiConfig.java
index ece1147e44f..f39893c23ea 100644
--- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/PortalOpenApiConfig.java
+++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/PortalOpenApiConfig.java
@@ -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);
});
}
}
diff --git a/docs/en/client/other-language-client-user-guide.md b/docs/en/client/other-language-client-user-guide.md
index ec00724c5e2..fc1325d140c 100644
--- a/docs/en/client/other-language-client-user-guide.md
+++ b/docs/en/client/other-language-client-user-guide.md
@@ -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
diff --git a/docs/zh/client/other-language-client-user-guide.md b/docs/zh/client/other-language-client-user-guide.md
index 669134f2db6..260ba42a26f 100644
--- a/docs/zh/client/other-language-client-user-guide.md
+++ b/docs/zh/client/other-language-client-user-guide.md
@@ -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接口说明
diff --git a/scripts/openapi/bash/openapi-usage-example.sh b/scripts/openapi/bash/openapi-usage-example.sh
index 94fd78331ea..fec3fb826f0 100644
--- a/scripts/openapi/bash/openapi-usage-example.sh
+++ b/scripts/openapi/bash/openapi-usage-example.sh
@@ -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=""
@@ -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)"
diff --git a/scripts/openapi/bash/openapi.sh b/scripts/openapi/bash/openapi.sh
index 0d6291b3446..6c39eb7fae8 100644
--- a/scripts/openapi/bash/openapi.sh
+++ b/scripts/openapi/bash/openapi.sh
@@ -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