Merge branch 'new-version' into feature/1309-1301-dd

frontendApi/modules/v1/controllers/BaseController.php

@@ -47,8 +47,9 @@ class BaseController extends \yii\rest\ActiveController {
     public function beforeAction($action) {
         $this->forbiddenQuicklyUser();
 
-        // 增加的判断用户登录后未操作后的超时
-        if (Yii::$app->getUser()->getUserInfo()){
+        // 增加的判断用户登录后未操作后的超时 和 快速登录的逻辑
+        $isQuickly = User::isQuicklyLogin();
+        if ($isQuickly != 1 && Yii::$app->getUser()->getUserInfo()){
             $userId = Yii::$app->getUser()->getUserInfo()['id'];
             $redisKey = 'user:timeOut';