|
@@ -3,6 +3,7 @@
|
|
|
namespace app\common\library;
|
|
|
|
|
|
use app\common\model\User;
|
|
|
+use app\common\model\UserPower;
|
|
|
use app\common\model\UserRule;
|
|
|
use fast\Random;
|
|
|
use think\Config;
|
|
@@ -99,6 +100,16 @@ class Auth
|
|
|
$this->setError('Account is locked');
|
|
|
return false;
|
|
|
}
|
|
|
+
|
|
|
+ //追加权限
|
|
|
+ $userpower = UserPower::getByUserId($user_id);
|
|
|
+ if(!$userpower){
|
|
|
+ $this->setError('Account not exist');
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ $user->power = $userpower;
|
|
|
+
|
|
|
+
|
|
|
$this->_user = $user;
|
|
|
$this->_logined = true;
|
|
|
$this->_token = $token;
|
|
@@ -319,6 +330,12 @@ class Auth
|
|
|
{
|
|
|
$user = User::getById($user_id);
|
|
|
if ($user) {
|
|
|
+
|
|
|
+ $userpower = UserPower::getByUserId($user_id);
|
|
|
+ if(!$userpower){
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
Db::startTrans();
|
|
|
try {
|
|
|
// 微信内置浏览器时不请空用户的token,APP才清除所有token
|
|
@@ -335,6 +352,7 @@ class Auth
|
|
|
|
|
|
$user->save();
|
|
|
|
|
|
+ $user->power = $userpower;// 追加权限
|
|
|
$this->_user = $user;
|
|
|
|
|
|
$this->_token = Random::uuid();
|