From ad5f78bc08a12448e257508c45c3e8493f4d0834 Mon Sep 17 00:00:00 2001 From: Haotian Zhang <928016560@qq.com> Date: Fri, 14 Oct 2022 15:25:40 +0800 Subject: [PATCH] fix:optimize expression parser V1. --- CHANGELOG.md | 3 ++- .../cloud/common/util/expresstion/ExpressionParserV1.java | 6 +++--- spring-cloud-tencent-dependencies/pom.xml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index efde869a3..a2021ef03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ - [Optimize: remove discovery module useless code](https://github.com/Tencent/spring-cloud-tencent/pull/595) - [Optimize: remove useless code for rest template router](https://github.com/Tencent/spring-cloud-tencent/pull/601) - [Optimize: optimize configuration conditional & optimize config data tips](https://github.com/Tencent/spring-cloud-tencent/pull/603) -- [Automatically transmit some headers specified by a environment varaible that directly defines header keys.](https://github.com/Tencent/spring-cloud-tencent/pull/606) +- [Automatically transmit some headers specified by an environment variable that directly defines header keys.](https://github.com/Tencent/spring-cloud-tencent/pull/606) - [Optimize: Maybe remove Chinese characters](https://github.com/Tencent/spring-cloud-tencent/pull/607) - [Optimize: InstanceId of PolarisRegistration and PolarisServiceRegistry](https://github.com/Tencent/spring-cloud-tencent/pull/610) - [ fix pr #606 cause ci fail](https://github.com/Tencent/spring-cloud-tencent/pull/613) @@ -19,3 +19,4 @@ - [Optimize:optimize transfer](https://github.com/Tencent/spring-cloud-tencent/pull/636) - [fix:cancel reporting useless metadata.](https://github.com/Tencent/spring-cloud-tencent/pull/639) - [Feature: support read config file from local file system](https://github.com/Tencent/spring-cloud-tencent/pull/640) +- [fix:optimize expression parser V1.](https://github.com/Tencent/spring-cloud-tencent/pull/642) diff --git a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/expresstion/ExpressionParserV1.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/expresstion/ExpressionParserV1.java index a5f28e8fd..dff35783a 100644 --- a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/expresstion/ExpressionParserV1.java +++ b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/expresstion/ExpressionParserV1.java @@ -53,7 +53,7 @@ public class ExpressionParserV1 implements ExpressionParser { @Override public String parseHeaderKey(String expression) { - return expression.substring(LABEL_HEADER_PREFIX_LEN, expression.length() - 1); + return StringUtils.substring(expression, LABEL_HEADER_PREFIX_LEN, expression.length() - 1); } @Override @@ -63,7 +63,7 @@ public class ExpressionParserV1 implements ExpressionParser { @Override public String parseQueryKey(String expression) { - return expression.substring(LABEL_QUERY_PREFIX_LEN, expression.length() - 1); + return StringUtils.substring(expression, LABEL_QUERY_PREFIX_LEN, expression.length() - 1); } @Override @@ -73,7 +73,7 @@ public class ExpressionParserV1 implements ExpressionParser { @Override public String parseCookieKey(String expression) { - return expression.substring(LABEL_COOKIE_PREFIX_LEN, expression.length() - 1); + return StringUtils.substring(expression, LABEL_COOKIE_PREFIX_LEN, expression.length() - 1); } @Override diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index c6bce1da1..7e2425a9a 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -73,7 +73,7 @@ 1.8.0-2021.0.3-SNAPSHOT - 1.9.0-SNAPSHOT + 1.9.1 31.0.1-jre 1.2.11 4.5.1