From fbfa291972432e0598913788ae4e08b14a06dd37 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 27 Oct 2019 18:24:12 +0800
Subject: [PATCH] =?UTF-8?q?dataGrid=20=E8=A1=A8=E5=A4=B4=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E8=BF=87=E9=95=BF=E6=97=B6=E6=94=AF=E6=8C=81=20=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jeesite/modules/sys/web/LoginController.java     | 4 +++-
 modules/core/src/test/java/com/jeesite/test/MsgPushTest.java  | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

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 6b4c5374..3d7b1b8c 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
@@ -217,7 +217,9 @@ public class LoginController extends BaseController{
 		
 		// 未加载shiro模块时会为空，直接访问则提示操作权限不足。
 		if(loginInfo == null){
-			UserUtils.getSubject().logout();
+			if (subject != null){
+				subject.logout();
+			}
 			String queryString = request.getQueryString();
 			queryString = queryString == null ? "" : "?" + queryString;
 			ServletUtils.redirectUrl(request, response, adminPath + "/login" + queryString);
diff --git a/modules/core/src/test/java/com/jeesite/test/MsgPushTest.java b/modules/core/src/test/java/com/jeesite/test/MsgPushTest.java
index 4445e063..6552a95b 100644
--- a/modules/core/src/test/java/com/jeesite/test/MsgPushTest.java
+++ b/modules/core/src/test/java/com/jeesite/test/MsgPushTest.java
@@ -114,7 +114,6 @@ public class MsgPushTest extends BaseSpringContextTests {
 
 	@Autowired
 	private MsgTemplateService msgTemplateService;
-	
 	public void testMailTpl(){
 		// 创建消息模板
 		MsgTemplate msgTemplate = new MsgTemplate();