Merge remote-tracking branch 'origin/master' into 7.0.x

This commit is contained in:
William Cheng
2023-05-10 15:00:56 +08:00
2319 changed files with 61134 additions and 22322 deletions

View File

@@ -204,9 +204,12 @@ Class | Method | HTTP request | Description
- [XmlItem](docs/XmlItem.md)
<a id="documentation-for-authorization"></a>
## Documentation for Authorization
Authentication schemes defined for the API:
<a id="petstore_auth"></a>
### petstore_auth
@@ -217,6 +220,7 @@ Authentication schemes defined for the API:
- write:pets: modify pets in your account
- read:pets: read your pets
<a id="api_key"></a>
### api_key
@@ -224,6 +228,7 @@ Authentication schemes defined for the API:
- **API key parameter name**: api_key
- **Location**: HTTP header
<a id="api_key_query"></a>
### api_key_query
@@ -231,6 +236,7 @@ Authentication schemes defined for the API:
- **API key parameter name**: api_key_query
- **Location**: URL query string
<a id="http_basic_test"></a>
### http_basic_test

View File

@@ -650,7 +650,7 @@ public class ApiClient extends JavaTimeFormatter {
throw new RestClientException("Could not build URL: " + builder.toUriString(), ex);
}
final BodyBuilder requestBuilder = RequestEntity.method(method, uri);
final BodyBuilder requestBuilder = RequestEntity.method(method, UriComponentsBuilder.fromHttpUrl(basePath).toUriString() + finalUri, uriParams);
if (accept != null) {
requestBuilder.accept(accept.toArray(new MediaType[accept.size()]));
}