From 09ebaf62ee9da74cc4f66e72c9e7af1e256f893b Mon Sep 17 00:00:00 2001 From: wanghongjun <1445693971@qq,com> Date: Thu, 7 Sep 2023 16:57:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E4=BD=BF=E7=94=A8session=20=E5=88=87?= =?UTF-8?q?=E6=8D=A2jwt=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/AgentTeam.php | 10 +++++----- app/controller/Passport.php | 4 ++-- app/controller/User.php | 27 ++++++++++++++++++++++----- app/controller/Zone.php | 6 +++--- app/middleware/CheckAgent.php | 6 +++--- app/middleware/CheckUser.php | 6 +++--- app/model/User.php | 2 +- 7 files changed, 39 insertions(+), 22 deletions(-) diff --git a/app/controller/AgentTeam.php b/app/controller/AgentTeam.php index 07f05d8..f90780f 100644 --- a/app/controller/AgentTeam.php +++ b/app/controller/AgentTeam.php @@ -34,7 +34,7 @@ class AgentTeam extends BaseController $limit = $request['limit'] ?? 10; # 代理id查询 启用用户 - $agentData = Session::get('login_agent_user_data'); + $agentData = $this->request->userInfo; $where = ['aid' => $agentData['id'], 'status' => 1]; $UserModel = new UserModel(); @@ -81,7 +81,7 @@ class AgentTeam extends BaseController $connection = Db::connect(); try { - $agentUser = Session::get('login_agent_user_data'); + $agentUser = $this->request->userInfo; validate(Agent::class)->scene('scores')->check($request); @@ -130,7 +130,7 @@ class AgentTeam extends BaseController $connection = Db::connect(); try { - $agentUser = Session::get('login_agent_user_data'); + $agentUser = $this->request->userInfo; validate(Agent::class)->scene('scores')->check($request); $user_id = $request['user_id']; # 用户id @@ -173,7 +173,7 @@ class AgentTeam extends BaseController */ public function getAgentInviteCode() { - $agentUser = Session::get('login_agent_user_data'); + $agentUser = $this->request->userInfo; $user = AgentUser::find($agentUser['id']); @@ -189,7 +189,7 @@ class AgentTeam extends BaseController */ public function getAgentUserInfo() { - $agentUser = Session::get('login_agent_user_data'); + $agentUser = $this->request->userInfo; $user = AgentUser::find($agentUser['id']); diff --git a/app/controller/Passport.php b/app/controller/Passport.php index 8877e18..f6bbb75 100644 --- a/app/controller/Passport.php +++ b/app/controller/Passport.php @@ -266,7 +266,7 @@ class Passport extends BaseController * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public function AgentLogin() + public function agentLogin() { $data = Request::param(); @@ -293,7 +293,7 @@ class Passport extends BaseController if ($agentUser['status'] == 1) { - $userinfo = ['agent_user_id' => $agentUser['data']['id'], 'avatar' => get_image_url($agentUser['data']['avatar'])]; + $userinfo = ['id' => $agentUser['data']['id'], 'avatar' => get_image_url($agentUser['data']['avatar'])]; $token = ['token'=>signToken($userinfo)]; Cookie::delete($cookie_name); diff --git a/app/controller/User.php b/app/controller/User.php index bafb303..cde4168 100644 --- a/app/controller/User.php +++ b/app/controller/User.php @@ -49,7 +49,7 @@ class User extends BaseController */ public function withdrawalRecords() { - $userData = Session::get('login_user_data'); + $userData = $this->request->userInfo; $data = Request::param(); @@ -81,7 +81,7 @@ class User extends BaseController */ public function rechargeRecords() { - $userData = Session::get('login_user_data'); + $userData = $this->request->userInfo; $data = Request::param(); @@ -113,7 +113,7 @@ class User extends BaseController */ public function consumptionRecords() { - $userData = Session::get('login_user_data'); + $userData = $this->request->userInfo; $data = Request::param(); @@ -145,7 +145,7 @@ class User extends BaseController */ public function awardsRecords() { - $userData = Session::get('login_user_data'); + $userData = $this->request->userInfo; $data = Request::param(); @@ -179,7 +179,7 @@ class User extends BaseController */ public function userInfo() { - $userData = Session::get('login_user_data'); + $userData = $this->request->userInfo; $UserModel = new UserModel(); @@ -206,4 +206,21 @@ class User extends BaseController $list = $CustomerServiceModel->field($field)->where($where)->order('id desc')->select()->toArray(); return $this->renderSuccess('数据返回成功', ['list' => $list]); } + + /** + * 退出登陆 + */ + public function LogOut() + { + if (Session::has('login_user_data')) { + Session::delete('login_user_data'); + } + if (Session::has('login_agent_user_data')) { + Session::delete('login_agent_user_data'); + } + if (Session::has('login_admin_user_data')) { + Session::delete('login_admin_user_data'); + } + return $this->renderSuccess('退出登陆成功'); + } } \ No newline at end of file diff --git a/app/controller/Zone.php b/app/controller/Zone.php index 858bf2e..298d58f 100644 --- a/app/controller/Zone.php +++ b/app/controller/Zone.php @@ -70,7 +70,7 @@ class Zone extends BaseController { $param = Request::param(); $zoneGoodsId = $param['zone_goods_id']; - $userData = Session::get('login_user_data'); + $userData = $this->request->userInfo; # 判断余额够不够 $judgeRes = ZoneLogic::judgeBalance($userData['id'],$zoneGoodsId); @@ -94,7 +94,7 @@ class Zone extends BaseController { $param = Request::param(); $c_r_id = $param['c_r_id']; - $userData = Session::get('login_user_data'); + $userData = $this->request->userInfo; $res = ZoneLogic::endOrder($userData['id'],$c_r_id); @@ -117,7 +117,7 @@ class Zone extends BaseController { $param = Request::param(); $c_r_id = $param['c_r_id']; - $userData = Session::get('login_user_data'); + $userData = $this->request->userInfo; $queryWhere = ['status' => 1, 'user_id' => $userData['id'], 'id' => $c_r_id]; $ConsumptionRecords = new ConsumptionRecords(); diff --git a/app/middleware/CheckAgent.php b/app/middleware/CheckAgent.php index 3c46239..1bf7311 100644 --- a/app/middleware/CheckAgent.php +++ b/app/middleware/CheckAgent.php @@ -25,9 +25,9 @@ class CheckAgent if($userinfo['code'] != 200) throw new Exception('Token checked error',403); $request->userInfo = $userinfo['data']; - if (!Session::get('login_agent_user_data')) { - throw new Exception('代理未登陆，请先登陆后操作',201); - } +// if (!Session::get('login_agent_user_data')) { +// throw new Exception('代理未登陆，请先登陆后操作',201); +// } } catch (\Exception $err){ return json(['code'=>$err->getCode(),'msg'=>$err->getMessage()]); diff --git a/app/middleware/CheckUser.php b/app/middleware/CheckUser.php index 76e570c..0c94cf9 100644 --- a/app/middleware/CheckUser.php +++ b/app/middleware/CheckUser.php @@ -26,9 +26,9 @@ class CheckUser if($userinfo['code'] != 200) throw new Exception('Token checked error',403); $request->userInfo = $userinfo['data']; - if (!Session::get('login_user_data')) { - throw new Exception('用户未登陆，请先登陆后操作',201); - } +// if (!Session::get('login_user_data')) { +// throw new Exception('用户未登陆，请先登陆后操作',201); +// } } catch (\Exception $err){ return json(['code'=>$err->getCode(),'msg'=>$err->getMessage()]); diff --git a/app/model/User.php b/app/model/User.php index c9e9b5b..44153e1 100644 --- a/app/model/User.php +++ b/app/model/User.php @@ -127,7 +127,7 @@ class User extends Model */ public function modifyPassword($data) { - $user = Session::get('login_user_data'); + $user = $this->request->userInfo; if ($user) {