add clear
This commit is contained in:
+20
-15
@@ -353,7 +353,7 @@ class HttpClient
|
||||
$body = $this->resolve($header, $body);
|
||||
|
||||
if ($client->getStatusCode() != 200) {
|
||||
return new Result(['code' => $client->getStatusCode(), 'message' => $body]);
|
||||
return new Result(['code' => $client->getStatusCode(), 'message' => $this->searchMessageByData($body), 'data' => $body]);
|
||||
}
|
||||
|
||||
return $this->structure($body, $data, $header);
|
||||
@@ -579,9 +579,24 @@ class HttpClient
|
||||
$result['message'] = '';
|
||||
} else {
|
||||
$result['code'] = $body[$this->errorCodeField] ?? 0;
|
||||
var_dump(strpos($this->errorMsgField, '.'));
|
||||
if (strpos($this->errorMsgField, '.') !== false) {
|
||||
$result['message'] = $this->searchMessageByData($body);
|
||||
}
|
||||
$result['data'] = $body;
|
||||
$result['header'] = $header;
|
||||
$result['httpStatus'] = $statusCode;
|
||||
return new Result($result);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $body
|
||||
* @return array|mixed|string
|
||||
*/
|
||||
private function searchMessageByData($body)
|
||||
{
|
||||
$parent = [];
|
||||
if (empty($this->errorMsgField)) {
|
||||
return 'system success.';
|
||||
}
|
||||
$explode = explode('.', $this->errorMsgField);
|
||||
foreach ($explode as $item) {
|
||||
if (empty($item)) {
|
||||
@@ -598,19 +613,9 @@ class HttpClient
|
||||
break;
|
||||
}
|
||||
}
|
||||
return !empty($parent) ? $parent : 'system success.';
|
||||
}
|
||||
|
||||
var_dump($parent);
|
||||
|
||||
$result['message'] = $parent ?? 'system success.';
|
||||
} else {
|
||||
$result['message'] = $body[$this->errorMsgField] ?? 'system success.';
|
||||
}
|
||||
}
|
||||
$result['data'] = $body;
|
||||
$result['header'] = $header;
|
||||
$result['httpStatus'] = $statusCode;
|
||||
return new Result($result);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return bool
|
||||
|
||||
Reference in New Issue
Block a user