github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

404错误提示修正

pull/22/head
RuoYi 2018-08-03 10:32:00 +08:00
parent f6798b90bf
commit adedb39132
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/ruoyi/common/utils/security/ShiroUtils.java
View File

@ -7,6 +7,7 @@ import org.apache.shiro.subject.PrincipalCollection;
import org.apache.shiro.subject.SimplePrincipalCollection; import org.apache.shiro.subject.SimplePrincipalCollection;
import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.Subject;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.framework.shiro.realm.UserRealm; import com.ruoyi.framework.shiro.realm.UserRealm;
import com.ruoyi.project.system.user.domain.User; import com.ruoyi.project.system.user.domain.User;
@ -36,8 +37,13 @@ public class ShiroUtils
public static User getUser() public static User getUser()
{ {
User user = new User(); User user = null;
BeanUtils.copyBeanProp(user, getSubjct().getPrincipal()); Object obj = getSubjct().getPrincipal();
if (StringUtils.isNotNull(obj))
{
user = new User();
BeanUtils.copyBeanProp(user, obj);
}
return user; return user;
} }

2
src/main/resources/templates/error/404.html
View File

@ -13,7 +13,7 @@
<h1>404</h1> <h1>404</h1>
<h3 class="font-bold">找不到网页！</h3> <h3 class="font-bold">找不到网页！</h3>
<div class="error-desc"> <div class="error-desc">
对不起，您正在寻找的页面已经找到。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。 对不起，您正在寻找的页面不存在。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。
<a href="javascript:top.document.location.href='/'" class="btn btn-primary m-t">主页</a> <a href="javascript:top.document.location.href='/'" class="btn btn-primary m-t">主页</a>
</div> </div>
</div> </div>