登录方式
修改
Merge branch 'master' of https://github.com/bestaone/wxserver

Conflicts:
	wxserver-web/src/main/resources/applicationContext-shiro.xml