loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-07 20:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 5.0-sync-master

Browse Source
This commit is contained in:
William Cheng
2020-04-17 15:51:00 +08:00
parent c3837ca331 896867b5e7
commit faf6f197be
4730 changed files with 208746 additions and 53119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION
View File

@@ -1 +1,5 @@
5.0.0-SNAPSHOT
<<<<<<< HEAD
5.0.0-SNAPSHOT
=======
4.3.1-SNAPSHOT
>>>>>>> origin/master

5
samples/client/petstore/javascript-promise-es6/src/ApiClient.js
View File

@@ -400,8 +400,6 @@ class ApiClient {
if(contentType != 'multipart/form-data') {
request.type(contentType);
}
} else if (!request.header['Content-Type']) {
request.type('application/json');
}
if (contentType === 'application/x-www-form-urlencoded') {
@@ -419,6 +417,9 @@ class ApiClient {
}
}
} else if (bodyParam !== null && bodyParam !== undefined) {
if (!request.header['Content-Type']) {
request.type('application/json');
}
request.send(bodyParam);
}