Merge branch '20180105-user-auth' of http://git.quantgroup.cn/head_group/xyqb-user2 into 20180105-user-auth