代理、管理员登录修改session登录记录

app/controller/AdminUser.php

@@ -11,6 +11,7 @@ use think\facade\Db;
 use think\facade\Filesystem;
 use think\facade\Request;
 use app\model\AdminUser as AdminModel;
+use think\facade\Session;
 
 class AdminUser extends BaseController
 {
@@ -165,6 +166,7 @@ class AdminUser extends BaseController
         if ($login_admin_user_data) Cache::store('redis')->delete('user_recharge_set');
         $login_admin_user_data = Cache::store('redis')->get('agent_recharge_set');
         if ($login_admin_user_data) Cache::store('redis')->delete('agent_recharge_set');
+        Session::destroy();
 
         // 删除所有图片文件
 //        $dirPath = public_path('storage');
@@ -179,8 +181,9 @@ class AdminUser extends BaseController
      */
     public function LogOut()
     {
-        $login_admin_user_data = Cache::store('redis')->get('login_admin_user_data');
-        if ($login_admin_user_data) Cache::store('redis')->delete('login_admin_user_data');
+        Session::delete('login_admin_user_data');
+//        $login_admin_user_data = Cache::store('redis')->get('login_admin_user_data');
+//        if ($login_admin_user_data) Cache::store('redis')->delete('login_admin_user_data');
         return $this->renderSuccess('退出登陆成功');
     }
 }

app/controller/AgentTeam.php

@@ -19,6 +19,7 @@ use think\exception\ValidateException;
 use think\facade\Cache;
 use think\facade\Db;
 use think\facade\Request;
+use think\facade\Session;
 
 class AgentTeam extends BaseController
 {
@@ -362,8 +363,9 @@ class AgentTeam extends BaseController
      */
     public function LogOut()
     {
-        $login_agent_user_data = Cache::store('redis')->get('login_agent_user_data');
-        if ($login_agent_user_data) Cache::store('redis')->delete('login_agent_user_data');
+        Session::delete('login_agent_user_data');
+//        $login_agent_user_data = Cache::store('redis')->get('login_agent_user_data');
+//        if ($login_agent_user_data) Cache::store('redis')->delete('login_agent_user_data');
         return $this->renderSuccess('退出登陆成功');
     }
 }

app/listener/LogoutAgent.php

@@ -4,6 +4,7 @@ namespace app\listener;
 
 use app\event\AgentPasswordChange;
 use think\facade\Cache;
+use think\facade\Session;
 
 class LogoutAgent
 {
@@ -20,7 +21,7 @@ class LogoutAgent
         if ($agentData) {
             $agentData = unserialize($agentData);
             if ($agentData['id'] == $aid) {
-                Cache::store('redis')->delete('login_agent_user_data');
+                Session::delete('login_agent_user_data');
             }
         }
     }

app/listener/LogoutUser.php

@@ -4,6 +4,7 @@ namespace app\listener;
 
 use app\event\UserPasswordChange;
 use think\facade\Cache;
+use think\facade\Session;
 
 class LogoutUser
 {
@@ -20,7 +21,8 @@ class LogoutUser
         if ($userData) {
             $userData = unserialize($userData);
             if ($userData['id'] == $userId) {
-                Cache::store('redis')->delete('login_user_data');
+                //Cache::store('redis')->delete('login_user_data');
+                Session::delete('login_user_data');
             }
         }
     }

app/middleware/CheckAdmin.php

@@ -26,7 +26,7 @@ class CheckAdmin
             if($userinfo['code'] != 200)
                 throw new Exception('当前登录已失效，请重新登录',403);
             $request->userInfo = $userinfo['data'];
-            if (!Cache::store('redis')->get('login_admin_user_data')) {
+            if (!Session::get('login_admin_user_data')) {
                 throw new Exception('管理员未登陆，请先登陆后操作',201);
             }
         }

app/middleware/CheckAgent.php

@@ -6,6 +6,7 @@ namespace app\middleware;
 use think\Exception;
 use think\facade\Cache;
 use think\facade\Request;
+use think\facade\Session;
 
 class CheckAgent
 {
@@ -25,7 +26,7 @@ class CheckAgent
             if($userinfo['code'] != 200)
                 throw new Exception('当前登录已失效，请重新登录',403);
             $request->userInfo = $userinfo['data'];
-            if (!Cache::store('redis')->get('login_agent_user_data')) {
+            if (!Session::get('login_agent_user_data')) {
                 throw new Exception('代理未登陆，请先登陆后操作',201);
             }
         }

app/model/AdminUser.php

@@ -43,7 +43,7 @@ class AdminUser extends Model
             # 缓存用户信息
             $login_user_data = $user->toArray();
             unset($login_user_data['password'],$login_user_data['salt'],$login_user_data['status']);
-            #Session::set('login_admin_user_data',$login_user_data);
+            Session::set('login_admin_user_data',$login_user_data);
             Cache::store('redis')->set('login_admin_user_data',serialize($login_user_data),7200);
 
             return ['status' => 1, 'msg' => '登陆成功', 'data' => $login_user_data];

app/model/AgentUser.php

@@ -4,6 +4,7 @@ declare (strict_types = 1);
 namespace app\model;
 
 use think\facade\Cache;
+use think\facade\Session;
 use think\Model;
 use think\model\concern\SoftDelete;
 
@@ -46,7 +47,7 @@ class AgentUser extends Model
             # 缓存用户信息
             $login_user_data = $user->toArray();
             unset($login_user_data['password'],$login_user_data['salt'],$login_user_data['status']);
-            # Session::set('login_agent_user_data',$login_user_data);
+            Session::set('login_agent_user_data',$login_user_data);
             Cache::store('redis')->set('login_agent_user_data',serialize($login_user_data),7200);
 
             return ['status' => 1, 'msg' => '登陆成功', 'data' => $login_user_data];

app/validate/Passport.php

@@ -20,7 +20,8 @@ class Passport extends Validate
         'repassword|确认密码'   => 'require|confirm:password',
         'sms_code|短信验证码'   => 'require',
         'account_number|账号'  => 'require|min:4|max:16',
-        'user_id|用户id'       => 'require|number'
+        'user_id|用户id'       => 'require|number',
+        'invite_code|邀请码'   => 'require'
     ];
 
     /**