diff --git a/QCloudMusicApi/CMakeLists.txt b/QCloudMusicApi/CMakeLists.txt index dd73edc..e5fde02 100644 --- a/QCloudMusicApi/CMakeLists.txt +++ b/QCloudMusicApi/CMakeLists.txt @@ -12,13 +12,11 @@ find_package(OpenSSL REQUIRED) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Network) +FILE(GLOB HEADERS ./*.h ./util/*.h) +FILE(GLOB SOURCES ./*.cpp ./util/*.cpp) add_library(QCloudMusicApi SHARED - ./util/crypto.h - ./util/config.h - ./util/index.h - module.h - module.cpp - request.hpp + ${HEADERS} + ${SOURCES} ) target_link_libraries(QCloudMusicApi Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Network OpenSSL::SSL OpenSSL::Crypto) diff --git a/QCloudMusicApi/module.cpp b/QCloudMusicApi/module.cpp index 581c5c7..9860fbb 100644 --- a/QCloudMusicApi/module.cpp +++ b/QCloudMusicApi/module.cpp @@ -9,8 +9,9 @@ #include #include #include +#include -#include "request.hpp" +#include "request.h" //入参与返回值类型为QVariantMap #define APICPP(FUNCNAME) \ diff --git a/QCloudMusicApi/request.hpp b/QCloudMusicApi/request.cpp similarity index 98% rename from QCloudMusicApi/request.hpp rename to QCloudMusicApi/request.cpp index 2ce5616..d862106 100644 --- a/QCloudMusicApi/request.hpp +++ b/QCloudMusicApi/request.cpp @@ -1,6 +1,4 @@ -#pragma once - -#include +#include #include #include #include @@ -26,7 +24,7 @@ namespace Request { -static QString chooseUserAgent(QString ua = "") { +QString chooseUserAgent(QString ua = "") { const QVariantMap userAgentList { { "mobile", @@ -66,7 +64,10 @@ static QString chooseUserAgent(QString ua = "") { : ua; } -static auto createRequest(QNetworkAccessManager::Operation method, QString urlStr, QVariantMap data, QVariantMap options) { +QVariantMap createRequest(QNetworkAccessManager::Operation method, + QString urlStr, + QVariantMap data, + QVariantMap options) { QUrl url(urlStr); qDebug().noquote() << QJsonDocument::fromVariant( diff --git a/QCloudMusicApi/request.h b/QCloudMusicApi/request.h new file mode 100644 index 0000000..054702b --- /dev/null +++ b/QCloudMusicApi/request.h @@ -0,0 +1,13 @@ +#include +#include + +namespace Request { + +QString chooseUserAgent(QString ua = ""); + +QVariantMap createRequest(QNetworkAccessManager::Operation method, + QString urlStr, + QVariantMap data, + QVariantMap options); + +}