From 59f6b7ec8bac87324eb055ce60ff23f03e3720e0 Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Wed, 17 Jul 2024 17:40:06 +0800 Subject: [PATCH] Fixed:app protocol bug. --- application/MissionManager/src/AppMonitor.cpp | 11 ++++++++++- application/MissionManager/src/AppMonitor.h | 1 + build/cmake/toolchain/linux.toolchain.cmake | 2 +- middleware/AppManager/include/IAppManager.h | 6 ++++++ middleware/AppManager/src/AppManager.cpp | 6 ++++++ middleware/AppManager/src/AppManager.h | 1 + middleware/AppManager/src/IAppManager.cpp | 6 ++++++ utils/WebServer/include/WebServer.h | 6 ++++++ utils/WebServer/src/WebServer.cpp | 4 ++++ 9 files changed, 41 insertions(+), 2 deletions(-) diff --git a/application/MissionManager/src/AppMonitor.cpp b/application/MissionManager/src/AppMonitor.cpp index 55dbd3e..1f57ee8 100644 --- a/application/MissionManager/src/AppMonitor.cpp +++ b/application/MissionManager/src/AppMonitor.cpp @@ -125,6 +125,7 @@ StatusCode AppMonitor::GetStorageFileList(const AppGetFileInfo &fileInfo, std::v } IFilesManager::GetInstance()->GetFiles(types, info); } + const std::string webServerDocumentRoot = IAppManager::GetInstance()->GetFilesSavingRootPath(); LogInfo("GetStorageFileList: file size = %d, event = %s.\n", info.size(), IAppManager::GetInstance()->StorageFileEventToString(fileInfo.mEvent)); @@ -132,7 +133,7 @@ StatusCode AppMonitor::GetStorageFileList(const AppGetFileInfo &fileInfo, std::v AppGetFileList file; file.mCreateTime_s = oneFileInfo.mCreateTime_s; file.mDuration = oneFileInfo.mFileDuration; - file.mName = oneFileInfo.mFileName; + file.mName = RemovePrefix(oneFileInfo.mFileName, webServerDocumentRoot); file.mSize = oneFileInfo.mFileSize; file.mType = StorageFileType::VIDEO; param.push_back(file); @@ -184,4 +185,12 @@ SdCardStatus AppMonitor::SdCardStatusConvert(const StorageEvent &event) default: return SdCardStatus::END; } +} +std::string AppMonitor::RemovePrefix(const std::string &originalStr, const std::string &prefix) +{ + if (originalStr.compare(0, prefix.length(), prefix) == 0) { + return originalStr.substr(prefix.length()); + } + LogWarning("Something wrong happened, prefix is %s.\n", prefix.c_str()); + return originalStr; } \ No newline at end of file diff --git a/application/MissionManager/src/AppMonitor.h b/application/MissionManager/src/AppMonitor.h index c4e48e9..5f7538c 100644 --- a/application/MissionManager/src/AppMonitor.h +++ b/application/MissionManager/src/AppMonitor.h @@ -41,6 +41,7 @@ public: private: SdCardStatus SdCardStatusConvert(const StorageEvent &event); + std::string RemovePrefix(const std::string &originalStr, const std::string &prefix); private: SwitchStatus mMicStatus; // TODO: improve delete. diff --git a/build/cmake/toolchain/linux.toolchain.cmake b/build/cmake/toolchain/linux.toolchain.cmake index 2f4b9a0..81f01b8 100755 --- a/build/cmake/toolchain/linux.toolchain.cmake +++ b/build/cmake/toolchain/linux.toolchain.cmake @@ -48,7 +48,7 @@ set(LOG_SUPPORT "true") # ------------ build log end ------------ # # ------------ build GoAhead ------------ # -set(GOAHEAD_DOCUMENTS_PATH "web") +set(GOAHEAD_DOCUMENTS_PATH "./sdcard") # web服务器配置文件的根目录，可以访问文件，例如：mp4，jpg，html等 set(GOAHEAD_UPLOAD_TMP_PATH "./goahead") set(GOAHEAD_UPLOAD_PATH "${GOAHEAD_UPLOAD_TMP_PATH}") set(GOAHEAD_LIMIT_POST "335544320") # If not defined means using default setting. See goahead-linux-static-fancy.mk diff --git a/middleware/AppManager/include/IAppManager.h b/middleware/AppManager/include/IAppManager.h index 5ce1253..f6ca8f4 100644 --- a/middleware/AppManager/include/IAppManager.h +++ b/middleware/AppManager/include/IAppManager.h @@ -344,5 +344,11 @@ public: virtual const StatusCode SetAppMonitor(std::shared_ptr &monitor); virtual StatusCode SetSdCardStatus(const SdCardStatus &status); virtual const char *StorageFileEventToString(const StorageFileEvent &event); + /** + * @brief Get the document root directory configured by the web server of the APP management module. The mobile APP + * can access the files in the directory through the network. + * @return std::string Path of the document root directory. + */ + virtual std::string GetFilesSavingRootPath(void); }; #endif \ No newline at end of file diff --git a/middleware/AppManager/src/AppManager.cpp b/middleware/AppManager/src/AppManager.cpp index 3e81aa8..cce28f4 100644 --- a/middleware/AppManager/src/AppManager.cpp +++ b/middleware/AppManager/src/AppManager.cpp @@ -23,6 +23,7 @@ #include "TcpModule.h" #include "WebServer.h" #include +#include #include AppManager::AppManager() : mTcpServer(nullptr), mInitRuning(false) { @@ -97,6 +98,11 @@ const char *AppManager::StorageFileEventToString(const StorageFileEvent &event) break; } } +std::string AppManager::GetFilesSavingRootPath(void) +{ + std::string rootPath = GetWebServerDocumentRoot(); + return rootPath; +} void AppManager::AppRequestHandle(const char *url, const unsigned int urlLength, ResponseHandle responseHandle, void *context) { diff --git a/middleware/AppManager/src/AppManager.h b/middleware/AppManager/src/AppManager.h index 3c5c986..82226d3 100644 --- a/middleware/AppManager/src/AppManager.h +++ b/middleware/AppManager/src/AppManager.h @@ -28,6 +28,7 @@ public: const StatusCode SetAppMonitor(std::shared_ptr &monitor) override; StatusCode SetSdCardStatus(const SdCardStatus &status) override; const char *StorageFileEventToString(const StorageFileEvent &event) override; + std::string GetFilesSavingRootPath(void) override; void AppRequestHandle(const char *url, const unsigned int urlLength, ResponseHandle responseHandle, void *context); void AppRequestHandleTcp(const char *data, const unsigned int dataLength, ResponseHandle responseHandle, void *context); diff --git a/middleware/AppManager/src/IAppManager.cpp b/middleware/AppManager/src/IAppManager.cpp index ddf8c23..7b8d8b4 100644 --- a/middleware/AppManager/src/IAppManager.cpp +++ b/middleware/AppManager/src/IAppManager.cpp @@ -249,4 +249,10 @@ StatusCode IAppManager::SetSdCardStatus(const SdCardStatus &status) const char *IAppManager::StorageFileEventToString(const StorageFileEvent &event) { return "STATUS_CODE_VIRTUAL_FUNCTION"; +} +std::string IAppManager::GetFilesSavingRootPath(void) +{ + LogInfo("STATUS_CODE_VIRTUAL_FUNCTION\n"); + const std::string path = "unknwon"; + return path; } \ No newline at end of file diff --git a/utils/WebServer/include/WebServer.h b/utils/WebServer/include/WebServer.h index 8e779a5..b36cf2a 100644 --- a/utils/WebServer/include/WebServer.h +++ b/utils/WebServer/include/WebServer.h @@ -29,6 +29,12 @@ typedef struct web_server_param StatusCode WebServerInit(const WebServerParam webParam); StatusCode WebServerExit(void); StatusCode WebServerUnInit(void); +/** + * @brief The document root directory configured by the web server. Files under the directory can be accessed over the + * network. + * @return const char* + */ +const char *GetWebServerDocumentRoot(void); #ifdef __cplusplus } #endif diff --git a/utils/WebServer/src/WebServer.cpp b/utils/WebServer/src/WebServer.cpp index 1342332..9314a12 100644 --- a/utils/WebServer/src/WebServer.cpp +++ b/utils/WebServer/src/WebServer.cpp @@ -237,4 +237,8 @@ StatusCode WebServerUnInit(void) { LogInfo("WebServerUnInit.\n"); return CreateStatusCode(STATUS_CODE_OK); +} +const char *GetWebServerDocumentRoot(void) +{ + return GOAHEAD_DOCUMENTS_PATH; } \ No newline at end of file