From f3229805b1e5730175f606aac783e4b14fe570fe Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 3 Aug 2018 10:32:00 +0800
Subject: [PATCH] =?UTF-8?q?404=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/common/utils/security/ShiroUtils.java    | 10 ++++++++--
 src/main/resources/templates/error/404.html            |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/common/utils/security/ShiroUtils.java b/src/main/java/com/ruoyi/common/utils/security/ShiroUtils.java
index dd00003a..d9830f09 100644
--- a/src/main/java/com/ruoyi/common/utils/security/ShiroUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/security/ShiroUtils.java
@@ -7,6 +7,7 @@ import org.apache.shiro.subject.PrincipalCollection;
 import org.apache.shiro.subject.SimplePrincipalCollection;
 import org.apache.shiro.subject.Subject;
 
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.framework.shiro.realm.UserRealm;
 import com.ruoyi.project.system.user.domain.User;
@@ -36,8 +37,13 @@ public class ShiroUtils
 
     public static User getUser()
     {
-        User user = new User();
-        BeanUtils.copyBeanProp(user, getSubjct().getPrincipal());
+        User user = null;
+        Object obj = getSubjct().getPrincipal();
+        if (StringUtils.isNotNull(obj))
+        {
+            user = new User();
+            BeanUtils.copyBeanProp(user, obj);
+        }
         return user;
     }
 
diff --git a/src/main/resources/templates/error/404.html b/src/main/resources/templates/error/404.html
index b37f2ac0..d7b27704 100644
--- a/src/main/resources/templates/error/404.html
+++ b/src/main/resources/templates/error/404.html
@@ -13,7 +13,7 @@
         <h1>404</h1>
         <h3 class="font-bold">找不到网页！</h3>
         <div class="error-desc">
-                                对不起，您正在寻找的页面已经找到。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。
+                                对不起，您正在寻找的页面不存在。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。
             <a href="javascript:top.document.location.href='/'" class="btn btn-primary m-t">主页</a>
         </div>
     </div>