From 2eb8be273af403407183597763e75a577866085b Mon Sep 17 00:00:00 2001
From: whs <2302410383@qq.com>
Date: 星期二, 10 六月 2025 09:46:32 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/智识v2_250602_0205

---
 Client/周嘉明/code/myworkandclient.rar                  |    0 
 Client/周嘉明/code/myworkfinal.rar                      |    0 
 Client/杨朔/log/日志_杨朔_250606.doc                       |    0 
 Client/周嘉明/document/Qt Creator 实现 RTSP 视频系统项目总结.docx |    0 
 Client/刘晴/code/Server.zip                            |    0 
 Server/杨林/log/日志_杨林_0606.doc                         |    0 
 Client/刘晴/log/日志_刘晴_2025-6-6.doc                     |    0 
 Client/刘晴/code/permission.sql                        |   71 +++++++++++++++++++++++++++++++++++
 Server/朱江龙/log/日志_朱江龙_25.6.6.doc                     |    0 
 Client/刘晴/code/qt_ui_permission.zip                  |    0 
 10 files changed, 71 insertions(+), 0 deletions(-)

diff --git "a/Client/\345\210\230\346\231\264/code/Server.zip" "b/Client/\345\210\230\346\231\264/code/Server.zip"
new file mode 100644
index 0000000..369802d
--- /dev/null
+++ "b/Client/\345\210\230\346\231\264/code/Server.zip"
Binary files differ
diff --git "a/Client/\345\210\230\346\231\264/code/permission.sql" "b/Client/\345\210\230\346\231\264/code/permission.sql"
new file mode 100644
index 0000000..dc20982
--- /dev/null
+++ "b/Client/\345\210\230\346\231\264/code/permission.sql"
@@ -0,0 +1,71 @@
+-- --------------------------------------------------------
+-- 涓绘満:                           127.0.0.1
+-- 鏈嶅姟鍣ㄧ増鏈�:                        8.0.42 - MySQL Community Server - GPL
+-- 鏈嶅姟鍣ㄦ搷浣滅郴缁�:                      Win64
+-- HeidiSQL 鐗堟湰:                  12.6.0.6765
+-- --------------------------------------------------------
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET NAMES utf8 */;
+/*!50503 SET NAMES utf8mb4 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+
+-- 瀵煎嚭 mybates 鐨勬暟鎹簱缁撴瀯
+CREATE DATABASE IF NOT EXISTS `mybates` /*!40100 DEFAULT CHARACTER SET armscii8 COLLATE armscii8_bin */ /*!80016 DEFAULT ENCRYPTION='N' */;
+USE `mybates`;
+
+-- 瀵煎嚭  琛� mybates.permission 缁撴瀯
+CREATE TABLE IF NOT EXISTS `permission` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `role_id` int DEFAULT NULL COMMENT '瑙掕壊ID锛屽綋user_id涓嶄负绌烘椂琛ㄧず涓汉鏉冮檺',
+  `user_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鐢ㄦ埛ID锛岀敤鎴风壒瀹氭潈闄愭椂涓嶄负NULL',
+  `history` tinyint(1) DEFAULT '0' COMMENT '鍘嗗彶鏌ヨ鏉冮檺',
+  `map_change` tinyint(1) DEFAULT '0' COMMENT '鍦板浘淇敼鏉冮檺',
+  `cap_img` tinyint(1) DEFAULT '0' COMMENT '鍥惧儚褰曞叆鏉冮檺',
+  `attend_man` tinyint(1) DEFAULT '0' COMMENT '鑰冨嫟绠$悊鏉冮檺',
+  `device_man` tinyint(1) DEFAULT '0' COMMENT '璁惧澶勭悊鏉冮檺',
+  `version_man` tinyint(1) DEFAULT '0' COMMENT '鐗堟湰绠$悊鏉冮檺',
+  `admin` tinyint(1) DEFAULT '0' COMMENT '鐢ㄦ埛绠$悊鏉冮檺',
+  `log_search` tinyint(1) DEFAULT '0' COMMENT '鏃ュ織鏌ヨ鏉冮檺',
+  `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `role_id` (`role_id`,`user_id`) COMMENT '纭繚姣忎釜瑙掕壊鎴栫敤鎴峰彧鏈変竴鏉℃潈闄愯褰�',
+  UNIQUE KEY `uk_user_id` (`user_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=44 DEFAULT CHARSET=armscii8 COLLATE=armscii8_bin;
+
+-- 鏁版嵁瀵煎嚭琚彇娑堥�夋嫨銆�
+
+-- 瀵煎嚭  琛� mybates.role 缁撴瀯
+CREATE TABLE IF NOT EXISTS `role` (
+  `role_id` int NOT NULL,
+  `role_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  PRIMARY KEY (`role_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=armscii8 COLLATE=armscii8_bin;
+
+-- 鏁版嵁瀵煎嚭琚彇娑堥�夋嫨銆�
+
+-- 瀵煎嚭  琛� mybates.user 缁撴瀯
+CREATE TABLE IF NOT EXISTS `user` (
+  `user_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `user_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `register_time` datetime DEFAULT NULL,
+  `department` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `role_id` int DEFAULT NULL,
+  PRIMARY KEY (`user_id`),
+  UNIQUE KEY `idx_user_id` (`user_id`),
+  KEY `role_id` (`role_id`),
+  CONSTRAINT `user_ibfk_1` FOREIGN KEY (`role_id`) REFERENCES `role` (`role_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=armscii8 COLLATE=armscii8_bin;
+
+-- 鏁版嵁瀵煎嚭琚彇娑堥�夋嫨銆�
+
+/*!40103 SET TIME_ZONE=IFNULL(@OLD_TIME_ZONE, 'system') */;
+/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;
+/*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40111 SET SQL_NOTES=IFNULL(@OLD_SQL_NOTES, 1) */;
diff --git "a/Client/\345\210\230\346\231\264/code/qt_ui_permission.zip" "b/Client/\345\210\230\346\231\264/code/qt_ui_permission.zip"
new file mode 100644
index 0000000..74131bc
--- /dev/null
+++ "b/Client/\345\210\230\346\231\264/code/qt_ui_permission.zip"
Binary files differ
diff --git "a/Client/\345\210\230\346\231\264/log/\346\227\245\345\277\227_\345\210\230\346\231\264_2025-6-6.doc" "b/Client/\345\210\230\346\231\264/log/\346\227\245\345\277\227_\345\210\230\346\231\264_2025-6-6.doc"
new file mode 100644
index 0000000..6364838
--- /dev/null
+++ "b/Client/\345\210\230\346\231\264/log/\346\227\245\345\277\227_\345\210\230\346\231\264_2025-6-6.doc"
Binary files differ
diff --git "a/Client/\345\221\250\345\230\211\346\230\216/code/myworkandclient.rar" "b/Client/\345\221\250\345\230\211\346\230\216/code/myworkandclient.rar"
new file mode 100644
index 0000000..3dc6768
--- /dev/null
+++ "b/Client/\345\221\250\345\230\211\346\230\216/code/myworkandclient.rar"
Binary files differ
diff --git "a/Client/\345\221\250\345\230\211\346\230\216/code/myworkfinal.rar" "b/Client/\345\221\250\345\230\211\346\230\216/code/myworkfinal.rar"
new file mode 100644
index 0000000..c4480e1
--- /dev/null
+++ "b/Client/\345\221\250\345\230\211\346\230\216/code/myworkfinal.rar"
Binary files differ
diff --git "a/Client/\345\221\250\345\230\211\346\230\216/document/Qt Creator \345\256\236\347\216\260 RTSP \350\247\206\351\242\221\347\263\273\347\273\237\351\241\271\347\233\256\346\200\273\347\273\223.docx" "b/Client/\345\221\250\345\230\211\346\230\216/document/Qt Creator \345\256\236\347\216\260 RTSP \350\247\206\351\242\221\347\263\273\347\273\237\351\241\271\347\233\256\346\200\273\347\273\223.docx"
new file mode 100644
index 0000000..00a190d
--- /dev/null
+++ "b/Client/\345\221\250\345\230\211\346\230\216/document/Qt Creator \345\256\236\347\216\260 RTSP \350\247\206\351\242\221\347\263\273\347\273\237\351\241\271\347\233\256\346\200\273\347\273\223.docx"
Binary files differ
diff --git "a/Client/\346\235\250\346\234\224/log/\346\227\245\345\277\227_\346\235\250\346\234\224_250606.doc" "b/Client/\346\235\250\346\234\224/log/\346\227\245\345\277\227_\346\235\250\346\234\224_250606.doc"
new file mode 100644
index 0000000..ee12d42
--- /dev/null
+++ "b/Client/\346\235\250\346\234\224/log/\346\227\245\345\277\227_\346\235\250\346\234\224_250606.doc"
Binary files differ
diff --git "a/Server/\346\234\261\346\261\237\351\276\231/log/\346\227\245\345\277\227_\346\234\261\346\261\237\351\276\231_25.6.6.doc" "b/Server/\346\234\261\346\261\237\351\276\231/log/\346\227\245\345\277\227_\346\234\261\346\261\237\351\276\231_25.6.6.doc"
new file mode 100644
index 0000000..e1c25e9
--- /dev/null
+++ "b/Server/\346\234\261\346\261\237\351\276\231/log/\346\227\245\345\277\227_\346\234\261\346\261\237\351\276\231_25.6.6.doc"
Binary files differ
diff --git "a/Server/\346\235\250\346\236\227/log/\346\227\245\345\277\227_\346\235\250\346\236\227_0606.doc" "b/Server/\346\235\250\346\236\227/log/\346\227\245\345\277\227_\346\235\250\346\236\227_0606.doc"
new file mode 100644
index 0000000..3578cf4
--- /dev/null
+++ "b/Server/\346\235\250\346\236\227/log/\346\227\245\345\277\227_\346\235\250\346\236\227_0606.doc"
Binary files differ

--
Gitblit v1.8.0