用户登录，注册
Merge branch 'master' of https://git.duapp.com/appid1147gdf48e