diff --git a/crmeb/app/adminapi/middleware/AdminAuthTokenMiddleware.php b/crmeb/app/adminapi/middleware/AdminAuthTokenMiddleware.php index 06d411e4a..26a3c8b4b 100644 --- a/crmeb/app/adminapi/middleware/AdminAuthTokenMiddleware.php +++ b/crmeb/app/adminapi/middleware/AdminAuthTokenMiddleware.php @@ -32,14 +32,14 @@ class AdminAuthTokenMiddleware implements MiddlewareInterface /** @var AdminAuthServices $service */ $service = app()->make(AdminAuthServices::class); $adminInfo = $service->parseToken($token); - Request::macro('isAdminLogin', function () use (&$adminInfo) { + $request->macro('isAdminLogin', function () use (&$adminInfo) { return !is_null($adminInfo); }); - Request::macro('adminId', function () use (&$adminInfo) { + $request->macro('adminId', function () use (&$adminInfo) { return $adminInfo['id']; }); - Request::macro('adminInfo', function () use (&$adminInfo) { + $request->macro('adminInfo', function () use (&$adminInfo) { return $adminInfo; }); diff --git a/crmeb/app/api/middleware/AuthTokenMiddleware.php b/crmeb/app/api/middleware/AuthTokenMiddleware.php index b48f2df76..aa16c5a93 100644 --- a/crmeb/app/api/middleware/AuthTokenMiddleware.php +++ b/crmeb/app/api/middleware/AuthTokenMiddleware.php @@ -16,7 +16,6 @@ use app\Request; use app\services\user\UserAuthServices; use crmeb\exceptions\AuthException; use crmeb\interfaces\MiddlewareInterface; -use think\exception\DbException; /** * Class AuthTokenMiddleware @@ -39,20 +38,20 @@ class AuthTokenMiddleware implements MiddlewareInterface } if (!is_null($authInfo)) { - Request::macro('user', function (string $key = null) use (&$authInfo) { + $request->macro('user', function (string $key = null) use (&$authInfo) { if ($key) { return $authInfo['user'][$key] ?? ''; } return $authInfo['user']; }); - Request::macro('tokenData', function () use (&$authInfo) { + $request->macro('tokenData', function () use (&$authInfo) { return $authInfo['tokenData']; }); } - Request::macro('isLogin', function () use (&$authInfo) { + $request->macro('isLogin', function () use (&$authInfo) { return !is_null($authInfo); }); - Request::macro('uid', function () use (&$authInfo) { + $request->macro('uid', function () use (&$authInfo) { return is_null($authInfo) ? 0 : (int)$authInfo['user']->uid; }); diff --git a/crmeb/app/http/middleware/BaseMiddleware.php b/crmeb/app/http/middleware/BaseMiddleware.php index f3c351490..a9a7ae00f 100644 --- a/crmeb/app/http/middleware/BaseMiddleware.php +++ b/crmeb/app/http/middleware/BaseMiddleware.php @@ -23,14 +23,14 @@ class BaseMiddleware implements MiddlewareInterface { public function handle(Request $request, \Closure $next, bool $force = true) { - if (!Request::hasMacro('uid')) { - Request::macro('uid', function(){ return 0; }); + if (!$request->hasMacro('uid')) { + $request->macro('uid', function(){ return 0; }); } - if (!Request::hasMacro('adminId')) { - Request::macro('adminId', function(){ return 0; }); + if (!$request->hasMacro('adminId')) { + $request->macro('adminId', function(){ return 0; }); } - if (!Request::hasMacro('kefuId')) { - Request::macro('kefuId', function(){ return 0; }); + if (!$request->hasMacro('kefuId')) { + $request->macro('kefuId', function(){ return 0; }); } return $next($request); diff --git a/crmeb/app/kefuapi/middleware/KefuAuthTokenMiddleware.php b/crmeb/app/kefuapi/middleware/KefuAuthTokenMiddleware.php index 11c1f6640..4a9f77ac9 100644 --- a/crmeb/app/kefuapi/middleware/KefuAuthTokenMiddleware.php +++ b/crmeb/app/kefuapi/middleware/KefuAuthTokenMiddleware.php @@ -39,11 +39,11 @@ class KefuAuthTokenMiddleware implements MiddlewareInterface /** @var LoginServices $services */ $services = app()->make(LoginServices::class); $kefuInfo = $services->parseToken($token); - Request::macro('kefuId', function () use (&$kefuInfo) { + $request->macro('kefuId', function () use (&$kefuInfo) { return (int)$kefuInfo['id']; }); - Request::macro('kefuInfo', function () use (&$kefuInfo) { + $request->macro('kefuInfo', function () use (&$kefuInfo) { return $kefuInfo; }); diff --git a/crmeb/app/outapi/middleware/AuthTokenMiddleware.php b/crmeb/app/outapi/middleware/AuthTokenMiddleware.php index 5f4d2eb1d..10dcf20b2 100644 --- a/crmeb/app/outapi/middleware/AuthTokenMiddleware.php +++ b/crmeb/app/outapi/middleware/AuthTokenMiddleware.php @@ -39,11 +39,11 @@ class AuthTokenMiddleware implements MiddlewareInterface /** @var OutAccountServices $services */ $services = app()->make(OutAccountServices::class); $outInfo = $services->parseToken($token); - Request::macro('outId', function () use (&$outInfo) { + $request->macro('outId', function () use (&$outInfo) { return (int)$outInfo['id']; }); - Request::macro('outInfo', function () use (&$outInfo) { + $request->macro('outInfo', function () use (&$outInfo) { return $outInfo; }); /** @var OutInterfaceServices $outInterfaceServices */