Merge branch 'feature/mzl_dev' into develop

# Conflicts:
#	app/functions.php
#	config/middleware.php
This commit is contained in:
mzl
2025-07-09 19:11:57 +08:00
parent 03a6d65b00
commit 3d8d9f841a
24 changed files with 1342 additions and 954 deletions
+46
View File
@@ -0,0 +1,46 @@
<?php
namespace app\middleware;
use app\common\utils\Jwt;
use ReflectionClass;
use Webman\MiddlewareInterface;
use Webman\Http\Response;
use Webman\Http\Request;
class AuthCheck implements MiddlewareInterface
{
public function process(Request $request, callable $handler) : Response
{
$controller = new ReflectionClass($request->controller);
$noNeedLogin = $controller->getDefaultProperties()['noNeedLogin'] ?? [];
if (in_array($request->action, $noNeedLogin)) {
// 白名单
return $handler($request);
} else {
try {
$authHeader = $request->header('Authorization');
if (!$authHeader || !preg_match('/Bearer\s(\S+)/', $authHeader, $matches)) {
$body = [
'status' => 'fail',
'code' => 401,
'message' => '未授权',
'data' => [],
];
return response(json_encode($body, JSON_UNESCAPED_UNICODE), 401, ['Content-Type' => 'application/json']);
}
$token = $matches[1];
$request->user = (new Jwt())->verifyToken($token);
} catch (\Throwable $e) {
$body = [
'status' => 'fail',
'code' => 401,
'message' => $e->getMessage(),
'data' => [],
];
return response(json_encode($body, JSON_UNESCAPED_UNICODE), 401, ['Content-Type' => 'application/json']);
}
return $handler($request);
}
}
}
+42
View File
@@ -0,0 +1,42 @@
<?php
namespace app\middleware;
use Webman\MiddlewareInterface;
use Webman\Http\Response;
use Webman\Http\Request;
use app\common\service\BasicDataService;
use ReflectionClass;
class BasicData implements MiddlewareInterface
{
public function process(Request $request, callable $handler): Response
{
$controller = new ReflectionClass($request->controller);
$noNeedHeader = $controller->getDefaultProperties()['noNeedHeader'] ?? [];
if (in_array($request->action, $noNeedHeader) || in_array($request->path(), config('whitelist.basi_cdata'))) {
// 白名单
return $handler($request);
} else {
try {
$corpAbbr = $request->header('Fdesk-Corp-Abbr');
$systemCode = $request->header('Fdesk-System-Code');
$loginType = $request->header('Fdesk-Login-Type');
$basicDataService = new BasicDataService();
if ($basicDataService->checkAndCacheBaseParams($loginType, $systemCode, $corpAbbr)) {
$request->login_type = $loginType;
$request->system_code = $systemCode;
$request->corp_abbr = $corpAbbr;
$request->basic_data = [
'login_type' => $loginType,
'system_code' => $systemCode,
'corp_abbr' => $corpAbbr
];
}
return $handler($request);
} catch (\Throwable $th) {
throw $th;
}
}
}
}