From a32ec0a36eaa9f35a7df079b79fd45e56abe31ff Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Thu, 7 Sep 2023 16:51:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E4=BD=BF=E7=94=A8session?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/AdminAgentTeam.php | 4 ++--
 app/controller/AdminUser.php      | 6 +++---
 app/controller/AdminUserTeam.php  | 4 ++--
 app/controller/Passport.php       | 2 +-
 app/middleware/CheckAdmin.php     | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/controller/AdminAgentTeam.php b/app/controller/AdminAgentTeam.php
index c60e75b..94d8671 100644
--- a/app/controller/AdminAgentTeam.php
+++ b/app/controller/AdminAgentTeam.php
@@ -78,7 +78,7 @@ class AdminAgentTeam extends BaseController
 
         $connection = Db::connect();
         try {
-            $adminUser = Session::get('login_admin_user_data');
+            $adminUser = $this->request->userInfo;
 
             validate(Admin::class)->scene('scores')->check($request);
 
@@ -118,7 +118,7 @@ class AdminAgentTeam extends BaseController
 
         $connection = Db::connect();
         try {
-            $adminUser = Session::get('login_admin_user_data');
+            $adminUser = $this->request->userInfo;
             validate(Admin::class)->scene('scores')->check($request);
 
             $aid = $request['aid']; # 用户id
diff --git a/app/controller/AdminUser.php b/app/controller/AdminUser.php
index 835234f..977b6af 100644
--- a/app/controller/AdminUser.php
+++ b/app/controller/AdminUser.php
@@ -25,7 +25,7 @@ class AdminUser extends BaseController
     public function userInfo()
     {
 
-        $adminData = Session::get('login_admin_user_data');
+        $adminData = $this->request->userInfo;
 
         $data = AdminModel::field('id,avatar')->where('id',$adminData['id'])->find();
         $data['avatar'] = get_image_url($data['avatar']);
@@ -39,7 +39,7 @@ class AdminUser extends BaseController
      */
     public function upScoresList()
     {
-        $adminData = Session::get('login_admin_user_data');
+        $adminData = $this->request->userInfo;
 
         $data = Request::param();
 
@@ -72,7 +72,7 @@ class AdminUser extends BaseController
      */
     public function downScoresList()
     {
-        $adminData = Session::get('login_admin_user_data');
+        $adminData = $this->request->userInfo;
 
         $data = Request::param();
 
diff --git a/app/controller/AdminUserTeam.php b/app/controller/AdminUserTeam.php
index 8b5bdb3..66c7744 100644
--- a/app/controller/AdminUserTeam.php
+++ b/app/controller/AdminUserTeam.php
@@ -125,7 +125,7 @@ class AdminUserTeam extends BaseController
 
         $connection = Db::connect();
         try {
-            $adminUser = Session::get('login_admin_user_data');
+            $adminUser = $this->request->userInfo;
 
             validate(Admin::class)->scene('scoresUser')->check($request);
 
@@ -167,7 +167,7 @@ class AdminUserTeam extends BaseController
 
         $connection = Db::connect();
         try {
-            $adminUser = Session::get('login_admin_user_data');
+            $adminUser = $this->request->userInfo;
             validate(Admin::class)->scene('scoresUser')->check($request);
 
             $user_id = $request['user_id']; # 用户id
diff --git a/app/controller/Passport.php b/app/controller/Passport.php
index b52f17d..8877e18 100644
--- a/app/controller/Passport.php
+++ b/app/controller/Passport.php
@@ -243,7 +243,7 @@ class Passport extends BaseController
 
             if ($adminUser['status'] == 1) {
 
-                $userinfo = ['admin_user_id' => $adminUser['data']['id'], 'avatar' => get_image_url($adminUser['data']['avatar'])];
+                $userinfo = ['id' => $adminUser['data']['id'], 'avatar' => get_image_url($adminUser['data']['avatar'])];
                 $token = ['token'=>signToken($userinfo)];
 
                 Cookie::delete($cookie_name);
diff --git a/app/middleware/CheckAdmin.php b/app/middleware/CheckAdmin.php
index d9e567c..df34e89 100644
--- a/app/middleware/CheckAdmin.php
+++ b/app/middleware/CheckAdmin.php
@@ -25,9 +25,9 @@ class CheckAdmin
             if($userinfo['code'] != 200)
                 throw new Exception('Token checked error',403);
             $request->userInfo = $userinfo['data'];
-            if (!Session::get('login_admin_user_data')) {
-                throw new Exception('管理员未登陆，请先登陆后操作',201);
-            }
+//            if (!$this->request->userInfo) {
+//                throw new Exception('管理员未登陆，请先登陆后操作',201);
+//            }
         }
         catch (\Exception $err){
             return json(['code'=>$err->getCode(),'msg'=>$err->getMessage()]);