diff --git a/frontend/models/MessageForm.php b/frontend/models/MessageForm.php index 644350e..679134c 100644 --- a/frontend/models/MessageForm.php +++ b/frontend/models/MessageForm.php @@ -20,7 +20,7 @@ class MessageForm extends Model public $parent; public $message; - public $username; + public $nickname; /** * @inheritdoc @@ -34,7 +34,7 @@ public function rules() ['parent', 'filter', 'filter' => 'trim'], ['parent', 'required'], - ['username', 'filter', 'filter' => 'trim'], + ['nickname', 'filter', 'filter' => 'trim'], ]; } @@ -68,7 +68,7 @@ public function save() } else { /** @var \yuncms\user\models\User $userClass */ $userClass = Yii::$app->user->identityClass; - $user = $userClass::findByEmailOrMobile($this->username); + $user = $userClass::findOne(['nickname' => $this->nickname]); $new->user_id = $user->id; } return $new->save(); diff --git a/frontend/models/MessageSendForm.php b/frontend/models/MessageSendForm.php index ab0f475..51fe5cd 100644 --- a/frontend/models/MessageSendForm.php +++ b/frontend/models/MessageSendForm.php @@ -24,9 +24,9 @@ class MessageSendForm extends Model public $user_id; /** - * @var string 用户名 + * @var string 用户昵称 */ - public $username; + public $nickname; /** * @var string 消息内容 @@ -41,9 +41,9 @@ class MessageSendForm extends Model public function rules() { return [ - [['message', 'username'], 'required'], - [['username', 'message'], 'filter', 'filter' => 'trim'], - ['username', 'validateUsername'], + [['message', 'nickname'], 'required'], + [['nickname', 'message'], 'filter', 'filter' => 'trim'], + ['nickname', 'validateNickname'], ]; } @@ -54,7 +54,7 @@ public function attributeLabels() { return [ 'user_id' => Yii::t('message', 'User ID'), - 'username' => Yii::t('message', 'Username'), + 'nickname' => Yii::t('message', 'Nickname'), 'message' => Yii::t('message', 'Message Body'), ]; } @@ -103,7 +103,7 @@ protected function getUser() { if ($this->_user === null) { $userClass = Yii::$app->user->identityClass; - $this->_user = $userClass::findOne(['username' => $this->username]); + $this->_user = $userClass::findOne(['nickname' => $this->nickname]); } return $this->_user; } diff --git a/frontend/views/message/send.php b/frontend/views/message/send.php index 571ed1e..3b191ef 100644 --- a/frontend/views/message/send.php +++ b/frontend/views/message/send.php @@ -21,7 +21,7 @@