登录与修改密码时兼容 drupal 格式密码
Merge remote-tracking branch 'origin/master'