shiro issue
Merge pull request #12 from qatang/dev

shiro issue