瀏覽代碼

V0.5
1、重新改版了External的Libraries,全面使用自己做的.cmake
2、CurlFtp可以使用sftp下载了

Apple 3 月之前
父節點
當前提交
3e12dccd0b
共有 4 個文件被更改,包括 6 次插入6 次删除
  1. 0 1
      .gitignore
  2. 1 1
      External
  3. 2 2
      demo/ftp/CMakeLists.txt
  4. 3 2
      demo/ftp/widget.cpp

+ 0 - 1
.gitignore

@@ -1,2 +1 @@
-External
 External_Ex

+ 1 - 1
External

@@ -1 +1 @@
-Subproject commit 440c7b8350f93d0003f6015611f3f662cecb37b4
+Subproject commit 21cbcad5fe011a12440db322f9027f52d1fec12a

+ 2 - 2
demo/ftp/CMakeLists.txt

@@ -42,7 +42,7 @@ target_include_directories(${this_exe} PRIVATE
     ${CMAKE_SOURCE_DIR}/External/common/FmtLog
 
     ${spdlog_INCLUDE_DIR}
-    # ${CURL_INCLUDE_DIR}
+    ${CURL_INCLUDE_DIR}
 )
 
 target_link_libraries(${this_exe} PRIVATE
@@ -59,7 +59,7 @@ target_link_libraries(${this_exe} PRIVATE
     # spdlog::spdlog
     ${CURL_LIBRARY}
     ${spdlog_LIBRARY}
-    ${OpenSSL-1.1.1_LIB_LIBRARY}
+    # ${OpenSSL-1.1.1_LIB_LIBRARY}
     # CURL::libcurl
 )
 

+ 3 - 2
demo/ftp/widget.cpp

@@ -25,7 +25,7 @@ Widget::Widget(QWidget *parent)
 
     // m_curlFtp.setFtpIPAndPort("192.168.50.100", 21);
     m_curlFtp.setSftpIPAndPort("192.168.50.100", 22);
-    m_curlFtp.setFtpUsernameAndPassword("microsoft", "19980714Lq");
+    m_curlFtp.setUsernameAndPassword("microsoft", "19980714Lq");
     m_curlFtp.setIgnoreSSLCert(true);
 
     SPDLOG_INFO("***** Qt Library *****");
@@ -123,7 +123,8 @@ 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/哪吒之魔童降世.mp4", QApplication::applicationDirPath().toStdString() + "/YPM.mp4");
+    bool ret = m_curlFtp.downloadFile("/SSD2/Video/Yes,Prime.Minister.rmvb", QApplication::applicationDirPath().toStdString() + "/YPM.rmvb");
     if(ret)
     {
         SPDLOG_INFO("下载成功");