开发分支的正式提交

backendApi/modules/v1/controllers/BaseController.php

@@ -41,7 +41,7 @@ class BaseController extends \yii\rest\ActiveController {
         // 增加的判断用户登录后未操作后的超时
         if (Yii::$app->getUser()->getUserInfo()){
             $adminId = Yii::$app->getUser()->getUserInfo()['id'];
-            $redisKey = 'admin-timeOut';
+            $redisKey = 'admin:timeOut';
 
             $lastTime = '';
             if (!Yii::$app->tokenRedis->hget($redisKey, $adminId)) {

backendApi/modules/v1/models/LoginForm.php

@@ -139,7 +139,7 @@ class LoginForm extends Model {
             AdminLoginLogger::success($this->_user);
 
             // 把用户的登录时间存在操作时间里
-            Yii::$app->tokenRedis->hset('admin-timeOut', $this->_user->getId(), time());
+            Yii::$app->tokenRedis->hset('admin:timeOut', $this->_user->getId(), time());
 
             return Yii::$app->user->loginWithUAndP($this->_user);
         }catch(\Exception $e){

common/config/params.php

@@ -9,7 +9,7 @@ return [
     'frontAccessTokenExpiresIn' => 3000 * 60,
     'frontRefreshTokenExpiresIn' => 3000 * 60 * 60,
     'user.passwordResetTokenExpire' => 3600,
-    'operationTimeOut' => 1 * 60,     // 这里设置的15分钟超时
+    'operationTimeOut' => 15 * 60,     // 这里设置的15分钟超时
     'pageSize' => 20,
     'http' => [
         'shopApi' => [

frontendApi/modules/v1/controllers/BaseController.php

@@ -50,7 +50,7 @@ class BaseController extends \yii\rest\ActiveController {
         // 增加的判断用户登录后未操作后的超时
         if (Yii::$app->getUser()->getUserInfo()){
             $userId = Yii::$app->getUser()->getUserInfo()['id'];
-            $redisKey = 'user-timeOut';
+            $redisKey = 'user:timeOut';
 
             $lastTime = '';
             if (!Yii::$app->tokenRedis->hget($redisKey, $userId)) {

frontendApi/modules/v1/models/LoginForm.php

@@ -171,7 +171,7 @@ class LoginForm extends Model
             UserLoginLogger::success($this->_userInfo);
 
             // 把用户的登录时间存在操作时间里
-            Yii::$app->tokenRedis->hset('user-timeOut', $this->_userInfo['USER_ID'], time());
+            Yii::$app->tokenRedis->hset('user:timeOut', $this->_userInfo['USER_ID'], time());
 
             return Yii::$app->user->loginWithUAndP($this->_user);
         }catch(\Exception $e){