第十九章

scnucxy · Mar 1, 2014 · 9b6e53b · 9b6e53b
1 parent 165b589
commit 9b6e53b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/...-chapter19/src/main/java/com/github/zhangkaitao/shiro/chapter19/dao/UrlFilterDaoImpl.java b/...-chapter19/src/main/java/com/github/zhangkaitao/shiro/chapter19/dao/UrlFilterDaoImpl.java
@@ -25,7 +25,7 @@ public class UrlFilterDaoImpl implements UrlFilterDao {
     private JdbcTemplate jdbcTemplate;
 
     public UrlFilter createUrlFilter(final UrlFilter urlFilter) {
-        final String sql = "insert into sys_url_filter(name, url, roles, permissions) values(?,?,?,?,?)";
+        final String sql = "insert into sys_url_filter(name, url, roles, permissions) values(?,?,?,?)";
 
         GeneratedKeyHolder keyHolder = new GeneratedKeyHolder();
         jdbcTemplate.update(new PreparedStatementCreator() {

diff --git a/...mple-chapter19/src/main/java/com/github/zhangkaitao/shiro/chapter19/entity/UrlFilter.java b/...mple-chapter19/src/main/java/com/github/zhangkaitao/shiro/chapter19/entity/UrlFilter.java
@@ -9,10 +9,10 @@
  */
 public class UrlFilter implements Serializable {
     private Long id;
-    private String name;
-    private String url;
-    private String roles;
-    private String permissions;
+    private String name; //url名称/描述
+    private String url; //地址
+    private String roles; //所需要的角色，可省略
+    private String permissions; //所需要的权限，可省略
 
     public Long getId() {
         return id;

diff --git a/...19/src/main/java/com/github/zhangkaitao/shiro/spring/CustomDefaultFilterChainManager.java b/...19/src/main/java/com/github/zhangkaitao/shiro/spring/CustomDefaultFilterChainManager.java
@@ -35,7 +35,7 @@ public class CustomDefaultFilterChainManager extends DefaultFilterChainManager {
     public CustomDefaultFilterChainManager() {
         setFilters(new LinkedHashMap<String, Filter>());
         setFilterChains(new LinkedHashMap<String, NamedFilterList>());
-        addDefaultFilters(true);
+        addDefaultFilters(false);
     }
 
     public Map<String, String> getFilterChainDefinitionMap() {
@@ -47,7 +47,9 @@ public void setFilterChainDefinitionMap(Map<String, String> filterChainDefinitio
     }
 
     public void setCustomFilters(Map<String, Filter> customFilters) {
-        getFilters().putAll(customFilters);
+        for(Map.Entry<String, Filter> entry : customFilters.entrySet()) {
+            addFilter(entry.getKey(), entry.getValue(), false);
+        }
     }
 
 
@@ -90,12 +92,6 @@ public void setUnauthorizedUrl(String unauthorizedUrl) {
 
     @PostConstruct
     public void init() {
-        Map<String, Filter> defaultFilters = getFilters();
-        //apply global settings if necessary:
-        for (Filter filter : defaultFilters.values()) {
-            applyGlobalPropertiesIfNecessary(filter);
-        }
-
         //Apply the acquired and/or configured filters:
         Map<String, Filter> filters = getFilters();
         if (!CollectionUtils.isEmpty(filters)) {
@@ -106,9 +102,6 @@ public void init() {
                 if (filter instanceof Nameable) {
                     ((Nameable) filter).setName(name);
                 }
-                //'init' argument is false, since Spring-configured filters should be initialized
-                //in Spring (i.e. 'init-method=blah') or implement InitializingBean:
-                addFilter(name, filter, false);
             }
         }