[ISSUE-#4306] StringJoiner should consider '@@'. (#5022)

* StringJoiner should consider '@@'. * StringJoiner should consider '@@'.
alibaba · Mar 8, 2021 · b1c39a6 · b1c39a6
1 parent 63f7e33
commit b1c39a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -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
@@ -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);
             }