From 3d2b586460830c5dbebffe49bd3d5c2477de0aee Mon Sep 17 00:00:00 2001
From: MYH <2395591599@qq.com>
Date: 星期五, 01 十一月 2024 18:09:08 +0800
Subject: [PATCH] a
---
common.h | 69 +++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 22 deletions(-)
diff --git a/common.h b/common.h
index 182b8e6..1a6a930 100644
--- a/common.h
+++ b/common.h
@@ -695,7 +695,7 @@
struct VersionNumRes // 鐗堟湰鍙峰搷搴�
{
Head head;
- char version_id[64]; // 鐗堟湰鍙�
+ char versionId[64]; // 鐗堟湰鍙�
VersionNumRes() {
head.type = VERSIONNUM_RES;
head.len = sizeof(VersionNumRes);
@@ -705,8 +705,8 @@
// 鏂囦欢浼犺緭
struct FileInfo
{
- char file_name[256];
- long long file_size;
+ char fileName[256];
+ long long fileSize;
char s_filepath[128];
char content[0];
};
@@ -724,7 +724,7 @@
struct UploadFileRes { // 涓婁紶鏂囦欢鐨勫搷搴�
Head head;
bool state = false;
- char file_name[256];
+ char fileName[256];
long long file_size;
UploadFileRes()
{
@@ -737,14 +737,9 @@
// 璇锋眰
struct VersionInfoEntryReq {
Head head;
- char version_id[64]; // 鐗堟湰鍙�
- char version_id_old[64]; // 涓婁竴涓増鏈彿
- char s_filepath[16][128]; //鏈嶅姟鍣ㄦ斁鏈�鏂扮増鏈殑璺緞
- char version_description[256]; //鏇存柊鍐呭
- char version_creattime[32]; // 鏇存柊鏃堕棿
- char filename[16][128];
- long long filesize[16];
- char c_filepath[16][128];
+ char versionId[64]; // 鐗堟湰鍙�
+ char versionIdOld[64]; // 涓婁竴涓増鏈彿
+ char context[0]; //鍖呭惈涓嬭浇鏂囦欢淇℃伅
int fileNum;
VersionInfoEntryReq()
@@ -769,7 +764,7 @@
struct VersionUpdateReq {
Head head;
- char cur_version_id[64]; // 鐗堟湰鍙�
+ char curVersionId[64]; // 鐗堟湰鍙�
VersionUpdateReq()
{
head.type = VERSIONUPDATE_REQ;
@@ -781,9 +776,9 @@
struct VersionUpdateRes {
Head head;
bool state = false;
- char version_id[64]; // 鐗堟湰鍙�
- char update_date[32]; // 鏇存柊鏃堕棿
- char version_description[1024]; //鏇存柊鎻忚堪
+ char versionId[64]; // 鐗堟湰鍙�
+ char updateDate[32]; // 鏇存柊鏃堕棿
+ char versionDescription[1024]; //鏇存柊鎻忚堪
VersionUpdateRes()
{
@@ -795,7 +790,7 @@
// 鐗堟湰鏇存柊鏂囦欢涓嬭浇璇锋眰
struct FileDownloadsReq {
Head head;
- char version_id[64]; // 鐗堟湰鍙�
+ char versionId[64]; // 鐗堟湰鍙�
FileDownloadsReq()
{
head.type = FILEDOWNLOADS_REQ;
@@ -806,12 +801,12 @@
// 鐗堟湰鏇存柊鏂囦欢涓嬭浇鍝嶅簲
struct FileDownloadsRes {
Head head;
- char version_id[64]; // 鐗堟湰鍙�
+ char versionId[64]; // 鐗堟湰鍙�
char filename[128]; //鏂囦欢鍚�
long long filesize; //鏂囦欢澶у皬
char c_filepath[128]; //瀹㈡埛绔斁鏈�鏂扮増鏈殑鏈湴璺緞
int fileNum; // 鏂囦欢鏁伴噺
- long long all_fileSize; // 鏂囦欢鎬诲ぇ灏�
+ long long allFileSize; // 鏂囦欢鎬诲ぇ灏�
char content[0];
FileDownloadsRes()
{
@@ -824,8 +819,8 @@
struct DownloadSuccessfullyRes{
Head head;
bool state = false;
- char file_name[256];
- long long file_size;
+ char fileName[256];
+ long long fileSize;
DownloadSuccessfullyRes()
{
head.type = DOWNLOADSUCCESSFULLY_RES;
@@ -833,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]; // 鏃堕棿鎴�
@@ -847,6 +862,7 @@
struct LogQueryReq {
Head head; // 鏁版嵁澶�
char keyWords[32]; // 瀛樺偍鍏抽敭瀛楃殑鏁扮粍
+>>>>>>> bb11cc624ab058fc3a6541f91f37985b8caae9b6
// 鏃犲弬鏋勯�犲嚱鏁�
LogQueryReq() {
head.type = LOGSEARCH_REQ;
@@ -856,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
\ No newline at end of file
+#endif // COMMON_H
+
--
Gitblit v1.8.0