From f1e7e5b8eed33159dc6349207d16db3eb44a68f8 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Thu, 11 Apr 2024 15:54:59 +0800 Subject: [PATCH] update --- .../main/java/com/jeesite/common/lang/StringUtils.java | 10 +++++----- .../java/com/jeesite/common/web/http/ServletUtils.java | 2 +- 2 files changed, 6 insertions(+), 6 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..ce9cd272 100644 --- a/common/src/main/java/com/jeesite/common/lang/StringUtils.java +++ b/common/src/main/java/com/jeesite/common/lang/StringUtils.java @@ -398,20 +398,20 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { /** * 获取树节点名字 * @param isShowCode 是否显示编码
- * true or 1:显示在左侧:(code)name
- * 2:显示在右侧:name(code)
+ * true or 1:显示在左侧:(code) name
+ * 2:显示在右侧:name (code)
* false or null:不显示编码:name * @param code 编码 * @param name 名称 - * @return + * @return */ public static String getTreeNodeName(String isShowCode, String code, String name) { 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 1494ee89..8c7b64c0 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) {