[HttpClient重构与LifecycleCallback组件新增]: 增强网络请求安全性与生命周期管理

- **GitHub Actions优化**: 修复条件判断语法，将`startsWith`改为直接比较操作系统名称，提高脚本执行准确性
- **HttpClient模块重构**: 使用LifecycleCallback包装器替换原始回调函数，自动处理对象销毁时的回调失效，防止悬空指针和内存安全问题
- **新增生命周期感知组件**: 添加LifecycleCallback模块，支持QObject、std::shared_ptr管理的对象及自由函数，提供安全的回调机制
- **测试框架完善**: 为HttpClient添加完整的单元测试，覆盖GET/POST/PUT/DELETE请求、文件上传下载、超时处理、错误处理等场景
- **代码质量提升**: 修复文件操作错误处理，改进网络超时机制，优化回调接口命名（CallBack→JsonCallback/ProgressCallback）
- **文档更新**: 同步README组件列表，修正图片路径，新增LifecycleCallback组件说明
- **构建系统调整**: 更新CMakeLists.txt和.pro文件，集成新组件到构建流程中

Author: RealChuan

.github/actions/install-dependencies/action.yml

@@ -17,23 +17,23 @@ runs:
 
   steps:
     - name: Install dependencies on windows
-      if: startsWith(runner.os, 'Windows')
+      if: runner.os == 'Windows'
       shell: bash
       run: |
         choco install ninja
         ninja --version
         cmake --version
 
     - name: Install dependencies on macos
-      if: startsWith(runner.os, 'macOS')
+      if: runner.os == 'macOS'
       shell: bash
       run: |
         ninja --version
         cmake --version
         clang --version
 
     - name: Install dependencies on linux
-      if: startsWith(runner.os, 'Linux')
+      if: runner.os == 'Linux'
       shell: bash
       run: |
         sudo apt-get update

README.md

@@ -57,7 +57,7 @@
 
 - 自定义样式气泡对话框
 - 可用作增强型工具提示
-- <img src="BubbleWindow/picture/Bubble.png" width="300" alt="气泡对话框">
+- <img src="src/BubbleWindow/picture/Bubble.png" width="300" alt="气泡对话框">
 
 ### [Chart](src/Chart/) - 数据可视化图表(QtCharts 模块 Desprecated)
 
@@ -114,6 +114,10 @@
 - 自动图片轮播
 - <img src="src/ImageCarousel/picture/ImageCarousel.jpg" width="90%" alt="图片轮播">
 
+### [LifecycleCallback](src/LifecycleCallback/) - 生命周期感知的回调包装器
+
+- 支持 QObject、std::shared_ptr 管理的对象以及自由函数，在对象被销毁时自动使回调无效，防止悬空指针和内存安全问题。
+
 ### [LoadingIndicator](src/LoadingIndicator/) - 加载动画
 
 - 动画加载指示器

src/CMakeLists.txt

@@ -12,6 +12,7 @@ add_subdirectory(GridViewModel)
 add_subdirectory(HttpClient)
 add_subdirectory(IconButton)
 add_subdirectory(ImageCarousel)
+add_subdirectory(LifecycleCallback)
 add_subdirectory(LoadingIndicator)
 add_subdirectory(LogAsynchronous)
 add_subdirectory(MulClient)

src/HttpClient/CMakeLists.txt

@@ -3,4 +3,5 @@ set(PROJECT_SOURCES httpclient_unittest.cc httpclient.cc httpclient.hpp)
 qt_add_executable(httpclient_unittest MANUAL_FINALIZATION ${PROJECT_SOURCES})
 target_link_libraries(httpclient_unittest PRIVATE Qt::Network Qt::Concurrent
                                                   Qt::Test)
+target_include_directories(httpclient_unittest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 qt_finalize_executable(httpclient_unittest)

src/HttpClient/HttpClient.pro

@@ -1,8 +1,6 @@
 include(../../qmake/ProjectSettings.pri)
 
-QT       += core gui network testlib
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core network testlib
 
 SOURCES += \
     httpclient.cc  \

src/HttpClient/httpclient.cc

@@ -78,13 +78,13 @@ class HttpClient::HttpClientPrivate
         QString filePath;
         qint64 fileBaseSize;
         QPointer<QFile> filePtr;
-        ProgressCallBack progressCallBack = nullptr;
+        ProgressCallback progressCallback = {};
     };
 
     HttpClient *q_ptr;
 
     QSslConfiguration sslConfiguration = QSslConfiguration::defaultConfiguration();
-    QMap<QNetworkReply *, CallBack> tasks;
+    QMap<QNetworkReply *, JsonCallback> tasks;
     QMap<QNetworkReply *, Download *> downloads;
     QMap<QNetworkReply *, QFile *> uploads;
 };
@@ -102,7 +102,7 @@ QNetworkReply *HttpClient::sendRequest(Method method,
                                        const QJsonObject &body,
                                        int timeout,
                                        bool verifyCertificate,
-                                       CallBack callBack)
+                                       JsonCallback callback)
 {
     auto request = d_ptr->networkRequest(verifyCertificate);
     request.setUrl(url);
@@ -120,7 +120,7 @@ QNetworkReply *HttpClient::sendRequest(Method method,
     connect(reply, &QNetworkReply::finished, this, &HttpClient::onReplyFinish);
     connect(reply, &QNetworkReply::errorOccurred, this, &HttpClient::onErrorOccurred);
     connect(reply, &QNetworkReply::sslErrors, this, &HttpClient::onSslErrors);
-    d_ptr->tasks.insert(reply, callBack);
+    d_ptr->tasks.insert(reply, callback);
     if (timeout > 0) {
         auto *timer = new QTimer(reply);
         connect(timer, &QTimer::timeout, this, &HttpClient::onNetworkTimeout);
@@ -158,13 +158,14 @@ QNetworkReply *HttpClient::downLoad(const QUrl &url,
                                     const QString &filePath,
                                     int timeout,
                                     bool verifyCertificate,
-                                    ProgressCallBack progressCallBack,
-                                    CallBack callBack)
+                                    ProgressCallback progressCallback,
+                                    JsonCallback callback)
 {
     Q_ASSERT(!filePath.isEmpty());
     auto *file = new QFile(filePath + ".temp", this);
     if (!file->open(QIODevice::WriteOnly | QIODevice::Append)) {
         qWarning() << QString("Cannot open the file: %1!").arg(filePath) << file->errorString();
+        file->deleteLater();
         return nullptr;
     }
 
@@ -179,8 +180,8 @@ QNetworkReply *HttpClient::downLoad(const QUrl &url,
 
     auto *reply = QNetworkAccessManager::get(request);
     d_ptr->downloads
-        .insert(reply, new HttpClientPrivate::Download{filePath, bytes, file, progressCallBack});
-    d_ptr->tasks.insert(reply, callBack);
+        .insert(reply, new HttpClientPrivate::Download{filePath, bytes, file, progressCallback});
+    d_ptr->tasks.insert(reply, callback);
     connect(reply, &QNetworkReply::errorOccurred, this, &HttpClient::onErrorOccurred);
     connect(reply, &QNetworkReply::sslErrors, this, &HttpClient::onSslErrors);
     connect(reply, &QNetworkReply::downloadProgress, this, &HttpClient::onDownloadProgress);
@@ -198,7 +199,7 @@ QNetworkReply *HttpClient::upload_put(const QUrl &url,
                                       const QString &filePath,
                                       int timeout,
                                       bool verifyCertificate,
-                                      CallBack callBack)
+                                      JsonCallback callback)
 {
     Q_ASSERT(!filePath.isEmpty());
     auto *file = new QFile(filePath, this);
@@ -214,27 +215,30 @@ QNetworkReply *HttpClient::upload_put(const QUrl &url,
     auto *reply = QNetworkAccessManager::put(request, file);
     file->setParent(reply);
     d_ptr->uploads.insert(reply, file);
-    connectUploadSlots(reply, timeout, callBack);
+    connectUploadSlots(reply, timeout, callback);
     return reply;
 }
 
-QNetworkReply *HttpClient::upload_put(
-    const QUrl &url, const QByteArray &data, int timeout, bool verifyCertificate, CallBack callBack)
+QNetworkReply *HttpClient::upload_put(const QUrl &url,
+                                      const QByteArray &data,
+                                      int timeout,
+                                      bool verifyCertificate,
+                                      JsonCallback callback)
 {
     qDebug() << QString("Upload To %1").arg(url.toString(QUrl::RemoveUserInfo));
 
     auto request = d_ptr->networkRequest(verifyCertificate);
     request.setUrl(url);
     auto *reply = QNetworkAccessManager::put(request, data);
-    connectUploadSlots(reply, timeout, callBack);
+    connectUploadSlots(reply, timeout, callback);
     return reply;
 }
 
 QNetworkReply *HttpClient::upload_post(const QUrl &url,
                                        const QString &filePath,
                                        int timeout,
                                        bool verifyCertificate,
-                                       CallBack callBack)
+                                       JsonCallback callback)
 {
     Q_ASSERT(!filePath.isEmpty());
     auto *file = new QFile(filePath, this);
@@ -261,7 +265,7 @@ QNetworkReply *HttpClient::upload_post(const QUrl &url,
     file->setParent(reply);
     multiPart->setParent(reply);
     d_ptr->uploads.insert(reply, file);
-    connectUploadSlots(reply, timeout, callBack);
+    connectUploadSlots(reply, timeout, callback);
     return reply;
 }
 
@@ -270,7 +274,7 @@ QNetworkReply *HttpClient::upload_post(const QUrl &url,
                                        const QByteArray &data,
                                        int timeout,
                                        bool verifyCertificate,
-                                       CallBack callBack)
+                                       JsonCallback callback)
 {
     qDebug() << QString("Upload To %1").arg(url.toString(QUrl::RemoveUserInfo) + "/" + filename);
     auto disposition = QString("form-data; name=\"%1\"; filename=\"%2\"").arg("file", filename);
@@ -285,7 +289,7 @@ QNetworkReply *HttpClient::upload_post(const QUrl &url,
 
     auto *reply = QNetworkAccessManager::post(request, multiPart);
     multiPart->setParent(reply);
-    connectUploadSlots(reply, timeout, callBack);
+    connectUploadSlots(reply, timeout, callback);
     return reply;
 }
 
@@ -360,11 +364,11 @@ void HttpClient::onDownloadProgress(qint64 bytesReceived, qint64 bytesTotal)
     if (!download) {
         return;
     }
-    auto progressCallBack = download->progressCallBack;
-    if (!progressCallBack) {
+    auto progressCallback = download->progressCallback;
+    if (!progressCallback) {
         return;
     }
-    progressCallBack(bytesReceived + download->fileBaseSize, bytesTotal + download->fileBaseSize);
+    progressCallback(bytesReceived + download->fileBaseSize, bytesTotal + download->fileBaseSize);
 }
 
 void HttpClient::onDownloadReadyRead()
@@ -391,25 +395,18 @@ void HttpClient::onDownloadFinish()
     }
 
     auto *download = d_ptr->downloads.value(reply);
-    if (download) {
-        if (!download->filePtr.isNull()) {
-            download->filePtr->write(reply->readAll());
-            download->filePtr->flush();
-            download->filePtr->close();
-            if (QFile::exists(download->filePath)) {
-                QFile::remove(download->filePath);
+    if (download && !download->filePtr.isNull()) {
+        download->filePtr->write(reply->readAll());
+        download->filePtr->flush();
+        download->filePtr->close();
+        if (QFile::exists(download->filePath)) {
+            if (!QFile::remove(download->filePath)) {
+                qWarning() << "Failed to remove existing file:" << download->filePath;
             }
-            download->filePtr->rename(download->filePath);
         }
-    }
-    queryResult(reply, {});
-}
-
-void HttpClient::onUploadFinish()
-{
-    auto *reply = qobject_cast<QNetworkReply *>(sender());
-    if (!reply) {
-        return;
+        if (!download->filePtr->rename(download->filePath)) {
+            qWarning() << "Failed to rename temp file to:" << download->filePath;
+        }
     }
     queryResult(reply, {});
 }
@@ -419,12 +416,12 @@ QJsonObject HttpClient::hookResult(const QJsonObject &object)
     return object;
 }
 
-void HttpClient::connectUploadSlots(QNetworkReply *reply, int timeout, CallBack callBack)
+void HttpClient::connectUploadSlots(QNetworkReply *reply, int timeout, JsonCallback callback)
 {
-    d_ptr->tasks.insert(reply, callBack);
+    d_ptr->tasks.insert(reply, callback);
     connect(reply, &QNetworkReply::errorOccurred, this, &HttpClient::onErrorOccurred);
     connect(reply, &QNetworkReply::sslErrors, this, &HttpClient::onSslErrors);
-    connect(reply, &QNetworkReply::finished, this, &HttpClient::onUploadFinish);
+    connect(reply, &QNetworkReply::finished, this, &HttpClient::onReplyFinish);
     if (timeout > 0) {
         auto *timer = new QTimer(reply);
         connect(timer, &QTimer::timeout, this, &HttpClient::onNetworkTimeout);
@@ -435,11 +432,14 @@ void HttpClient::connectUploadSlots(QNetworkReply *reply, int timeout, CallBack
 void HttpClient::queryResult(QNetworkReply *reply, const QJsonObject &object)
 {
     qDebug() << object;
-    auto callBack = d_ptr->tasks.value(reply);
+
+    disconnect(reply, nullptr, this, nullptr);
+
+    auto callback = d_ptr->tasks.value(reply);
     d_ptr->clearTask(reply);
     auto json = hookResult(object);
-    if (callBack) {
-        callBack(json);
+    if (callback) {
+        callback(json);
     }
     emit ready(reply, json);
 

src/HttpClient/httpclient.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <LifecycleCallback/lifecyclecallback.hpp>
+
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 
@@ -9,8 +11,8 @@ class HttpClient : public QNetworkAccessManager
 {
     Q_OBJECT
 public:
-    using CallBack = std::function<void(const QJsonObject &)>;
-    using ProgressCallBack = std::function<void(qint64 download, qint64 total)>;
+    using JsonCallback = LifecycleCallback<const QJsonObject &>;
+    using ProgressCallback = LifecycleCallback<qint64, qint64>;
     using HttpHeaders = QHash<QString, QString>;
     enum class Method : int { GET, POST, PUT, DELETE };
 
@@ -23,7 +25,7 @@ class HttpClient : public QNetworkAccessManager
                                const QJsonObject &body,
                                int timeout = -1,
                                bool verifyCertificate = true,
-                               CallBack callBack = nullptr);
+                               JsonCallback callback = {});
 
     QJsonObject sync(QNetworkReply *reply);
     void cancel(QNetworkReply *reply);
@@ -32,30 +34,30 @@ class HttpClient : public QNetworkAccessManager
                             const QString &filePath,
                             int timeout = -1,
                             bool verifyCertificate = true,
-                            ProgressCallBack progressCallBack = nullptr,
-                            CallBack callBack = nullptr);
+                            ProgressCallback progressCallback = {},
+                            JsonCallback callback = {});
 
     QNetworkReply *upload_put(const QUrl &url,
                               const QString &filePath,
                               int timeout = -1,
                               bool verifyCertificate = true,
-                              CallBack callBack = nullptr);
+                              JsonCallback callback = {});
     QNetworkReply *upload_put(const QUrl &url,
                               const QByteArray &data,
                               int timeout = -1,
                               bool verifyCertificate = true,
-                              CallBack callBack = nullptr);
+                              JsonCallback callback = {});
     QNetworkReply *upload_post(const QUrl &url,
                                const QString &filePath,
                                int timeout = -1,
                                bool verifyCertificate = true,
-                               CallBack callBack = nullptr);
+                               JsonCallback callback = {});
     QNetworkReply *upload_post(const QUrl &url,
                                const QString &filename,
                                const QByteArray &data,
                                int timeout = -1,
                                bool verifyCertificate = true,
-                               CallBack callBack = nullptr);
+                               JsonCallback callback = {});
 
 signals:
     void timeOut();
@@ -69,13 +71,12 @@ private slots:
     void onDownloadProgress(qint64 bytesReceived, qint64 bytesTotal);
     void onDownloadReadyRead();
     void onDownloadFinish();
-    void onUploadFinish();
 
 protected:
     virtual QJsonObject hookResult(const QJsonObject &object);
 
 private:
-    void connectUploadSlots(QNetworkReply *reply, int timeout, CallBack callBack);
+    void connectUploadSlots(QNetworkReply *reply, int timeout, JsonCallback callback);
     void queryResult(QNetworkReply *reply, const QJsonObject &object);
 
     class HttpClientPrivate;