up.
This commit is contained in:
parent
ca926e0cfb
commit
f9f8410d9b
@ -15,13 +15,14 @@ class ClientMiddleware extends Middleware
|
|||||||
if(empty($clientName)) {
|
if(empty($clientName)) {
|
||||||
return \json('设备未授权');
|
return \json('设备未授权');
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* 客户端信息
|
* 客户端信息
|
||||||
*/
|
*/
|
||||||
$client = new HttpClient(
|
$client = new HttpClient(
|
||||||
$clientName,
|
$clientName,
|
||||||
$request->header('clientId', ''),
|
$request->header('client-id', ''),
|
||||||
$request->header('clientVersion', ''),
|
$request->header('client-version', ''),
|
||||||
);
|
);
|
||||||
/*
|
/*
|
||||||
* 获取客户端
|
* 获取客户端
|
||||||
|
|||||||
@ -111,8 +111,12 @@ class ContextMiddleware extends middleware
|
|||||||
}
|
}
|
||||||
$route = $request->rule()->getRoute();
|
$route = $request->rule()->getRoute();
|
||||||
|
|
||||||
|
$client = \app\Request::getClient();
|
||||||
(new SysRequestRecord)->save([
|
(new SysRequestRecord)->save([
|
||||||
'context_id' => $request->contextId,
|
'context_id' => $request->contextId,
|
||||||
|
'client_id' => $client->id,
|
||||||
|
'client_name' => $client->name,
|
||||||
|
'client_version' => $client->version,
|
||||||
'request_date' => $request_date,
|
'request_date' => $request_date,
|
||||||
'request_time' => $request_date . '.' . ($request_start_time[1] ?? 0),
|
'request_time' => $request_date . '.' . ($request_start_time[1] ?? 0),
|
||||||
'request_method' => $request_method,
|
'request_method' => $request_method,
|
||||||
|
|||||||
@ -70,7 +70,7 @@ Route::group("adminapi", function () {
|
|||||||
*/
|
*/
|
||||||
Route::get("captcha", [auth\LoginController::class, "captcha"])->name("admin.LoginCaptcha");
|
Route::get("captcha", [auth\LoginController::class, "captcha"])->name("admin.LoginCaptcha");
|
||||||
|
|
||||||
Route::post("login", [auth\LoginController::class, "index"])->name("admin.SysUserLogin")->middleware([ClientMiddleware::class]);
|
Route::post("login", [auth\LoginController::class, "index"])->name("admin.SysUserLogin");
|
||||||
|
|
||||||
|
|
||||||
Route::group(function () {
|
Route::group(function () {
|
||||||
@ -179,12 +179,12 @@ Route::group("adminapi", function () {
|
|||||||
|
|
||||||
})->name('系统接口');
|
})->name('系统接口');
|
||||||
|
|
||||||
})->middleware([ClientMiddleware::class, AuthMiddleware::class]);
|
})->middleware([AuthMiddleware::class]);
|
||||||
|
|
||||||
})->layer('admin')
|
})->layer('admin')
|
||||||
->middleware([AllowCrossDomain::class], [
|
->middleware([AllowCrossDomain::class], [
|
||||||
'Access-Control-Allow-Headers' => 'Client, Client-Version, Client-Id, Authorization, Content-Type, If-Match, If-Modified-Since, If-None-Match, If-Unmodified-Since, X-CSRF-TOKEN, X-Requested-With'
|
'Access-Control-Allow-Headers' => 'Client, Client-Version, Client-Id, Authorization, Content-Type, If-Match, If-Modified-Since, If-None-Match, If-Unmodified-Since, X-CSRF-TOKEN, X-Requested-With'
|
||||||
]);
|
])->middleware([ClientMiddleware::class]);
|
||||||
// AllowCrossDomain 缺一个预检检查.
|
// AllowCrossDomain 缺一个预检检查.
|
||||||
//if($request->isOptions()) {
|
//if($request->isOptions()) {
|
||||||
// return \response()->header($header)->code(204);
|
// return \response()->header($header)->code(204);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user