diff --git a/build/cmake/toolchain/linux.toolchain.cmake b/build/cmake/toolchain/linux.toolchain.cmake index 5efb0d2..82c6dab 100755 --- a/build/cmake/toolchain/linux.toolchain.cmake +++ b/build/cmake/toolchain/linux.toolchain.cmake @@ -53,7 +53,7 @@ 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 # GOAHEAD_CONFIG_FILE_PATH should be set when cross compile -# set(GOAHEAD_CONFIG_FILE_PATH "./") +set(GOAHEAD_CONFIG_FILE_PATH ".") # ------------ build GoAhead end ------------ # # ------------ build McuManager ------------ # diff --git a/test/utils/WebServer/src/WebServer_Test.cpp b/test/utils/WebServer/src/WebServer_Test.cpp index 6790165..20b2856 100644 --- a/test/utils/WebServer/src/WebServer_Test.cpp +++ b/test/utils/WebServer/src/WebServer_Test.cpp @@ -27,6 +27,8 @@ TEST(WebServerTest, Demo) WebServerParam web = {.mIp = "192.168.1.29", .mPort = 8080}; WebServerInit(web); // std::this_thread::sleep_for(std::chrono::milliseconds(1000 * 10)); + WebServerExit(); + WebServerUnInit(); ILogUnInit(); } } // namespace WebServerTest \ No newline at end of file diff --git a/utils/WebServer/README.md b/utils/WebServer/README.md index da6df73..ea6ab86 100644 --- a/utils/WebServer/README.md +++ b/utils/WebServer/README.md @@ -38,11 +38,24 @@ add_custom_target( 1. 拷贝self.crt,self.key两个到运行目录; 2. 配置文件两个:route.txt,auth.txt; +  目前暂未发现如何配置self.crt,self.key两个文件的路径,此处认为是route.txt,auth.txt的路径。 +详见配置:**GOAHEAD_CONFIG_FILE_PATH** +``` +# ------------ build GoAhead ------------ # +set(GOAHEAD_DOCUMENTS_PATH "web") +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 +# GOAHEAD_CONFIG_FILE_PATH should be set when cross compile +set(GOAHEAD_CONFIG_FILE_PATH ".") +# ------------ build GoAhead end ------------ # +``` + ## 1.4. 代码整改 ### 1.4.1. web服务安全退出 -   由于官方源码是不超时阻塞,为了方便自动化测试,把官方源码的不超时阻塞改成超时阻塞。 +  由于官方源码是不超时阻塞,为了方便自动化测试,把官方源码的不超时阻塞改成超时阻塞。 ``` PUBLIC void websServiceEvents(int *finished) { @@ -76,14 +89,14 @@ PUBLIC void websServiceEvents(int *finished) ### 1.4.2. HTTP POST 文件限制 -   源码限制POST文件大小太小,这里修改为32M。 +  源码限制POST文件大小太小,这里修改为32M。 ``` ``` ## 1.5. goahead的bug -   当goahead使用无效的ip进行listen时,asan工具会报内存泄漏问题,目前暂时忽略该bug +  当goahead使用无效的ip进行listen时,asan工具会报内存泄漏问题,目前暂时忽略该bug ``` ================================================================= diff --git a/utils/WebServer/src/WebServer.cpp b/utils/WebServer/src/WebServer.cpp index cac6782..38d63a7 100644 --- a/utils/WebServer/src/WebServer.cpp +++ b/utils/WebServer/src/WebServer.cpp @@ -186,11 +186,9 @@ StatusCode WebServerInit(const WebServerParam webParam) char authPath[BUF_LENGTH] = {0}; char listen[BUF_LENGTH] = {0}; snprintf(routePath, BUF_LENGTH, "%s/route.txt", GOAHEAD_CONFIG_FILE_PATH); - LogInfo("ssssssssssssssssssssssssssssssssss routePath %s\n", routePath); snprintf(authPath, BUF_LENGTH, "%s/auth.txt", GOAHEAD_CONFIG_FILE_PATH); - LogInfo("ssssssssssssssssssssssssssssssssss authPath %s\n", authPath); snprintf(listen, BUF_LENGTH, "%s:%d", webParam.mIp, webParam.mPort); - // initPlatform(); + initPlatform(); if (websOpen(documents, routePath) < 0) { LogError("Cannot initialize server. Exiting.\n"); return CreateStatusCode(STATUS_CODE_NOT_OK);