From 87ef42b4f156750f9a80878b7cb15d75b67bf2b1 Mon Sep 17 00:00:00 2001
From: zhuhang <729713003@qq.com>
Date: 星期五, 01 十一月 2024 15:54:53 +0800
Subject: [PATCH] 1

---
 common.h |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/common.h b/common.h
index a714e74..26ba158 100644
--- a/common.h
+++ b/common.h
@@ -1,9 +1,7 @@
 #ifndef COMMON_H
 #define COMMON_H
-#include <iostream>
-#include <cstring>
-#include <QString>
 
+#include <string.h>
 
 enum TypeInfo{
 
@@ -835,6 +833,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]; // 鏃堕棿鎴�
@@ -849,6 +867,7 @@
 struct LogQueryReq {
     Head head;                 // 鏁版嵁澶�
     char keyWords[32];            // 瀛樺偍鍏抽敭瀛楃殑鏁扮粍
+>>>>>>> bb11cc624ab058fc3a6541f91f37985b8caae9b6
     // 鏃犲弬鏋勯�犲嚱鏁�
     LogQueryReq() {
         head.type = LOGSEARCH_REQ;
@@ -858,18 +877,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
\ No newline at end of file
+#endif // COMMON_H
+

--
Gitblit v1.8.0