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

dataGrid 表头文字过长时支持 自动换行

Browse Source
This commit is contained in:
thinkgem
2019-10-27 18:24:12 +08:00
parent 093b692df4
commit fbfa291972
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,7 +217,9 @@ public class LoginController extends BaseController{
// 未加载shiro模块时会为空，直接访问则提示操作权限不足。 // 未加载shiro模块时会为空，直接访问则提示操作权限不足。
if(loginInfo == null){ if(loginInfo == null){
UserUtils.getSubject().logout(); if (subject != null){
subject.logout();
}
String queryString = request.getQueryString(); String queryString = request.getQueryString();
queryString = queryString == null ? "" : "?" + queryString; queryString = queryString == null ? "" : "?" + queryString;
ServletUtils.redirectUrl(request, response, adminPath + "/login" + queryString); ServletUtils.redirectUrl(request, response, adminPath + "/login" + queryString);

1
modules/core/src/test/java/com/jeesite/test/MsgPushTest.java
View File

@@ -114,7 +114,6 @@ public class MsgPushTest extends BaseSpringContextTests {
@Autowired @Autowired
private MsgTemplateService msgTemplateService; private MsgTemplateService msgTemplateService;
public void testMailTpl(){ public void testMailTpl(){
// 创建消息模板 // 创建消息模板
MsgTemplate msgTemplate = new MsgTemplate(); MsgTemplate msgTemplate = new MsgTemplate();