recode

appsrc/baseservice/front_msg_processer/front_msg_processer.hpp

@@ -102,8 +102,8 @@ class FrontMsgProcesser {
     if (typeInfoMap.find(type_index(typeid(T))) != typeInfoMap.end()) {
       return typeInfoMap[type_index(typeid(T))].typeName;
     }
-    return typeid(T).name();
-    // throw std::runtime_error(fmt::format("reg {}:{} fail,getTypeName error:{}", className, fnName, typeid(T).name()));
+    // return typeid(T).name();
+    throw std::runtime_error(fmt::format("reg {}:{} fail,getTypeName error:{}", className, fnName, typeid(T).name()));
   };
 
   //

appsrc/service/app/add_liquid_service.cpp

@@ -9,7 +9,7 @@ using namespace iflytop;
 void AddLiquidService::initialize() {
   logger->info("AddLiquidService initialize");
 
-  REG_EXTFN_VOID(start, void());
+  REG_EXTFN(start, void(int), stopatg);
   REG_EXTFN_VOID(stop, void());
   REG_EXTFN_VOID(getState, void());
   REG_EXTFN_VOID(getServiceConfig, void());
@@ -139,10 +139,7 @@ void AddLiquidService::stop() {
 }
 AddLiquidService::state_t AddLiquidService::getWorkstate() { return m_workstate; }
 
-void AddLiquidService::start(shared_ptr<MsgProcessContext> cxt) {  //
-  int stopatg = jsonGet<int>(cxt->params["stopatg"]);
-  start(stopatg);
-}
+void AddLiquidService::start(shared_ptr<MsgProcessContext> cxt, int stopatg) { start(stopatg); }
 void AddLiquidService::stop(shared_ptr<MsgProcessContext> cxt) { stop(); }
 void AddLiquidService::getState(shared_ptr<MsgProcessContext> cxt) {  //
   cxt->content["workState"]        = state2str(getWorkstate());

appsrc/service/app/add_liquid_service.hpp

@@ -70,7 +70,7 @@ class AddLiquidService : public enable_shared_from_this<AddLiquidService> {
   void    stop();
   state_t getWorkstate();
 
-  void start(shared_ptr<MsgProcessContext> cxt);
+  void start(shared_ptr<MsgProcessContext> cxt,int stopatg);
   void stop(shared_ptr<MsgProcessContext> cxt);
   void getState(shared_ptr<MsgProcessContext> cxt);
   void getServiceConfig(shared_ptr<MsgProcessContext> cxt);

appsrc/service/app/disinfection_ctrl_service_ext.cpp

@@ -42,24 +42,22 @@ void DisinfectionCtrlServiceExt::initialize() {
   GET_TO_SERVICE(gConfig);
   GET_TO_SERVICE(dcs);
 
-  REG_EXTFN_VOID(start, void());
-  REG_EXTFN_VOID(startWithFormula, void());
+  REG_EXTFN(start, void(string), loglevel);
+  REG_EXTFN(startWithFormula, void(string), formulaid);
   REG_EXTFN_VOID(stop, void());
   REG_EXTFN_VOID(getState, void());
   REG_EXTFN_VOID(getRealtimeConfig, void());
-  REG_EXTFN_VOID(setRealtimeConfig, void());
+  REG_EXTFN(setRealtimeConfig, void(string, string), key, val);
   REG_EXTFN_VOID(getServiceConfig, void());
 }
 
-void DisinfectionCtrlServiceExt::start(shared_ptr<MsgProcessContext> cxt) {
+void DisinfectionCtrlServiceExt::start(shared_ptr<MsgProcessContext> cxt, string loglevel) {
   // 从setting中获取实时参数
-  string loglevel = cxt->params["loglevel"];
-  int    level    = atoi(loglevel.c_str());
+  int level = atoi(loglevel.c_str());
   dcs->start(level);
   // m_state = DisinfectionState::preheat;
 }
-void DisinfectionCtrlServiceExt::startWithFormula(shared_ptr<MsgProcessContext> cxt) {  //
-  string formulaid = cxt->params["formulaId"];
+void DisinfectionCtrlServiceExt::startWithFormula(shared_ptr<MsgProcessContext> cxt, string formulaid) {  //
   dcs->startWithFormula(formulaid);
 }
 void DisinfectionCtrlServiceExt::stop(shared_ptr<MsgProcessContext> cxt) { dcs->stop(); }
@@ -70,9 +68,8 @@ void DisinfectionCtrlServiceExt::getRealtimeConfig(shared_ptr<MsgProcessContext>
     rely[cfg.first] = cfg.second;
   }
 }
-void DisinfectionCtrlServiceExt::setRealtimeConfig(shared_ptr<MsgProcessContext> cxt) {
-  string key                 = cxt->params["key"];
-  string val                 = cxt->params;
+void DisinfectionCtrlServiceExt::setRealtimeConfig(shared_ptr<MsgProcessContext> cxt, string key, string val) {
+  logger->info("setRealtimeConfig key:{} val:{}", key, val);
   dcs->getRealtimeCfg()[key] = val;
 }
 

appsrc/service/app/disinfection_ctrl_service_ext.hpp

@@ -36,12 +36,12 @@ class DisinfectionCtrlServiceExt : public enable_shared_from_this<DisinfectionCt
   /*******************************************************************************
    *                                    控制                                     *
    *******************************************************************************/
-  void start(shared_ptr<MsgProcessContext> cxt);
-  void startWithFormula(shared_ptr<MsgProcessContext> cxt);
+  void start(shared_ptr<MsgProcessContext> cxt, string loglevel);
+  void startWithFormula(shared_ptr<MsgProcessContext> cxt,string formulaid);
   void stop(shared_ptr<MsgProcessContext> cxt);
 
   void getRealtimeConfig(shared_ptr<MsgProcessContext> cxt);
-  void setRealtimeConfig(shared_ptr<MsgProcessContext> cxt);
+  void setRealtimeConfig(shared_ptr<MsgProcessContext> cxt, string key, string val);
   /*******************************************************************************
    *                                    状态                                     *
    *******************************************************************************/

appsrc/service/app/pipeline_pressure_control.cpp

@@ -19,13 +19,11 @@ void PipelinePressureControl::initialize() {
   GET_TO_SERVICE(m_dics);
   GET_TO_SERVICE(m_gConfig);
 
-  REG_EXTFN_VOID(setType, void(void));
-  REG_EXTFN_VOID(setIntensity, void(void));
+  REG_EXTFN(setType, void(string), type);
+  REG_EXTFN(setIntensity, void(string), intensity);
   REG_EXTFN_VOID(getState, void(void));
   REG_EXTFN_VOID(getConfig, void(void));
 
-
-
   m_type      = "constantPressure";
   m_intensity = 0;
   syncPressureValueState();
@@ -57,7 +55,7 @@ void PipelinePressureControl::getConfig(shared_ptr<MsgProcessContext> cxt) {
   cfg["intensitys"]["negativePressure"] = {"10%", "20%", "30%", "40%", "50%", "60%", "70%", "80%", "90%", "100%"};
   cxt->content                          = cfg;
 }
-void PipelinePressureControl::setType(shared_ptr<MsgProcessContext> cxt) {
+void PipelinePressureControl::setType(shared_ptr<MsgProcessContext> cxt, string type) {
   m_type = cxt->params["type"];
   if (!isInStrings(m_type, pressureEnum)) {
     cxt->ackcode = err::kappe_param_value_err;
@@ -79,8 +77,7 @@ void PipelinePressureControl::setType(shared_ptr<MsgProcessContext> cxt) {
   cxt->content["intensity"] = fmt::format("{}%", m_intensity);
 }
 
-void PipelinePressureControl::setIntensity(shared_ptr<MsgProcessContext> cxt) {
-  string intensity = cxt->params["intensity"];
+void PipelinePressureControl::setIntensity(shared_ptr<MsgProcessContext> cxt, string intensity) {
   // 解析字符串 10%  -> 10
   auto pos = intensity.find("%");
   if (pos == string::npos) {

appsrc/service/app/pipeline_pressure_control.hpp

@@ -58,8 +58,8 @@ class PipelinePressureControl : public enable_shared_from_this<PipelinePressureC
   void syncPressureValueState();
 
  private:
-  void setType(shared_ptr<MsgProcessContext> cxt);
-  void setIntensity(shared_ptr<MsgProcessContext> cxt);
+  void setType(shared_ptr<MsgProcessContext> cxt,string type);
+  void setIntensity(shared_ptr<MsgProcessContext> cxt,string intensity);
   void getState(shared_ptr<MsgProcessContext> cxt);
   void getConfig(shared_ptr<MsgProcessContext> cxt);
 

appsrc/service/app_core.cpp

@@ -38,6 +38,7 @@ void AppCore::initialize() {
   REG_TYPE(float);
   REG_TYPE(double);
   REG_TYPE(void);
+  REG_TYPE(json);
 
   // FrontEnd
   BUILD_AND_REG_SERRVICE(IflytopFrontEndService);
@@ -135,12 +136,11 @@ void AppCore::initialize() {
 
   // REG_EXTFN_VOID(getState, void(void));
 
-
   REG_EXTFN(promptConfirm, void(string), promptId);
   REG_EXTFN_VOID(promptGetAll, void(void));
   REG_EXTFN_VOID(promptGetNext, void(void));
   REG_EXTFN(setInTestMode, void(void), isInTestMode);
-  REG_EXTFN_VOID(startGenFakeH2O2Data, void(void));
+  REG_EXTFN(startGenFakeH2O2Data, void(void), data);
   REG_EXTFN_VOID(stopGenFakeH2O2Data, void(void));
 };
 int AppCore::demofn(int a, int b) { return 0; }
@@ -188,7 +188,7 @@ typedef struct {
   bool  enable[3];
 } fake_h2o2_data_cache_t;
 
-void AppCore::startGenFakeH2O2Data(shared_ptr<MsgProcessContext> cxt) {
+void AppCore::startGenFakeH2O2Data(shared_ptr<MsgProcessContext> cxt, json data) {
   if (m_genFakeH2O2DataThread) {
     m_genFakeH2O2DataThread->join();
     m_genFakeH2O2DataThread = nullptr;
@@ -196,12 +196,12 @@ void AppCore::startGenFakeH2O2Data(shared_ptr<MsgProcessContext> cxt) {
 
   fake_h2o2_data_cache_t cache;
   for (size_t i = 0; i < 3; i++) {
-    cache.h2o2[i]       = cxt->params["data"][i]["h2o2"];
-    cache.humid[i]      = cxt->params["data"][i]["humid"];
-    cache.temp[i]       = cxt->params["data"][i]["temp"];
-    cache.saturation[i] = cxt->params["data"][i]["saturation"];
-    cache.random[i]     = cxt->params["data"][i]["random"];
-    cache.enable[i]     = cxt->params["data"][i]["enable"];
+    cache.h2o2[i]       = data[i]["h2o2"];
+    cache.humid[i]      = data[i]["humid"];
+    cache.temp[i]       = data[i]["temp"];
+    cache.saturation[i] = data[i]["saturation"];
+    cache.random[i]     = data[i]["random"];
+    cache.enable[i]     = data[i]["enable"];
   }
 
   m_genFakeH2O2DataThread.reset(new Thread("genFakeH2O2DataThread", [this, cache]() {

appsrc/service/app_core.hpp

@@ -73,7 +73,7 @@ class AppCore : public enable_shared_from_this<AppCore> {
   void promptGetNext(shared_ptr<MsgProcessContext> cxt);
   // 测试
   void setInTestMode(shared_ptr<MsgProcessContext> cxt, bool isInTestMode);
-  void startGenFakeH2O2Data(shared_ptr<MsgProcessContext> cxt);
+  void startGenFakeH2O2Data(shared_ptr<MsgProcessContext> cxt,json data);
   void stopGenFakeH2O2Data(shared_ptr<MsgProcessContext> cxt);
 
  private:

appsrc/service/disinfection_logs_service.cpp

@@ -158,8 +158,8 @@ void DisinfectionLogsService::initialize() {
 
   REG_EXTFN_VOID(getRecordList, void());
   REG_EXTFN_VOID(getRecord, void());
-  REG_EXTFN_VOID(deleteReport, void());
-  REG_EXTFN_VOID(exportRecord, void());
+  REG_EXTFN(deleteReport, void(string), logName);
+  REG_EXTFN(exportRecord, void(vector<string>), logNames);
   REG_EXTFN_VOID(printRecord, void());
   REG_EXTFN_VOID(selftest, void());
 
@@ -571,14 +571,13 @@ void DisinfectionLogsService::getRecord(shared_ptr<MsgProcessContext> cxt) {
   }
 }
 
-void DisinfectionLogsService::deleteReport(shared_ptr<MsgProcessContext> cxt) {
-  string logName = cxt->params["logName"];
+void DisinfectionLogsService::deleteReport(shared_ptr<MsgProcessContext> cxt, string logName) {
   deleteRecordFile(logName);
 }
 
-void DisinfectionLogsService::exportRecord(shared_ptr<MsgProcessContext> cxt) {
+void DisinfectionLogsService::exportRecord(shared_ptr<MsgProcessContext> cxt, vector<string> logNames) {
   vector<string> files;
-  for (auto& key : cxt->params["logNames"]) {
+  for (auto& key : logNames) {
     files.push_back(key);
   }
   auto errcode = exportDisinfectionData(files);

appsrc/service/disinfection_logs_service.hpp

@@ -53,8 +53,8 @@ class DisinfectionLogsService : public enable_shared_from_this<DisinfectionLogsS
    *******************************************************************************/
   void getRecordList(shared_ptr<MsgProcessContext> cxt);
   void getRecord(shared_ptr<MsgProcessContext> cxt);
-  void deleteReport(shared_ptr<MsgProcessContext> cxt);
-  void exportRecord(shared_ptr<MsgProcessContext> cxt);
+  void deleteReport(shared_ptr<MsgProcessContext> cxt,string logName);
+  void exportRecord(shared_ptr<MsgProcessContext> cxt,vector<string> logNames);
   void printRecord(shared_ptr<MsgProcessContext> cxt);
   void selftest(shared_ptr<MsgProcessContext> cxt);
 

appsrc/service/front_end_realtime_display_content_mgr.cpp

@@ -4,7 +4,7 @@
 using namespace iflytop;
 
 void FrontEndRealtimeDisplayContentMgr::initialize() {  //
-  REG_EXTFN_VOID(readH2O2SensorData, void());
+  REG_EXTFN_VOID(readH2O2SensorData, json());
 }
 
 void FrontEndRealtimeDisplayContentMgr::readH2O2SensorData(shared_ptr<MsgProcessContext> cxt) {

appsrc/service/os_mgr_service.cpp

@@ -10,10 +10,8 @@ void OsMgrService::initialize() {
   GET_TO_SERVICE(m_gConfig);
 
   REG_EXTFN_VOID(shutdown, void());
-  REG_EXTFN_VOID(updateDate, void());
-  REG_EXTFN_VOID(updateTime, void());
-
-
+  REG_EXTFN(updateDate, void(int, int, int), year, month, day);
+  REG_EXTFN(updateTime, void(int, int, int), hour, min, second);
 }
 
 void OsMgrService::shutdown(shared_ptr<MsgProcessContext> cxt) {
@@ -22,25 +20,16 @@ void OsMgrService::shutdown(shared_ptr<MsgProcessContext> cxt) {
   this_thread::sleep_for(chrono::seconds(3));
   return;
 }
-void OsMgrService::updateDate(shared_ptr<MsgProcessContext> cxt) {
+void OsMgrService::updateDate(shared_ptr<MsgProcessContext> cxt, int year, int month, int day) {
   logger->info("updateDate");
   // sleep
-  auto& param = cxt->cmd["params"];
-
-  int32_t year  = jsonGet<int>(param["year"]);
-  int32_t month = jsonGet<int>(param["month"]);
-  int32_t day   = jsonGet<int>(param["day"]);
   logger->info("updateDate {} {} {}", year, month, day);
   // date -s "2023-01-02 02:32:32"
   dosystem(fmt::format("date -s \"{}{:02}{:02} `date +%T`\"", year, month, day).c_str());
   dosystem(fmt::format("hwclock -w").c_str());
 }
-void OsMgrService::updateTime(shared_ptr<MsgProcessContext> cxt) {
-  auto& param = cxt->cmd["params"];
+void OsMgrService::updateTime(shared_ptr<MsgProcessContext> cxt, int hour, int min, int second) {
 
-  int32_t hour   = jsonGet<int>(param["hour"]);
-  int32_t min    = jsonGet<int>(param["min"]);
-  int32_t second = jsonGet<int>(param["second"]);
   logger->info("updateDate {}:{}:{}", hour, min, second);
   // date -s "2023-01-02 02:32:32"
   dosystem(fmt::format("date -s \"`date +%Y-%m-%d` {:02}:{:02}:{:02}\"", hour, min, second).c_str());

appsrc/service/os_mgr_service.hpp

@@ -24,8 +24,8 @@ class OsMgrService : public enable_shared_from_this<OsMgrService> {
 
  private:
   void shutdown(shared_ptr<MsgProcessContext> cxt);
-  void updateDate(shared_ptr<MsgProcessContext> cxt);
-  void updateTime(shared_ptr<MsgProcessContext> cxt);
+  void updateDate(shared_ptr<MsgProcessContext> cxt, int year, int month, int day);
+  void updateTime(shared_ptr<MsgProcessContext> cxt,int hour, int min, int second);
 
   void dosystem(string order) {
     logger->info("do:{}", order);

appsrc/service/setting_mgr_service.cpp

@@ -13,25 +13,21 @@ void SettingMgrService::initialize() {
   GET_TO_SERVICE(m_ds);
 
   REG_EXTFN_VOID(getAllSetting, void());
-  REG_EXTFN_VOID(setSettingVal, void());
-  REG_EXTFN_VOID(getAllFormula, void());
-  REG_EXTFN_VOID(addNewFormula, void());
-  REG_EXTFN_VOID(delFormula, void());
-  REG_EXTFN_VOID(updateFormula, void());
-  REG_EXTFN_VOID(updateFormulaIterm, void());
+  REG_EXTFN(setSettingVal, void(string, string), settingName, settingVal);
+  REG_EXTFN_VOID(getAllFormula, json());
+  REG_EXTFN_VOID(addNewFormula, json());
+  REG_EXTFN(delFormula, void(string), formula_id);
+  REG_EXTFN(updateFormula, void(string, json), formula_id, formula);
+  REG_EXTFN(updateFormulaIterm, void(string, string, string), formula_id, itemName, val);
   REG_EXTFN_VOID(factoryResetSettings, void());
-
-
 }
 
 void SettingMgrService::getAllSetting(shared_ptr<MsgProcessContext> cxt) {
   auto settings = SETTING_DB->getAllSetting();
   cxt->content  = settings;
 }
-void SettingMgrService::setSettingVal(shared_ptr<MsgProcessContext> cxt) {
-  string settingName = cxt->cmd["params"]["settingName"];
-  string settingVal  = cxt->cmd["params"]["settingVal"];
-  bool   suc         = SETTING_DB->setSettingVal(settingName, settingVal);
+void SettingMgrService::setSettingVal(shared_ptr<MsgProcessContext> cxt, string settingName, string settingVal) {
+  bool suc = SETTING_DB->setSettingVal(settingName, settingVal);
   APPCHECK(suc, err::kappe_db_operate_error, "setSettingVal failed");
 }
 void SettingMgrService::getAllFormula(shared_ptr<MsgProcessContext> cxt) { cxt->content = FORMULA_DB->getAllFormula(); }
@@ -41,17 +37,17 @@ void SettingMgrService::addNewFormula(shared_ptr<MsgProcessContext> cxt) {
   cxt->content = formula;
 }
 
-void SettingMgrService::delFormula(shared_ptr<MsgProcessContext> cxt) {
+void SettingMgrService::delFormula(shared_ptr<MsgProcessContext> cxt, string formula_id) {
   auto param = cxt->cmd["params"];
   FORMULA_DB->deleteFormula(param["formula_id"]);
   return;
 }
-void SettingMgrService::updateFormula(shared_ptr<MsgProcessContext> cxt) {
+void SettingMgrService::updateFormula(shared_ptr<MsgProcessContext> cxt, string formula_id, json formula) {
   auto param = cxt->cmd["params"];
-  FORMULA_DB->updateFormula(param["formula_id"], param["formula"]);
+  FORMULA_DB->updateFormula(formula_id, formula);
   return;
 }
-void SettingMgrService::updateFormulaIterm(shared_ptr<MsgProcessContext> cxt) {
+void SettingMgrService::updateFormulaIterm(shared_ptr<MsgProcessContext> cxt, string formula_id, string itemName, string val) {
   auto param = cxt->cmd["params"];
   FORMULA_DB->updateFormula(param["formula_id"], param["itemName"], param["val"]);
   return;

appsrc/service/setting_mgr_service.hpp

@@ -23,13 +23,13 @@ class SettingMgrService : public enable_shared_from_this<SettingMgrService> {
 
  private:
   void getAllSetting(shared_ptr<MsgProcessContext> cxt);
-  void setSettingVal(shared_ptr<MsgProcessContext> cxt);
+  void setSettingVal(shared_ptr<MsgProcessContext> cxt,string settingName, string settingVal);
   void addNewFormula(shared_ptr<MsgProcessContext> cxt);
   void getAllFormula(shared_ptr<MsgProcessContext> cxt);
   void addFormula(shared_ptr<MsgProcessContext> cxt);
-  void delFormula(shared_ptr<MsgProcessContext> cxt);
-  void updateFormula(shared_ptr<MsgProcessContext> cxt);
-  void updateFormulaIterm(shared_ptr<MsgProcessContext> cxt);
+  void delFormula(shared_ptr<MsgProcessContext> cxt, string formula_id);
+  void updateFormula(shared_ptr<MsgProcessContext> cxt, string formula_id, json formula);
+  void updateFormulaIterm(shared_ptr<MsgProcessContext> cxt, string formula_id, string itemName, string val);
   void factoryResetSettings(shared_ptr<MsgProcessContext> cxt);
 
  private:

appsrc/service/user_mgr_service.cpp

@@ -8,20 +8,17 @@ void UserMgrService::initialize() {
   GET_TO_SERVICE(m_db);
   GET_TO_SERVICE(m_deviceStateService);
 
-  REG_EXTFN_VOID(login, void());
+  REG_EXTFN(login, void(string, string), uid, pwd);
   REG_EXTFN_VOID(unlogin, void());
-  REG_EXTFN_VOID(chpasswd, void());
-  REG_EXTFN_VOID(addUser, void());
-  REG_EXTFN_VOID(delUser, void());
-  REG_EXTFN_VOID(updateUserUid, void());
+  REG_EXTFN(chpasswd, void(string, string, string), uid, newpasswd, passwd);
+  REG_EXTFN(addUser, void(string, string), uid, passwd);
+  REG_EXTFN(delUser, void(int), id);
+  REG_EXTFN(updateUserUid, void(int, string), id, uid);
   REG_EXTFN_VOID(getAllUser, void());
   REG_EXTFN_VOID(getLoginUser, void());
 };
 
-void UserMgrService::login(shared_ptr<MsgProcessContext> cxt) {
-  string uid = cxt->cmd["params"]["uid"];
-  string pwd = cxt->cmd["params"]["passwd"];
-
+void UserMgrService::login(shared_ptr<MsgProcessContext> cxt, string uid, string pwd) {
   // 超超级用户
   if (uid == "admin" && pwd == "iflytop9973") {
     m_deviceStateService->setLoginState("admin", true);
@@ -46,10 +43,7 @@ void UserMgrService::unlogin(shared_ptr<MsgProcessContext> cxt) {
   ADD_USER_BEHAVIOR(loginuid, kbehavior_logout, "");
   return;
 }
-void UserMgrService::chpasswd(shared_ptr<MsgProcessContext> cxt) {
-  string uid       = cxt->cmd["params"]["uid"];
-  string newpasswd = cxt->cmd["params"]["newpasswd"];
-  string passwd    = cxt->cmd["params"]["passwd"];
+void UserMgrService::chpasswd(shared_ptr<MsgProcessContext> cxt, string uid, string newpasswd, string passwd) {
 
   if (!m_deviceStateService->isLoginAdmin()) {
     APPCHECK(!m_db->ispasswdCorrect(uid, passwd), err::kappe_passwd_error, fmt::format("user {} passwd error", uid));
@@ -58,20 +52,15 @@ void UserMgrService::chpasswd(shared_ptr<MsgProcessContext> cxt) {
   logger->info("changet passwd {} {}", uid, passwd);
   auto user = m_db->changePasswd(uid, newpasswd);
 }
-void UserMgrService::addUser(shared_ptr<MsgProcessContext> cxt) {
-  string uid    = cxt->cmd["params"]["uid"];
-  string passwd = cxt->cmd["params"]["passwd"];
+void UserMgrService::addUser(shared_ptr<MsgProcessContext> cxt, string uid, string passwd) {
   m_db->addUser(uid, passwd);
 }
-void UserMgrService::delUser(shared_ptr<MsgProcessContext> cxt) {
-  int  id   = jsonGet<int>(cxt->cmd["params"]["id"]);
+void UserMgrService::delUser(shared_ptr<MsgProcessContext> cxt, int id) {
   auto user = m_db->delUser(id);
   APPCHECK(!user, err::kappe_user_not_exist, fmt::format("user {} not exist", id));
 }
 
-void UserMgrService::updateUserUid(shared_ptr<MsgProcessContext> cxt) {
-  int    id  = jsonGet<int>(cxt->cmd["params"]["id"]);
-  string uid = cxt->cmd["params"]["uid"];
+void UserMgrService::updateUserUid(shared_ptr<MsgProcessContext> cxt, int id, string uid) {
   string olduid;
   auto   user = m_db->updateUserUid(id, uid, olduid);
   APPCHECK(!user, err::kappe_user_not_exist, fmt::format("user {} not exist", id));

appsrc/service/user_mgr_service.hpp

@@ -22,12 +22,12 @@ class UserMgrService : public enable_shared_from_this<UserMgrService> {
   void initialize();
 
  private:
-  void login(shared_ptr<MsgProcessContext> cxt);
+  void login(shared_ptr<MsgProcessContext> cxt, string uid, string pwd);
   void unlogin(shared_ptr<MsgProcessContext> cxt);
-  void chpasswd(shared_ptr<MsgProcessContext> cxt);
-  void addUser(shared_ptr<MsgProcessContext> cxt);
-  void delUser(shared_ptr<MsgProcessContext> cxt);
-  void updateUserUid(shared_ptr<MsgProcessContext> cxt);
+  void chpasswd(shared_ptr<MsgProcessContext> cxt, string uid, string newpasswd, string passwd);
+  void addUser(shared_ptr<MsgProcessContext> cxt, string uid, string passwd);
+  void delUser(shared_ptr<MsgProcessContext> cxt, int id);
+  void updateUserUid(shared_ptr<MsgProcessContext> cxt, int id, string uid);
   void getAllUser(shared_ptr<MsgProcessContext> cxt);
   void getLoginUser(shared_ptr<MsgProcessContext> cxt);
 };