修改applicationContext-shiro.xml
Merge branch 'master' into github