V0.9.9

1、修改了ftp示例

CMakeLists.txt

@@ -188,7 +188,7 @@ file(GLOB GLOBAL_SRC
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/mqtt)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/http)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/threadPool)
-# add_subdirectory(${CMAKE_SOURCE_DIR}/demo/ftp)
+add_subdirectory(${CMAKE_SOURCE_DIR}/demo/ftp)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/OneThread)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/timer)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/time)
@@ -196,9 +196,11 @@ file(GLOB GLOBAL_SRC
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/xlsx)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/DesignerPattern)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/ViewModel)
-add_subdirectory(${CMAKE_SOURCE_DIR}/demo/OpenGLWidgetLibrary)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/VideoPlayerGL)
-add_subdirectory(${CMAKE_SOURCE_DIR}/demo/OpenGLWidgetTest)
-add_subdirectory(${CMAKE_SOURCE_DIR}/demo/VideoPlayerLibrary)
+
+# add_subdirectory(${CMAKE_SOURCE_DIR}/demo/OpenGLWidgetLibrary)
+# add_subdirectory(${CMAKE_SOURCE_DIR}/demo/OpenGLWidgetTest)
+# add_subdirectory(${CMAKE_SOURCE_DIR}/demo/VideoPlayerLibrary)
+
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/RecordAudio)
 

External

@@ -1 +1 @@
-Subproject commit 05f813609e9d5828554e0f29ed1dbb8070faec3a
+Subproject commit a0df85fee753c18978da465599254dc856f3ed5a

demo/ftp/CMakeLists.txt

@@ -42,8 +42,8 @@ target_include_directories(${this_exe} PRIVATE
     ${CMAKE_SOURCE_DIR}/External/module/CurlFtp
     ${CMAKE_SOURCE_DIR}/External/module/StdLog
 
-    ${spdlog_INCLUDE_DIR}
-    ${CURL_INCLUDE_DIR}
+    # ${spdlog_INCLUDE_DIR}
+    # ${CURL_INCLUDE_DIR}
 )
 
 target_link_libraries(${this_exe} PRIVATE
@@ -56,12 +56,10 @@ target_link_libraries(${this_exe} PRIVATE
 )
 
 target_link_libraries(${this_exe} PRIVATE 
-    # fmt::fmt
-    # spdlog::spdlog
-    ${CURL_LIBRARY}
-    ${spdlog_LIBRARY}
-    # ${OpenSSL-1.1.1_LIB_LIBRARY}
-    # CURL::libcurl
+    # ${CURL_LIBRARY}
+    # ${spdlog_LIBRARY}
+    External::curl
+    External::spdlog
 )
 
 if(CMAKE_CXX_COMPILER_VERSION LESS 9.0)

demo/ftp/main.cpp

@@ -8,6 +8,7 @@ int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
     init_log();
+    
     Widget w;
     w.show();
     return a.exec();

demo/ftp/widget.cpp

@@ -24,8 +24,9 @@ Widget::Widget(QWidget *parent)
 
     // m_curlFtp.setFtpIPAndPort("192.168.50.100", 21);
     
-    m_curlFtp.setSftpIPAndPort("10.147.18.91", 22);
-    m_curlFtp.setUsernameAndPassword("microsoft", "19980714Lq");
+    m_curlFtp.setSftpIPAndPort("10.147.18.180", 21);
+    // m_curlFtp.setUsernameAndPassword("microsoft", "19980714Lq");
+    m_curlFtp.setUsernameAndPassword("haxiaoxun@outlook.com", "147258369ztl");
 
     // m_curlFtp.setUsernameAndPassword("lh", "DWw7V9u0");
 
@@ -139,10 +140,10 @@ void Widget::on_pBtn_connect_clicked()
     //     SPDLOG_INFO("Image 文件夹创建失败");
     // }
     
-    m_curlFtp.createDirectory("/SSD2/lh");
+    m_curlFtp.createDirectory("/音乐");
     
     std::vector<std::string> driList;
-    m_curlFtp.getDirList("/SSD2", driList);
+    m_curlFtp.getDirList("/音乐", driList);
     for(auto& it : driList)
     {
         SPDLOG_INFO("{}", it);
@@ -157,7 +158,7 @@ void Widget::on_pBtn_downloadFile_clicked()
     SPDLOG_INFO("点击了“下载文件”");
     std::vector<std::string> fileList;
     // bool ret = m_curlFtp.downloadFile("/SSD2/Video/哪吒之魔童降世.mp4", QApplication::applicationDirPath().toStdString() + "/YPM.mp4");
-    bool ret = m_curlFtp.downloadFile("/SSD2/Video/Yes,Prime.Minister.rmvb", QApplication::applicationDirPath().toStdString() + "/YPM.rmvb");
+    bool ret = m_curlFtp.downloadFile("/SSD1/Video/v1.mp4", QApplication::applicationDirPath().toStdString() + "/v1.mp4");
     if(ret)
     {
         SPDLOG_INFO("下载成功");