xuanchen/YeePay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

增加输出日志

Browse Source
This commit is contained in:
徐永宾
2024-04-02 10:24:41 +08:00
parent f8299b36aa
commit c5df43ce48
5 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Http/YopHttpClient.php
View File

@@ -34,18 +34,18 @@ class YopHttpClient
/**
* YopHttpClient constructor.
*
* @param ClientConfiguration $clientConfiguration
*/
public function __construct(ClientConfiguration $clientConfiguration)
{
$this->logger = LogFactory::getLogger(get_class($this));
$this->clientConfiguration = $clientConfiguration;
$guzzleClientConfig = [
RequestOptions::CONNECT_TIMEOUT => $clientConfiguration->getConnectionTimeoutInMillis() / 1000,
RequestOptions::TIMEOUT, $clientConfiguration->getSocketTimeoutInMillis() / 1000,
];
if (!empty($clientConfiguration->getProxyUrl())) {
if (! empty($clientConfiguration->getProxyUrl())) {
$guzzleClientConfig[RequestOptions::PROXY] = $clientConfiguration->getProxyUrl();
}
$this->guzzleClient = new Client($guzzleClientConfig);
@@ -66,8 +66,10 @@ class YopHttpClient
$executionContext->getEncryptor()->encrypt($request);
}
$executionContext->getSigner()
->sign($request, $executionContext->getCredentials(), $executionContext->getSignOptions());
->sign($request, $executionContext->getCredentials(), $executionContext->getSignOptions());
try {
\Log::channel('yeepay')->error('头部信息', $request->getHeaders());
$guzzleResponse = $this->sendRequest($request);
} catch (ServerException $e) {
$guzzleResponse = $e->getResponse();
@@ -87,12 +89,12 @@ class YopHttpClient
private function sendRequest(Request $request)
{
$uri = $request->getEndpoint().HttpUtils::urlEncodeExceptSlash($request->getResourcePath());
if (!empty($request->getMultipartFiles())) {
if (! empty($request->getMultipartFiles())) {
if ($request->getHttpMethod() == HttpMethod::POST) {
$body = [];
if (!empty($request->getParameters())) {
if (! empty($request->getParameters())) {
foreach ($request->getParameters() as $k => $v) {
if (!empty($v)) {
if (! empty($v)) {
foreach ($v as $value) {
$body[] = ['name' => $k, 'contents' => $value];
}
@@ -101,7 +103,7 @@ class YopHttpClient
}
foreach ($request->getMultipartFiles() as $k => $v) {
$part = ['name' => $k];
if (!empty($v)) {
if (! empty($v)) {
foreach ($v as $value) {
/** @var MultiPartFile $value */
$part['contents'] = $value->getContent();
@@ -121,11 +123,11 @@ class YopHttpClient
}
}
$requestIsPostOrPut = $request->getHttpMethod() == HttpMethod::POST || $request->getHttpMethod() == HttpMethod::PUT;
$requestHasPayload = !empty($request->getContent());
$putParamsInUri = !$requestIsPostOrPut || $requestHasPayload;
$requestHasPayload = ! empty($request->getContent());
$putParamsInUri = ! $requestIsPostOrPut || $requestHasPayload;
if ($putParamsInUri) {
$encodedParameters = \GuzzleHttp\Psr7\Query::build(HttpUtils::encodedParameters($request->getParameters()));
if (!empty($encodedParameters)) {
if (! empty($encodedParameters)) {
$uri = $uri.'?'.$encodedParameters;
}
}