1、上传8.0.2版本web（8.10）

pro/config/cfg.h

@@ -46,6 +46,7 @@
 
 #ifdef CUST_ANDERSON
     #define USE_NETSWITCH
+    #define USE_SMTP
 
     #define SW_PORT_INDEX_START         0
     #define SW_PORT_INDEX_END           21
@@ -59,7 +60,7 @@
     #endif
     
     #undef MAX_CHN_COUNT
-    #define MAX_CHN_COUNT               24
+    #define MAX_CHN_COUNT               16//24
 #endif
 
 ////////////////////////////////////////////////////

pro/src/app.c

@@ -2376,7 +2376,7 @@ int _global_device_manage_init(GlobalDeviceManager* _globalDeviceManager)
     thread_start(THREAD_ID_BREAKER_SCANNER,breaker_scanner_thread,_globalDeviceManager,1*MB,0);
 
 	thread_start(THREAD_ID_BREAKER, breaker_thread, _globalDeviceManager, 5*MB, 0);
-        dev_Alarm_Run_message(_globalDeviceManager,language_alarm_Init_Success[0],"Server Thread");
+    dev_Alarm_Run_message(_globalDeviceManager,language_alarm_Init_Success[0],"Server Thread");
     
    #endif
     //创建传感器采集控制线程
@@ -2416,7 +2416,8 @@ int _global_device_manage_init(GlobalDeviceManager* _globalDeviceManager)
     dev_Alarm_Run_message(_globalDeviceManager, language_alarm_Init_Success[0], "NTP");
     thread_start(THREAD_ID_SNMP, snmp_thread, _globalDeviceManager, 10 * MB, 0);
     dev_Alarm_Run_message(_globalDeviceManager, language_alarm_Init_Success[0], "SNMP");
-    // 初始化webapp
+    
+    // 初始化web
     websocket_init();
     appweb_init();
 

pro/src/appweb_handle.c

@@ -2703,12 +2703,16 @@ static void serviceManagement(void *conn)
     //查询smtp信息
     else if(strcmp(_serviceManageRequestInfo.type,"listSmtpQuery")==0)
     {
-        // SmtpSever* _smtp_sever_info = &__globalDeviceManage.user_server.smtp_set;
-        // ack_str = communication_net_ack_to_json(_smtp_sever_info);
+    #ifdef USE_SMTP
+         //ack_str = communication_net_ack_to_json(__globalDeviceManage.db, &globalSMTPManager);
+    #endif
     }   
     else if(strcmp(_serviceManageRequestInfo.type,"SmtpSave")==0)
     {
+    #ifdef USE_SMTP
+
 
+    #endif
     }   
     //查询snmp信息
     else if(strcmp(_serviceManageRequestInfo.type,"listSnmpQuery")==0)

pro/src/json_handle.c

@@ -4701,46 +4701,46 @@ char* service_snmp_ack_to_json(SNMPManager* __SNMPManager_t)
     return str;
 }
 
-char* service_smtp_ack_to_json(SMTPManager* __SMTPManager_t)
+char* service_smtp_ack_to_json(SMTPManager* sm)
 {
-     char* str = NULL;
+    char* str = NULL;
     
-    // // 创建 JSON 对象
-    // cJSON* root = cJSON_CreateObject();   
-    // // 添加基本键值对
-    // cJSON_AddNumberToObject(root, "code", 200); 
-
-    // cJSON* data_filed = cJSON_CreateObject();
-    // char buf[30];
-    // memset(buf, 0, sizeof(buf));
-    // sprintf(buf, "%d", __SMTPManager_t->mode);
-    // cJSON_AddStringToObject(data_filed,"mode", buf);
-    // cJSON_AddStringToObject(data_filed,"server", __SMTPManager_t->server);
-    // memset(buf, 0, sizeof(buf));
-    // sprintf(buf, "%d", __SMTPManager_t->port);
-    // cJSON_AddStringToObject(data_filed,"public", buf);
-    // cJSON_AddStringToObject(data_filed,"zh", __SMTPManager_t->account);
-    // cJSON_AddStringToObject(data_filed,"mm", __SMTPManager_t->password);
-    // cJSON_AddStringToObject(data_filed,"rzfs", __SMTPManager_t->auth);
-
-    // SMTPreceiveAccount* iterator = NULL;
-    // //循环添加数据
-    // list_for_each_entry(iterator, &__SMTPManager_t->list, list)
-    // {
-    //     cJSON* data_filed = cJSON_CreateObject();   
-    //     cJSON_AddStringToObject(data_filed,"receiveAccount", iterator->receive_account);
-    //     cJSON_AddNumberToObject(data_filed,"idx",iterator->idx);
-    //     cJSON_AddItemToObject(root, "data", data_filed);
-    // }
-    // //添加汇总
-    // cJSON_AddItemToObject(root, "data", root);
-    // //添加结果
-    // cJSON_AddStringToObject(root, "msg", "操作成功");
-    // //转换
-    // str = cJSON_Print(root);    
-    // //释放资源
-    // cJSON_Delete(root);
-     return str;
+    // 创建 JSON 对象
+    cJSON* root = cJSON_CreateObject();   
+    // 添加基本键值对
+    cJSON_AddNumberToObject(root, "code", 200); 
+
+    cJSON* data_filed = cJSON_CreateObject();
+    char buf[30];
+    memset(buf, 0, sizeof(buf));
+    sprintf(buf, "%d", sm->mode);
+    cJSON_AddStringToObject(data_filed,"mode", buf);
+    cJSON_AddStringToObject(data_filed,"server", sm->server);
+    memset(buf, 0, sizeof(buf));
+    sprintf(buf, "%d", sm->port);
+    cJSON_AddStringToObject(data_filed,"public", buf);
+    cJSON_AddStringToObject(data_filed,"zh", sm->account);
+    cJSON_AddStringToObject(data_filed,"mm", sm->password);
+    cJSON_AddStringToObject(data_filed,"rzfs", sm->auth);
+
+    SMTPreceiveAccount* iterator = NULL;
+    //循环添加数据
+    list_for_each_entry(iterator, &sm->receive_account->list, list)
+    {
+        cJSON* data_filed = cJSON_CreateObject();   
+        cJSON_AddStringToObject(data_filed,"receiveAccount", iterator->receive_account);
+        cJSON_AddNumberToObject(data_filed,"idx",iterator->idx);
+        cJSON_AddItemToObject(root, "data", data_filed);
+    }
+    //添加汇总
+    cJSON_AddItemToObject(root, "data", root);
+    //添加结果
+    cJSON_AddStringToObject(root, "msg", "操作成功");
+    //转换
+    str = cJSON_Print(root);    
+    //释放资源
+    cJSON_Delete(root);
+    return str;
 }
 
 // @brief 返回分组设置

pub

@@ -8,7 +8,7 @@
 #  8:  ANDERSON_EN
 #  9:  USA_SL
 
-cust=1
+cust=8
 
 cmp_flag=1
 if [ $# -gt 0 ]; then