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

Improve:WebServer module.

Browse Source
This commit is contained in:
Fancy code 2024-04-19 09:45:12 +08:00
parent 8aaf9b4074
commit 4e2de1ef55
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ set(GOAHEAD_UPLOAD_TMP_PATH "./goahead")
set(GOAHEAD_UPLOAD_PATH "${GOAHEAD_UPLOAD_TMP_PATH}") 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 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 # GOAHEAD_CONFIG_FILE_PATH should be set when cross compile
# set(GOAHEAD_CONFIG_FILE_PATH "./") set(GOAHEAD_CONFIG_FILE_PATH ".")
# ------------ build GoAhead end ------------ # # ------------ build GoAhead end ------------ #
# ------------ build McuManager ------------ # # ------------ build McuManager ------------ #

2
test/utils/WebServer/src/WebServer_Test.cpp
View File

@ -27,6 +27,8 @@ TEST(WebServerTest, Demo)
WebServerParam web = {.mIp = "192.168.1.29", .mPort = 8080}; WebServerParam web = {.mIp = "192.168.1.29", .mPort = 8080};
WebServerInit(web); WebServerInit(web);
// std::this_thread::sleep_for(std::chrono::milliseconds(1000 * 10)); // std::this_thread::sleep_for(std::chrono::milliseconds(1000 * 10));
WebServerExit();
WebServerUnInit();
ILogUnInit(); ILogUnInit();
} }
} // namespace WebServerTest } // namespace WebServerTest

13
utils/WebServer/README.md
View File

@ -38,6 +38,19 @@ add_custom_target(
1. 拷贝self.crt,self.key两个到运行目录； 1. 拷贝self.crt,self.key两个到运行目录；
2. 配置文件两个：route.txt，auth.txt； 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.4.1. web服务安全退出 ### 1.4.1. web服务安全退出

4
utils/WebServer/src/WebServer.cpp
View File

@ -186,11 +186,9 @@ StatusCode WebServerInit(const WebServerParam webParam)
char authPath[BUF_LENGTH] = {0}; char authPath[BUF_LENGTH] = {0};
char listen[BUF_LENGTH] = {0}; char listen[BUF_LENGTH] = {0};
snprintf(routePath, BUF_LENGTH, "%s/route.txt", GOAHEAD_CONFIG_FILE_PATH); 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); 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); snprintf(listen, BUF_LENGTH, "%s:%d", webParam.mIp, webParam.mPort);
// initPlatform(); initPlatform();
if (websOpen(documents, routePath) < 0) { if (websOpen(documents, routePath) < 0) {
LogError("Cannot initialize server. Exiting.\n"); LogError("Cannot initialize server. Exiting.\n");
return CreateStatusCode(STATUS_CODE_NOT_OK); return CreateStatusCode(STATUS_CODE_NOT_OK);