Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025

MYH

2024-11-01 c30e70a957f431fc8f5f44129b4cc5921f54ff7a

Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025

 Client/¼½ºÆêÆ/log/ÈÕÖ¾_¼½ºÆêÆ_1101.doc

Binary files differ

 Client/Ö캽/log/Ö캽1030.doc

Binary files differ

 Client/Ö캽/log/Ö캽1031.doc

Binary files differ

 Client/Ö캽/log/Ö캽1101.doc

Binary files differ

 common.h

@@ -828,6 +828,26 @@
    }
};

<<<<<<< HEAD
//日志查询

enum Typeinfo{
    LOGSEARCH_REQ,//日志查询请求
    LOGSEARCH_RES,//日志查询响应

};

struct Head
{
    int type;   // åŠŸèƒ½ç±»åž‹
    int len;    //封包长度

};
// æ—¥å¿—查询请求结构体
struct LogQueryReq {
    Head heade;                 // æ•°æ®å¤´
    char keyWords[0];            // å­˜å‚¨å¤šä¸ªå…³é”®å­—的柔性数组
=======
//日志
struct ParsedLog { 
    char timestamp[64]; // æ—¶é—´æˆ³
@@ -842,6 +862,7 @@
struct LogQueryReq {
    Head head;                 // æ•°æ®å¤´
    char keyWords[32];            // å­˜å‚¨å…³é”®å­—的数组
>>>>>>> bb11cc624ab058fc3a6541f91f37985b8caae9b6
    // æ— å‚构造函数
    LogQueryReq() {
        head.type = LOGSEARCH_REQ;
@@ -851,18 +872,27 @@

// æ—¥å¿—查询响应结构体
struct LogQueryRes {
<<<<<<< HEAD
    Head heade;  
=======
    Head head;  
>>>>>>> bb11cc624ab058fc3a6541f91f37985b8caae9b6
    int status;                    // å“åº”状态 (如 0 è¡¨ç¤ºæˆåŠŸï¼Œéž 0 è¡¨ç¤ºå¤±è´¥)
    char errorMessage[256];        // é”™è¯¯ä¿¡æ¯ï¼ˆå¦‚果有）
    
    // æ— å‚构造函数
    LogQueryRes() {
        head.type = LOGSEARCH_RES;
<<<<<<< HEAD
        head.len = sizeof(LogQueryRes);
=======
        head.len = sizeof(LogQueryRes);
>>>>>>> bb11cc624ab058fc3a6541f91f37985b8caae9b6
    }
};




#endif // COMMON_H
#endif // COMMON_H