manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
thinkgem
2024-04-11 15:54:59 +08:00
parent b99fcbad06
commit f1e7e5b8ee
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/com/jeesite/common/lang/StringUtils.java
View File

@@ -398,20 +398,20 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
/** /**
* 获取树节点名字 * 获取树节点名字
* @param isShowCode 是否显示编码<br> * @param isShowCode 是否显示编码<br>
* true or 1：显示在左侧：(code)name<br> * true or 1：显示在左侧：(code) name<br>
* 2：显示在右侧：name(code)<br> * 2：显示在右侧：name (code)<br>
* false or null：不显示编码：name * false or null：不显示编码：name
* @param code 编码 * @param code 编码
* @param name 名称 * @param name 名称
* @return * @return
*/ */
public static String getTreeNodeName(String isShowCode, String code, String name) { public static String getTreeNodeName(String isShowCode, String code, String name) {
if ("true".equals(isShowCode) || "1".equals(isShowCode)) { if ("true".equals(isShowCode) || "1".equals(isShowCode)) {
return "(" + code + ") " + StringUtils.replace(name, SPACE, EMPTY); return "(" + code + ") " + StringUtils.replace(name, SPACE, EMPTY);
} else if ("2".equals(isShowCode)) { } else if ("2".equals(isShowCode)) {
return name/*StringUtils.replace(name, " ", "")*/ + " (" + code + ")"; return name + " (" + code + ")";
} else { } else {
return name/*StringUtils.replace(name, " ", "")*/; return name;
} }
} }

2
common/src/main/java/com/jeesite/common/web/http/ServletUtils.java
View File

@@ -121,7 +121,7 @@ public class ServletUtils {
public static boolean isStaticFile(String uri){ public static boolean isStaticFile(String uri){
if (STATIC_FILE == null){ if (STATIC_FILE == null){
try { try {
throw new Exception("检测到“jeesite.yml”中没有配置“web.staticFile”属性。" throw new Exception("检测到“application.yml”中没有配置“web.staticFile”属性。"
+ "配置示例：\n#静态文件后缀\nweb.staticFile=.css,.js,.png,.jpg,.gif," + "配置示例：\n#静态文件后缀\nweb.staticFile=.css,.js,.png,.jpg,.gif,"
+ ".jpeg,.bmp,.ico,.swf,.psd,.htc,.crx,.xpi,.exe,.ipa,.apk"); + ".jpeg,.bmp,.ico,.swf,.psd,.htc,.crx,.xpi,.exe,.ipa,.apk");
} catch (Exception e) { } catch (Exception e) {