diff --git a/build/cmake/toolchain/linux.toolchain.cmake b/build/cmake/toolchain/linux.toolchain.cmake index e32701dc..9f0dd440 100755 --- a/build/cmake/toolchain/linux.toolchain.cmake +++ b/build/cmake/toolchain/linux.toolchain.cmake @@ -48,4 +48,10 @@ set(GOAHEAD_DOCUMENTS_PATH "web") # ------------ build GoAhead end ------------ # # ------------ build McuManager ------------ # set(MCU_UART_DEVICE "dev/s1") -# ------------ build McuManager end ------------ # \ No newline at end of file +# ------------ build McuManager end ------------ # +# ------------ build curl + openssl ------------ start +set(CROSS_COMPILE_PREFIX "") +# set(CROSS_COMPILE_PREFIX "") +set(CURL_OPENSSL_LIB_SHARED_ENABLE "false") +set(CURL_SHARED_LIBS_PATH "/mnt/mmc") +# ------------ build curl + openssl ------------ end \ No newline at end of file diff --git a/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp b/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp index 9bc9d4d9..f871a4cb 100644 --- a/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp +++ b/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp @@ -45,7 +45,7 @@ void SixFrameHandle::RequestHandle(const char *url, const unsigned int urlLength } LogInfo("command = %s\n", command.c_str()); ExtractParamsFromUrl(urlStr2, paramsMap); - RequestHandle(command, paramsMap, responseHandle, context); + RequestHandle2(command, paramsMap, responseHandle, context); } } void SixFrameHandle::ExtractParamsFromUrl(const std::string &url, std::multimap ¶msMap) @@ -73,8 +73,8 @@ void SixFrameHandle::test(std::multimap ¶msMap, Re // LogInfo("sssssssssssssssssssssssssssssssss\n"); } -void SixFrameHandle::RequestHandle(const std::string command, std::multimap ¶msMap, - ResponseHandle responseHandle, void *context) +void SixFrameHandle::RequestHandle2(const std::string command, std::multimap ¶msMap, + ResponseHandle responseHandle, void *context) { auto result = mResquesHandleFunc.find(command); if (result != mResquesHandleFunc.end()) { diff --git a/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.h b/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.h index 42d2901f..2f2de6d6 100644 --- a/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.h +++ b/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.h @@ -35,8 +35,8 @@ public: private: void ExtractParamsFromUrl(const std::string &url, std::multimap ¶msMap); void test(std::multimap ¶msMap, ResponseHandle responseHandle, void *context); - void RequestHandle(const std::string command, std::multimap ¶msMap, - ResponseHandle responseHandle, void *context); + void RequestHandle2(const std::string command, std::multimap ¶msMap, + ResponseHandle responseHandle, void *context); void DoNothing(std::multimap ¶msMap, ResponseHandle responseHandle, void *context); private: diff --git a/test/utils/FxHttpServer/src/FxHttpServer_Test.cpp b/test/utils/FxHttpServer/src/FxHttpServer_Test.cpp index 84086edf..78fda040 100644 --- a/test/utils/FxHttpServer/src/FxHttpServer_Test.cpp +++ b/test/utils/FxHttpServer/src/FxHttpServer_Test.cpp @@ -41,7 +41,7 @@ TEST(FxHttpServerTest, INTEGRATION_AppManager_EXAMPLE_Demo) { CreateLogModule(); ILogInit(LOG_INSTANCE_TYPE_END); - FxHttpServerInit(HttpHandle); + FxHttpServerInit(HttpHandle, 8080); std::this_thread::sleep_for(std::chrono::milliseconds(1000 * 10)); FxHttpServerUnInit(); ILogUnInit();