Leecheng/KTVCentral
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

202509041156

Browse Source 
MachineStatusForwarder Token 問題修正
This commit is contained in:
allen.yan 2025-09-04 11:57:38 +08:00
parent 77bf255d60
commit 355dde4481
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/RoomSongController.php
View File

@ -109,7 +109,7 @@ class RoomSongController extends Controller
$roomSession->room->branch->external_ip,
"/api/room/sync-order-song",
$validated,
Auth::user()->api_plain_token
$request->bearerToken()
))->forward();
}
public function syncOrderSong(SyncOrderSongRequest $request)

6
app/Http/Controllers/RoomControlController.php
View File

@ -180,7 +180,7 @@ class RoomControlController extends Controller
$branch->external_ip,
"/api/room/session",
$validated,
Auth::user()->api_plain_token
$request->bearerToken()
))->forward();
return ApiResponse::success([
'room' => $room->latestSession,
@ -274,7 +274,7 @@ class RoomControlController extends Controller
$branch->external_ip ?? '',
'/api/room/receiveSwitch',
(new RoomResource($room->refresh()))->toArray(request()),
Auth::user()->api_plain_token
$request->bearerToken()
))->forward();
return ApiResponse::success([
'data' => MachineStatus::create($validated),
@ -383,7 +383,7 @@ class RoomControlController extends Controller
$branch->external_ip,
"/api/room/receiveSwitch",
(new RoomResource($room->refresh()))->toArray(request()),
Auth::user()->api_plain_token
$request->bearerToken()
))->forward();
return $validated['command']==='error' ? ApiResponse::error('機房控制失敗') : ApiResponse::success($room);
}

9
app/Services/MachineStatusForwarder.php
View File

@ -2,6 +2,7 @@
namespace App\Services;
use App\Models\User;
use Illuminate\Support\Facades\Log;
use Illuminate\Http\Client\Response;
use App\Services\ApiClient;
@ -11,14 +12,14 @@ class MachineStatusForwarder
protected string $externalUrl;
protected string $endpoint;
protected array $validated;
protected string $apiPlainToken;
protected ?string $apiPlainToken;
public function __construct(string $externalUrl, string $endpoint, array $validated, string $token=null)
public function __construct(string $externalUrl, string $endpoint, array $validated, ?string $token=null)
{
$this->externalUrl = $externalUrl;
$this->endpoint = $endpoint;
$this->validated = $validated;
$this->$apiPlainToken = $token;
$this->apiPlainToken = $token;
}
public function forward(): ?Response
@ -30,7 +31,7 @@ class MachineStatusForwarder
$mainDomain = implode('.', array_slice($hostParts, 1));
$mainDomainUrl = "{$parsed['scheme']}://{$mainDomain}";
$token = $this->api_plain_token ?? User::find(2)?->api_plain_token;
$token = $this->apiPlainToken ?? User::find(2)?->api_plain_token;
if ($token) {
$client = new ApiClient($mainDomainUrl, $token);
$response = $client->post($this->endpoint, $this->validated);