修正注册用户邮箱激活时，登录失败 username != email

packov · Mar 8, 2017 · 97faa42 · 97faa42
1 parent 1e7b199
commit 97faa42
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/models/User.php b/models/User.php
@@ -155,9 +155,14 @@ public function beforeSave($insert)
  $this->generateAuthKey();
  $this->generateEmailConfirmationToken();
  // 名字与邮箱
-  if (!$this->realname) {
+ if (!$this->realname) {
  $this->realname = $this->username;
  }
+ // 本地注册需要把 username = email
+ $userDriver = isset(\Yii::$app->params['user_driver']) == true && empty(\Yii::$app->params['user_driver']) == false ? \Yii::$app->params['user_driver'] : 'local';
+ if ($userDriver == 'local') {
+ $this->username = $this->email;
+ }
  }
  return parent::beforeSave($insert);
  }
@@ -175,9 +180,9 @@ public static function findIdentity($id)
  */
  public static function findByUsername($username)
  {
- return static::findOne(array(
+ return static::findOne([
  'username' => $username
- ));
+ ]);
  }
 
  /**