password统一变成大写
Merge remote-tracking branch 'origin/master'