diff --git a/app-wx/controllers/SiteController.php b/app-wx/controllers/SiteController.php index fe5c032..3b69e4c 100644 --- a/app-wx/controllers/SiteController.php +++ b/app-wx/controllers/SiteController.php @@ -2,7 +2,7 @@ namespace app\wx\controllers; use Yii; -use domain\User\models\User as UserModel; +use domain\user\models\User as UserModel; use common\helpers\WxHelper; use common\models\SysSetting; diff --git a/app-wx/controllers/WechatController.php b/app-wx/controllers/WechatController.php index 8980889..0c646ad 100644 --- a/app-wx/controllers/WechatController.php +++ b/app-wx/controllers/WechatController.php @@ -9,7 +9,7 @@ use domain\user\UserRepository; use common\helpers\AppErrorLog; use common\helpers\Log as AppLog; use common\helpers\WechatMessageHelper; -use domain\User\models\User as UserModel; +use domain\user\models\User as UserModel; use common\exts\wechat\PHPSDK as WxPHPSDK; use common\helpers\WxHelper; use common\helpers\ImageManager; diff --git a/app-wx/exts/User.php b/app-wx/exts/User.php index 9fe5465..9954a63 100644 --- a/app-wx/exts/User.php +++ b/app-wx/exts/User.php @@ -4,6 +4,7 @@ namespace app\wx\exts; use Yii; use yii\web\Cookie; use yii\web\User as AppUser; +use domain\user\models\User as UserModel; /** * Class User @@ -72,8 +73,7 @@ class User extends AppUser if ($id === null) { $identity = null; } else { - $class = 'domain\user\Models\User'; - $identity = $class::findIdentity($id); + $identity = UserModel::findIdentity($id); } $this->setIdentity($identity); diff --git a/domain/user/User.php b/domain/user/User.php index 784123b..85bf9e9 100644 --- a/domain/user/User.php +++ b/domain/user/User.php @@ -1,9 +1,9 @@ $openId]); return $user; } - - /** @inheritdoc */ - public static function findIdentity($condition) - { - return UserModel::findByCondition($condition)->one(); - } - - /** @inheritdoc */ - public static function findIdentityByAccessToken($token, $type = null) - { - throw new NotSupportedException('"findIdentityByAccessToken" is not implemented.'); - } } \ No newline at end of file diff --git a/domain/user/models/User.php b/domain/user/models/User.php index 24f8013..0b40655 100644 --- a/domain/user/models/User.php +++ b/domain/user/models/User.php @@ -1,6 +1,6 @@