Merge branch 'dg102_feature_new_process' of http://192.168.1.212:3000/zhangsheng/WLG into dg102_feature_new_process
This commit is contained in:
commit
8ade412b42
@ -9,9 +9,9 @@
|
||||
|
||||
typedef struct statfs DISK, *pDISK;
|
||||
|
||||
#define SECTION_MAX_LEN 256
|
||||
#define STRVALUE_MAX_LEN 256
|
||||
#define LINE_CONTENT_MAX_LEN 256
|
||||
#define SECTION_MAX_LEN 1024
|
||||
#define STRVALUE_MAX_LEN 1024
|
||||
#define LINE_CONTENT_MAX_LEN 1024
|
||||
//配置文件位置
|
||||
#define NETWORK "/etc/network/interfaces"
|
||||
#define SYSTEMINFOFILE "/opt/configenv/SystemInfo.json" //系统信息
|
||||
|
||||
@ -1573,7 +1573,7 @@ std::string JsonData::JsonCmd_Cgi_69(Param_69 ¶m){
|
||||
char whereCon[512] = {0};
|
||||
char updateSql[256] = {0};
|
||||
if (param.mMode == 1) {
|
||||
trigerThresholdEnable = writeIntValue("config", "trigerThresholdEnable", param.trigerThresholdEnable, (char *)GlobalConfig::Config_G.c_str());
|
||||
trigerThresholdEnable = writeIntValue("config", "trigerThresholdEnable", param.trigerThresholdEnable ? 1:0, (char *)GlobalConfig::Config_G.c_str());
|
||||
if(param.vecParam69.size() > 0){
|
||||
for (size_t i = 0; i < param.vecParam69.size(); i++)
|
||||
{
|
||||
|
||||
@ -634,6 +634,7 @@ std::string LocalServer::HandleCgi_cmd(std::string &pData) {
|
||||
param.mMode = 0;
|
||||
}
|
||||
Json::Value recvDataNodeNo = recvBody["DataNodeNo"];
|
||||
param.trigerThresholdEnable = recvBody["threshold"].asBool();
|
||||
if (recvDataNodeNo.size() > 0)
|
||||
{
|
||||
for (size_t i = 0; i < recvDataNodeNo.size(); i++) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user