From 4e7252c333acdd188747974848dd1edad98220ee Mon Sep 17 00:00:00 2001 From: shishuiwuhen2009 <90782280+shishuiwuhen2009@users.noreply.github.com> Date: Wed, 20 Aug 2025 12:09:39 +0800 Subject: [PATCH 1/2] Update McpToolUtils.java fix McpToolUtils.prefixedToolName formatted in order to support Chinese characters in toolName Signed-off-by: shishuiwuhen2009 <90782280+shishuiwuhen2009@users.noreply.github.com> --- .../main/java/org/springframework/ai/mcp/McpToolUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mcp/common/src/main/java/org/springframework/ai/mcp/McpToolUtils.java b/mcp/common/src/main/java/org/springframework/ai/mcp/McpToolUtils.java index c7ab81072ec..be95611384d 100644 --- a/mcp/common/src/main/java/org/springframework/ai/mcp/McpToolUtils.java +++ b/mcp/common/src/main/java/org/springframework/ai/mcp/McpToolUtils.java @@ -79,9 +79,9 @@ public static String prefixedToolName(String prefix, String toolName) { String input = prefix + "_" + toolName; - // Replace any character that isn't alphanumeric, underscore, or hyphen with - // concatenation - String formatted = input.replaceAll("[^a-zA-Z0-9_-]", ""); + // Replace any character that isn't alphanumeric, underscore, hyphen, or Chinese + // characters with empty string + String formatted = input.replaceAll("[^a-zA-Z0-9_\u4e00-\u9fa5]", ""); formatted = formatted.replaceAll("-", "_"); From e95e632f66510888b8230c492bfe5f51f45da03d Mon Sep 17 00:00:00 2001 From: shishuiwuhen2009 <90782280+shishuiwuhen2009@users.noreply.github.com> Date: Wed, 20 Aug 2025 12:26:55 +0800 Subject: [PATCH 2/2] Update McpToolUtils.java fix McpToolUtils.prefixedToolName formatted in order to support Chinese characters in toolName. Signed-off-by: shishuiwuhen2009 <90782280+shishuiwuhen2009@users.noreply.github.com> --- .../main/java/org/springframework/ai/mcp/McpToolUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mcp/common/src/main/java/org/springframework/ai/mcp/McpToolUtils.java b/mcp/common/src/main/java/org/springframework/ai/mcp/McpToolUtils.java index be95611384d..be4c7879913 100644 --- a/mcp/common/src/main/java/org/springframework/ai/mcp/McpToolUtils.java +++ b/mcp/common/src/main/java/org/springframework/ai/mcp/McpToolUtils.java @@ -79,9 +79,9 @@ public static String prefixedToolName(String prefix, String toolName) { String input = prefix + "_" + toolName; - // Replace any character that isn't alphanumeric, underscore, hyphen, or Chinese - // characters with empty string - String formatted = input.replaceAll("[^a-zA-Z0-9_\u4e00-\u9fa5]", ""); + // Replace any character that isn't alphanumeric, underscore, or hyphen with + // concatenation. Meanwhile, support Chinese characters + String formatted = input.replaceAll("[^a-zA-Z0-9_\u4e00-\u9fa5-]", ""); formatted = formatted.replaceAll("-", "_");