1.命名空间大小写修复。

曹明
1 parent ae88ab85
Showing 6 changed files with 7 additions and 20 deletions Show diff stats
app-wx/controllers/SiteController.php
app-wx/controllers/WechatController.php
app-wx/exts/User.php
domain/user/User.php
domain/user/UserRepository.php
domain/user/models/User.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;
  
@@ -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;
@@ -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);
  
 <?php
  
-namespace domain\User;
+namespace domain\user;
  
 use Yii;
-use domain\User\models\User as UserModel;
+use domain\user\models\User as UserModel;
 use Exception;
  
 /**
@@ -3,7 +3,6 @@
 namespace domain\user;
  
 use domain\user\models\User as UserModel;
-use yii\base\NotSupportedException;
  
  
 /**
@@ -111,16 +110,4 @@ class UserRepository
         $user = UserModel::findOne(["openid" => $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
 <?php
  
-namespace domain\User\models;
+namespace domain\user\models;
  
 use yii\base\NotSupportedException;
 use yii\db\ActiveRecord;
...	...	@@ -2,7 +2,7 @@
2	2	namespace app\wx\controllers;
3	3
4	4	use Yii;
5		-use domain\User\models\User as UserModel;
	5	+use domain\user\models\User as UserModel;
6	6	use common\helpers\WxHelper;
7	7	use common\models\SysSetting;
8	8
...	...
...	...	@@ -9,7 +9,7 @@ use domain\user\UserRepository;
9	9	use common\helpers\AppErrorLog;
10	10	use common\helpers\Log as AppLog;
11	11	use common\helpers\WechatMessageHelper;
12		-use domain\User\models\User as UserModel;
	12	+use domain\user\models\User as UserModel;
13	13	use common\exts\wechat\PHPSDK as WxPHPSDK;
14	14	use common\helpers\WxHelper;
15	15	use common\helpers\ImageManager;
...	...
...	...	@@ -4,6 +4,7 @@ namespace app\wx\exts;
4	4	use Yii;
5	5	use yii\web\Cookie;
6	6	use yii\web\User as AppUser;
	7	+use domain\user\models\User as UserModel;
7	8
8	9	/**
9	10	* Class User
...	...	@@ -72,8 +73,7 @@ class User extends AppUser
72	73	if ($id === null) {
73	74	$identity = null;
74	75	} else {
75		- $class = 'domain\user\Models\User';
76		- $identity = $class::findIdentity($id);
	76	+ $identity = UserModel::findIdentity($id);
77	77	}
78	78	$this->setIdentity($identity);
79	79
...	...
1	1	<?php
2	2
3		-namespace domain\User;
	3	+namespace domain\user;
4	4
5	5	use Yii;
6		-use domain\User\models\User as UserModel;
	6	+use domain\user\models\User as UserModel;
7	7	use Exception;
8	8
9	9	/**
...	...
...	...	@@ -3,7 +3,6 @@
3	3	namespace domain\user;
4	4
5	5	use domain\user\models\User as UserModel;
6		-use yii\base\NotSupportedException;
7	6
8	7
9	8	/**
...	...	@@ -111,16 +110,4 @@ class UserRepository
111	110	$user = UserModel::findOne(["openid" => $openId]);
112	111	return $user;
113	112	}
114		-
115		- /** @inheritdoc */
116		- public static function findIdentity($condition)
117		- {
118		- return UserModel::findByCondition($condition)->one();
119		- }
120		-
121		- /** @inheritdoc */
122		- public static function findIdentityByAccessToken($token, $type = null)
123		- {
124		- throw new NotSupportedException('"findIdentityByAccessToken" is not implemented.');
125		- }
126	113	}
127	114	\ No newline at end of file
...	...
1	1	<?php
2	2
3		-namespace domain\User\models;
	3	+namespace domain\user\models;
4	4
5	5	use yii\base\NotSupportedException;
6	6	use yii\db\ActiveRecord;
...	...