From 21c8fe15b7cb4cda60ceb355ed51e1f80e4fbda5 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 11 Apr 2024 15:55:06 +0800
Subject: [PATCH] =?UTF-8?q?json=20=E6=8F=90=E4=BA=A4=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=20exclude=20=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=92=E9=99=A4=E4=B8=8D=E8=A2=AB=E5=BA=8F=E5=88=97?=
 =?UTF-8?q?=E5=8C=96=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jeesite/common/lang/StringUtils.java    | 8 ++++----
 .../java/com/jeesite/common/web/http/ServletUtils.java    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/lang/StringUtils.java b/common/src/main/java/com/jeesite/common/lang/StringUtils.java
index c08dd6a5..0f162755 100644
--- a/common/src/main/java/com/jeesite/common/lang/StringUtils.java
+++ b/common/src/main/java/com/jeesite/common/lang/StringUtils.java
@@ -398,8 +398,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
 	/**
 	 * 获取树节点名字
 	 * @param isShowCode 是否显示编码<br>
-	 * 		true or 1：显示在左侧：(code)name<br>
-	 * 		2：显示在右侧：name(code)<br>
+	 * 		true or 1：显示在左侧：(code) name<br>
+	 * 		2：显示在右侧：name (code)<br>
 	 * 		false or null：不显示编码：name
 	 * @param code 编码
 	 * @param name 名称
@@ -409,9 +409,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
 		if ("true".equals(isShowCode) || "1".equals(isShowCode)) {
 			return "(" + code + ") " + StringUtils.replace(name, SPACE, EMPTY);
 		} else if ("2".equals(isShowCode)) {
-			return name/*StringUtils.replace(name, " ", "")*/ + " (" + code + ")";
+			return name + " (" + code + ")";
 		} else {
-			return name/*StringUtils.replace(name, " ", "")*/;
+			return name;
 		}
 	}
 	
diff --git a/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java b/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java
index f10a6f7f..e3ed6619 100644
--- a/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java
+++ b/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java
@@ -121,7 +121,7 @@ public class ServletUtils {
 	public static boolean isStaticFile(String uri){
 		if (STATIC_FILE == null){
 			try {
-				throw new Exception("检测到“jeesite.yml”中没有配置“web.staticFile”属性。"
+				throw new Exception("检测到“application.yml”中没有配置“web.staticFile”属性。"
 						+ "配置示例：\n#静态文件后缀\nweb.staticFile=.css,.js,.png,.jpg,.gif,"
 						+ ".jpeg,.bmp,.ico,.swf,.psd,.htc,.crx,.xpi,.exe,.ipa,.apk");
 			} catch (Exception e) {