修改用户登录方法
Merge branch 'master' into launch