runing with ledger interface

LFtid1056/PQSMsg.cpp

@@ -7,6 +7,8 @@
 #include <cctype>
 #include <cstdlib>
 #include "client2.h"
+#include <iostream>
+
 // <20><><EFBFBD><EFBFBD>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 float IntToFloat(int num) {
     return static_cast<float>(num) / 65536.0f;
@@ -32,7 +34,62 @@ void ReversalBuff(uint8_t* buff, int start, int length) {
 }
 
 // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>MAC<41><43>ַ<EFBFBD><D6B7><EFBFBD><EFBFBD><EFBFBD>䵽<EFBFBD><E4B5BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-void GetMAC(const std::string& strMAC, std::vector<unsigned char>& packet, size_t startIndex) {
+//lnk20250808
+static inline int hex_nibble(char c) {
+    if (c >= '0' && c <= '9') return c - '0';
+    c = static_cast<char>(std::tolower(static_cast<unsigned char>(c)));
+    if (c >= 'a' && c <= 'f') return 10 + (c - 'a');
+    return -1;
+}
+
+// <20><>ȫ<EFBFBD>棺<EFBFBD><E6A3BA><EFBFBD><EFBFBD><EFBFBD>쳣<EFBFBD><ECB3A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD> true/false
+bool GetMAC(const std::string& strMAC,
+                 std::vector<unsigned char>& packet,
+                 size_t startIndex,
+                 std::string* err = nullptr) {
+    // 1) <20>淶<EFBFBD><E6B7B6><EFBFBD><EFBFBD>ȥ<EFBFBD><C8A5> '-', ':', ' '
+    std::string s;
+    s.reserve(strMAC.size());
+    for (char c : strMAC) {
+        if (c == '-' || c == ':' || c == ' ') continue;
+        s.push_back(c);
+    }
+
+    // 2) <20><><EFBFBD><EFBFBD>У<EFBFBD><D0A3>
+    if (s.size() != 12) {
+        if (err) *err = "MAC<EFBFBD><EFBFBD><EFBFBD>ȱ<EFBFBD><EFBFBD><EFBFBD>Ϊ12<EFBFBD><EFBFBD>ʮ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD>";
+        return false;
+    }
+
+    // 3) ʮ<><CAAE><EFBFBD><EFBFBD><EFBFBD><EFBFBD>У<EFBFBD><D0A3> + <20><><EFBFBD><EFBFBD>
+    std::array<unsigned char, 6> mac{};
+    for (int i = 0; i < 6; ++i) {
+        int hi = hex_nibble(s[2*i]);
+        int lo = hex_nibble(s[2*i + 1]);
+        if (hi < 0 || lo < 0) {
+            if (err) *err = "MAC<EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD>ַ<EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0-9<><39>A-F)";
+            return false;
+        }
+        mac[i] = static_cast<unsigned char>((hi << 4) | lo);
+    }
+
+    // 4) ȷ<><C8B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>㹻д<E3B9BB><D0B4>64<36>ֽڣ<D6BD>MAC 6<>ֽ<EFBFBD> + <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>㣩
+    const size_t need = startIndex + 64;
+    if (packet.size() < need) packet.resize(need, 0);
+
+    // 5) д<><D0B4>MAC
+    for (int i = 0; i < 6; ++i) {
+        packet[startIndex + i] = mac[i];
+    }
+
+    // 6) <20><><EFBFBD><EFBFBD>λ<EFBFBD>ò<EFBFBD><C3B2>㣨<EFBFBD><E3A3A8> resize <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><30><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤һ<D6A4>£<EFBFBD>
+    for (size_t i = 6; i < 64; ++i) {
+        packet[startIndex + i] = 0;
+    }
+
+    return true;
+}
+/*void GetMAC(const std::string& strMAC, std::vector<unsigned char>& packet, size_t startIndex) {
     // <20>Ƴ<EFBFBD><C6B3><EFBFBD><EFBFBD>пո<D0BF><D5B8>Ͷ̺<CDB6><CCBA><EFBFBD>
     std::string cleanedMAC = strMAC;
     cleanedMAC.erase(std::remove(cleanedMAC.begin(), cleanedMAC.end(), ' '), cleanedMAC.end());
@@ -70,7 +127,7 @@ void GetMAC(const std::string& strMAC, std::vector<unsigned char>& packet, size_
     catch (const std::exception& e) {
         throw std::invalid_argument("<22><>Ч<EFBFBD><D0A7>MAC<41><43>ַ: " + std::string(e.what()));
     }
-}
+}*/
 
 // CRC<52><43><EFBFBD>㺯<EFBFBD><E3BAAF>
 unsigned char GetCrcSum(const std::vector<unsigned char>& Check, int nOffset, int nLen) {
@@ -292,7 +349,13 @@ std::vector<unsigned char> generate_frontlogin_message(const std::string& strMac
     // [16-19] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2 (<28><><EFBFBD><EFBFBD>Ϊ0)
 
     // <20><><EFBFBD><EFBFBD>MAC<41><43>ַ (<28><>λ<EFBFBD><CEBB>20<32><30>ʼ<EFBFBD><CABC>64<36>ֽ<EFBFBD>)
-    GetMAC(strMac, packet, 20);
+    //GetMAC(strMac, packet, 20);
+    //lnk20250808
+    std::string err;
+    if (!GetMAC(strMac, packet, 0, &err)) {
+        std::cerr << "[GetMAC] parse failed: " << err << "\n";
+        // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>򷵻<EFBFBD>
+    }
 
     // <20><><EFBFBD><EFBFBD>У<EFBFBD><D0A3><EFBFBD><EFBFBD> (<28><>ƫ<EFBFBD><C6AB>8<EFBFBD><38>137)
     unsigned char checksum = 0;

LFtid1056/cloudfront/code/cfg_parser.cpp

@@ -2750,6 +2750,7 @@ void to_json(nlohmann::json& j, const MsgObj& m) {
 // FullObj to_json
 void to_json(nlohmann::json& j, const FullObj& f) {
     j = nlohmann::json{
+        {"Id", f.mac},
         {"Mid", f.Mid},
         {"Did", f.Did},
         {"Pri", f.Pri},
@@ -2758,6 +2759,7 @@ void to_json(nlohmann::json& j, const FullObj& f) {
     };
 }
 std::string generate_json(
+    const std::string mac,
     int Mid,    //需应答的报文订阅者收到后需以此ID应答，无需应答填入“-1”
     int Did,    //设备唯一标识Ldid，填入0代表Ndid。
     int Pri,    //报文处理的优先级
@@ -2769,6 +2771,7 @@ std::string generate_json(
     const std::vector<DataArrayItem>& dataArray     //数据数组。
 ) {
     FullObj fobj;
+    fobj.mac = mac;
     fobj.Mid = Mid;
     fobj.Did = Did;
     fobj.Pri = Pri;
@@ -2792,7 +2795,7 @@ void upload_data_test(){
     arr.push_back({2, 1691741340, 0, 1, "yyyy"});
 
     std::string js = generate_json(
-        -1, 2, 1, 4866, 1, 0, 2, 1, arr
+        "123",-1, 1, 1, 4866, 1, 0, 2, 1, arr
     );
     std::cout << js << std::endl;
     
@@ -2814,8 +2817,9 @@ std::vector<DeviceInfo> GenerateDeviceInfoFromLedger(const std::vector<terminal_
         DeviceInfo device;
         device.device_id = terminal.terminal_id;
         device.name = terminal.terminal_name;
-        device.model = terminal.dev_series;
+        device.model = terminal.dev_type;
-        device.mac = terminal.mac;
+        device.mac = terminal.addr_str;
+        device.status = 1;
 
         for (const auto& monitor : terminal.line) {
             PointInfo point;
@@ -2826,6 +2830,9 @@ std::vector<DeviceInfo> GenerateDeviceInfoFromLedger(const std::vector<terminal_
             point.PT2 = monitor.PT2;
             point.CT1 = monitor.CT1;
             point.CT2 = monitor.CT2;
+            point.strScale = monitor.voltage_level;
+            point.nCpuNo = std::stoi(monitor.logical_device_seq);
+            point.nPTType = std::stoi(monitor.terminal_connect);
 
             device.points.push_back(point);
         }
@@ -2882,7 +2889,7 @@ bool assign_qvvr_file_list(const std::string& id, ushort nCpuNo, const std::vect
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////下载成功通知
 //提取下载路径的文件名
-std::string extract_filename(const std::string& path) {
+std::string extract_filename1(const std::string& path) {
     size_t pos = path.find_last_of("/\\");
     return (pos != std::string::npos) ? path.substr(pos + 1) : path;
 }
@@ -2946,7 +2953,7 @@ bool update_qvvr_file_download(const std::string& filename_with_mac, const std::
     std::lock_guard<std::mutex> lock(ledgermtx);
 
     // 去除 mac 路径前缀，仅保留文件名
-    std::string filename = extract_filename(filename_with_mac);
+    std::string filename = extract_filename1(filename_with_mac);
 
     // 提取逻辑序号（如 PQM1 → 1）
     size_t under_pos = filename.find('_');
@@ -2992,7 +2999,7 @@ bool update_qvvr_file_download(const std::string& filename_with_mac, const std::
                     std::set<std::string> s_name(qfile.file_name.begin(), qfile.file_name.end());
                     std::set<std::string> s_down;
                     for (const auto& path : qfile.file_download) {
-                        s_down.insert(extract_filename(path));  // 提取每个路径中的文件名
+                        s_down.insert(extract_filename1(path));  // 提取每个路径中的文件名
                     }
 
                     // 检查 file_download 是否与 file_name 完全一致（集合相同）
@@ -3001,7 +3008,7 @@ bool update_qvvr_file_download(const std::string& filename_with_mac, const std::
 
                         // 找到其中的 .cfg 文件进行匹配
                         for (const auto& fpath : qfile.file_download) {
-                            std::string fname = extract_filename(fpath);
+                            std::string fname = extract_filename1(fpath);
                             if (fname.size() >= 4 && fname.substr(fname.size() - 4) == ".cfg") {
                                 // 提取文件时标和监测点事件的时标匹配
                                 qvvr_data matched;
@@ -3064,3 +3071,10 @@ bool update_qvvr_file_download(const std::string& filename_with_mac, const std::
     }
     return false; // 未匹配到终端ID或逻辑序号对应的监测点
 }
+
+////////////////////////////////////////////////////////////////////////////////////////提取mac
+std::string normalize_mac(const std::string& mac) {
+    std::string result = mac;
+    result.erase(std::remove(result.begin(), result.end(), '-'), result.end());
+    return result;
+}

LFtid1056/cloudfront/code/interface.cpp

@@ -609,27 +609,27 @@ int terminal_ledger_web(std::map<std::string, terminal_dev>& terminal_dev_map,
         dev.terminal_id   = safe_str(item, "id");
         dev.addr_str      = safe_str(item, "ip");
         dev.terminal_name = safe_str(item, "name");
-        dev.org_name      = safe_str(item, "org_name");
+        //dev.org_name      = safe_str(item, "org_name");
-        dev.maint_name    = safe_str(item, "maint_name");
+        //dev.maint_name    = safe_str(item, "maint_name");
-        dev.station_name  = safe_str(item, "stationName");
+        //dev.station_name  = safe_str(item, "stationName");
-        dev.tmnl_factory  = safe_str(item, "manufacturer");
+        //dev.tmnl_factory  = safe_str(item, "manufacturer");
-        dev.tmnl_status   = safe_str(item, "status");
+        //dev.tmnl_status   = safe_str(item, "status");
         dev.dev_type      = safe_str(item, "devType");
-        dev.dev_key       = safe_str(item, "devKey");
+        //dev.dev_key       = safe_str(item, "devKey");
-        dev.dev_series    = safe_str(item, "series");
+        //dev.dev_series    = safe_str(item, "series");
-        dev.port          = safe_str(item, "port");
+        //dev.port          = safe_str(item, "port");
-        dev.timestamp     = safe_str(item, "updateTime");
+        //dev.timestamp     = safe_str(item, "updateTime");
-        dev.processNo     = safe_str(item, "processNo");
+        dev.processNo     = safe_str(item, "node");
-        dev.maxProcessNum = safe_str(item, "maxProcessNum");
+        //dev.maxProcessNum = safe_str(item, "maxProcessNum");
 
-        dev.mac = safe_str(item, "mac");//添加mac
+        //dev.mac = safe_str(item, "mac");//添加mac
 
         if (item.contains("monitorData") && item["monitorData"].is_array()) {
             for (auto& mon : item["monitorData"]) {
                 if (dev.line.size() >= 10) break;
                 ledger_monitor m;
                 m.monitor_id         = safe_str(mon, "id");
-                m.terminal_id      = safe_str(mon, "terminal_id");
+                m.terminal_id        = safe_str(mon, "deviceId");
                 m.monitor_name       = safe_str(mon, "name");
                 m.logical_device_seq = safe_str(mon, "lineNo");
                 m.voltage_level      = safe_str(mon, "voltageLevel");
@@ -637,10 +637,10 @@ int terminal_ledger_web(std::map<std::string, terminal_dev>& terminal_dev_map,
                 m.timestamp          = safe_str(mon, "updateTime");
                 m.status             = safe_str(mon, "status");
 
-                m.CT1                = mon.value("CT1", 0.0);
+                m.CT1                = mon.value("ct1", 0.0);
-                m.CT2                = mon.value("CT2", 0.0);
+                m.CT2                = mon.value("ct2", 0.0);
-                m.PT1                = mon.value("PT1", 0.0);
+                m.PT1                = mon.value("pt1", 0.0);
-                m.PT2                = mon.value("PT2", 0.0);
+                m.PT2                = mon.value("pt2", 0.0);
 
                 dev.line.push_back(m);
             }
@@ -736,9 +736,9 @@ int parse_device_cfg_web()
 
     if (IED_COUNT < count_cfg) {
         std::cout << "!!!!!!!!!!single process can not add any ledger unless reboot!!!!!!!" << std::endl;
-        DIY_WARNLOG("process","【WARN】前置的%d号进程获取到的台账的数量大于配置文件中给单个进程配置的台账数量:%d,这个进程将按照获取到的台账的数量来创建台账空间，这个进程不能直接通过台账添加来新增台账，只能通过重启进程或者先删除已有台账再添加台账的方式来添加新台账", g_front_seg_index, IED_COUNT);
+        //DIY_WARNLOG("process","【WARN】前置的%d号进程获取到的台账的数量大于配置文件中给单个进程配置的台账数量:%d,这个进程将按照获取到的台账的数量来创建台账空间，这个进程不能直接通过台账添加来新增台账，只能通过重启进程或者先删除已有台账再添加台账的方式来添加新台账", g_front_seg_index, IED_COUNT);
     } else {
-        DIY_INFOLOG("process","【NORMAL】前置的%d号进程根据配置文件中给单个进程配置的台账数量:%d来创建台账空间", g_front_seg_index, IED_COUNT);
+        //DIY_INFOLOG("process","【NORMAL】前置的%d号进程根据配置文件中给单个进程配置的台账数量:%d来创建台账空间", g_front_seg_index, IED_COUNT);
     }
 
     ///////////////////////////////////////////////////////////////////////////////用例这里将局部的map拷贝到全局map，后续根据协议台账修改
@@ -1199,21 +1199,21 @@ int transfer_json_qvvr_data(const std::string& dev_id, ushort monitor_id,
             // 有效响应，略过
         } catch (...) {
             // 响应异常，保存 json
-            DIY_ERRORLOG(full_key_m_d.c_str(), "【ERROR】暂态接口响应异常,无法上送监测点%s的暂态事件", monitor_id.c_str());
+            DIY_ERRORLOG(full_key_m_d.c_str(), "【ERROR】暂态接口响应异常,无法上送装置%s监测点%s的暂态事件",dev_id, monitor_id);
 
             std::cout << "qvvr send fail ,store in local" << std::endl;
             std::string qvvrDir = FRONT_PATH + "/dat/qvvr/";
-            std::string fileName = qvvrDir + monitor_id + "-" + FormatTimeForFilename(start_time_str) + "-" + std::to_string(dis_kind) + ".txt";
+            std::string fileName = qvvrDir + dev_id + "-" + std::to_string(monitor_id) + "-" + FormatTimeForFilename(start_time_str) + "-" + std::to_string(dis_kind) + ".txt";
             writeJsonToFile(fileName, json_string);
             checkAndRemoveOldestIfNeeded(qvvrDir, 10LL * 1024 * 1024);
         }
     } else {
         // 无响应，保存 json
-        DIY_ERRORLOG(full_key_m_d.c_str(), "【ERROR】暂态接口无响应,无法上送监测点%s的暂态事件", monitor_id.c_str());
+        DIY_ERRORLOG(full_key_m_d.c_str(), "【ERROR】暂态接口无响应,无法上送装置%s监测点%s的暂态事件",dev_id, monitor_id);
 
         std::cout << "qvvr send fail ,store in local" << std::endl;
         std::string qvvrDir = FRONT_PATH + "/dat/qvvr/";
-        std::string fileName = qvvrDir + monitor_id + "-" + FormatTimeForFilename(start_time_str) + "-" + std::to_string(dis_kind) + ".txt";
+        std::string fileName = qvvrDir + dev_id + "-" + std::to_string(monitor_id) + "-" + FormatTimeForFilename(start_time_str) + "-" + std::to_string(dis_kind) + ".txt";
         writeJsonToFile(fileName, json_string);
         checkAndRemoveOldestIfNeeded(qvvrDir, 10LL * 1024 * 1024);
         return 1;
@@ -1234,7 +1234,9 @@ int transfer_json_qvvr_data(const std::string& dev_id, ushort monitor_id,
 
 void qvvr_test()
 {
-
+    transfer_json_qvvr_data("qvvrtest123", 6,
+                            10.98, 1234, 1754566628692, 1,1,
+                            "testwavepath");
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////通用接口响应

LFtid1056/cloudfront/code/interface.h

@@ -429,6 +429,7 @@ struct MsgObj {
 
 // 整体
 struct FullObj {
+    std::string mac;
     int Mid;
     int Did;
     int Pri;
@@ -446,6 +447,7 @@ void to_json(nlohmann::json& j, const FullObj& f);
 std::vector<DeviceInfo> GenerateDeviceInfoFromLedger(const std::vector<terminal_dev>& terminal_devlist);//接口读取台账后，再调用这个将台账拷贝过来
 
 std::string generate_json(  //构造装置主动上送数据的报文
+    const std::string mac,
     int Mid,    //需应答的报文订阅者收到后需以此ID应答，无需应答填入“-1”
     int Did,    //设备唯一标识Ldid，填入0代表Ndid。
     int Pri,    //报文处理的优先级
@@ -461,6 +463,8 @@ std::string generate_json(  //构造装置主动上送数据的报文
 int transfer_json_qvvr_data(const std::string& dev_id, ushort monitor_id,
                             double mag, double dur, long long start_tm, int dis_kind,int phase,
                             const std::string& wavepath);
+//录波文件上传接口
+void SOEFileWeb(std::string& localpath,std::string& cloudpath, std::string& wavepath);
 
 //录波文件目录接口
 bool assign_qvvr_file_list(const std::string& id, ushort nCpuNo, const std::vector<std::string>& file_list_raw);
@@ -468,6 +472,9 @@ bool assign_qvvr_file_list(const std::string& id, ushort nCpuNo, const std::vect
 //录波文件下载完成通知接口
 bool update_qvvr_file_download(const std::string& filename_with_mac, const std::string& terminal_id);
 
+//提取mac
+std::string normalize_mac(const std::string& mac);
+
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 #endif

LFtid1056/cloudfront/code/log4.cpp

@@ -334,8 +334,8 @@ void init_loggers_bydevid(const std::string& dev_id)
             const ledger_monitor& monitor = term.line[j];
             if (!monitor.monitor_id.empty()) {
                 std::ostringstream mon_key_c, mon_key_d, mon_path, mon_name;
-                mon_key_c << "monitor." << monitor.monitor_id << ".COM";
+                mon_key_c << "monitor." << term.terminal_id << "." << monitor.logical_device_seq << ".COM";
-                mon_key_d << "monitor." << monitor.monitor_id << ".DATA";
+                mon_key_d << "monitor." << term.terminal_id << "." <<  monitor.logical_device_seq << ".DATA";
                 mon_path << device_dir << "/monitor" << j;
                 mon_name << monitor.monitor_id;
 
@@ -355,7 +355,7 @@ void init_loggers_bydevid(const std::string& dev_id)
                     logger_map[mon_key_c.str()] = TypedLogger(mon_logger_c, LOGTYPE_COM);
                     logger_map[mon_key_d.str()] = TypedLogger(mon_logger_d, LOGTYPE_DATA);
 
-                    DIY_WARNLOG(mon_key_d.str().c_str(), "【WARN】监测点:%s - id:%s监测点级日志初始化完毕", monitor.monitor_name.c_str(), monitor.monitor_id.c_str());
+                    DIY_WARNLOG(mon_key_d.str().c_str(), "【WARN】监测点:%s - id:%s监测点级日志初始化完毕", monitor.monitor_name.c_str(), monitor.logical_device_seq.c_str());
                 }
             }
         }
@@ -406,8 +406,8 @@ void init_loggers()
 
             if (!monitor.monitor_id.empty()) {
                 std::ostringstream mon_key_c, mon_key_d, mon_path, mon_name;
-                mon_key_c << "monitor." << monitor.monitor_id << ".COM";
+                mon_key_c << "monitor." << term.terminal_id << "." << monitor.logical_device_seq << ".COM";
-                mon_key_d << "monitor." << monitor.monitor_id << ".DATA";
+                mon_key_d << "monitor." << term.terminal_id << "." <<  monitor.logical_device_seq << ".DATA";
 
                 mon_path << device_dir << "/monitor" << i; // 用monitor+序号作为目录
                 mon_name << monitor.monitor_id;
@@ -425,7 +425,7 @@ void init_loggers()
                 logger_map[mon_key_d.str()] = TypedLogger(mon_logger_d, LOGTYPE_DATA);
 
                 DIY_WARNLOG(mon_key_d.str().c_str(), "【WARN】监测点:%s - id:%s监测点级日志初始化完毕",
-                            monitor.monitor_name.c_str(), monitor.monitor_id.c_str());
+                            monitor.monitor_name.c_str(), monitor.logical_device_seq.c_str());
             }
         }
     }

LFtid1056/cloudfront/code/main.cpp

@@ -215,7 +215,7 @@ std::string get_parent_directory() {
         init_loggers();
 
         //读取模型,下载模板文件
-        parse_model_cfg_web();
+        //parse_model_cfg_web();
 
         //解析模板文件
         //Set_xml_nodeinfo();
@@ -518,16 +518,35 @@ void Front::mqproducerThread()
 
 extern thread_info_t thread_info[THREAD_CONNECTIONS];
 
+void cleanup_args(ThreadArgs* args) {
+    for (int i = 0; i < args->argc; ++i) {
+        free(args->argv[i]);  // strdup 分配的
+    }
+    delete[] args->argv;
+    delete args;
+}
+
 void* cloudfrontthread(void* arg) {
 ///////////////////////////////////////
     ThreadArgs* args = static_cast<ThreadArgs*>(arg);
     int argc = args->argc;
     char **argv = args->argv;
 
-    printf("argc = %d, argv[0] = %s\n", argc, argv[0]);
+    printf("[cloudfrontthread] argc = %d\n", argc);
+    for (int i = 0; i < argc; ++i) {
+        printf("  argv[%d] = %s\n", i, argv[i]);
+    }
 
-    //添加线程处理
+    // 动态解析线程 index
-    int index = *(int*)argv[0];
+    int index = 0;
+    if (argc > 0 && argv[0]) {
+        try {
+            index = std::stoi(argv[0]);
+        } catch (...) {
+            std::cerr << "[cloudfrontthread] Failed to parse index from argv[0]: " << argv[0] << "\n";
+            return nullptr;
+        }
+    }
 
     // 更新线程状态为运行中
     pthread_mutex_lock(&thread_info[index].lock);
@@ -539,11 +558,12 @@ void* cloudfrontthread(void* arg) {
     // 解析命令行参数
     if(!parse_param(argc,argv)){
         std::cerr << "process param error,exit" << std::endl;
+        cleanup_args(args);
         return nullptr;
     }
 
     // 线程使用完后清理参数
-    delete args;
+    cleanup_args(args);
 
     //路径获取
     FRONT_PATH = get_parent_directory();

LFtid1056/dealMsg.cpp

@@ -354,22 +354,23 @@ void process_received_message(string mac, string id,const char* data, size_t len
                                         std::vector<DataArrayItem> arr;
                                         arr.push_back({1,   //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  -1-<2D>ޣ<EFBFBD> 0-<2D><>Rt<52><74>,1-<2D><>Max<61><78>,2-<2D><>Min<69><6E>,3-<2D><>Avg<76><67>,4-<2D><>Cp95<39><35>
                                             data_time,     //<2F><><EFBFBD><EFBFBD>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD>䣬<EFBFBD><E4A3AC><EFBFBD><EFBFBD>ʱ<EFBFBD>꣬<EFBFBD><EAA3AC><EFBFBD><EFBFBD>1970<37><30><EFBFBD><EFBFBD><EFBFBD>룬<EFBFBD><EBA3AC>Ч<EFBFBD><D0A7><EFBFBD>롰-1<><31>
-                                            -1,             //<2F><><EFBFBD><EFBFBD>ʱ<EFBFBD>꣬΢<EAA3AC><CEA2><EFBFBD>ӣ<EFBFBD><D3A3><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD>롰-1<><31>
+                                            0,             //<2F><><EFBFBD><EFBFBD>ʱ<EFBFBD>꣬΢<EAA3AC><CEA2><EFBFBD>ӣ<EFBFBD><D3A3><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD>롰-1<><31>
                                             0,              //<2F><><EFBFBD>ݱ<EFBFBD>ʶ<EFBFBD><CAB6>1-<2D><>ʶ<EFBFBD><CAB6><EFBFBD><EFBFBD><EFBFBD>쳣
                                             max_base64Str});
-                                        arr.push_back({2, data_time, -1, 0, min_base64Str});
+                                        arr.push_back({2, data_time, 0, 0, min_base64Str});
-                                        arr.push_back({3, data_time, -1, 0, avg_base64Str});
+                                        arr.push_back({3, data_time, 0, 0, avg_base64Str});
-                                        arr.push_back({4, data_time, -1, 0, cp95_base64Str});
+                                        arr.push_back({4, data_time, 0, 0, cp95_base64Str});
 
                                         std::string js = generate_json(
+                                            normalize_mac(mac),
                                             -1,                 //<2F><>Ӧ<EFBFBD><D3A6><EFBFBD>ı<EFBFBD><C4B1>Ķ<EFBFBD><C4B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>յ<EFBFBD><D5B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Դ<EFBFBD>IDӦ<44><D3A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD><EFBFBD>롰-1<><31>
-                                            123456,                  //<2F>豸Ψһ<CEA8><D2BB>ʶLdid<69><64><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><30><EFBFBD><EFBFBD>Ndid,<2C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>id<69><64><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+                                            1,                  //<2F>豸Ψһ<CEA8><D2BB>ʶLdid<69><64><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><30><EFBFBD><EFBFBD>Ndid,<2C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>id<69><64><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-                                            3,                  //<2F><><EFBFBD>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȼ<EFBFBD><C8BC><EFBFBD>1 I<><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><>Ӧ 2 II<49><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><>Ӧ 3 <20><>ͨ<EFBFBD><CDA8><EFBFBD><EFBFBD>/<2F><>Ӧ 4 <20>㲥<EFBFBD><E3B2A5><EFBFBD><EFBFBD>
+                                            1,                  //<2F><><EFBFBD>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȼ<EFBFBD><C8BC><EFBFBD>1 I<><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><>Ӧ 2 II<49><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><>Ӧ 3 <20><>ͨ<EFBFBD><CDA8><EFBFBD><EFBFBD>/<2F><>Ӧ 4 <20>㲥<EFBFBD><E3B2A5><EFBFBD><EFBFBD>
                                             0x1302,               //<2F>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͵<EFBFBD><CDB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
                                             avg_data.name,        //<2F>߼<EFBFBD><DFBC><EFBFBD><EFBFBD>豸ID<49><44>0-<2D>߼<EFBFBD><DFBC>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-1
                                             0x04,               //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͹̶<CDB9>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
                                             2,                      //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԣ<EFBFBD><D4A3>ޡ<EFBFBD>0<EFBFBD><30><EFBFBD><EFBFBD>ʵʱ<CAB5><CAB1>1<EFBFBD><31><EFBFBD><EFBFBD>ͳ<EFBFBD>ơ<EFBFBD>2<EFBFBD><32><EFBFBD><EFBFBD>
-                                            -1,                      //<2F><><EFBFBD>ݼ<EFBFBD><DDBC><EFBFBD><EFBFBD>ţ<EFBFBD><C5A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݼ<EFBFBD><DDBC><EFBFBD>ʽ<EFBFBD><CABD><EFBFBD>ͣ<EFBFBD><CDA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-1
+                                            1,                      //<2F><><EFBFBD>ݼ<EFBFBD><DDBC><EFBFBD><EFBFBD>ţ<EFBFBD><C5A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݼ<EFBFBD><DDBC><EFBFBD>ʽ<EFBFBD><CABD><EFBFBD>ͣ<EFBFBD><CDA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-1
                                             arr                     //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
                                         );
 
@@ -543,18 +544,19 @@ void process_received_message(string mac, string id,const char* data, size_t len
                         std::vector<DataArrayItem> arr;
                         arr.push_back({1,   //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  -1-<2D>ޣ<EFBFBD> 0-<2D><>Rt<52><74>,1-<2D><>Max<61><78>,2-<2D><>Min<69><6E>,3-<2D><>Avg<76><67>,4-<2D><>Cp95<39><35>
                             data_time,     //<2F><><EFBFBD><EFBFBD>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD>䣬<EFBFBD><E4A3AC><EFBFBD><EFBFBD>ʱ<EFBFBD>꣬<EFBFBD><EAA3AC><EFBFBD><EFBFBD>1970<37><30><EFBFBD><EFBFBD><EFBFBD>룬<EFBFBD><EBA3AC>Ч<EFBFBD><D0A7><EFBFBD>롰-1<><31>
-                            -1,             //<2F><><EFBFBD><EFBFBD>ʱ<EFBFBD>꣬΢<EAA3AC><CEA2><EFBFBD>ӣ<EFBFBD><D3A3><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD>롰-1<><31>
+                            0,             //<2F><><EFBFBD><EFBFBD>ʱ<EFBFBD>꣬΢<EAA3AC><CEA2><EFBFBD>ӣ<EFBFBD><D3A3><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD>롰-1<><31>
                             0,              //<2F><><EFBFBD>ݱ<EFBFBD>ʶ<EFBFBD><CAB6>1-<2D><>ʶ<EFBFBD><CAB6><EFBFBD><EFBFBD><EFBFBD>쳣
                             base64});
                         std::string js = generate_json(
+                            normalize_mac(mac),
                             -1,                 //<2F><>Ӧ<EFBFBD><D3A6><EFBFBD>ı<EFBFBD><C4B1>Ķ<EFBFBD><C4B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>յ<EFBFBD><D5B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Դ<EFBFBD>IDӦ<44><D3A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD><EFBFBD>롰-1<><31>
-                            123456,                  //<2F>豸Ψһ<CEA8><D2BB>ʶLdid<69><64><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><30><EFBFBD><EFBFBD>Ndid,<2C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>id<69><64><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+                            1,                  //<2F>豸Ψһ<CEA8><D2BB>ʶLdid<69><64><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><30><EFBFBD><EFBFBD>Ndid,<2C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>id<69><64><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-                            3,                  //<2F><><EFBFBD>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȼ<EFBFBD><C8BC><EFBFBD>1 I<><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><>Ӧ 2 II<49><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><>Ӧ 3 <20><>ͨ<EFBFBD><CDA8><EFBFBD><EFBFBD>/<2F><>Ӧ 4 <20>㲥<EFBFBD><E3B2A5><EFBFBD><EFBFBD>
+                            1,                  //<2F><><EFBFBD>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȼ<EFBFBD><C8BC><EFBFBD>1 I<><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><>Ӧ 2 II<49><49><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><>Ӧ 3 <20><>ͨ<EFBFBD><CDA8><EFBFBD><EFBFBD>/<2F><>Ӧ 4 <20>㲥<EFBFBD><E3B2A5><EFBFBD><EFBFBD>
                             0x1302,               //<2F>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͵<EFBFBD><CDB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
                             cid,                //<2F>߼<EFBFBD><DFBC><EFBFBD><EFBFBD>豸ID<49><44>0-<2D>߼<EFBFBD><DFBC>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-1
                             0x04,               //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͹̶<CDB9>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
                             1,                      //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԣ<EFBFBD><D4A3>ޡ<EFBFBD>0<EFBFBD><30><EFBFBD><EFBFBD>ʵʱ<CAB5><CAB1>1<EFBFBD><31><EFBFBD><EFBFBD>ͳ<EFBFBD>ơ<EFBFBD>2<EFBFBD><32><EFBFBD><EFBFBD>
-                            -1,                      //<2F><><EFBFBD>ݼ<EFBFBD><DDBC><EFBFBD><EFBFBD>ţ<EFBFBD><C5A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݼ<EFBFBD><DDBC><EFBFBD>ʽ<EFBFBD><CABD><EFBFBD>ͣ<EFBFBD><CDA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-1
+                            1,                      //<2F><><EFBFBD>ݼ<EFBFBD><DDBC><EFBFBD><EFBFBD>ţ<EFBFBD><C5A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݼ<EFBFBD><DDBC><EFBFBD>ʽ<EFBFBD><CABD><EFBFBD>ͣ<EFBFBD><CDA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-1
                             arr                     //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
                         );
                         //std::cout << js << std::en

LFtid1056/main_thread.cpp

@@ -8,6 +8,8 @@
 
 #include "cloudfront/code/interface.h"
 #include <iostream>
+#include <thread>
+#include <chrono>
 
 using namespace std;
 #if 0
@@ -32,6 +34,9 @@ typedef struct {
 } thread_info_t;
 #endif
 
+extern int INITFLAG;//̨<>˵ȳ<CBB5>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD>ɱ<EFBFBD>־
+extern void cleanup_args(ThreadArgs* args);
+
 void init_daemon(void) 
 { 
     int pid; 
@@ -108,6 +113,32 @@ std::vector<DeviceInfo> generate_test_devices(int count) {
     return devices;
 }
 
+void PrintDevices(const std::vector<DeviceInfo>& devices) {
+    std::cout << "==== Devices List (" << devices.size() << ") ====\n";
+    for (const auto& dev : devices) {
+        std::cout << "Device ID   : " << dev.device_id << "\n";
+        std::cout << "Name        : " << dev.name << "\n";
+        std::cout << "Model       : " << dev.model << "\n";
+        std::cout << "MAC         : " << dev.mac << "\n";
+        std::cout << "Status      : " << dev.status << "\n";
+        std::cout << "Points (" << dev.points.size() << "):\n";
+        for (const auto& pt : dev.points) {
+            std::cout << "  Point ID   : " << pt.point_id << "\n";
+            std::cout << "  Name       : " << pt.name << "\n";
+            std::cout << "  Device ID  : " << pt.device_id << "\n";
+            std::cout << "  Cpu No     : " << pt.nCpuNo << "\n";
+            std::cout << "  PT1        : " << pt.PT1 << "\n";
+            std::cout << "  PT2        : " << pt.PT2 << "\n";
+            std::cout << "  CT1        : " << pt.CT1 << "\n";
+            std::cout << "  CT2        : " << pt.CT2 << "\n";
+            std::cout << "  Scale      : " << pt.strScale << "\n";
+            std::cout << "  PTType     : " << pt.nPTType << "\n";
+            std::cout << "----------------------\n";
+        }
+        std::cout << "==========================\n";
+    }
+}
+
 /* <20>̹߳<DFB3><CCB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 0<><30><EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD>*/
 /* <20>ͻ<EFBFBD><CDBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӹ<EFBFBD><D3B9><EFBFBD><EFBFBD>̺߳<DFB3><CCBA><EFBFBD>*/
 void* client_manager_thread(void* arg) {
@@ -123,17 +154,17 @@ void* client_manager_thread(void* arg) {
     printf("Started client connections\n");
 
     // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-    std::vector<PointInfo> points1 = {
+    /*std::vector<PointInfo> points1 = {
         {"P001", "Main Voltage", "D001",1 ,1, 1, 1, 1,"0.38k",0},
         {"P002", "Backup Voltage", "D001",2 ,1, 1, 1, 1,"0.38k",0}
     };
 
     std::vector<PointInfo> points2 = {
         {"P101", "Generator Output", "D002",1 ,1, 1, 1, 1,"0.38k",0}
-    };
+    };*/
     //00B78DA800D6 00-B7-8D-01-79-06
     // <20><><EFBFBD><EFBFBD>װ<EFBFBD><D7B0><EFBFBD>б<EFBFBD>
-    std::vector<DeviceInfo> devices = {
+    /*std::vector<DeviceInfo> devices = {
         {
             "D001", "Primary Device", "Model-X", "00-B7-8D-01-79-06",
             1, points1
@@ -142,12 +173,16 @@ void* client_manager_thread(void* arg) {
             "D002", "Backup Device", "Model-Y", "00-B7-8D-A8-00-D6",
             1, points2
         }
-    };
+    };*/
 
     // <20><><EFBFBD><EFBFBD>100<30><30><EFBFBD><EFBFBD><EFBFBD><EFBFBD>װ<EFBFBD><D7B0>
-    std::vector<DeviceInfo> test_devices = generate_test_devices(100);
+    //std::vector<DeviceInfo> test_devices = generate_test_devices(100);
 
-    //std::vector<DeviceInfo> devices = GenerateDeviceInfoFromLedger(terminal_devlist);//lnk<6E><6B><EFBFBD><EFBFBD>
+    //lnk<EFBFBD><EFBFBD>̨<EFBFBD>˶<EFBFBD>ȡ<EFBFBD>豸
+    std::vector<DeviceInfo> devices = GenerateDeviceInfoFromLedger(terminal_devlist);//lnk<6E><6B><EFBFBD><EFBFBD>
+
+    //̨<>˴<EFBFBD>ӡ
+    PrintDevices(devices);
 
     // <20><><EFBFBD><EFBFBD><EFBFBD>ͻ<EFBFBD><CDBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     start_client_connect(devices);
@@ -215,7 +250,7 @@ void restart_thread(int index) {
     int* new_index = (int*)malloc(sizeof(int));
     *new_index = index;
 
-    if (index == 0) {
+    if (index == 1) {
         // <20>ͻ<EFBFBD><CDBB>˹<EFBFBD><CBB9><EFBFBD><EFBFBD>߳<EFBFBD>
         if (pthread_create(&thread_info[index].tid, NULL, client_manager_thread, new_index) != 0) {
             pthread_mutex_lock(&global_lock);
@@ -225,7 +260,7 @@ void restart_thread(int index) {
             free(new_index);
         }
     }
-    else if (index == 1) {
+    else if (index == 2) {
         // <20><>Ϣ<EFBFBD><CFA2><EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD>
         if (pthread_create(&thread_info[index].tid, NULL, message_processor_thread, new_index) != 0) {
             pthread_mutex_lock(&global_lock);
@@ -235,7 +270,7 @@ void restart_thread(int index) {
             free(new_index);
         }
     }
-    else if (index == 2) {
+    else if (index == 0) {
         // <20>ӿڣ<D3BF>mq
         char* argv[] = { (char*)new_index };//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̺Ų<CCBA><C5B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
             ThreadArgs* args = new ThreadArgs{1, argv};
@@ -259,6 +294,16 @@ int is_thread_alive(pthread_t tid) {
     return pthread_tryjoin_np(tid, NULL) == EBUSY;  // EBUSY<53><59>ʾ<EFBFBD>߳<EFBFBD><DFB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 }
 
+//lnk<6E><6B><EFBFBD><EFBFBD>
+ThreadArgs* make_thread_args_from_strs(const std::vector<std::string>& args_vec) {
+    char** argv = new char*[args_vec.size() + 1]; // <20><>һ<EFBFBD><D2BB> nullptr <20><>β
+    for (size_t i = 0; i < args_vec.size(); ++i) {
+        argv[i] = strdup(args_vec[i].c_str());    // strdup <20><> malloc <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    }
+    argv[args_vec.size()] = nullptr;
+    return new ThreadArgs{static_cast<int>(args_vec.size()), argv};
+}
+
 /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
 int main(int argc ,char** argv) {//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӳ<EFBFBD><D3B2><EFBFBD>
     if(!parse_param(argc,argv)){
@@ -275,34 +320,46 @@ int main(int argc ,char** argv) {//
         pthread_mutex_init(&thread_info[i].lock, NULL);  // <20><>ʼ<EFBFBD><CABC>ÿ<EFBFBD><C3BF><EFBFBD>̵߳<DFB3><CCB5><EFBFBD>
     }
 
+    //<2F>ӿں<D3BF>mq
+    ThreadArgs* args = make_thread_args_from_strs({ "0" });
+    if (pthread_create(&thread_info[0].tid, NULL, cloudfrontthread, args) != 0) {
+        printf("Failed to create message processor thread 0\n");
+        cleanup_args(args);
+    }
+
+    while(!INITFLAG){
+        std::this_thread::sleep_for(std::chrono::seconds(3));
+        std::cout << "waiting cloudfront initialize ..." << std::endl;
+    }
+
     // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ<EFBFBD>߳<EFBFBD><DFB3><EFBFBD>
-    for (int i = 0; i < THREAD_CONNECTIONS; i++) {
+    for (int i = 1; i < THREAD_CONNECTIONS; i++) {
         int* index = (int*)malloc(sizeof(int));
         *index = i;
 
-        if (i == 0) {
+        if (i == 1) {
             // <20>ͻ<EFBFBD><CDBB>˹<EFBFBD><CBB9><EFBFBD><EFBFBD>߳<EFBFBD>
             if (pthread_create(&thread_info[i].tid, NULL, client_manager_thread, index) != 0) {
                 printf("Failed to create client manager thread %d\n", i);
                 free(index);
             }
         }
-        else if (i == 1) {
+        else if (i == 2) {
             // <20><>Ϣ<EFBFBD><CFA2><EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD>
             if (pthread_create(&thread_info[i].tid, NULL, message_processor_thread, index) != 0) {
                 printf("Failed to create message processor thread %d\n", i);
                 free(index);
             }
         }
-        else if (i == 2){
+        else if (i == 3){
-            //<2F>ӿں<D3BF>mq
+            /*//<2F>ӿں<D3BF>mq
             char* argv[] = { (char*)index };//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̺Ų<CCBA><C5B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
             ThreadArgs* args = new ThreadArgs{1, argv};
             if (pthread_create(&thread_info[i].tid, NULL, cloudfrontthread, args) != 0) {
                 printf("Failed to create message processor thread %d\n", i);
                 delete args;  // <20><><EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD>ֶ<EFBFBD><D6B6>ͷ<EFBFBD>
                 free(index);
-            }
+            }*/
         }
         else {
             // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD>