From e03bcf74bc9f5b18cf0cece2c880890f4adcc2b8 Mon Sep 17 00:00:00 2001
From: lzh <3394874942@qq.com>
Date: 星期五, 08 十一月 2024 13:50:02 +0800
Subject: [PATCH] 上传日志
---
Server/马渝杭/code/common.h | 277 +++++++++++++++++++++++++++++++------------------------
1 files changed, 155 insertions(+), 122 deletions(-)
diff --git "a/Server/\351\251\254\346\270\235\346\235\255/code/common.h" "b/Server/\351\251\254\346\270\235\346\235\255/code/common.h"
index b6c770d..0b1523a 100644
--- "a/Server/\351\251\254\346\270\235\346\235\255/code/common.h"
+++ "b/Server/\351\251\254\346\270\235\346\235\255/code/common.h"
@@ -1,162 +1,195 @@
#ifndef COMMON_H
#define COMMON_H
-#include <string.h>
-//绉佹湁鍗忚灏佽
-//璇锋眰鍝嶅簲缁撴瀯浣撴湁鏁版嵁澶�+鏁版嵁浣�
-
-//浣跨敤鏋氫妇鏉ョ粺涓�鍚勭鍔熻兘绫诲瀷銆�
+#include <string.h>
enum TypeInfo{
- LOGIN_REQ, //鐧诲綍璇锋眰
- LOGIN_RES,
- VERSIONUPDATA_REQ, // 鐗堟湰鏇存柊璇锋眰
- VERSIONUPDATA_RES,
- VERSIONNUM_REQ, //鐗堟湰鍙疯姹�
- VERSIONNUM_RES,
- UPLOAD_FILE_REQ,
- UPLOAD_FILE_RES,
- VERSIONINFOENTRY_REQ, //鐗堟湰淇℃伅鏉＄洰
- VERSIONINFOENTRY_RES
+
+ //鑷姩鍗囩骇
+ VERSION_NUM_REQ, // 鐗堟湰鍙疯姹�
+ VERSION_NUM_RES, // 鐗堟湰鍙峰搷搴�
+ UPLOAD_FILE_REQ, // 涓婁紶鏂囦欢鐨勮姹�
+ UPLOAD_FILE_RES, // 涓婁紶鏂囦欢鐨勫搷搴�
+ VERSION_INFOENTRY_REQ, // 鐗堟湰淇℃伅褰曞叆璇锋眰
+ VERSION_INFOENTRY_RES, //鐗堟湰淇℃伅褰曞叆鍝嶅簲
+ VERSION_UPDATE_REQ, // 鐗堟湰鏇存柊璇锋眰
+ VERSION_UPDATE_RES, // 鐗堟湰鏇存柊鍝嶅簲
+ FILE_DOWNLOADS_REQ, // 鐗堟湰鏇存柊鏂囦欢涓嬭浇璇锋眰
+ FILE_DOWNLOADS_RES, // 鐗堟湰鏇存柊鏂囦欢涓嬭浇鍝嶅簲
+ DOWNLOAD_SUCCESSFULLY_RES, // 鏇存柊鏂囦欢涓嬭浇鎴愬姛鐨勫搷搴�
+
+
};
-struct Head
-{
- int type; // 鍔熻兘绫诲瀷锛岃В鍐虫瘡涓寘鐨勫叿浣撲綔鐢紝鍖哄垎涓氬姟
- int len; //灏佸寘闀垮害
-
-};
-// 鐧诲綍涓氬姟
-// 鐧诲綍璇锋眰
-struct LoginReq
-{
- Head head;
-
- char user_name[32];
- char password[32];
- LoginReq(){
- head.type=LOGIN_REQ;
- head.len=sizeof(LoginReq);
- }
-};
-//鐧诲綍鏉冮檺缁撴瀯浣�
-struct PermissionInfo
-{
- int admin; //绠＄悊鍛�
- int history; //鍘嗗彶鏌ョ湅
- int version_manager;//鐗堟湰绠＄悊
- int log_search; //鏃ュ織鏌ョ湅
- int flaw_mark ; //缂洪櫡鏍囪
-
+struct Head{
+ int type;
+ int len;
};
-//鐧诲綍鍝嶅簲
-struct LoginRes
+//鑷姩鍗囩骇
+struct VersionNumReq // 鐗堟湰鍙疯姹�
{
Head head;
- char user_name[32];
- int state; // 鐧诲綍鐘舵��
- PermissionInfo per;
- LoginRes(){
- head.type=LOGIN_RES;
- head.len=sizeof(LoginRes);
+ VersionNumReq() {
+ head.type = VERSION_NUM_REQ;
+ head.len = sizeof(VersionNumReq);
}
};
-struct VersionUpdataReq //鐗堟湰鏇存柊璇锋眰鐨勭粨鏋勪綋
+
+struct VersionNumRes // 鐗堟湰鍙峰搷搴�
{
Head head;
- VersionUpdataReq(){
- head.type=VERSIONUPDATA_REQ;
- head.len=sizeof(VersionUpdataReq);
+ char versionId[64]; // 鐗堟湰鍙�
+ VersionNumRes() {
+ head.type = VERSION_NUM_RES;
+ head.len = sizeof(VersionNumRes);
}
};
-struct VersionUpdataRes //鐗堟湰鏇存柊鍝嶅簲鐨勭粨鏋勪綋
-{
- Head head;
- char version_id[64]; // 鐗堟湰鍙�
- char update_date[32]; //鏇存柊鏃堕棿
- char file_path[128]; //鏈嶅姟绔彁渚涙渶鏂扮増鏈殑鏈湴璺緞
- VersionUpdataRes(){
- head.type=VERSIONUPDATA_REQ;
- head.len=sizeof(VersionUpdataReq);
- }
-};
-struct VersionNumReq //鐗堟湰鍙疯姹�
-{
- Head head;
- VersionNumReq(){
- head.type=VERSIONNUM_REQ;
- head.len=sizeof(VersionNumReq);
- }
-};
-struct VersionNumRes
-{
- Head head;
- char version_id[64];
- VersionNumRes(){
- head.type=VERSIONNUM_RES;
- head.len=sizeof(VersionNumRes);
- }
-};
-//鏂囦欢浼犺緭鍔熻兘
+
+// 鏂囦欢浼犺緭
struct FileInfo
{
- char file_name[256];
- long long file_size;
- char s_filepath[32];
- char content[0]; //鏌旀�ф暟缁勭粨鏋勪綋
+ char fileName[256];
+ long long fileSize;
+ char s_filepath[128];
+ char content[0];
};
-struct UploadFileReq
+
+struct UploadFileReq // 涓婁紶鏂囦欢鐨勮姹�
{
Head head;
FileInfo fileInfo;
- UploadFileReq(){
- head.type=UPLOAD_FILE_REQ;
- head.len=sizeof(UploadFileReq);
+ UploadFileReq() {
+ head.type = UPLOAD_FILE_REQ;
+ head.len = sizeof(UploadFileReq);
}
};
-struct UploadFileRes
-{
- Head head;
- int status;
- long long file_size; //鎬诲ぇ灏�
- long long file_cuesize; //鏂囦欢宸蹭紶澶у皬
- UploadFileRes(){
- head.type=UPLOAD_FILE_RES;
- head.len=sizeof(UploadFileRes);
- }
-};
-//鐗堟湰淇℃伅褰曞叆---鐗堟湰淇℃伅鏉＄洰
-struct VersionInfoEntryReq
-{
- Head head;
- char version_id[64];
- char version_id_old[64];
- char s_filepath[32]; //鏈嶅姟鍣ㄦ斁鏈�鏂扮増鏈殑璺緞
- char version_description[256]; //鏇存柊鎻忚堪
- char version_creattime[32]; //鏇存柊鏃堕棿
- char filename[16][128]; //鏀寔澶氭枃浠朵笂浼�
- long long filesize[16]; //鏂囦欢缁勭殑澶у皬
- char c_filepath[16][128]; //瀹㈡埛绔殑瀹夎璺緞
- int filenum; //涓�娆＄増鏈洿鏂版墍闇�鏂囦欢涓暟
- VersionInfoEntryReq(){
- head.type=VERSIONINFOENTRY_REQ;
- head.len=sizeof(VersionInfoEntryReq);
+struct UploadFileRes { // 涓婁紶鏂囦欢鐨勫搷搴�
+ Head head;
+ bool state = false;
+ char fileName[256];
+ long long file_size;
+ UploadFileRes()
+ {
+ head.type = UPLOAD_FILE_RES;
+ head.len = sizeof(UploadFileRes);
}
};
-//鍝嶅簲
+
+// 鐗堟湰淇℃伅褰曞叆
+// 璇锋眰
+//struct VersionInfoEntryReq {
+// Head head;
+// char version_id[64]; // 鐗堟湰鍙�
+// char version_id_old[64]; // 涓婁竴涓増鏈彿
+// char s_filepath[32]; //鏈嶅姟鍣ㄦ斁鏈�鏂扮増鏈殑璺緞
+// char version_description[256]; //鏇存柊鍐呭
+// char version_creattime[32]; // 鏇存柊鏃堕棿
+// char filename[16][128];
+// long long filesize[16];
+// char c_filepath[16][128];
+// int fileNum;
+
+// VersionInfoEntryReq()
+// {
+// head.type = VERSIONINFOENTRY_REQ;
+// head.len = sizeof(VersionInfoEntryReq);
+// }
+//};
+
+struct VersionInfoEntryReq {
+ Head head;
+ char versionId[64]; // 鐗堟湰鍙�
+ char versionIdOld[64]; // 涓婁竴涓増鏈彿
+ int fileNum;
+ char context[0]; //鍖呭惈涓嬭浇鏂囦欢淇℃伅
+
+ VersionInfoEntryReq()
+ {
+ head.type = VERSION_INFOENTRY_REQ;
+ head.len = sizeof(VersionInfoEntryReq);
+ }
+};
+
+// 鐗堟湰淇℃伅褰曞叆鍝嶅簲
struct VersionInfoEntryRes {
Head head;
- char version_id_old[64]; // 鐗堟湰鍙�
+ bool state = false;
VersionInfoEntryRes()
{
- head.type = VERSIONINFOENTRY_RES;
+ head.type = VERSION_INFOENTRY_RES;
head.len = sizeof(VersionInfoEntryRes);
}
};
+// 鐗堟湰鏇存柊璇锋眰
+struct VersionUpdateReq {
+ Head head;
+ char curVersionId[64]; // 鐗堟湰鍙�
+ VersionUpdateReq()
+ {
+ head.type = VERSION_UPDATE_REQ;
+ head.len = sizeof(VersionUpdateReq);
+ }
+};
+
+// 鐗堟湰鏇存柊鍝嶅簲
+struct VersionUpdateRes {
+ Head head;
+ bool state = false;
+ char versionId[64]; // 鐗堟湰鍙�
+ char updateDate[32]; // 鏇存柊鏃堕棿
+ char versionDescription[1024]; //鏇存柊鎻忚堪
+
+ VersionUpdateRes()
+ {
+ head.type = VERSION_UPDATE_RES;
+ head.len = sizeof(VersionUpdateRes);
+ }
+};
+
+// 鐗堟湰鏇存柊鏂囦欢涓嬭浇璇锋眰
+struct FileDownloadsReq {
+ Head head;
+ char versionId[64]; // 鐗堟湰鍙�
+ FileDownloadsReq()
+ {
+ head.type = FILE_DOWNLOADS_REQ;
+ head.len = sizeof(FileDownloadsReq);
+ }
+};
+
+// 鐗堟湰鏇存柊鏂囦欢涓嬭浇鍝嶅簲
+struct FileDownloadsRes {
+ Head head;
+ char versionId[64]; // 鐗堟湰鍙�
+ char filename[128]; //鏂囦欢鍚�
+ long long filesize; //鏂囦欢澶у皬
+ char c_filepath[128]; //瀹㈡埛绔斁鏈�鏂扮増鏈殑鏈湴璺緞
+ int fileNum; // 鏂囦欢鏁伴噺
+ long long allFileSize; // 鏂囦欢鎬诲ぇ灏�
+ char content[0];
+ FileDownloadsRes()
+ {
+ head.type = FILE_DOWNLOADS_RES;
+ head.len = sizeof(FileDownloadsRes);
+ }
+};
+
+// 鏇存柊鏂囦欢涓嬭浇鎴愬姛鐨勫搷搴�
+struct DownloadSuccessfullyRes {
+ Head head;
+ bool state = false;
+ char fileName[256];
+ long long fileSize;
+ DownloadSuccessfullyRes()
+ {
+ head.type = DOWNLOAD_SUCCESSFULLY_RES;
+ head.len = sizeof(DownloadSuccessfullyRes);
+ }
+};
--
Gitblit v1.8.0