From f16c3abc2a0277a50dc0b6e376da004ff61b244f Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 12 Jun 2023 15:54:28 +0800 Subject: [PATCH] update --- common/pom.xml | 13 ++----------- .../com/jeesite/common/io/PropertiesUtils.java | 2 +- .../com/jeesite/common/lang/StringUtils.java | 17 +++++++++++++---- .../com/jeesite/common/media/VideoUtils.java | 2 +- .../com/jeesite/modules/sys/entity/Log.java | 3 ++- .../com/jeesite/modules/sys/utils/LogUtils.java | 2 +- .../modules/sys/web/CompanyController.java | 4 ++-- .../modules/sys/web/LoginController.java | 7 +++++++ .../src/main/resources/config/logger-core.xml | 1 + 9 files changed, 30 insertions(+), 21 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 5ec4c450..c1f913f8 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -45,11 +45,6 @@ commons-io ${commons-io.version} - - commons-beanutils - commons-beanutils - ${commons-beanutils.version} - @@ -89,6 +84,7 @@ org.yaml snakeyaml + ${snakeyaml.version} @@ -194,11 +190,6 @@ poi-ooxml ${poi.version} - - org.apache.poi - poi-ooxml-schemas - ${poi.version} - org.apache.poi poi-scratchpad @@ -262,7 +253,7 @@ junit junit - + diff --git a/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java b/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java index 2a85cd2e..a32ce19d 100644 --- a/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java +++ b/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java @@ -138,7 +138,7 @@ public class PropertiesUtils { } } } - properties.put("configFiles", StringUtils.join(configFiles, ",")); + properties.put("configFiles", StringUtils.joinComma(configFiles)); } /** 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 99d07854..c08dd6a5 100644 --- a/common/src/main/java/com/jeesite/common/lang/StringUtils.java +++ b/common/src/main/java/com/jeesite/common/lang/StringUtils.java @@ -28,8 +28,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { public static final String UNDERLINE = "_"; /** - * 分隔字符串（默认逗号分隔） - * @param str + * 分隔字符串（逗号分隔） + * @param str 字符串 * @return */ public static String[] splitComma(final String str) { @@ -37,8 +37,17 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { } /** - * 连接字符串（默认逗号分隔） - * @param iterable + * 连接字符串（逗号分隔） + * @param array 字符串数组 + * @return + */ + public static String joinComma(final Object[] array) { + return join(array, COMMA); + } + + /** + * 连接字符串（逗号分隔） + * @param iterable 字符串集合 * @return */ public static String joinComma(final Iterable iterable) { diff --git a/common/src/main/java/com/jeesite/common/media/VideoUtils.java b/common/src/main/java/com/jeesite/common/media/VideoUtils.java index 9de2fcf6..e9bac436 100644 --- a/common/src/main/java/com/jeesite/common/media/VideoUtils.java +++ b/common/src/main/java/com/jeesite/common/media/VideoUtils.java @@ -279,7 +279,7 @@ public class VideoUtils { */ private boolean process(List command) { try { - log.debug(StringUtils.join(command, " ")); + log.debug(StringUtils.join(command, StringUtils.SPACE)); // Process process = new ProcessBuilder(command).redirectErrorStream(true).start(); Process process = Runtime.getRuntime().exec(command.toArray(new String[command.size()])); new PrintErrorReader(process.getErrorStream()).start(); diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java index 039e6bde..667186a6 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java @@ -259,7 +259,8 @@ public class Log extends DataEntity { if (StringUtils.endsWithIgnoreCase(param.getKey(), "password")){ params.append("*"); }else if (param.getValue() != null) { - params.append(EncodeUtils.xssFilter(StringUtils.abbr(StringUtils.join(param.getValue(), ","), 1000))); + params.append(EncodeUtils.xssFilter(StringUtils.abbr( + StringUtils.joinComma(param.getValue()), 1000))); } String[] values = param.getValue(); if (values != null) { diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java b/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java index f7b7da5c..ddd82a07 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java @@ -152,7 +152,7 @@ public class LogUtils { Method m = hm.getMethod(); // 获取权限字符串 RequiresPermissions rp = m.getAnnotation(RequiresPermissions.class); - permission = (rp != null ? StringUtils.join(rp.value(), ",") : ""); + permission = (rp != null ? StringUtils.joinComma(rp.value()) : ""); // 尝试获取BaseEntity的设置的主键值 for (Class type : m.getParameterTypes()){ diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java index 5e045ff7..ddfca632 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java @@ -119,8 +119,8 @@ public class CompanyController extends BaseController { officeCodes.add(e.getOfficeCode()); officeNames.add(e.getOfficeCode()); }); - model.addAttribute("officeCodes", StringUtils.join(officeCodes, ",")); - model.addAttribute("officeNames", StringUtils.join(officeNames, ",")); + model.addAttribute("officeCodes", StringUtils.joinComma(officeCodes)); + model.addAttribute("officeNames", StringUtils.joinComma(officeNames)); } model.addAttribute("company", company); model.addAttribute("ctrlPermi", Global.getConfig("user.adminCtrlPermi", "2")); diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java index 470476e4..90560d58 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java @@ -14,6 +14,7 @@ import com.jeesite.common.web.BaseController; import com.jeesite.common.web.CookieUtils; import com.jeesite.common.web.http.ServletUtils; import com.jeesite.modules.sys.entity.Menu; +import com.jeesite.modules.sys.entity.Role; import com.jeesite.modules.sys.entity.User; import com.jeesite.modules.sys.utils.CorpUtils; import com.jeesite.modules.sys.utils.PwdUtils; @@ -197,6 +198,12 @@ public class LoginController extends BaseController{ model.addAttribute("msgEnabled", Global.getPropertyToBoolean("msg.enabled", "false")); model.addAttribute("sysCode", session.getAttribute("sysCode")); model.addAttribute("title", Global.getProperty("productName")); + for (Role role : user.getRoleList()){ + if (StringUtils.isNotBlank(role.getDesktopUrl())) { + model.addAttribute("desktopUrl", role.getDesktopUrl()); // 设置当前用户信息 + break; + } + } // 是否是登录操作 boolean isLogin = Global.TRUE.equals(session.getAttribute(BaseAuthorizingRealm.IS_LOGIN_OPER)); diff --git a/modules/core/src/main/resources/config/logger-core.xml b/modules/core/src/main/resources/config/logger-core.xml index 52e5e9d5..e786ef8a 100644 --- a/modules/core/src/main/resources/config/logger-core.xml +++ b/modules/core/src/main/resources/config/logger-core.xml @@ -29,6 +29,7 @@ +