shish hace 3 años
padre
commit
fac7ea92b4

+ 1 - 4
app-mall/controllers/AuthController.php

@@ -154,10 +154,7 @@ class AuthController extends PublicController
         $cacheKey = 'MALL_MINI_SESSION_KEY_' . $miniOpenId;
         Yii::$app->redis->executeCommand('SET', [$cacheKey, $sessionKey]);
         $userId = $user['id'] ?? 0;
-        $token = '';
-        if (!empty($userId)) {
-            $token = jwt::getNewToken($userId);
-        }
+        $token = !empty($userId) ? jwt::getNewToken($userId) : '';
         util::success([
             'token' => $token,
             'user' => $user,

+ 5 - 1
app-mall/controllers/UserController.php

@@ -8,6 +8,7 @@ use bizMall\message\services\SmsService;
 use bizMall\user\classes\UserClass;
 use bizMall\user\services\UserAssetService;
 use bizMall\user\services\UserService;
+use common\components\jwt;
 use common\components\stringUtil;
 use Yii;
 use common\components\util;
@@ -27,7 +28,10 @@ class UserController extends BaseController
             //增加用户的门店
             UserClass::addRecentShop($this->shop->id, $user);
         }
-        util::success(['info' => $user]);
+        $userId = $user->id ?? 0;
+        $token = !empty($userId) ? jwt::getNewToken($userId) : '';
+        $fullUser = UserClass::getById($userId, true);
+        util::success(['user' => $fullUser, 'token' => $token]);
     }
 
     //最近店铺 ssh 2021.2.27