From 848061d20f8231c408ebc5066104addd03f3fbe8 Mon Sep 17 00:00:00 2001
From: weiz <weiz@lihai.com>
Date: Wed, 8 Nov 2023 14:11:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0token=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/LoginController.php | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/api/controller/LoginController.php b/app/api/controller/LoginController.php
index 3464a4ea2..c83925bf2 100755
--- a/app/api/controller/LoginController.php
+++ b/app/api/controller/LoginController.php
@@ -14,6 +14,8 @@
 
 namespace app\api\controller;
 
+use app\common\cache\UserTokenCache;
+use app\common\model\Company;
 use app\api\validate\{LoginAccountValidate, RegisterValidate, WebScanLoginValidate, WechatLoginValidate};
 use app\api\logic\LoginLogic;
 use app\api\logic\UserLogic;
@@ -23,6 +25,7 @@ use Firebase\JWT\JWT;
 use Firebase\JWT\Key;
 use think\facade\{Db, Config};
 use app\common\service\FileService;
+use function Symfony\Component\String\s;
 
 /**
  * 登录注册
@@ -32,7 +35,7 @@ use app\common\service\FileService;
 class LoginController extends BaseApiController
 {
 
-    public array $notNeedLogin = ['register', 'account', 'logout', 'codeUrl', 'oaLogin',  'mnpLogin', 'getScanCode', 'scanLogin', 'shop_account'];
+    public array $notNeedLogin = ['register', 'account', 'logout', 'codeUrl', 'oaLogin',  'mnpLogin', 'getScanCode', 'scanLogin', 'shop_account','checkToken'];
 
 
     /**
@@ -255,4 +258,23 @@ class LoginController extends BaseApiController
         LoginLogic::updateUser($params, $this->userId);
         return $this->success('操作成功', [], 1, 1);
     }
+	
+	public function checkToken(): \think\response\Json
+	{
+		$token = $this->request->post('token');
+		if(empty($token)){
+			return $this->fail('参数错误');
+		}
+		$userInfo = (new UserTokenCache())->getUserInfo($token);
+		if(!$userInfo){
+			return $this->fail('token无效');
+		}
+		//获取公司信息
+		$company = Company::field('company_name,company_type')->where('id',$userInfo['company_id'])->findOrEmpty();
+		if(!$company->isEmpty()){
+			$userInfo['company_name'] = $company['company_name'];
+			$userInfo['company_type'] = $company['company_type'];
+		}
+		return $this->success('请求成功',$userInfo);
+	}
 }

From dc9356c42f8b48533bdb1d3db458901b0c3fe7f5 Mon Sep 17 00:00:00 2001
From: weiz <weiz@lihai.com>
Date: Wed, 8 Nov 2023 14:13:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0token=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/LoginController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/api/controller/LoginController.php b/app/api/controller/LoginController.php
index c83925bf2..9c598d473 100755
--- a/app/api/controller/LoginController.php
+++ b/app/api/controller/LoginController.php
@@ -25,7 +25,6 @@ use Firebase\JWT\JWT;
 use Firebase\JWT\Key;
 use think\facade\{Db, Config};
 use app\common\service\FileService;
-use function Symfony\Component\String\s;
 
 /**
  * 登录注册