Germany/hunting
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Fixed:Build openssl setting.

Browse Source
This commit is contained in:
Fancy code 2024-02-29 04:05:46 -08:00
parent 8c1a1045a3
commit 480d5ee9c7
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/cmake/toolchain/linux.toolchain.cmake
View File

@ -48,4 +48,10 @@ set(GOAHEAD_DOCUMENTS_PATH "web")
# ------------ build GoAhead end ------------ #
# ------------ build McuManager ------------ #
set(MCU_UART_DEVICE "dev/s1")
# ------------ build McuManager end ------------ #
# ------------ 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

6
middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp
View File

@ -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<std::string, std::string> &paramsMap)
@ -73,8 +73,8 @@ void SixFrameHandle::test(std::multimap<std::string, std::string> &paramsMap, Re
//
LogInfo("sssssssssssssssssssssssssssssssss\n");
}
void SixFrameHandle::RequestHandle(const std::string command, std::multimap<std::string, std::string> &paramsMap,
ResponseHandle responseHandle, void *context)
void SixFrameHandle::RequestHandle2(const std::string command, std::multimap<std::string, std::string> &paramsMap,
ResponseHandle responseHandle, void *context)
{
auto result = mResquesHandleFunc.find(command);
if (result != mResquesHandleFunc.end()) {

4
middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.h
View File

@ -35,8 +35,8 @@ public:
private:
void ExtractParamsFromUrl(const std::string &url, std::multimap<std::string, std::string> &paramsMap);
void test(std::multimap<std::string, std::string> &paramsMap, ResponseHandle responseHandle, void *context);
void RequestHandle(const std::string command, std::multimap<std::string, std::string> &paramsMap,
ResponseHandle responseHandle, void *context);
void RequestHandle2(const std::string command, std::multimap<std::string, std::string> &paramsMap,
ResponseHandle responseHandle, void *context);
void DoNothing(std::multimap<std::string, std::string> &paramsMap, ResponseHandle responseHandle, void *context);
private:

2
test/utils/FxHttpServer/src/FxHttpServer_Test.cpp
View File

@ -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();