From 4722fd9eb4ff750057c29ed7a2df0014790adca8 Mon Sep 17 00:00:00 2001
From: wpz <1249632539@qq.com>
Date: 星期四, 26 六月 2025 14:55:28 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/智能网联_25-0305_617_v1
---
Server/刘斌/log/日志_刘斌_20250624.doc | 0
Server/林余杰/log/日志_林余杰_20250624.doc | 0
Client/舒海林/log/日志_舒海林_0624.doc | 0
Client/牛彦江/log/日志_牛彦江_250624.doc | 0
Client/魏强/log/日志_魏强_0625.doc | 0
Client/师浩/log/日志_师浩_250625.doc | 0
Client/于文龙/log/日志-于文龙-250624.doc | 0
Client/陈豪/log/日志_陈豪_250624.doc | 0
Client/寇百盛/log/日志_寇百盛_0624.doc | 0
Server/common_type.h | 72 ++++++++++++++++++++++++++++++++++++
Server/段延冲/log/日志_段延冲_0624 .doc | 0
Client/杨高权/log/日志_杨高权_250624.doc | 0
/dev/null | 0
Client/王国壮/log/日志_王国壮_0624.doc | 0
Server/梁博/log/~WRL1314.tmp | 0
Client/杨高权/log/日志_杨高权_250625 .doc | 0
Server/刘斌/log/~$_刘斌_20250623.doc | 0
Client/徐蔓云/log/日志_徐蔓云_0625.doc | 0
Server/梁博/log/日志_梁博_0624.doc | 0
Server/汪卫军/log/1.2.doc | 0
Server/徐逸凡/log/日志_徐逸凡_250624.doc | 0
Server/段延冲/log/日志_段延冲_0623.doc | 0
Client/王国壮/log/日志_王国壮_0623.doc | 0
Server/胡重阳/log/数据模型预处理日志_胡重阳_20250624.doc | 0
24 files changed, 72 insertions(+), 0 deletions(-)
diff --git "a/Client/\344\272\216\346\226\207\351\276\231/log/\346\227\245\345\277\227-\344\272\216\346\226\207\351\276\231-250624.doc" "b/Client/\344\272\216\346\226\207\351\276\231/log/\346\227\245\345\277\227-\344\272\216\346\226\207\351\276\231-250624.doc"
new file mode 100644
index 0000000..0f1a7db
--- /dev/null
+++ "b/Client/\344\272\216\346\226\207\351\276\231/log/\346\227\245\345\277\227-\344\272\216\346\226\207\351\276\231-250624.doc"
Binary files differ
diff --git "a/Client/\345\257\207\347\231\276\347\233\233/log/\346\227\245\345\277\227_\345\257\207\347\231\276\347\233\233_0624.doc" "b/Client/\345\257\207\347\231\276\347\233\233/log/\346\227\245\345\277\227_\345\257\207\347\231\276\347\233\233_0624.doc"
new file mode 100644
index 0000000..a3b0b50
--- /dev/null
+++ "b/Client/\345\257\207\347\231\276\347\233\233/log/\346\227\245\345\277\227_\345\257\207\347\231\276\347\233\233_0624.doc"
Binary files differ
diff --git "a/Client/\345\270\210\346\265\251/log/\346\227\245\345\277\227_\345\270\210\346\265\251_250625.doc" "b/Client/\345\270\210\346\265\251/log/\346\227\245\345\277\227_\345\270\210\346\265\251_250625.doc"
new file mode 100644
index 0000000..56e6620
--- /dev/null
+++ "b/Client/\345\270\210\346\265\251/log/\346\227\245\345\277\227_\345\270\210\346\265\251_250625.doc"
Binary files differ
diff --git "a/Client/\345\276\220\350\224\223\344\272\221/log/\346\227\245\345\277\227_\345\276\220\350\224\223\344\272\221_0625.doc" "b/Client/\345\276\220\350\224\223\344\272\221/log/\346\227\245\345\277\227_\345\276\220\350\224\223\344\272\221_0625.doc"
new file mode 100644
index 0000000..4f6c66a
--- /dev/null
+++ "b/Client/\345\276\220\350\224\223\344\272\221/log/\346\227\245\345\277\227_\345\276\220\350\224\223\344\272\221_0625.doc"
Binary files differ
diff --git "a/Client/\346\235\250\351\253\230\346\235\203/log/\346\227\245\345\277\227_\346\235\250\351\253\230\346\235\203_250624.doc" "b/Client/\346\235\250\351\253\230\346\235\203/log/\346\227\245\345\277\227_\346\235\250\351\253\230\346\235\203_250624.doc"
new file mode 100644
index 0000000..e08fd82
--- /dev/null
+++ "b/Client/\346\235\250\351\253\230\346\235\203/log/\346\227\245\345\277\227_\346\235\250\351\253\230\346\235\203_250624.doc"
Binary files differ
diff --git "a/Client/\346\235\250\351\253\230\346\235\203/log/\346\227\245\345\277\227_\346\235\250\351\253\230\346\235\203_250625 .doc" "b/Client/\346\235\250\351\253\230\346\235\203/log/\346\227\245\345\277\227_\346\235\250\351\253\230\346\235\203_250625 .doc"
new file mode 100644
index 0000000..b03727c
--- /dev/null
+++ "b/Client/\346\235\250\351\253\230\346\235\203/log/\346\227\245\345\277\227_\346\235\250\351\253\230\346\235\203_250625 .doc"
Binary files differ
diff --git "a/Client/\347\211\233\345\275\246\346\261\237/log/\346\227\245\345\277\227_\347\211\233\345\275\246\346\261\237_250624.doc" "b/Client/\347\211\233\345\275\246\346\261\237/log/\346\227\245\345\277\227_\347\211\233\345\275\246\346\261\237_250624.doc"
new file mode 100644
index 0000000..a688b84
--- /dev/null
+++ "b/Client/\347\211\233\345\275\246\346\261\237/log/\346\227\245\345\277\227_\347\211\233\345\275\246\346\261\237_250624.doc"
Binary files differ
diff --git "a/Client/\347\216\213\345\233\275\345\243\256/log/\346\227\245\345\277\227_\347\216\213\345\233\275\345\243\256_0623.doc" "b/Client/\347\216\213\345\233\275\345\243\256/log/\346\227\245\345\277\227_\347\216\213\345\233\275\345\243\256_0623.doc"
new file mode 100644
index 0000000..5651989
--- /dev/null
+++ "b/Client/\347\216\213\345\233\275\345\243\256/log/\346\227\245\345\277\227_\347\216\213\345\233\275\345\243\256_0623.doc"
Binary files differ
diff --git "a/Client/\347\216\213\345\233\275\345\243\256/log/\346\227\245\345\277\227_\347\216\213\345\233\275\345\243\256_0624.doc" "b/Client/\347\216\213\345\233\275\345\243\256/log/\346\227\245\345\277\227_\347\216\213\345\233\275\345\243\256_0624.doc"
index 5651989..d369c5d 100644
--- "a/Client/\347\216\213\345\233\275\345\243\256/log/\346\227\245\345\277\227_\347\216\213\345\233\275\345\243\256_0624.doc"
+++ "b/Client/\347\216\213\345\233\275\345\243\256/log/\346\227\245\345\277\227_\347\216\213\345\233\275\345\243\256_0624.doc"
Binary files differ
diff --git "a/Client/\350\210\222\346\265\267\346\236\227/log/~$_\350\210\222\346\265\267\346\236\227_0623.doc" "b/Client/\350\210\222\346\265\267\346\236\227/log/~$_\350\210\222\346\265\267\346\236\227_0623.doc"
deleted file mode 100644
index 880a878..0000000
--- "a/Client/\350\210\222\346\265\267\346\236\227/log/~$_\350\210\222\346\265\267\346\236\227_0623.doc"
+++ /dev/null
Binary files differ
diff --git "a/Client/\350\210\222\346\265\267\346\236\227/log/\346\227\245\345\277\227_\350\210\222\346\265\267\346\236\227_0624.doc" "b/Client/\350\210\222\346\265\267\346\236\227/log/\346\227\245\345\277\227_\350\210\222\346\265\267\346\236\227_0624.doc"
new file mode 100644
index 0000000..2038e32
--- /dev/null
+++ "b/Client/\350\210\222\346\265\267\346\236\227/log/\346\227\245\345\277\227_\350\210\222\346\265\267\346\236\227_0624.doc"
Binary files differ
diff --git "a/Client/\351\231\210\350\261\252/log/\346\227\245\345\277\227_\351\231\210\350\261\252_250624.doc" "b/Client/\351\231\210\350\261\252/log/\346\227\245\345\277\227_\351\231\210\350\261\252_250624.doc"
new file mode 100644
index 0000000..ae6ed01
--- /dev/null
+++ "b/Client/\351\231\210\350\261\252/log/\346\227\245\345\277\227_\351\231\210\350\261\252_250624.doc"
Binary files differ
diff --git "a/Client/\351\255\217\345\274\272/log/\346\227\245\345\277\227_\351\255\217\345\274\272_0625.doc" "b/Client/\351\255\217\345\274\272/log/\346\227\245\345\277\227_\351\255\217\345\274\272_0625.doc"
new file mode 100644
index 0000000..9dd96c1
--- /dev/null
+++ "b/Client/\351\255\217\345\274\272/log/\346\227\245\345\277\227_\351\255\217\345\274\272_0625.doc"
Binary files differ
diff --git a/Server/common_type.h b/Server/common_type.h
new file mode 100644
index 0000000..68ac3f8
--- /dev/null
+++ b/Server/common_type.h
@@ -0,0 +1,72 @@
+#ifndef TCPDATATYPE_H
+#define TCPDATATYPE_H
+/*请求类型*/
+enum class ActionType
+{
+ HeartCheck = 100,
+ Login = 110,
+ Register = 120,
+ Msg = 200,
+ Download = 300
+};
+/*参考HTTP的响应码*/
+enum class ResponseCode
+{
+ ResponseOK = 200, // 请求成功。
+ BadRequest = 400, // 客户端请求的语法错误，服务器无法理解
+ Unauthorized = 401, // 请求要求用户的身份认证
+ Forbidden = 403, // 服务器理解请求客户端的请求，但是拒绝执行此请求
+ NotFound = 404, // 服务器无法找到请求的资源
+ MethodNotAllowed = 405 // 客户端请求中的方法被禁止
+
+};
+/*消息体*/
+struct Head
+{
+ ActionType type;
+ int len;
+ int version;
+ Head(ActionType ptype, int plen, int pversion)
+ {
+ len = plen;
+ type = ptype;
+ version = pversion;
+ }
+};
+struct HeartCheckReq // 心跳请求包
+{
+ ActionType type;
+ int len;
+ HeartCheckReq()
+ {
+ type = ActionType::HeartCheck;
+ len = sizeof(HeartCheckReq);
+ }
+};
+
+struct HeartCheckRes // 心跳响应包
+{
+ ActionType type;
+ int len;
+ HeartCheckRes()
+ {
+ type = ActionType::HeartCheck;
+ len = sizeof(HeartCheckRes);
+ }
+};
+struct RegisterRequest
+{
+ Head head;
+ char name[64];
+ char password[64];
+ char email[32];
+ char phone[32];
+};
+struct LoginRequest
+{
+
+ Head head;
+ char name[64];
+ char password[64];
+};
+#endif
diff --git "a/Server/\345\210\230\346\226\214/log/~$_\345\210\230\346\226\214_20250623.doc" "b/Server/\345\210\230\346\226\214/log/~$_\345\210\230\346\226\214_20250623.doc"
new file mode 100644
index 0000000..d372c3b
--- /dev/null
+++ "b/Server/\345\210\230\346\226\214/log/~$_\345\210\230\346\226\214_20250623.doc"
Binary files differ
diff --git "a/Server/\345\210\230\346\226\214/log/\346\227\245\345\277\227_\345\210\230\346\226\214_20250624.doc" "b/Server/\345\210\230\346\226\214/log/\346\227\245\345\277\227_\345\210\230\346\226\214_20250624.doc"
new file mode 100644
index 0000000..8e19a42
--- /dev/null
+++ "b/Server/\345\210\230\346\226\214/log/\346\227\245\345\277\227_\345\210\230\346\226\214_20250624.doc"
Binary files differ
diff --git "a/Server/\345\276\220\351\200\270\345\207\241/log/\346\227\245\345\277\227_\345\276\220\351\200\270\345\207\241_250624.doc" "b/Server/\345\276\220\351\200\270\345\207\241/log/\346\227\245\345\277\227_\345\276\220\351\200\270\345\207\241_250624.doc"
new file mode 100644
index 0000000..6908913
--- /dev/null
+++ "b/Server/\345\276\220\351\200\270\345\207\241/log/\346\227\245\345\277\227_\345\276\220\351\200\270\345\207\241_250624.doc"
Binary files differ
diff --git "a/Server/\346\236\227\344\275\231\346\235\260/log/\346\227\245\345\277\227_\346\236\227\344\275\231\346\235\260_20250624.doc" "b/Server/\346\236\227\344\275\231\346\235\260/log/\346\227\245\345\277\227_\346\236\227\344\275\231\346\235\260_20250624.doc"
new file mode 100644
index 0000000..773180b
--- /dev/null
+++ "b/Server/\346\236\227\344\275\231\346\235\260/log/\346\227\245\345\277\227_\346\236\227\344\275\231\346\235\260_20250624.doc"
Binary files differ
diff --git "a/Server/\346\242\201\345\215\232/log/~WRL1314.tmp" "b/Server/\346\242\201\345\215\232/log/~WRL1314.tmp"
new file mode 100644
index 0000000..f846480
--- /dev/null
+++ "b/Server/\346\242\201\345\215\232/log/~WRL1314.tmp"
Binary files differ
diff --git "a/Server/\346\242\201\345\215\232/log/\346\227\245\345\277\227_\346\242\201\345\215\232_0624.doc" "b/Server/\346\242\201\345\215\232/log/\346\227\245\345\277\227_\346\242\201\345\215\232_0624.doc"
new file mode 100644
index 0000000..17190ff
--- /dev/null
+++ "b/Server/\346\242\201\345\215\232/log/\346\227\245\345\277\227_\346\242\201\345\215\232_0624.doc"
Binary files differ
diff --git "a/Server/\346\256\265\345\273\266\345\206\262/log/\346\227\245\345\277\227_\346\256\265\345\273\266\345\206\262_0623.doc" "b/Server/\346\256\265\345\273\266\345\206\262/log/\346\227\245\345\277\227_\346\256\265\345\273\266\345\206\262_0623.doc"
new file mode 100644
index 0000000..461d2e5
--- /dev/null
+++ "b/Server/\346\256\265\345\273\266\345\206\262/log/\346\227\245\345\277\227_\346\256\265\345\273\266\345\206\262_0623.doc"
Binary files differ
diff --git "a/Server/\346\256\265\345\273\266\345\206\262/log/\346\227\245\345\277\227_\346\256\265\345\273\266\345\206\262_0624 .doc" "b/Server/\346\256\265\345\273\266\345\206\262/log/\346\227\245\345\277\227_\346\256\265\345\273\266\345\206\262_0624 .doc"
new file mode 100644
index 0000000..bea6b17
--- /dev/null
+++ "b/Server/\346\256\265\345\273\266\345\206\262/log/\346\227\245\345\277\227_\346\256\265\345\273\266\345\206\262_0624 .doc"
Binary files differ
diff --git "a/Server/\346\261\252\345\215\253\345\206\233/log/1.2.doc" "b/Server/\346\261\252\345\215\253\345\206\233/log/1.2.doc"
new file mode 100644
index 0000000..8394548
--- /dev/null
+++ "b/Server/\346\261\252\345\215\253\345\206\233/log/1.2.doc"
Binary files differ
diff --git "a/Server/\350\203\241\351\207\215\351\230\263/log/\346\225\260\346\215\256\346\250\241\345\236\213\351\242\204\345\244\204\347\220\206\346\227\245\345\277\227_\350\203\241\351\207\215\351\230\263_20250624.doc" "b/Server/\350\203\241\351\207\215\351\230\263/log/\346\225\260\346\215\256\346\250\241\345\236\213\351\242\204\345\244\204\347\220\206\346\227\245\345\277\227_\350\203\241\351\207\215\351\230\263_20250624.doc"
new file mode 100644
index 0000000..56137a1
--- /dev/null
+++ "b/Server/\350\203\241\351\207\215\351\230\263/log/\346\225\260\346\215\256\346\250\241\345\236\213\351\242\204\345\244\204\347\220\206\346\227\245\345\277\227_\350\203\241\351\207\215\351\230\263_20250624.doc"
Binary files differ
--
Gitblit v1.8.0