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
2023-06-12 15:54:28 +08:00
parent 6a0edc92d6
commit f16c3abc2a
9 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java
View File

@@ -259,7 +259,8 @@ public class Log extends DataEntity<Log> {
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) {

2
modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java
View File

@@ -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()){

4
modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java
View File

@@ -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"));

7
modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
View File

@@ -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));

1
modules/core/src/main/resources/config/logger-core.xml
View File

@@ -29,6 +29,7 @@
<logger name="org.flowable.identitylink.service.impl.persistence" level="DEBUG" />
<logger name="org.flowable.variable.service.impl.persistence" level="DEBUG" />
<logger name="org.flowable.engine.impl.persistence" level="DEBUG" />
<logger name="com.bstek.ureport" level="DEBUG" />
<logger name="com.jeesite" level="DEBUG" />
<logger name="com.jeesite.common.i18n" level="INFO" />