forked from loafle/openapi-generator-original
updated request process
This commit is contained in:
parent
f4cbd88e2c
commit
6ec7cf5a9d
@ -103,6 +103,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
|
|||||||
response = "";
|
response = "";
|
||||||
error_type = QNetworkReply::NoError;
|
error_type = QNetworkReply::NoError;
|
||||||
error_str = "";
|
error_str = "";
|
||||||
|
bool isFormData = false;
|
||||||
|
|
||||||
|
|
||||||
// decide on the variable layout
|
// decide on the variable layout
|
||||||
@ -124,6 +125,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
|
|||||||
|
|
||||||
if (input->vars.count() > 0) {
|
if (input->vars.count() > 0) {
|
||||||
bool first = true;
|
bool first = true;
|
||||||
|
isFormData = true;
|
||||||
foreach (QString key, input->vars.keys()) {
|
foreach (QString key, input->vars.keys()) {
|
||||||
if (!first) {
|
if (!first) {
|
||||||
request_content.append("&");
|
request_content.append("&");
|
||||||
@ -250,7 +252,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
|
|||||||
request.setRawHeader(key.toStdString().c_str(), input->headers.value(key).toStdString().c_str());
|
request.setRawHeader(key.toStdString().c_str(), input->headers.value(key).toStdString().c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (request_content.size() > 0) {
|
if (request_content.size() > 0 && !isFormData) {
|
||||||
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
|
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
|
||||||
}
|
}
|
||||||
else if (input->var_layout == URL_ENCODED) {
|
else if (input->var_layout == URL_ENCODED) {
|
||||||
|
@ -44,7 +44,6 @@ void PetApiTests::getPetByIdTest() {
|
|||||||
timer.setSingleShot(true);
|
timer.setSingleShot(true);
|
||||||
|
|
||||||
auto validator = [](SWGPet* pet) {
|
auto validator = [](SWGPet* pet) {
|
||||||
qDebug() << pet->asJson();
|
|
||||||
QVERIFY(pet->getId() == 3);
|
QVERIFY(pet->getId() == 3);
|
||||||
loop.quit();
|
loop.quit();
|
||||||
};
|
};
|
||||||
|
@ -103,6 +103,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
|
|||||||
response = "";
|
response = "";
|
||||||
error_type = QNetworkReply::NoError;
|
error_type = QNetworkReply::NoError;
|
||||||
error_str = "";
|
error_str = "";
|
||||||
|
bool isFormData = false;
|
||||||
|
|
||||||
|
|
||||||
// decide on the variable layout
|
// decide on the variable layout
|
||||||
@ -124,6 +125,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
|
|||||||
|
|
||||||
if (input->vars.count() > 0) {
|
if (input->vars.count() > 0) {
|
||||||
bool first = true;
|
bool first = true;
|
||||||
|
isFormData = true;
|
||||||
foreach (QString key, input->vars.keys()) {
|
foreach (QString key, input->vars.keys()) {
|
||||||
if (!first) {
|
if (!first) {
|
||||||
request_content.append("&");
|
request_content.append("&");
|
||||||
@ -250,7 +252,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
|
|||||||
request.setRawHeader(key.toStdString().c_str(), input->headers.value(key).toStdString().c_str());
|
request.setRawHeader(key.toStdString().c_str(), input->headers.value(key).toStdString().c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (request_content.size() > 0) {
|
if (request_content.size() > 0 && !isFormData) {
|
||||||
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
|
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
|
||||||
}
|
}
|
||||||
else if (input->var_layout == URL_ENCODED) {
|
else if (input->var_layout == URL_ENCODED) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user