From b1c39a6354c1c8e4ff060d3f1d529d075376c29d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BB=B6?= <1060026287@qq.com> Date: Mon, 8 Mar 2021 11:43:26 +0800 Subject: [PATCH] [ISSUE-#4306] StringJoiner should consider '@@'. (#5022) * StringJoiner should consider '@@'. * StringJoiner should consider '@@'. --- api/src/main/java/com/alibaba/nacos/api/common/Constants.java | 2 ++ .../main/java/com/alibaba/nacos/naming/core/ServiceManager.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/com/alibaba/nacos/api/common/Constants.java b/api/src/main/java/com/alibaba/nacos/api/common/Constants.java index f81a9349181..9d1d1de0e50 100644 --- a/api/src/main/java/com/alibaba/nacos/api/common/Constants.java +++ b/api/src/main/java/com/alibaba/nacos/api/common/Constants.java @@ -176,6 +176,8 @@ public class Constants { public static final String SERVICE_INFO_SPLITER = "@@"; + public static final int SERVICE_INFO_SPLIT_COUNT = 2; + public static final String NULL_STRING = "null"; public static final String NUMBER_PATTERN = "^\\d+$"; diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java b/naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java index 6c7621f1d95..3c2ce6b04a7 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java @@ -941,7 +941,7 @@ public int getPagedService(String namespaceId, int startPage, int pageSize, Stri if (StringUtils.isNotBlank(param)) { StringJoiner regex = new StringJoiner(Constants.SERVICE_INFO_SPLITER); - for (String s : param.split(Constants.SERVICE_INFO_SPLITER)) { + for (String s : param.split(Constants.SERVICE_INFO_SPLITER, Constants.SERVICE_INFO_SPLIT_COUNT)) { regex.add(StringUtils.isBlank(s) ? Constants.ANY_PATTERN : Constants.ANY_PATTERN + s + Constants.ANY_PATTERN); }