From 01ab03eaf761634f79db9db440cd0b57b04ce84a Mon Sep 17 00:00:00 2001
From: xiangwbs <xiwnagwbs@163.com>
Date: Fri, 30 Mar 2018 23:29:10 +0800
Subject: [PATCH] merge

---
 boot-web/src/main/java/com/xwbing/shiro/MyShiroRealm.java | 4 ++--
 boot-web/src/main/java/com/xwbing/shiro/ShiroConfig.java  | 8 +++++---
 boot-web/src/main/resources/static/login.html             | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/boot-web/src/main/java/com/xwbing/shiro/MyShiroRealm.java b/boot-web/src/main/java/com/xwbing/shiro/MyShiroRealm.java
index 99a715f..e53a16b 100644
--- a/boot-web/src/main/java/com/xwbing/shiro/MyShiroRealm.java
+++ b/boot-web/src/main/java/com/xwbing/shiro/MyShiroRealm.java
@@ -36,7 +36,7 @@ public class MyShiroRealm extends AuthorizingRealm {
     private SysRoleService sysRoleService;
 
     /**
-     * 授权用户权限
+     * 授权用户权限(授权)
      *
      * @param principals
      * @return
@@ -68,7 +68,7 @@ public class MyShiroRealm extends AuthorizingRealm {
     }
 
     /**
-     * 验证用户身份
+     * 验证用户身份(认证)
      *
      * @param authenticationToken
      * @return
diff --git a/boot-web/src/main/java/com/xwbing/shiro/ShiroConfig.java b/boot-web/src/main/java/com/xwbing/shiro/ShiroConfig.java
index d7fd7f2..cf4e6e6 100644
--- a/boot-web/src/main/java/com/xwbing/shiro/ShiroConfig.java
+++ b/boot-web/src/main/java/com/xwbing/shiro/ShiroConfig.java
@@ -35,10 +35,10 @@ public class ShiroConfig {
     public ShiroFilterFactoryBean shiroFilter() {
         ShiroFilterFactoryBean shiroFilterFactoryBean = new ShiroFilterFactoryBean();
         shiroFilterFactoryBean.setSecurityManager(securityManager());
-        //配置访问权限
-        Map<String, String> chains = new LinkedHashMap<>();
-        shiroFilterFactoryBean.setLoginUrl("/user/login");
+        //如果不设置默认会自动寻找Web工程根目录下的"/login.jsp"页面
+        shiroFilterFactoryBean.setLoginUrl("/login.html");
         shiroFilterFactoryBean.setSuccessUrl("/doc");
+        Map<String, String> chains = new LinkedHashMap<>();
         //静态资源
         chains.put("/META-INF/resources/**", "anon");
         chains.put("/resources/**", "anon");
@@ -57,6 +57,8 @@ public class ShiroConfig {
         //德鲁伊数据源
         chains.put("/druid/*", "anon");
         chains.put("/druid", "anon");
+        //登录校验
+        chains.put("/user/login", "anon");
         //权限认证路径
         chains.put("/**", "authc");
         shiroFilterFactoryBean.setFilterChainDefinitionMap(chains);
diff --git a/boot-web/src/main/resources/static/login.html b/boot-web/src/main/resources/static/login.html
index e3cfd15..562a45b 100644
--- a/boot-web/src/main/resources/static/login.html
+++ b/boot-web/src/main/resources/static/login.html
@@ -5,6 +5,6 @@
 	<title>Welcome to the world</title>
 </head>
 <body>
-<h2>Hello World!</h2>
+<h2>welcome!</h2>
 </body>
 </html>
\ No newline at end of file