From f46fb9808b9a2b56994fc5891989443069f4dbd8 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 11 Sep 2024 08:47:08 +0800 Subject: [PATCH] VERSION 1.1.7 --- README.md | 4 +++ app_protocols/appexception/appexception.hpp | 10 ++----- .../appbase/appevent/app_warning_promopt_event.hpp | 12 ++++----- .../appsetting/project_port/basic/zappversion.hpp | 2 +- appsrc/baseservice/db/formula_db_dao.cpp | 2 +- .../front_msg_processer/front_msg_processer.cpp | 31 +++++++--------------- .../iflytop_front_end_service.cpp | 12 ++++----- appsrc/service/app_core.cpp | 4 +-- appsrc/service/setting_mgr_service.cpp | 11 +++----- 9 files changed, 35 insertions(+), 53 deletions(-) diff --git a/README.md b/README.md index 096efee..62396fc 100644 --- a/README.md +++ b/README.md @@ -67,6 +67,10 @@ VERSION 1.1.6 1. 添加批量日志接口 2. 修复测试模式下出现重复消毒日志的BUG +VERSION 1.1.7 + 1. 修复配方更新接口BUG + 2. 修改ackinfo 为 message + TODO: 添加用户增加用户查重检查 diff --git a/app_protocols/appexception/appexception.hpp b/app_protocols/appexception/appexception.hpp index 5882bd3..1dbd99e 100644 --- a/app_protocols/appexception/appexception.hpp +++ b/app_protocols/appexception/appexception.hpp @@ -27,8 +27,6 @@ using namespace std; class appexception : public std::exception { public: int32_t ecode; - string fromClass; - string fromFn; string traceinfo; string description; @@ -58,17 +56,13 @@ class appexception : public std::exception { whatstr = this->traceinfo; } - appexception(ThisClass &thisclass, string func, int32_t ecode, const string &description) { + appexception( int32_t ecode, const string &description) { this->description = description; this->ecode = ecode; - this->fromClass = thisclass.className; - this->fromFn = func; this->traceinfo = printStackTrace(); string info; info += fmt::format("ecode:{}\n", ecode); - info += fmt::format("fromClass:{}\n", fromClass); - info += fmt::format("fromFn:{}\n", fromFn); info += fmt::format("description:{}\n", description); info += fmt::format("traceInfo:{}\n", traceinfo); whatstr = info; @@ -86,5 +80,5 @@ class appexception : public std::exception { THROW_APP_EXCEPTION(ecode, info); \ } -#define THROW_APP_EXCEPTION(ecode, info) throw appexception(thisClass, __FUNCTION__, ecode, info); +#define THROW_APP_EXCEPTION(ecode, info) throw appexception(ecode, info); } // namespace iflytop \ No newline at end of file diff --git a/appsrc/appbase/appevent/app_warning_promopt_event.hpp b/appsrc/appbase/appevent/app_warning_promopt_event.hpp index fcbd5a5..7a414b0 100644 --- a/appsrc/appbase/appevent/app_warning_promopt_event.hpp +++ b/appsrc/appbase/appevent/app_warning_promopt_event.hpp @@ -5,8 +5,8 @@ namespace iflytop { class AppWarningPromoptEvent : public IAppEvent { private: int32_t ecode; - string fromClass; - string fromFn; + // string fromClass; + // string fromFn; string traceinfo; string description; @@ -14,15 +14,15 @@ class AppWarningPromoptEvent : public IAppEvent { AppWarningPromoptEvent(int ecode) : ecode(ecode) {} AppWarningPromoptEvent(const appexception& e) { ecode = e.ecode; - fromClass = e.fromClass; - fromFn = e.fromFn; + // fromClass = e.fromClass; + // fromFn = e.fromFn; traceinfo = e.traceinfo; description = e.description; } virtual ~AppWarningPromoptEvent() {} int getEcode() { return ecode; } - const string &getFromClass() { return fromClass; } - const string &getFromFn() { return fromFn; } + // const string &getFromClass() { return fromClass; } + // const string &getFromFn() { return fromFn; } const string &getTraceinfo() { return traceinfo; } const string &getDescription() { return description; } }; diff --git a/appsrc/appsetting/project_port/basic/zappversion.hpp b/appsrc/appsetting/project_port/basic/zappversion.hpp index 6f57d2f..1b9834c 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.1.6" +#define VERSION "1.1.7" #define PROJECT_NAME "TRANSMIT_DM" \ No newline at end of file diff --git a/appsrc/baseservice/db/formula_db_dao.cpp b/appsrc/baseservice/db/formula_db_dao.cpp index 83d267d..ed55ed0 100644 --- a/appsrc/baseservice/db/formula_db_dao.cpp +++ b/appsrc/baseservice/db/formula_db_dao.cpp @@ -28,7 +28,7 @@ json FormulaDBDao::getAllFormula() { } void FormulaDBDao::updateFormula(string formulaid, json formula) { formula["formula_id"] = formulaid; - keyvaldb.set(formulaid, formula); + keyvaldb.set(formulaid, formula.dump()); } void FormulaDBDao::updateFormula(string formulaid, string key, string val) { json formula = keyvaldb.get(formulaid); diff --git a/appsrc/baseservice/front_msg_processer/front_msg_processer.cpp b/appsrc/baseservice/front_msg_processer/front_msg_processer.cpp index ae58fdd..99d3d8b 100644 --- a/appsrc/baseservice/front_msg_processer/front_msg_processer.cpp +++ b/appsrc/baseservice/front_msg_processer/front_msg_processer.cpp @@ -83,34 +83,21 @@ void FrontMsgProcesser::processMsg(shared_ptr cxt) { } if (m_msgProcesserMap.find(key) != m_msgProcesserMap.end()) { + cxt->receipt["fromClass"] = m_msgProcesserMap[key]->className; + cxt->receipt["fromFn"] = m_msgProcesserMap[key]->fnName; + try { m_msgProcesserMap[key]->fn(cxt); - - if (cxt->ackcode != 0) { - cxt->receipt["ackcode"] = cxt->ackcode; - } - - if (int(cxt->receipt["ackcode"]) != 0) { - cxt->receipt["message"] = fmt::format("{}", ecode2str(cxt->receipt["ackcode"])); - cxt->receipt["extMessage"] = fmt::format("{}", cxt->ackcodeExtMessage); - } - if (cxt->rely.empty() == false) { - cxt->receipt["rely"] = cxt->rely; - } - + if (cxt->ackcode != 0) cxt->receipt["ackcode"] = cxt->ackcode; + if (int(cxt->receipt["ackcode"]) != 0) cxt->receipt["message"] = fmt::format("{}", ecode2str(cxt->receipt["ackcode"]) + cxt->ackcodeExtMessage); + if (cxt->rely.empty() == false) cxt->receipt["rely"] = cxt->rely; } catch (const appexception& e) { - cxt->receipt["ackcode"] = e.ecode; - cxt->receipt["message"] = fmt::format("{}", ecode2str(cxt->receipt["ackcode"])); - cxt->receipt["traceinfo"] = fmt::format("{}", e.traceinfo); - cxt->receipt["description"] = fmt::format("{}", e.description); - cxt->receipt["fromClass"] = fmt::format("{}", e.fromClass); - cxt->receipt["fromFn"] = fmt::format("{}", e.fromFn); - + cxt->receipt["ackcode"] = e.ecode; + cxt->receipt["message"] = fmt::format("{}", ecode2str(cxt->receipt["ackcode"]) + e.description); + cxt->receipt["traceinfo"] = fmt::format("{}", e.traceinfo); logger->error("appexception: {}", e.what()); } - cxt->receipt["fromClass"] = m_msgProcesserMap[key]->className; - cxt->receipt["fromFn"] = m_msgProcesserMap[key]->fnName; } else { logger->error("unknown command: {}", key); cxt->receipt["ackcode"] = err::kappe_cmd_not_support; diff --git a/appsrc/baseservice/iflytop_front_end_service/iflytop_front_end_service.cpp b/appsrc/baseservice/iflytop_front_end_service/iflytop_front_end_service.cpp index 59e5e74..874524b 100644 --- a/appsrc/baseservice/iflytop_front_end_service/iflytop_front_end_service.cpp +++ b/appsrc/baseservice/iflytop_front_end_service/iflytop_front_end_service.cpp @@ -156,36 +156,36 @@ void IflytopFrontEndService::processRxMessage(weak_ptr webSocket, str // json parse error logger->error("process rx json failed,exception:{},{}", e.what(), msgtext); receipt["ackcode"] = err::kappe_parse_json_err; - receipt["ackcodeInfo"] = ecode2str(err::kappe_parse_json_err) + "," + e.what(); + receipt["message"] = ecode2str(err::kappe_parse_json_err) + "," + e.what(); ws->sendText(receipt.dump(1)); } catch (const detail::invalid_iterator& e) { // json parse error logger->error("process rx json failed,exception:{},{}", e.what(), msgtext); receipt["ackcode"] = err::kappe_parse_json_err; - receipt["ackcodeInfo"] = ecode2str(err::kappe_parse_json_err) + "," + e.what(); + receipt["message"] = ecode2str(err::kappe_parse_json_err) + "," + e.what(); ws->sendText(receipt.dump(1)); } catch (const detail::type_error& e) { // json parse error logger->error("process rx json failed,exception:{},{}", e.what(), msgtext); receipt["ackcode"] = err::kappe_parse_json_err; - receipt["ackcodeInfo"] = ecode2str(err::kappe_parse_json_err) + "," + e.what(); + receipt["message"] = ecode2str(err::kappe_parse_json_err) + "," + e.what(); ws->sendText(receipt.dump(1)); } catch (const detail::out_of_range& e) { // json parse error logger->error("process rx json failed,exception:{},{}", e.what(), msgtext); receipt["ackcode"] = err::kappe_parse_json_err; - receipt["ackcodeInfo"] = ecode2str(err::kappe_parse_json_err) + "," + e.what(); + receipt["message"] = ecode2str(err::kappe_parse_json_err) + "," + e.what(); ws->sendText(receipt.dump(1)); } catch (const detail::other_error& e) { // json parse error logger->error("process rx json failed,exception:{},{}", e.what(), msgtext); receipt["ackcode"] = err::kappe_parse_json_err; - receipt["ackcodeInfo"] = ecode2str(err::kappe_parse_json_err); + receipt["message"] = ecode2str(err::kappe_parse_json_err); ws->sendText(receipt.dump(1)); } catch (const std::exception& e) { logger->error("process rx json failed,exception:{},{}", e.what(), msgtext); receipt["ackcode"] = err::kappe_std_exception; - receipt["ackcodeInfo"] = ecode2str(err::kappe_std_exception) + "," + e.what(); + receipt["message"] = ecode2str(err::kappe_std_exception) + "," + e.what(); ws->sendText(receipt.dump(1)); } diff --git a/appsrc/service/app_core.cpp b/appsrc/service/app_core.cpp index bd6661e..e7e23a0 100644 --- a/appsrc/service/app_core.cpp +++ b/appsrc/service/app_core.cpp @@ -182,8 +182,8 @@ void AppCore::initialize() { if (appWarningPromoptEvent) { string extmessage = ""; - extmessage += fmt::format("fromClass:{}\n", appWarningPromoptEvent->getFromClass()); - extmessage += fmt::format("fromFn:{}\n", appWarningPromoptEvent->getFromFn()); + // extmessage += fmt::format("fromClass:{}\n", appWarningPromoptEvent->getFromClass()); + // extmessage += fmt::format("fromFn:{}\n", appWarningPromoptEvent->getFromFn()); extmessage += fmt::format("description:{}\n", appWarningPromoptEvent->getDescription()); extmessage += fmt::format("traceinfo:{}\n", appWarningPromoptEvent->getTraceinfo()); diff --git a/appsrc/service/setting_mgr_service.cpp b/appsrc/service/setting_mgr_service.cpp index 369ddee..3602c44 100644 --- a/appsrc/service/setting_mgr_service.cpp +++ b/appsrc/service/setting_mgr_service.cpp @@ -24,7 +24,7 @@ void SettingMgrService::initialize() { void SettingMgrService::getAllSetting(shared_ptr cxt) { auto settings = SETTING_DB->getAllSetting(); - cxt->rely = settings; + cxt->rely = settings; } void SettingMgrService::setSettingVal(shared_ptr cxt, string settingName, string settingVal) { bool suc = SETTING_DB->setSettingVal(settingName, settingVal); @@ -34,22 +34,19 @@ void SettingMgrService::getAllFormula(shared_ptr cxt) { cxt-> void SettingMgrService::addNewFormula(shared_ptr cxt) { auto formula = FORMULA_DB->newFormula(); - cxt->rely = formula; + cxt->rely = formula; } void SettingMgrService::delFormula(shared_ptr cxt, string formula_id) { - auto param = cxt->cmd["params"]; - FORMULA_DB->deleteFormula(param["formula_id"]); + FORMULA_DB->deleteFormula(formula_id); return; } void SettingMgrService::updateFormula(shared_ptr cxt, string formula_id, json formula) { - auto param = cxt->cmd["params"]; FORMULA_DB->updateFormula(formula_id, formula); return; } void SettingMgrService::updateFormulaIterm(shared_ptr cxt, string formula_id, string itemName, string val) { - auto param = cxt->cmd["params"]; - FORMULA_DB->updateFormula(param["formula_id"], param["itemName"], param["val"]); + FORMULA_DB->updateFormula(formula_id, itemName, val); return; } void SettingMgrService::factoryResetSettings(shared_ptr cxt) {