修复了单点登录的问题
Merge remote-tracking branch 'origin/master'