update

example/qml-Qt6/page/T_Network.qml

@@ -414,7 +414,7 @@ FluContentPage{
             (status,errorString,result)=>{
                 btn_upload.progress = 0
                 text_info.text = result
-                console.debug(result)
+                console.debug(status+";"+errorString+";"+result)
             }
         onSuccess:
             (result)=>{
@@ -480,9 +480,9 @@ FluContentPage{
         id: file_dialog
         onAccepted: {
             FluNetwork.postForm("https://httpbingo.org/post")
-            .setRetry(0)//请求失败后不重复请求
+            .setRetry(1)//只请求一次
             .add("accessToken","12345678")
-            .addFile("file",FluTools.toLocalPath(file_dialog.selectedFile))
+            .addFile("file",FluTools.toLocalPath(file_dialog.currentFile))
             .bind(root)
             .go(callable_upload_file)
         }

example/qml-Qt6/window/MainWindow.qml

@@ -360,7 +360,7 @@ FluWindow {
     function checkUpdate(silent){
         callable.silent = silent
         FluNetwork.get("https://api.github.com/repos/zhuzichu520/FluentUI/releases/latest")
-            .go(callable)
+        .go(callable)
     }
 
 }

example/qml/page/T_Network.qml

@@ -415,7 +415,7 @@ FluContentPage{
             (status,errorString,result)=>{
                 btn_upload.progress = 0
                 text_info.text = result
-                console.debug(result)
+                console.debug(status+";"+errorString+";"+result)
             }
         onSuccess:
             (result)=>{
@@ -481,9 +481,9 @@ FluContentPage{
         id: file_dialog
         onAccepted: {
             FluNetwork.postForm("https://httpbingo.org/post")
-            .setRetry(0)//请求失败后不重复请求
+            .setRetry(1)//只请求一次
             .add("accessToken","12345678")
-            .addFile("file",FluTools.toLocalPath(file_dialog.selectedFile))
+            .addFile("file",FluTools.toLocalPath(file_dialog.currentFile))
             .bind(root)
             .go(callable_upload_file)
         }

example/qml/window/MainWindow.qml

@@ -363,7 +363,7 @@ FluWindow {
     function checkUpdate(silent){
         callable.silent = silent
         FluNetwork.get("https://api.github.com/repos/zhuzichu520/FluentUI/releases/latest")
-            .go(callable)
+        .go(callable)
     }
 
 }

src/FluNetwork.cpp

@@ -12,7 +12,10 @@
 #include <QJSEngine>
 #include <QJsonArray>
 #include <QStandardPaths>
+#include <QThreadPool>
 #include <QDir>
+#include <QEventLoop>
+#include <QGuiApplication>
 
 NetworkCallable::NetworkCallable(QObject *parent):QObject{parent}{
 
@@ -158,37 +161,47 @@ void NetworkParams::go(NetworkCallable* callable){
 
 void FluNetwork::handle(NetworkParams* params,NetworkCallable* c){
     QPointer<NetworkCallable> callable(c);
-    if(!callable.isNull()){
+    QThreadPool::globalInstance()->start([=](){
-        callable->start();
-    }
-    QString cacheKey = params->buildCacheKey();
-    if(params->_cacheMode == FluNetworkType::CacheMode::FirstCacheThenRequest && cacheExists(cacheKey)){
         if(!callable.isNull()){
-            callable->cache(readCache(cacheKey));
+            callable->start();
         }
-    }
+        QString cacheKey = params->buildCacheKey();
-    if(params->_cacheMode == FluNetworkType::CacheMode::IfNoneCacheRequest && cacheExists(cacheKey)){
+        if(params->_cacheMode == FluNetworkType::CacheMode::FirstCacheThenRequest && cacheExists(cacheKey)){
-        if(!callable.isNull()){
+            if(!callable.isNull()){
-            callable->cache(readCache(cacheKey));
+                callable->cache(readCache(cacheKey));
-            callable->finish();
+            }
-            params->deleteLater();
         }
-        return;
+        if(params->_cacheMode == FluNetworkType::CacheMode::IfNoneCacheRequest && cacheExists(cacheKey)){
-    }
+            if(!callable.isNull()){
-    std::shared_ptr<int> times = std::make_shared<int>(0);
+                callable->cache(readCache(cacheKey));
-    QUrl url(params->_url);
+                callable->finish();
-    QNetworkAccessManager* manager = new QNetworkAccessManager();
+                params->deleteLater();
-    QNetworkReply *reply = nullptr;
+            }
-    manager->setTransferTimeout(params->getTimeout());
+            return;
-    addQueryParam(&url,params->_queryMap);
+        }
-    QNetworkRequest request(url);
+        QNetworkAccessManager manager;
-    addHeaders(&request,params->_headerMap);
+        manager.setTransferTimeout(params->getTimeout());
-    connect(manager,&QNetworkAccessManager::finished,this,[this,params,request,callable,manager,times,cacheKey](QNetworkReply *reply){
+        QEventLoop loop;
-        if(reply->error() != QNetworkReply::NoError && *times < params->getRetry()) {
+        for (int i = 0; i < params->getRetry(); ++i) {
-            (*times)++;
+            QUrl url(params->_url);
-            sendRequest(manager,request,params,reply,callable);
+            addQueryParam(&url,params->_queryMap);
-        } else {
+            QNetworkRequest request(url);
-            QString response = QString::fromUtf8(reply->readAll());
+            addHeaders(&request,params->_headerMap);
+            QNetworkReply* reply;
+            sendRequest(&manager,request,params,reply,callable);
+            if(!QPointer(qApp)){
+                reply->deleteLater();
+                reply = nullptr;
+                return;
+            }
+            QEventLoop loop;
+            connect(&manager,&QNetworkAccessManager::finished,&manager,[&loop](QNetworkReply *reply){loop.quit();});
+            connect(qApp,&QGuiApplication::aboutToQuit,&manager, [&loop,reply](){reply->abort(),loop.quit();});
+            loop.exec();
+            QString response;
+            if(reply->isOpen()){
+                response = QString::fromUtf8(reply->readAll());
+            }
             QNetworkReply::NetworkError error = reply->error();
             if(error == QNetworkReply::NoError){
                 if(!callable.isNull()){
@@ -197,26 +210,27 @@ void FluNetwork::handle(NetworkParams* params,NetworkCallable* c){
                     }
                     callable->success(response);
                 }
+                break;
             }else{
-                if(!callable.isNull()){
+                if(i == params->getRetry()-1){
-                    int httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+                    if(!callable.isNull()){
-                    if(params->_cacheMode == FluNetworkType::CacheMode::RequestFailedReadCache && cacheExists(cacheKey)){
+                        int httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-                        if(!callable.isNull()){
+                        if(params->_cacheMode == FluNetworkType::CacheMode::RequestFailedReadCache && cacheExists(cacheKey)){
-                            callable->cache(readCache(cacheKey));
+                            if(!callable.isNull()){
+                                callable->cache(readCache(cacheKey));
+                            }
                         }
+                        callable->error(httpStatus,reply->errorString(),response);
                     }
-                    callable->error(httpStatus,reply->errorString(),response);
                 }
             }
-            params->deleteLater();
             reply->deleteLater();
-            manager->deleteLater();
+        }
-            if(!callable.isNull()){
+        params->deleteLater();
-                callable->finish();
+        if(!callable.isNull()){
-            }
+            callable->finish();
         }
     });
-    sendRequest(manager,request,params,reply,callable);
 }
 
 void FluNetwork::handleDownload(NetworkParams* params,NetworkCallable* c){
@@ -267,7 +281,6 @@ void FluNetwork::handleDownload(NetworkParams* params,NetworkCallable* c){
         }
         return;
     }
-
     if(params->_downloadParam->_append){
         if (!cacheFile->open(QIODevice::WriteOnly|QIODevice::Truncate))
         {
@@ -347,9 +360,6 @@ QString FluNetwork::getCacheFilePath(const QString& key){
 }
 
 void FluNetwork::sendRequest(QNetworkAccessManager* manager,QNetworkRequest request,NetworkParams* params,QNetworkReply*& reply,QPointer<NetworkCallable> callable){
-    if(reply){
-        reply->deleteLater();
-    }
     QByteArray verb = params->method2String().toUtf8();
     switch (params->_type) {
     case NetworkParams::TYPE_FORM:{

src/Qt5/imports/FluentUI/Controls/FluWindow.qml

@@ -131,7 +131,7 @@ Window {
         Item{
             data: window.appBar
             height: {
-                if(window.useSystemAppBar){
+                if(FluApp.useSystemAppBar){
                     return 0
                 }
                 return window.fitsAppBarWindows ? 0 : childrenRect.height

src/Qt6/imports/FluentUI/Controls/FluWindow.qml

@@ -130,7 +130,7 @@ Window {
         Item{
             data: window.appBar
             height: {
-                if(window.useSystemAppBar){
+                if(FluApp.useSystemAppBar){
                     return 0
                 }
                 return window.fitsAppBarWindows ? 0 : childrenRect.height