回退 'Pull Request : enhance: Internal requests follow 301 redirects'

Merge pull request  from shenmo/revert-merge-278-Thunder
This commit is contained in:
shenmo 2024-08-17 07:03:45 +00:00 committed by Gitee
commit 8aa1a40b41
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 2 additions and 6 deletions

@ -28,7 +28,6 @@ void SparkAPI::get(QUrl url)
QNetworkRequest request; QNetworkRequest request;
HttpRequest *httprequest = new HttpRequest; HttpRequest *httprequest = new HttpRequest;
request.setUrl(QUrl(url.toString().replace("+", "%2B"))); request.setUrl(QUrl(url.toString().replace("+", "%2B")));
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
connect(httprequest, &HttpRequest::finished, [=](QString data) connect(httprequest, &HttpRequest::finished, [=](QString data)
{ {
QByteArray arr = data.toUtf8(); QByteArray arr = data.toUtf8();
@ -54,7 +53,6 @@ void SparkAPI::getRAW(QUrl url)
QNetworkRequest request; QNetworkRequest request;
HttpRequest *httprequest = new HttpRequest; HttpRequest *httprequest = new HttpRequest;
request.setUrl(QUrl(url.toString().replace("+", "%2B"))); request.setUrl(QUrl(url.toString().replace("+", "%2B")));
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
connect(httprequest, &HttpRequest::finished, [=](QString data) connect(httprequest, &HttpRequest::finished, [=](QString data)
{ {
emit finishedRAW(data); emit finishedRAW(data);

@ -73,7 +73,6 @@ void AppIntoPage::openUrl(const QUrl &url)
iconRequest.setUrl(QUrl(pkgUrlBase + "/icon.png")); iconRequest.setUrl(QUrl(pkgUrlBase + "/icon.png"));
iconRequest.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent); iconRequest.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent);
iconRequest.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'"); iconRequest.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'");
iconRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
iconManager->get(iconRequest); iconManager->get(iconRequest);
QObject::connect(iconManager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply) QObject::connect(iconManager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply)
@ -97,7 +96,6 @@ void AppIntoPage::openUrl(const QUrl &url)
request.setUrl(QUrl(imgUrl)); request.setUrl(QUrl(imgUrl));
request.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent); request.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent);
request.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'"); request.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'");
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
manager->get(request); manager->get(request);
QObject::connect(manager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply) QObject::connect(manager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply)
{ {
@ -116,10 +114,10 @@ void AppIntoPage::openUrl(const QUrl &url)
qDebug() << imgUrl; qDebug() << imgUrl;
} }
manager->deleteLater(); manager->deleteLater();
}); });
} }
/** /**
* NOTE: No need to judget developmode status * NOTE: No need to judget developmode status