diff --git a/app/http/middleware/ClientMiddleware.php b/app/http/middleware/ClientMiddleware.php index 0424cb6..e7500b5 100644 --- a/app/http/middleware/ClientMiddleware.php +++ b/app/http/middleware/ClientMiddleware.php @@ -15,13 +15,14 @@ class ClientMiddleware extends Middleware if(empty($clientName)) { return \json('设备未授权'); } + /* * 客户端信息 */ $client = new HttpClient( $clientName, - $request->header('clientId', ''), - $request->header('clientVersion', ''), + $request->header('client-id', ''), + $request->header('client-version', ''), ); /* * 获取客户端 diff --git a/app/http/middleware/ContextMiddleware.php b/app/http/middleware/ContextMiddleware.php index c8aac50..62814a1 100644 --- a/app/http/middleware/ContextMiddleware.php +++ b/app/http/middleware/ContextMiddleware.php @@ -111,8 +111,12 @@ class ContextMiddleware extends middleware } $route = $request->rule()->getRoute(); + $client = \app\Request::getClient(); (new SysRequestRecord)->save([ 'context_id' => $request->contextId, + 'client_id' => $client->id, + 'client_name' => $client->name, + 'client_version' => $client->version, 'request_date' => $request_date, 'request_time' => $request_date . '.' . ($request_start_time[1] ?? 0), 'request_method' => $request_method, diff --git a/route/api.php b/route/api.php index 2d05168..a69d077 100644 --- a/route/api.php +++ b/route/api.php @@ -70,7 +70,7 @@ Route::group("adminapi", function () { */ 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 () { @@ -179,12 +179,12 @@ Route::group("adminapi", function () { })->name('系统接口'); - })->middleware([ClientMiddleware::class, AuthMiddleware::class]); + })->middleware([AuthMiddleware::class]); })->layer('admin') ->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' - ]); + ])->middleware([ClientMiddleware::class]); // AllowCrossDomain 缺一个预检检查. //if($request->isOptions()) { // return \response()->header($header)->code(204);