From 8ecbd3252ac3214e8ae36dd4651b0703be14901d Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Fri, 15 Sep 2023 14:37:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/middleware/CheckAdmin.php | 4 ++--
 app/middleware/CheckAgent.php | 4 ++--
 app/middleware/CheckUser.php  | 4 ++--
 app/model/User.php            | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/middleware/CheckAdmin.php b/app/middleware/CheckAdmin.php
index 91ee511..96b83d4 100644
--- a/app/middleware/CheckAdmin.php
+++ b/app/middleware/CheckAdmin.php
@@ -21,10 +21,10 @@ class CheckAdmin
         try {
             $token = Request::header()['token']??false;
             if(!$token)
-                throw new Exception('Without Token',403);
+                throw new Exception('当前登录已失效，请重新登录',403);
             $userinfo = checkToken($token);
             if($userinfo['code'] != 200)
-                throw new Exception('Token checked error',403);
+                throw new Exception('当前登录已失效，请重新登录',403);
             $request->userInfo = $userinfo['data'];
             if (!Cache::store('redis')->get('login_admin_user_data')) {
                 throw new Exception('管理员未登陆，请先登陆后操作',201);
diff --git a/app/middleware/CheckAgent.php b/app/middleware/CheckAgent.php
index 9e34184..5d55b5d 100644
--- a/app/middleware/CheckAgent.php
+++ b/app/middleware/CheckAgent.php
@@ -20,10 +20,10 @@ class CheckAgent
         try {
             $token = Request::header()['token']??false;
             if(!$token)
-                throw new Exception('Without Token',403);
+                throw new Exception('当前登录已失效，请重新登录',403);
             $userinfo = checkToken($token);
             if($userinfo['code'] != 200)
-                throw new Exception('Token checked error',403);
+                throw new Exception('当前登录已失效，请重新登录',403);
             $request->userInfo = $userinfo['data'];
             if (!Cache::store('redis')->get('login_agent_user_data')) {
                 throw new Exception('代理未登陆，请先登陆后操作',201);
diff --git a/app/middleware/CheckUser.php b/app/middleware/CheckUser.php
index c3e24d2..c436b6d 100644
--- a/app/middleware/CheckUser.php
+++ b/app/middleware/CheckUser.php
@@ -21,10 +21,10 @@ class CheckUser
         try {
             $token = Request::header()['token']??false;
             if(!$token)
-                throw new Exception('Without Token',403);
+                throw new Exception('当前登录已失效，请重新登录',403);
             $userinfo = checkToken($token);
             if($userinfo['code'] != 200)
-                throw new Exception('Token checked error',403);
+                throw new Exception('当前登录已失效，请重新登录',403);
             $request->userInfo = $userinfo['data'];
             if (!Cache::store('redis')->get('login_user_data')) {
                 throw new Exception('用户未登陆，请先登陆后操作',201);
diff --git a/app/model/User.php b/app/model/User.php
index 012b8bd..9415723 100644
--- a/app/model/User.php
+++ b/app/model/User.php
@@ -130,7 +130,7 @@ class User extends Model
     {
         $user = ['id' => $user_id];
 
-        if ($user) {
+        if ($user_id) {
 
             $userModel = $this->find($user['id']);
             $password = $this->generateHashedPassword($data['password'], $userModel->salt);