fix(core): harden settlement and wallet integration
This commit is contained in:
@@ -3,15 +3,15 @@
|
||||
namespace App\Services\Wallet;
|
||||
|
||||
use App\Models\Player;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use App\Support\Integration\WalletApiRequestGuard;
|
||||
use App\Services\Integration\PartnerSiteConfigResolver;
|
||||
use App\Support\Integration\WalletApiUrlSanitizer;
|
||||
|
||||
/** 按幂等键查询主站钱包侧是否已有对应划转记录。 */
|
||||
final class HttpMainSiteWalletIdempotentProbeClient
|
||||
{
|
||||
public function __construct(
|
||||
private readonly PartnerSiteConfigResolver $partnerSiteConfigResolver,
|
||||
private readonly WalletApiRequestGuard $walletApiRequestGuard,
|
||||
) {}
|
||||
|
||||
public function probe(Player $player, string $idempotentKey): MainSiteWalletIdempotentProbeResult
|
||||
@@ -32,8 +32,11 @@ final class HttpMainSiteWalletIdempotentProbeClient
|
||||
);
|
||||
}
|
||||
|
||||
$base = WalletApiUrlSanitizer::normalizeAndValidate($config->walletApiUrl);
|
||||
if ($base === null) {
|
||||
$endpoint = $this->walletApiRequestGuard->guard(
|
||||
$config->walletApiUrl,
|
||||
$config->walletTimeoutSeconds,
|
||||
);
|
||||
if ($endpoint === null) {
|
||||
return new MainSiteWalletIdempotentProbeResult(
|
||||
status: MainSiteWalletIdempotentProbeResult::STATUS_UNAVAILABLE,
|
||||
message: 'wallet_api_url_invalid',
|
||||
@@ -41,7 +44,7 @@ final class HttpMainSiteWalletIdempotentProbeClient
|
||||
}
|
||||
|
||||
$path = $config->walletLookupIdempotentPath;
|
||||
$url = $base.'/'.ltrim($path, '/');
|
||||
$url = $endpoint->baseUrl.'/'.ltrim($path, '/');
|
||||
$headers = ['Accept' => 'application/json'];
|
||||
if (is_string($config->walletApiKey) && $config->walletApiKey !== '') {
|
||||
$headers['Authorization'] = 'Bearer '.$config->walletApiKey;
|
||||
@@ -54,8 +57,7 @@ final class HttpMainSiteWalletIdempotentProbeClient
|
||||
];
|
||||
|
||||
try {
|
||||
$response = Http::withHeaders($headers)
|
||||
->timeout($config->walletTimeoutSeconds)
|
||||
$response = $endpoint->request($headers)
|
||||
->acceptJson()
|
||||
->get($url, $query);
|
||||
} catch (\Throwable $e) {
|
||||
|
||||
Reference in New Issue
Block a user