From 0980932c8b68960b71e132f9f1a2d470fb9fc268 Mon Sep 17 00:00:00 2001 From: ywl <2586593062@qq.com> Date: 星期四, 26 六月 2025 15:17:21 +0800 Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/智能网联_25-0305_617_v1 --- Client/王国壮/log/日志_王国壮_0625.doc | 0 Client/师浩/log/日志_师浩_250626.doc | 0 智能网联_25-0305_617_v1 | 2 Server/王鹏哲/log/日志_王鹏哲_20250624.doc | 0 Client/牛彦江/log/日志_牛彦江_250624.doc | 0 Client/师浩/log/日志_师浩_250625.doc | 0 Server/段延冲/log/日志_段延冲_0624 .doc | 0 Server/胡重阳/log/数据模型预处理日志_胡重阳_20250625.doc | 0 Client/杨高权/log/日志_杨高权_250624.doc | 0 Server/段延冲/log/日志_段延冲_0625.doc | 0 Server/梁博/log/~WRL0005.tmp | 0 Server/梁博/log/~$_梁博_0624.doc | 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 Client/陈豪/log/日志_陈豪_250625.doc | 0 Server/汪卫军/log/日志_汪卫军_0625.doc | 0 Client/王国壮/log/日志_王国壮_0623.doc | 0 Server/林余杰/log/日志_林余杰_20250625.doc | 0 Server/胡重阳/log/数据模型预处理日志_胡重阳_20250624.doc | 0 Server/刘斌/log/日志_刘斌_20250624.doc | 0 Server/林余杰/log/日志_林余杰_20250624.doc | 0 Server/梁博/log/日志_梁博_0625.doc | 0 Client/魏强/log/日志_魏强_0625.doc | 0 Server/徐逸凡/log/日志_徐逸凡_250625.doc | 0 Client/陈豪/log/日志_陈豪_250624.doc | 0 Client/寇百盛/log/日志_寇百盛_0624.doc | 0 Server/common_type.h | 72 ++++++++++++++++++++++++++++++++++++ Client/王国壮/log/日志_王国壮_0624.doc | 0 Server/王鹏哲/log/日志_王鹏哲_20250625.doc | 0 Server/徐逸凡/log/日志_徐逸凡_250624.doc | 0 Server/段延冲/log/日志_段延冲_0623.doc | 0 Client/寇百盛/log/日志_寇百盛_0625.doc | 0 35 files changed, 73 insertions(+), 1 deletions(-) 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\257\207\347\231\276\347\233\233/log/\346\227\245\345\277\227_\345\257\207\347\231\276\347\233\233_0625.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_0625.doc" new file mode 100644 index 0000000..9813cbd --- /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_0625.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\270\210\346\265\251/log/\346\227\245\345\277\227_\345\270\210\346\265\251_250626.doc" "b/Client/\345\270\210\346\265\251/log/\346\227\245\345\277\227_\345\270\210\346\265\251_250626.doc" new file mode 100644 index 0000000..217dcc8 --- /dev/null +++ "b/Client/\345\270\210\346\265\251/log/\346\227\245\345\277\227_\345\270\210\346\265\251_250626.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/\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_0625.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_0625.doc" new file mode 100644 index 0000000..a6e1165 --- /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_0625.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\231\210\350\261\252/log/\346\227\245\345\277\227_\351\231\210\350\261\252_250625.doc" "b/Client/\351\231\210\350\261\252/log/\346\227\245\345\277\227_\351\231\210\350\261\252_250625.doc" new file mode 100644 index 0000000..d10695c --- /dev/null +++ "b/Client/\351\231\210\350\261\252/log/\346\227\245\345\277\227_\351\231\210\350\261\252_250625.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..f9524ae --- /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/\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_250625.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_250625.doc" new file mode 100644 index 0000000..d63190f --- /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_250625.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\236\227\344\275\231\346\235\260/log/\346\227\245\345\277\227_\346\236\227\344\275\231\346\235\260_20250625.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_20250625.doc" new file mode 100644 index 0000000..27b3d6c --- /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_20250625.doc" Binary files differ diff --git "a/Server/\346\242\201\345\215\232/log/~$_\346\242\201\345\215\232_0624.doc" "b/Server/\346\242\201\345\215\232/log/~$_\346\242\201\345\215\232_0624.doc" new file mode 100644 index 0000000..7cf3296 --- /dev/null +++ "b/Server/\346\242\201\345\215\232/log/~$_\346\242\201\345\215\232_0624.doc" Binary files differ diff --git "a/Server/\346\242\201\345\215\232/log/~WRL0005.tmp" "b/Server/\346\242\201\345\215\232/log/~WRL0005.tmp" new file mode 100644 index 0000000..17190ff --- /dev/null +++ "b/Server/\346\242\201\345\215\232/log/~WRL0005.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\242\201\345\215\232/log/\346\227\245\345\277\227_\346\242\201\345\215\232_0625.doc" "b/Server/\346\242\201\345\215\232/log/\346\227\245\345\277\227_\346\242\201\345\215\232_0625.doc" new file mode 100644 index 0000000..1ee7837 --- /dev/null +++ "b/Server/\346\242\201\345\215\232/log/\346\227\245\345\277\227_\346\242\201\345\215\232_0625.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\256\265\345\273\266\345\206\262/log/\346\227\245\345\277\227_\346\256\265\345\273\266\345\206\262_0625.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_0625.doc" new file mode 100644 index 0000000..508b824 --- /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_0625.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/\346\261\252\345\215\253\345\206\233/log/\346\227\245\345\277\227_\346\261\252\345\215\253\345\206\233_0625.doc" "b/Server/\346\261\252\345\215\253\345\206\233/log/\346\227\245\345\277\227_\346\261\252\345\215\253\345\206\233_0625.doc" new file mode 100644 index 0000000..bc22d97 --- /dev/null +++ "b/Server/\346\261\252\345\215\253\345\206\233/log/\346\227\245\345\277\227_\346\261\252\345\215\253\345\206\233_0625.doc" Binary files differ diff --git "a/Server/\347\216\213\351\271\217\345\223\262/log/\346\227\245\345\277\227_\347\216\213\351\271\217\345\223\262_20250624.doc" "b/Server/\347\216\213\351\271\217\345\223\262/log/\346\227\245\345\277\227_\347\216\213\351\271\217\345\223\262_20250624.doc" new file mode 100644 index 0000000..6d961ad --- /dev/null +++ "b/Server/\347\216\213\351\271\217\345\223\262/log/\346\227\245\345\277\227_\347\216\213\351\271\217\345\223\262_20250624.doc" Binary files differ diff --git "a/Server/\347\216\213\351\271\217\345\223\262/log/\346\227\245\345\277\227_\347\216\213\351\271\217\345\223\262_20250625.doc" "b/Server/\347\216\213\351\271\217\345\223\262/log/\346\227\245\345\277\227_\347\216\213\351\271\217\345\223\262_20250625.doc" new file mode 100644 index 0000000..0f0d865 --- /dev/null +++ "b/Server/\347\216\213\351\271\217\345\223\262/log/\346\227\245\345\277\227_\347\216\213\351\271\217\345\223\262_20250625.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 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_20250625.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_20250625.doc" new file mode 100644 index 0000000..180a6d1 --- /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_20250625.doc" Binary files differ diff --git "a/\346\231\272\350\203\275\347\275\221\350\201\224_25-0305_617_v1" "b/\346\231\272\350\203\275\347\275\221\350\201\224_25-0305_617_v1" new file mode 160000 index 0000000..89d19ad --- /dev/null +++ "b/\346\231\272\350\203\275\347\275\221\350\201\224_25-0305_617_v1" @@ -1 +1 @@ -Subproject commit 0000000000000000000000000000000000000000 +Subproject commit 89d19ad386e768e8e54b6aa4b1d42f4617ceed03 -- Gitblit v1.8.0