From 426e88d90d2e70ee1efc2eeb0ca746eadca427e6 Mon Sep 17 00:00:00 2001 From: 宗玛帝 <1006520659@qq.com> Date: 星期四, 08 八月 2024 10:10:06 +0800 Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/ef-p_pro_24_07_23 --- Client/李颖怡/log/日志模板_李颖怡_20240806.doc | 0 Client/胡宵/log/~WRL0002.tmp | 0 Client/何小豪/code/quanxian.sql | 23 +++++++++++++++++++---- Client/孟喆/code/Real_time_translation.zip | 0 Client/范蓉/log/范蓉_2024.8.7.doc | 0 Server/袁晨琳/log/日志_袁晨琳_0807.doc | 0 Client/胡宵/log/历史查询分析_胡宵_2024.8.7.doc | 0 Server/吴泽林/log/日报_吴泽林_0802.doc | 0 Client/李颖怡/log/日志模板_李颖怡_20240802.doc | 0 Server/吴泽林/log/日报_吴泽林_0807.doc | 0 Client/李颖怡/log/日志模板_李颖怡_20240803.doc | 0 Client/何小豪/log/日志_何小豪_0807.doc | 0 Server/杜润昆/log/日报_杜润昆_0807.doc | 0 Client/孟喆/log/大屏显示日志0807.doc | 0 Client/李颖怡/log/日志模板_李颖怡_20240805.doc | 0 Client/李颖怡/log/日志模板_李颖怡_20240807.doc | 0 16 files changed, 19 insertions(+), 4 deletions(-) diff --git "a/Client/\344\275\225\345\260\217\350\261\252/code/quanxian.sql" "b/Client/\344\275\225\345\260\217\350\261\252/code/quanxian.sql" index 210dae1..b1e3956 100644 --- "a/Client/\344\275\225\345\260\217\350\261\252/code/quanxian.sql" +++ "b/Client/\344\275\225\345\260\217\350\261\252/code/quanxian.sql" @@ -30,12 +30,16 @@ CONSTRAINT `FK_permissions_roles` FOREIGN KEY (`role`) REFERENCES `roles` (`role`) ON DELETE SET NULL ON UPDATE SET NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; --- 鏁版嵁瀵煎嚭琚彇娑堥�夋嫨銆� +-- 姝ｅ湪瀵煎嚭琛� uesr.permissions 鐨勬暟鎹細~1 rows (澶х害) +DELETE FROM `permissions`; +INSERT INTO `permissions` (`user_id`, `user_name`, `role`) VALUES + (1, 'admin', 'role_admin'); -- 瀵煎嚭 琛� uesr.roles 缁撴瀯 DROP TABLE IF EXISTS `roles`; CREATE TABLE IF NOT EXISTS `roles` ( - `role` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '瑙掕壊', + `role_id` int NOT NULL AUTO_INCREMENT, + `role` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '瑙掕壊', `Permissions_admin` tinyint unsigned DEFAULT '0' COMMENT '鏉冮檺绠＄悊鏉冮檺', `Permissions_query` tinyint unsigned DEFAULT '0' COMMENT '鍘嗗彶鏌ヨ鍒嗘瀽鏉冮檺', `Permissions_alert` tinyint unsigned DEFAULT '0' COMMENT '璀︽姤绠＄悊鏉冮檺', @@ -44,10 +48,21 @@ `Permissions_produce` tinyint unsigned DEFAULT '0' COMMENT '鐢熶骇璁″垝鏉冮檺', `Permissions_equipment` tinyint unsigned DEFAULT '0' COMMENT '璁惧绠＄悊鏉冮檺', `Permissions_version` tinyint unsigned DEFAULT '0' COMMENT '鐗堟湰绠＄悊鏉冮檺', + PRIMARY KEY (`role_id`), KEY `role` (`role`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; --- 鏁版嵁瀵煎嚭琚彇娑堥�夋嫨銆� +-- 姝ｅ湪瀵煎嚭琛� uesr.roles 鐨勬暟鎹細~8 rows (澶х害) +DELETE FROM `roles`; +INSERT INTO `roles` (`role_id`, `role`, `Permissions_admin`, `Permissions_query`, `Permissions_alert`, `Permissions_Log`, `Permissions_map`, `Permissions_produce`, `Permissions_equipment`, `Permissions_version`) VALUES + (1, 'role_admin', 1, 1, 1, 1, 1, 1, 1, 1), + (2, 'role_query', 0, 1, 0, 0, 0, 0, 0, 0), + (3, 'role_alert', 0, 0, 1, 0, 0, 0, 0, 0), + (4, 'role_Log', 0, 0, 0, 1, 0, 0, 0, 0), + (5, 'role_map', 0, 0, 0, 0, 1, 0, 0, 0), + (6, 'role_produce', 0, 0, 0, 0, 0, 1, 0, 0), + (7, 'role_equipment', 0, 0, 0, 0, 0, 0, 1, 0), + (8, 'role_version', 0, 0, 0, 0, 0, 0, 0, 1); /*!40103 SET TIME_ZONE=IFNULL(@OLD_TIME_ZONE, 'system') */; /*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */; diff --git "a/Client/\344\275\225\345\260\217\350\261\252/log/\346\227\245\345\277\227_\344\275\225\345\260\217\350\261\252_0807.doc" "b/Client/\344\275\225\345\260\217\350\261\252/log/\346\227\245\345\277\227_\344\275\225\345\260\217\350\261\252_0807.doc" new file mode 100644 index 0000000..e83dcad --- /dev/null +++ "b/Client/\344\275\225\345\260\217\350\261\252/log/\346\227\245\345\277\227_\344\275\225\345\260\217\350\261\252_0807.doc" Binary files differ diff --git "a/Client/\345\255\237\345\226\206/code/Real_time_translation.zip" "b/Client/\345\255\237\345\226\206/code/Real_time_translation.zip" new file mode 100644 index 0000000..7d7e5ab --- /dev/null +++ "b/Client/\345\255\237\345\226\206/code/Real_time_translation.zip" Binary files differ diff --git "a/Client/\345\255\237\345\226\206/log/\345\244\247\345\261\217\346\230\276\347\244\272\346\227\245\345\277\2270807.doc" "b/Client/\345\255\237\345\226\206/log/\345\244\247\345\261\217\346\230\276\347\244\272\346\227\245\345\277\2270807.doc" new file mode 100644 index 0000000..5c85bf4 --- /dev/null +++ "b/Client/\345\255\237\345\226\206/log/\345\244\247\345\261\217\346\230\276\347\244\272\346\227\245\345\277\2270807.doc" Binary files differ diff --git "a/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240802.doc" "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240802.doc" new file mode 100644 index 0000000..a9f70d1 --- /dev/null +++ "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240802.doc" Binary files differ diff --git "a/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240803.doc" "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240803.doc" new file mode 100644 index 0000000..be0812f --- /dev/null +++ "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240803.doc" Binary files differ diff --git "a/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240805.doc" "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240805.doc" new file mode 100644 index 0000000..d614abd --- /dev/null +++ "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240805.doc" Binary files differ diff --git "a/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240806.doc" "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240806.doc" new file mode 100644 index 0000000..934988d --- /dev/null +++ "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240806.doc" Binary files differ diff --git "a/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240807.doc" "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240807.doc" new file mode 100644 index 0000000..59737aa --- /dev/null +++ "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240807.doc" Binary files differ diff --git "a/Client/\350\203\241\345\256\265/log/~WRL0001.tmp" "b/Client/\350\203\241\345\256\265/log/~WRL0002.tmp" similarity index 80% rename from "Client/\350\203\241\345\256\265/log/~WRL0001.tmp" rename to "Client/\350\203\241\345\256\265/log/~WRL0002.tmp" index 3d300fb..0a8a47f 100644 --- "a/Client/\350\203\241\345\256\265/log/~WRL0001.tmp" +++ "b/Client/\350\203\241\345\256\265/log/~WRL0002.tmp" Binary files differ diff --git "a/Client/\350\203\241\345\256\265/log/~WRL0001.tmp" "b/Client/\350\203\241\345\256\265/log/\345\216\206\345\217\262\346\237\245\350\257\242\345\210\206\346\236\220_\350\203\241\345\256\265_2024.8.7.doc" similarity index 74% copy from "Client/\350\203\241\345\256\265/log/~WRL0001.tmp" copy to "Client/\350\203\241\345\256\265/log/\345\216\206\345\217\262\346\237\245\350\257\242\345\210\206\346\236\220_\350\203\241\345\256\265_2024.8.7.doc" index 3d300fb..94d17cc 100644 --- "a/Client/\350\203\241\345\256\265/log/~WRL0001.tmp" +++ "b/Client/\350\203\241\345\256\265/log/\345\216\206\345\217\262\346\237\245\350\257\242\345\210\206\346\236\220_\350\203\241\345\256\265_2024.8.7.doc" Binary files differ diff --git "a/Client/\350\214\203\350\223\211/log/\350\214\203\350\223\211_2024.8.7.doc" "b/Client/\350\214\203\350\223\211/log/\350\214\203\350\223\211_2024.8.7.doc" new file mode 100644 index 0000000..b956463 --- /dev/null +++ "b/Client/\350\214\203\350\223\211/log/\350\214\203\350\223\211_2024.8.7.doc" Binary files differ diff --git "a/Server/\345\220\264\346\263\275\346\236\227/log/\346\227\245\346\212\245_\345\220\264\346\263\275\346\236\227_0802.doc" "b/Server/\345\220\264\346\263\275\346\236\227/log/\346\227\245\346\212\245_\345\220\264\346\263\275\346\236\227_0802.doc" new file mode 100644 index 0000000..eb6c5df --- /dev/null +++ "b/Server/\345\220\264\346\263\275\346\236\227/log/\346\227\245\346\212\245_\345\220\264\346\263\275\346\236\227_0802.doc" Binary files differ diff --git "a/Server/\345\220\264\346\263\275\346\236\227/log/\346\227\245\346\212\245_\345\220\264\346\263\275\346\236\227_0807.doc" "b/Server/\345\220\264\346\263\275\346\236\227/log/\346\227\245\346\212\245_\345\220\264\346\263\275\346\236\227_0807.doc" new file mode 100644 index 0000000..7f8e7ed --- /dev/null +++ "b/Server/\345\220\264\346\263\275\346\236\227/log/\346\227\245\346\212\245_\345\220\264\346\263\275\346\236\227_0807.doc" Binary files differ diff --git "a/Server/\346\235\234\346\266\246\346\230\206/log/\346\227\245\346\212\245_\346\235\234\346\266\246\346\230\206_0807.doc" "b/Server/\346\235\234\346\266\246\346\230\206/log/\346\227\245\346\212\245_\346\235\234\346\266\246\346\230\206_0807.doc" new file mode 100644 index 0000000..eaed04c --- /dev/null +++ "b/Server/\346\235\234\346\266\246\346\230\206/log/\346\227\245\346\212\245_\346\235\234\346\266\246\346\230\206_0807.doc" Binary files differ diff --git "a/Client/\350\203\241\345\256\265/log/~WRL0001.tmp" "b/Server/\350\242\201\346\231\250\347\220\263/log/\346\227\245\345\277\227_\350\242\201\346\231\250\347\220\263_0807.doc" similarity index 70% copy from "Client/\350\203\241\345\256\265/log/~WRL0001.tmp" copy to "Server/\350\242\201\346\231\250\347\220\263/log/\346\227\245\345\277\227_\350\242\201\346\231\250\347\220\263_0807.doc" index 3d300fb..929f9d0 100644 --- "a/Client/\350\203\241\345\256\265/log/~WRL0001.tmp" +++ "b/Server/\350\242\201\346\231\250\347\220\263/log/\346\227\245\345\277\227_\350\242\201\346\231\250\347\220\263_0807.doc" Binary files differ -- Gitblit v1.8.0