From 4c68467cf59130b6849eab5c23e2e0b0af451609 Mon Sep 17 00:00:00 2001
From: jhc <2991879965@qq.com>
Date: 星期六, 02 十一月 2024 12:18:30 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
Client/朱航/log/朱航1031.doc | 0
Client/宋昊昳/log/日志_宋昊昳_1102.doc | 0
Client/朱航/log/朱航1030.doc | 0
Client/朱航/log/朱航1101.doc | 0
Client/龚启祥/log/日志模板_龚启祥_1102.doc | 0
Client/刘子航/log/日志_刘子航_1102.doc | 0
Server/胡家明/log/日志_胡家明_1101.doc | 0
common.h | 109 ++++++++++++++++++++++++++++++++++--------------------
8 files changed, 69 insertions(+), 40 deletions(-)
diff --git "a/Client/\345\210\230\345\255\220\350\210\252/log/\346\227\245\345\277\227_\345\210\230\345\255\220\350\210\252_1102.doc" "b/Client/\345\210\230\345\255\220\350\210\252/log/\346\227\245\345\277\227_\345\210\230\345\255\220\350\210\252_1102.doc"
new file mode 100644
index 0000000..b942f8d
--- /dev/null
+++ "b/Client/\345\210\230\345\255\220\350\210\252/log/\346\227\245\345\277\227_\345\210\230\345\255\220\350\210\252_1102.doc"
Binary files differ
diff --git "a/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1102.doc" "b/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1102.doc"
new file mode 100644
index 0000000..7b40336
--- /dev/null
+++ "b/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1102.doc"
Binary files differ
diff --git "a/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521030.doc" "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521030.doc"
new file mode 100644
index 0000000..f1496da
--- /dev/null
+++ "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521030.doc"
Binary files differ
diff --git "a/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521031.doc" "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521031.doc"
new file mode 100644
index 0000000..ee2e85f
--- /dev/null
+++ "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521031.doc"
Binary files differ
diff --git "a/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521101.doc" "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521101.doc"
new file mode 100644
index 0000000..55be380
--- /dev/null
+++ "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521101.doc"
Binary files differ
diff --git "a/Client/\351\276\232\345\220\257\347\245\245/log/\346\227\245\345\277\227\346\250\241\346\235\277_\351\276\232\345\220\257\347\245\245_1102.doc" "b/Client/\351\276\232\345\220\257\347\245\245/log/\346\227\245\345\277\227\346\250\241\346\235\277_\351\276\232\345\220\257\347\245\245_1102.doc"
new file mode 100644
index 0000000..638bcb1
--- /dev/null
+++ "b/Client/\351\276\232\345\220\257\347\245\245/log/\346\227\245\345\277\227\346\250\241\346\235\277_\351\276\232\345\220\257\347\245\245_1102.doc"
Binary files differ
diff --git "a/Server/\350\203\241\345\256\266\346\230\216/log/\346\227\245\345\277\227_\350\203\241\345\256\266\346\230\216_1101.doc" "b/Server/\350\203\241\345\256\266\346\230\216/log/\346\227\245\345\277\227_\350\203\241\345\256\266\346\230\216_1101.doc"
new file mode 100644
index 0000000..ffdb92b
--- /dev/null
+++ "b/Server/\350\203\241\345\256\266\346\230\216/log/\346\227\245\345\277\227_\350\203\241\345\256\266\346\230\216_1101.doc"
Binary files differ
diff --git a/common.h b/common.h
index 182b8e6..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);
}
};
@@ -695,9 +695,9 @@
struct VersionNumRes // 鐗堟湰鍙峰搷搴�
{
Head head;
- char version_id[64]; // 鐗堟湰鍙�
+ char versionId[64]; // 鐗堟湰鍙�
VersionNumRes() {
- head.type = VERSIONNUM_RES;
+ head.type = VERSION_NUM_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,19 +737,14 @@
// 璇锋眰
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()
{
- head.type = VERSIONINFOENTRY_REQ;
+ head.type = VERSION_INFOENTRY_REQ;
head.len = sizeof(VersionInfoEntryReq);
}
};
@@ -760,7 +755,7 @@
bool state = false;
VersionInfoEntryRes()
{
- head.type = VERSIONINFOENTRY_RES;
+ head.type = VERSION_INFOENTRY_RES;
head.len = sizeof(VersionInfoEntryRes);
}
};
@@ -769,10 +764,10 @@
struct VersionUpdateReq {
Head head;
- char cur_version_id[64]; // 鐗堟湰鍙�
+ char curVersionId[64]; // 鐗堟湰鍙�
VersionUpdateReq()
{
- head.type = VERSIONUPDATE_REQ;
+ head.type = VERSION_UPDATE_REQ;
head.len = sizeof(VersionUpdateReq);
}
};
@@ -781,13 +776,13 @@
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()
{
- head.type = VERSIONUPDATE_RES;
+ head.type = VERSION_UPDATE_RES;
head.len = sizeof(VersionUpdateRes);
}
};
@@ -795,10 +790,10 @@
// 鐗堟湰鏇存柊鏂囦欢涓嬭浇璇锋眰
struct FileDownloadsReq {
Head head;
- char version_id[64]; // 鐗堟湰鍙�
+ char versionId[64]; // 鐗堟湰鍙�
FileDownloadsReq()
{
- head.type = FILEDOWNLOADS_REQ;
+ head.type = FILE_DOWNLOADS_REQ;
head.len = sizeof(FileDownloadsReq);
}
};
@@ -806,16 +801,16 @@
// 鐗堟湰鏇存柊鏂囦欢涓嬭浇鍝嶅簲
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()
{
- head.type = FILEDOWNLOADS_RES;
+ head.type = FILE_DOWNLOADS_RES;
head.len = sizeof(FileDownloadsRes);
}
};
@@ -824,15 +819,35 @@
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;
+ head.type = DOWNLOAD_SUCCESSFULLY_RES;
head.len = sizeof(DownloadSuccessfullyRes);
}
};
+<<<<<<< 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]; // 鏃堕棿鎴�
@@ -846,7 +861,12 @@
// 鏃ュ織鏌ヨ璇锋眰缁撴瀯浣�
struct LogQueryReq {
Head head; // 鏁版嵁澶�
+<<<<<<< HEAD
+ char keyWords[32]; // 瀛樺偍鍏抽敭瀛楃殑鏁扮粍
+=======
char keyWords[32]; // 瀛樺偍鍏抽敭瀛楃殑鏁扮粍
+>>>>>>> bb11cc624ab058fc3a6541f91f37985b8caae9b6
+>>>>>>> 3d2b586460830c5dbebffe49bd3d5c2477de0aee
// 鏃犲弬鏋勯�犲嚱鏁�
LogQueryReq() {
head.type = LOGSEARCH_REQ;
@@ -856,18 +876,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