From ab4ba1172020857faa0b0126f6e22fe60cf27dd1 Mon Sep 17 00:00:00 2001
From: shy <2247311482@qq.com>
Date: 星期四, 31 十月 2024 15:04:17 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
Server/马渝杭/log/日志_马渝杭_20241030.doc | 0
Server/马渝杭/code/common.h | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 164 insertions(+), 0 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"
new file mode 100644
index 0000000..b6c770d
--- /dev/null
+++ "b/Server/\351\251\254\346\270\235\346\235\255/code/common.h"
@@ -0,0 +1,164 @@
+#ifndef COMMON_H
+#define COMMON_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
+};
+
+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 LoginRes
+{
+ Head head;
+ char user_name[32];
+ int state; // 鐧诲綍鐘舵��
+ PermissionInfo per;
+ LoginRes(){
+ head.type=LOGIN_RES;
+ head.len=sizeof(LoginRes);
+ }
+};
+struct VersionUpdataReq //鐗堟湰鏇存柊璇锋眰鐨勭粨鏋勪綋
+{
+ Head head;
+ VersionUpdataReq(){
+ head.type=VERSIONUPDATA_REQ;
+ head.len=sizeof(VersionUpdataReq);
+ }
+};
+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]; //鏌旀�ф暟缁勭粨鏋勪綋
+};
+struct UploadFileReq
+{
+ Head head;
+ FileInfo fileInfo;
+ 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 VersionInfoEntryRes {
+ Head head;
+ char version_id_old[64]; // 鐗堟湰鍙�
+ VersionInfoEntryRes()
+ {
+ head.type = VERSIONINFOENTRY_RES;
+ head.len = sizeof(VersionInfoEntryRes);
+ }
+};
+
+
+
+
+
+
+#endif // COMMON_H
diff --git "a/Server/\351\251\254\346\270\235\346\235\255/log/\346\227\245\345\277\227_\351\251\254\346\270\235\346\235\255_20241030.doc" "b/Server/\351\251\254\346\270\235\346\235\255/log/\346\227\245\345\277\227_\351\251\254\346\270\235\346\235\255_20241030.doc"
new file mode 100644
index 0000000..3171038
--- /dev/null
+++ "b/Server/\351\251\254\346\270\235\346\235\255/log/\346\227\245\345\277\227_\351\251\254\346\270\235\346\235\255_20241030.doc"
Binary files differ
--
Gitblit v1.8.0