From 178b49292365dda90cc91d9547e97a5eb43006df Mon Sep 17 00:00:00 2001
From: lzz <xiguabobo_2020@qq.com>
Date: 星期六, 02 十一月 2024 12:23:29 +0800
Subject: [PATCH] 提交

---
 common.h |   40 ++++++++++++++++++++++------------------
 1 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/common.h b/common.h
index 1a6a930..03aa54b 100644
--- a/common.h
+++ b/common.h
@@ -67,17 +67,17 @@
     HISTORY_QUERY_RES, // 鍘嗗彶鏌ヨ鍝嶅簲
 
     //鑷姩鍗囩骇
-    VERSIONNUM_REQ,  // 鐗堟湰鍙疯姹�
-    VERSIONNUM_RES,   // 鐗堟湰鍙峰搷搴�
+    VERSION_NUM_REQ,  // 鐗堟湰鍙疯姹�
+    VERSION_NUM_RES,   // 鐗堟湰鍙峰搷搴�
     UPLOAD_FILE_REQ, // 涓婁紶鏂囦欢鐨勮姹�
     UPLOAD_FILE_RES, // 涓婁紶鏂囦欢鐨勫搷搴�
-    VERSIONINFOENTRY_REQ,       // 鐗堟湰淇℃伅褰曞叆璇锋眰
-    VERSIONINFOENTRY_RES,       //鐗堟湰淇℃伅褰曞叆鍝嶅簲
-    VERSIONUPDATE_REQ, // 鐗堟湰鏇存柊璇锋眰
-    VERSIONUPDATE_RES, // 鐗堟湰鏇存柊鍝嶅簲
-    FILEDOWNLOADS_REQ, // 鐗堟湰鏇存柊鏂囦欢涓嬭浇璇锋眰
-    FILEDOWNLOADS_RES, // 鐗堟湰鏇存柊鏂囦欢涓嬭浇鍝嶅簲
-    DOWNLOADSUCCESSFULLY_RES        // 鏇存柊鏂囦欢涓嬭浇鎴愬姛鐨勫搷搴�
+    VERSION_INFOENTRY_REQ,       // 鐗堟湰淇℃伅褰曞叆璇锋眰
+    VERSION_INFOENTRY_RES,       //鐗堟湰淇℃伅褰曞叆鍝嶅簲
+    VERSION_UPDATE_REQ, // 鐗堟湰鏇存柊璇锋眰
+    VERSION_UPDATE_RES, // 鐗堟湰鏇存柊鍝嶅簲
+    FILE_DOWNLOADS_REQ, // 鐗堟湰鏇存柊鏂囦欢涓嬭浇璇锋眰
+    FILE_DOWNLOADS_RES, // 鐗堟湰鏇存柊鏂囦欢涓嬭浇鍝嶅簲
+    DOWNLOAD_SUCCESSFULLY_RES        // 鏇存柊鏂囦欢涓嬭浇鎴愬姛鐨勫搷搴�
 
     //鏃ュ織
     LOGSEARCH_REQ;//鏃ュ織鏌ヨ璇锋眰
@@ -687,7 +687,7 @@
 {
 	Head head;
 	VersionNumReq() {
-		head.type = VERSIONNUM_REQ;
+		head.type = VERSION_NUM_REQ;
 		head.len = sizeof(VersionNumReq);
 	}
 };
@@ -697,7 +697,7 @@
 	Head head;
 	char versionId[64]; // 鐗堟湰鍙�
 	VersionNumRes() {
-		head.type = VERSIONNUM_RES;
+		head.type = VERSION_NUM_RES;
 		head.len = sizeof(VersionNumRes);
 	}
 };
@@ -744,7 +744,7 @@
 
     VersionInfoEntryReq()
     {
-        head.type = VERSIONINFOENTRY_REQ;
+        head.type = VERSION_INFOENTRY_REQ;
         head.len = sizeof(VersionInfoEntryReq);
     }
 };
@@ -755,7 +755,7 @@
     bool state = false;
     VersionInfoEntryRes()
     {
-        head.type = VERSIONINFOENTRY_RES;
+        head.type = VERSION_INFOENTRY_RES;
         head.len = sizeof(VersionInfoEntryRes);
     }
 };
@@ -767,7 +767,7 @@
     char curVersionId[64]; // 鐗堟湰鍙�
     VersionUpdateReq()
     {
-        head.type = VERSIONUPDATE_REQ;
+        head.type = VERSION_UPDATE_REQ;
         head.len = sizeof(VersionUpdateReq);
     }
 };
@@ -782,7 +782,7 @@
 
     VersionUpdateRes()
     {
-        head.type = VERSIONUPDATE_RES;
+        head.type = VERSION_UPDATE_RES;
         head.len = sizeof(VersionUpdateRes);
     }
 };
@@ -793,7 +793,7 @@
     char versionId[64]; // 鐗堟湰鍙�
     FileDownloadsReq()
     {
-        head.type = FILEDOWNLOADS_REQ;
+        head.type = FILE_DOWNLOADS_REQ;
         head.len = sizeof(FileDownloadsReq);
     }
 };
@@ -810,7 +810,7 @@
     char content[0];
     FileDownloadsRes()
     {
-        head.type = FILEDOWNLOADS_RES;
+        head.type = FILE_DOWNLOADS_RES;
         head.len = sizeof(FileDownloadsRes);
     }
 };
@@ -823,7 +823,7 @@
     long long fileSize;
     DownloadSuccessfullyRes()
     {
-        head.type = DOWNLOADSUCCESSFULLY_RES;
+        head.type = DOWNLOAD_SUCCESSFULLY_RES;
         head.len = sizeof(DownloadSuccessfullyRes);
     }
 };
@@ -861,8 +861,12 @@
 // 鏃ュ織鏌ヨ璇锋眰缁撴瀯浣�
 struct LogQueryReq {
     Head head;                 // 鏁版嵁澶�
+<<<<<<< HEAD
+    char keyWords[32];         // 瀛樺偍鍏抽敭瀛楃殑鏁扮粍
+=======
     char keyWords[32];            // 瀛樺偍鍏抽敭瀛楃殑鏁扮粍
 >>>>>>> bb11cc624ab058fc3a6541f91f37985b8caae9b6
+>>>>>>> 3d2b586460830c5dbebffe49bd3d5c2477de0aee
     // 鏃犲弬鏋勯�犲嚱鏁�
     LogQueryReq() {
         head.type = LOGSEARCH_REQ;

--
Gitblit v1.8.0