From 1806c10378d91e5a11c4c2bcff468a6ca66d8ab3 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sat, 7 Sep 2024 21:47:55 +0800 Subject: [PATCH] v1.0.10 --- README.md | 4 ++ .../project_port/basic/project_constant.hpp | 6 +-- .../appsetting/project_port/basic/zappversion.hpp | 2 +- .../app_http_server/app_http_server.cpp | 19 ++++++++ .../app_http_server/app_http_server.hpp | 51 ++++++++++++++++++++++ appsrc/baseservice/debugpage/debugpage.cpp | 12 ----- appsrc/baseservice/debugpage/debugpage.hpp | 50 --------------------- appsrc/service/app_core.cpp | 4 +- 8 files changed, 80 insertions(+), 68 deletions(-) create mode 100644 appsrc/baseservice/app_http_server/app_http_server.cpp create mode 100644 appsrc/baseservice/app_http_server/app_http_server.hpp delete mode 100644 appsrc/baseservice/debugpage/debugpage.cpp delete mode 100644 appsrc/baseservice/debugpage/debugpage.hpp diff --git a/README.md b/README.md index 7576f48..ae1c890 100644 --- a/README.md +++ b/README.md @@ -43,4 +43,8 @@ VERSION 1.0.8 VERSION 1.0.9 1. 修改加液时，排液时间 + +VERSION 1.0.10 + 1. 修正gpm和rpm转换系数 + 2. 支持存放应用的静态网页 ``` \ No newline at end of file diff --git a/appsrc/appsetting/project_port/basic/project_constant.hpp b/appsrc/appsetting/project_port/basic/project_constant.hpp index 3e1a98a..82677c1 100644 --- a/appsrc/appsetting/project_port/basic/project_constant.hpp +++ b/appsrc/appsetting/project_port/basic/project_constant.hpp @@ -18,9 +18,9 @@ #define MAX_SUPPORT_SENSOR 3 // GPM_TO_SPEED_RADIO -#define LARGE_SPACE_DM__GPM_TO_SPEED_RADIO (11.0250) -#define SMALL_SPACE_DM__GPM_TO_SPEED_RADIO (11.0250) -#define PIPE_DM_GPM_TO_SPEED_RADIO (11.0250) +#define LARGE_SPACE_DM__GPM_TO_SPEED_RADIO (11.3070) +#define SMALL_SPACE_DM__GPM_TO_SPEED_RADIO (11.3070) +#define PIPE_DM_GPM_TO_SPEED_RADIO (11.3070) #define DRAW_BAR_DM_GPM_TO_SPEED_RADIO (41.97) // EXT_SENSOR_NUM diff --git a/appsrc/appsetting/project_port/basic/zappversion.hpp b/appsrc/appsetting/project_port/basic/zappversion.hpp index 1468cfa..021274d 100644 --- a/appsrc/appsetting/project_port/basic/zappversion.hpp +++ b/appsrc/appsetting/project_port/basic/zappversion.hpp @@ -1,3 +1,3 @@ #pragma once -#define VERSION "1.0.9" +#define VERSION "1.0.10" #define PROJECT_NAME "TRANSMIT_DM" \ No newline at end of file diff --git a/appsrc/baseservice/app_http_server/app_http_server.cpp b/appsrc/baseservice/app_http_server/app_http_server.cpp new file mode 100644 index 0000000..205a9d9 --- /dev/null +++ b/appsrc/baseservice/app_http_server/app_http_server.cpp @@ -0,0 +1,19 @@ +#include "app_http_server.hpp" +using namespace iflytop; +using namespace std; + +void AppHttpServer::initialize() { + appthread.reset(new Thread("AppHttpServer-Debug", [this]() { + logger->info("AppHttpServer::initialize Debug"); + Server svr; + svr.set_base_dir("./html/debug/"); + svr.listen("0.0.0.0", 8081); + })); + + debugthread.reset(new Thread("AppHttpServer-App", [this]() { + logger->info("AppHttpServer::initialize App"); + Server svr; + svr.set_base_dir("./html/app/"); + svr.listen("0.0.0.0", 80); + })); +} \ No newline at end of file diff --git a/appsrc/baseservice/app_http_server/app_http_server.hpp b/appsrc/baseservice/app_http_server/app_http_server.hpp new file mode 100644 index 0000000..1e9d181 --- /dev/null +++ b/appsrc/baseservice/app_http_server/app_http_server.hpp @@ -0,0 +1,51 @@ +// +// Created by zwsd +// + +#pragma once +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "appbase/appbase.hpp" +#include "appsetting/appsetting.hpp" +#include "httplib/httplib.h" + +/** + * @brief + * + * service: FrontMsgProcesser + * + * 监听事件: + * 依赖状态: + * 依赖服务: + * 作用: + * + */ + +namespace iflytop { +using namespace std; +using namespace core; +using namespace httplib; + +class AppHttpServer { + THISCLASS(AppHttpServer) + private: + /* data */ + unique_ptr appthread; + unique_ptr debugthread; + + public: + AppHttpServer(/* args */) {} + ~AppHttpServer() {} + + void initialize(); +}; + +} // namespace iflytop diff --git a/appsrc/baseservice/debugpage/debugpage.cpp b/appsrc/baseservice/debugpage/debugpage.cpp deleted file mode 100644 index dc26e32..0000000 --- a/appsrc/baseservice/debugpage/debugpage.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "debugpage.hpp" -using namespace iflytop; -using namespace std; - -void DebugPage::initialize() { - thread.reset(new Thread("DebugPage", [this]() { - logger->info("DebugPage::initialize"); - Server svr; - svr.set_base_dir("./html/debug/"); - svr.listen("0.0.0.0", 8081); - })); -} \ No newline at end of file diff --git a/appsrc/baseservice/debugpage/debugpage.hpp b/appsrc/baseservice/debugpage/debugpage.hpp deleted file mode 100644 index ddf5c8e..0000000 --- a/appsrc/baseservice/debugpage/debugpage.hpp +++ /dev/null @@ -1,50 +0,0 @@ -// -// Created by zwsd -// - -#pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "appbase/appbase.hpp" -#include "appsetting/appsetting.hpp" -#include "httplib/httplib.h" - -/** - * @brief - * - * service: FrontMsgProcesser - * - * 监听事件: - * 依赖状态: - * 依赖服务: - * 作用: - * - */ - -namespace iflytop { -using namespace std; -using namespace core; -using namespace httplib; - -class DebugPage { - THISCLASS(DebugPage) - private: - /* data */ - unique_ptr thread; - - public: - DebugPage(/* args */) {} - ~DebugPage() {} - - void initialize(); -}; - -} // namespace iflytop diff --git a/appsrc/service/app_core.cpp b/appsrc/service/app_core.cpp index c18a994..2e11fdd 100644 --- a/appsrc/service/app_core.cpp +++ b/appsrc/service/app_core.cpp @@ -1,7 +1,7 @@ #include "app_core.hpp" #include "baseservice/baseservice.hpp" -#include "baseservice/debugpage/debugpage.hpp" +#include "baseservice/app_http_server/app_http_server.hpp" #include "service/audit_mgr_service.hpp" #include "service/debug_page_test_service.hpp" #include "service/device_info_mgr_service.hpp" @@ -118,7 +118,7 @@ void AppCore::initialize() { installEcodeInfo(); // FrontEnd BUILD_AND_REG_SERRVICE(IflytopFrontEndService); - BUILD_AND_REG_SERRVICE(DebugPage); + BUILD_AND_REG_SERRVICE(AppHttpServer); // Data ProjectPort::ins().initialize();