From d9062aacafdb9c9360c325b012eb225aab66c6af Mon Sep 17 00:00:00 2001
From: cwb <1169192992@qq.com>
Date: 星期六, 05 十月 2024 10:49:32 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/紫鸾PCB_0927
---
/dev/null | 0
自定义功能结构体记录.txt | 203 ++++++++++++++++++++++++++++++++++++++++++++++++++
参考文档/A组项目计划表.xlsx | 0
Client/王凯航/log/wkh-2024-10-04.doc | 0
4 files changed, 203 insertions(+), 0 deletions(-)
diff --git "a/Client/\347\216\213\345\207\257\350\210\252/log/wkh-2024-10-04.doc" "b/Client/\347\216\213\345\207\257\350\210\252/log/wkh-2024-10-04.doc"
index db857f5..6b1501d 100644
--- "a/Client/\347\216\213\345\207\257\350\210\252/log/wkh-2024-10-04.doc"
+++ "b/Client/\347\216\213\345\207\257\350\210\252/log/wkh-2024-10-04.doc"
Binary files differ
diff --git "a/Client/\350\260\242\350\231\271\351\223\255/log/~$PCB_\350\260\242\350\231\271\351\223\255_20241005.doc" "b/Client/\350\260\242\350\231\271\351\223\255/log/~$PCB_\350\260\242\350\231\271\351\223\255_20241005.doc"
deleted file mode 100644
index b4630f2..0000000
--- "a/Client/\350\260\242\350\231\271\351\223\255/log/~$PCB_\350\260\242\350\231\271\351\223\255_20241005.doc"
+++ /dev/null
Binary files differ
diff --git "a/Server/\351\231\210\346\226\207\345\215\232/log/~$\345\215\232_241004.doc" "b/Server/\351\231\210\346\226\207\345\215\232/log/~$\345\215\232_241004.doc"
deleted file mode 100644
index c5101c1..0000000
--- "a/Server/\351\231\210\346\226\207\345\215\232/log/~$\345\215\232_241004.doc"
+++ /dev/null
Binary files differ
diff --git "a/\345\217\202\350\200\203\346\226\207\346\241\243/A\347\273\204\351\241\271\347\233\256\350\256\241\345\210\222\350\241\250.xlsx" "b/\345\217\202\350\200\203\346\226\207\346\241\243/A\347\273\204\351\241\271\347\233\256\350\256\241\345\210\222\350\241\250.xlsx"
new file mode 100644
index 0000000..44b6f61
--- /dev/null
+++ "b/\345\217\202\350\200\203\346\226\207\346\241\243/A\347\273\204\351\241\271\347\233\256\350\256\241\345\210\222\350\241\250.xlsx"
Binary files differ
diff --git "a/\350\207\252\345\256\232\344\271\211\345\212\237\350\203\275\347\273\223\346\236\204\344\275\223\350\256\260\345\275\225.txt" "b/\350\207\252\345\256\232\344\271\211\345\212\237\350\203\275\347\273\223\346\236\204\344\275\223\350\256\260\345\275\225.txt"
new file mode 100644
index 0000000..73ad27f
--- /dev/null
+++ "b/\350\207\252\345\256\232\344\271\211\345\212\237\350\203\275\347\273\223\346\236\204\344\275\223\350\256\260\345\275\225.txt"
@@ -0,0 +1,203 @@
+
+----------------鏋氫妇
+// 鐢ㄦ潵鍖哄垎涓嶅悓鍔熻兘鐨勶紝閬垮厤浜х敓榄旈鏁板瓧
+// 缁熶竴鐢辫礋璐ｇ綉缁滈�氫俊鐨勪汉鏉ュ畾锛屽苟涓斿鎴风鍜屾湇鍔＄鍏辩敤
+// 鏈�鍚庡拰缁撴瀯浣撲竴璧锋斁鍒板悓涓�涓ご鏂囦欢閲岄潰锛屼綔涓哄叕鍏辩殑閮ㄥ垎 common.h
+
+enum TypeInfo
+{
+ REGISTER_REQ, // 娉ㄥ唽璇锋眰
+ REGISTER_RES, // 娉ㄥ唽鍝嶅簲
+
+ LOGIN_REQ, // 鐧诲綍璇锋眰
+ LOGIN_RES, // 鐧诲綍鍝嶅簲
+ CHANGE_PASSWORD_REQ, // 淇敼瀵嗙爜璇锋眰
+ CHANGE_PASSWORD_RES, // 淇敼瀵嗙爜鍝嶅簲
+ CHANGE_PASSWORD_BY_TEL_REQ, // 閫氳繃鎵嬫満鍙锋敼瀵嗙爜璇锋眰
+ CHANGE_PASSWORD_BY_TEL_RES, // 閫氳繃鎵嬫満鍙锋敼瀵嗙爜鍝嶅簲
+
+ PER_SEARCH_USER_REQ, // 鏉冮檺绠＄悊锛氭煡璇㈢敤鎴疯姹�
+ PER_SEARCH_USER_RES, // 鏉冮檺绠＄悊锛氭煡璇㈢敤鎴峰搷搴�
+ CHANGE_PERMISSION_REQ, // 鏉冮檺绠＄悊: 淇敼鏉冮檺璇锋眰
+ CHANGE_PERMISSION_RES, // 鏉冮檺绠＄悊: 淇敼鏉冮檺鍝嶅簲
+
+};
+----------------鏁版嵁澶�
+
+
+struct Head
+{
+ int type;
+ int len;
+};
+========================================
+C绔細瀹㈡埛绔�
+ 1銆佹敞鍐屻�佺櫥褰�
+ 1.1 娉ㄥ唽
+ 鐢ㄦ埛鍚嶃�佺敤鎴穒d[sql鑷姩鐢熸垚]銆�
+ 閭銆佸瘑鐮併�佹潈闄怺鑷姩鐢熸垚鏈�浣庢潈闄怾銆�
+ 閮ㄩ棬銆佹敞鍐屾椂闂碵鑷姩鐢熸垚]
+ 鐢ㄦ埛鐘舵�乕鑷姩鐢熸垚]銆乕AES銆丷SA銆丮D5]
+ 鎵嬫満鍙�
+ ------瀹㈡埛绔彂璧风殑
+ 鐢ㄦ埛鍚�
+ 瀵嗙爜
+ [纭瀵嗙爜]
+ 閭
+ 閮ㄩ棬
+ 鎵嬫満鍙�
+ -------------
+ 璇锋眰缁撴瀯浣擄細
+ struct RegisterReq
+ {
+ Head head;
+ char user_name[32];
+ char password[32];
+ char email[32];
+ char department[32];
+ char tel[20];
+ };
+
+ 鍝嶅簲: 鍥炰竴涓姸鎬佺爜琛ㄧず鎴愬姛銆佸け璐�
+ struct RegisterRes
+ {
+ Head head;
+ char user_name[32];
+ int state; // 鐘舵�� 1:娉ㄥ唽鎴愬姛銆�2:鐢ㄦ埛鍚嶅凡瀛樺湪銆�3:鐢ㄦ埛鍚嶉潪娉曘��4:瀵嗙爜闈炴硶銆�5銆侀偖绠遍潪娉曘��6銆佹墜鏈哄彿闈炴硶
+ };
+
+ 1.2 鐧诲綍
+ 鐢ㄦ埛鍚嶃�佸瘑鐮併�乕閮ㄩ棬]銆乕鎵嬫満鍙穄
+ 璇锋眰锛�
+ struct LoginReq
+ {
+ Head head;
+ char user_name[32];
+ char password[32];
+ };
+ 鍝嶅簲锛�
+ struct Permission
+ {
+ int admin;
+ int history;
+ int map_change;
+ int device_manage;
+ int pro_plan; // 鐢熸垚璁″垝
+ int warning;
+ int sto_manage; // 搴撳瓨鍏宠仈
+ };
+ struct LoginRes
+ {
+ Head head;
+ char user_name[32];
+ int state; // 1:鐧诲綍鎴愬姛銆�2銆佺敤鎴峰悕涓嶅瓨鍦ㄣ��3:瀵嗙爜閿欒銆�4:鐢ㄦ埛鍚嶆牸寮忛敊璇��5:瀵嗙爜閿欒銆�6:宸叉敞閿�銆�7:宸茶绂佺敤
+ Permission per; // 鏉冮檺锛屾牴鎹叿浣撴潈闄愭潵鏄剧ず涓嶅悓鐨勫瓙绐楀彛
+ };
+ ------------------------------
+ 1.3 淇敼瀵嗙爜
+ 1.3.1 鐧诲綍鎴愬姛鍚庯紝淇敼瀵嗙爜
+ 闇�锛氬師瀵嗙爜銆佹柊瀵嗙爜銆乕纭鏂板瘑鐮乚
+ struct ChangePasswordReq
+ {
+ Head head;
+ char user_name[32];
+ char password[32];
+ };
+ struct ChangePasswordRes
+ {
+ Head head;
+ char user_name[32];
+ int state; // 鐘舵�侊細1:鎴愬姛銆�2锛氫笌鍘熷瘑鐮佺浉鍚屻��3:瀵嗙爜闈炴硶
+ };
+
+ 1.3.2 鏈櫥褰曚慨鏀瑰瘑鐮�
+ 闇�锛氭墜鏈哄彿--楠岃瘉鐮併�佹柊瀵嗙爜銆乕纭鏂板瘑鐮乚
+ struct ChangePasswordByTelReq
+ {
+ Head head;
+ char tel[32];
+ char tel_code[32];
+ char password[32];
+ };
+ struct ChangePasswordByTelRes
+ {
+ Head head;
+ char user_name[32];
+ int state; // 鐘舵�侊細1:鎴愬姛銆�2锛氫笌鍘熷瘑鐮佺浉鍚屻��3:瀵嗙爜闈炴硶 銆�4锛氶獙璇佺爜閿欒
+ };
+ -----------------------------------------
+
+ 2銆佹潈闄愮鐞�
+ 瀵圭壒瀹氱敤鎴风殑鏉冮檺杩涜绠＄悊锛氬鍔犮�佸噺灏戞潈闄�
+ 鐗瑰畾鐢ㄦ埛锛氬緱鏌ヨ--鏄剧ず鏌ヨ鍒扮殑鍗曚釜鎴栧涓敤鎴�
+ 鏀规潈闄愶細閫変腑鏌愪釜鐢ㄦ埛杩涜淇敼
+ 7涓潈闄愶細浼氫骇鐢熷浐瀹氱殑缁勫悎鍏崇郴 鏈�澶�2鐨�7娆℃柟鍏�128绉�
+ 鍗曠嫭鐨勬潈闄愯〃--瑙掕壊id--鐢ㄦ埛淇℃伅琛�
+ -------------
+ 2.1 鏌ヨ鐢ㄦ埛
+ 鏉′欢锛氬悕瀛梉鏀寔妯＄硦鍖归厤]銆侀儴闂ㄣ�佹敞鍐屾椂闂碵娈礭銆佹墜鏈哄彿銆侀偖绠� [鏈夐檺浣跨敤鍗曟潯浠舵煡璇€�佷篃鍙互澶氭潯浠剁粍鍚圿
+ // 鍙互閫氳繃瀛楃涓查暱搴� strlen鏉ュ垽鏂槸鍚︽湁鍐呭锛岃寰楁彁鍓嶅垵濮嬪寲涓虹┖\0
+ struct PerSearchUserReq
+ {
+ Head head;
+ char user_name[32];
+ char department[32];
+ char register_time_begin[32];
+ char register_time_end[32];
+ char tel[20];
+ char email[32];
+ };
+ // 鍝嶅簲锛屾湁鍙兘浼氭煡鍒板涓敤鎴蜂俊鎭紝灏卞緱浣跨敤鏌旀�ф暟缁勬潵琛ㄧず
+
+ struct UserInfo
+ {
+ char user_name[32];
+ char department[32];
+ char register_time[32];
+ char tel[20];
+ char email[32];
+ int role_id; // 瑙掕壊id
+ Permission per; // 鍏蜂綋鏉冮檺
+ };
+ struct PerSearchUserRes
+ {
+ Head head;
+ UserInfo user_info[0];
+
+ };
+
+ 2.2 淇敼鏉冮檺
+ 鎸囧畾鐢ㄦ埛鍚嶄慨鏀�
+ 蹇�熼�夋嫨锛氶�氳繃瑙掕壊id鎴栬�呰鑹插悕鏉ユ敼
+ 璇︾粏閫夋嫨锛氱洿鎺ユ寜鍏蜂綋鐨勬潈闄愬瓧娈靛幓鍕鹃��
+ struct ChangePermissionReq
+ {
+ Head head;
+ char user_name[32];
+ Permission per; // 鍏蜂綋鏉冮檺
+ };
+
+ struct ChangePermissionRes
+ {
+ Head head;
+ char user_name[32];
+ int state; // 1:淇敼鎴愬姛 2:淇敼澶辫触
+ };
+
+ ------------------- 鍜� 娉ㄥ唽銆佺櫥褰� 鍏辩敤鍚屾牱鐨勬暟鎹簱琛�
+ 1銆佺敤鎴蜂俊鎭〃
+ 2銆佽鑹叉潈闄愯〃
+ -------------------
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
--
Gitblit v1.8.0