From 1b6e22266fc9b225fff1db32d9a9c144d8943747 Mon Sep 17 00:00:00 2001
From: 杜润昆 <1171266357@qq.com>
Date: 星期五, 02 八月 2024 19:47:47 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/ef-p_pro_24_07_23

---
 Server/宗玛帝/log/EF-P日志_宗玛帝_202040731.doc  |    0 
 Client/李颖怡/log/日志模板_李颖怡_20240801.doc     |    0 
 Client/胡宵/log/历史查询分析_胡宵_2024.8.1.doc     |    0 
 Client/何小豪/code/quanxian.sql             |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Client/李颖怡/log/日志模板_李颖怡_20240731.doc     |    0 
 Server/宗玛帝/log/EF-P日志_宗玛帝_202040801.doc  |    0 
 Server/袁晨琳/log/日志_袁晨琳_0801.doc           |    0 
 Client/何小豪/log/日志_何小豪_0801.doc           |    0 
 Client/何小豪/code/test_tcp_server_0620.rar |    0 
 Client/胡宵/log/历史查询分析_胡宵_2024.7.31.doc    |    0 
 Client/范蓉/log/范蓉_2024.7.31.doc           |    0 
 Client/张健钰/log/地图标注日志_张健钰_0801.docx      |    0 
 Client/范蓉/log/范蓉_2024.8.1.doc            |    0 
 Client/何小豪/code/Permissions.rar          |    0 
 Server/吴泽林/log/日报_吴泽林_0801.doc           |    0 
 Client/王一博/log/王一博-0801.doc              |    0 
 Client/胡宵/log/~WRL3045.tmp               |    0 
 17 files changed, 56 insertions(+), 0 deletions(-)

diff --git "a/Client/\344\275\225\345\260\217\350\261\252/code/Permissions.rar" "b/Client/\344\275\225\345\260\217\350\261\252/code/Permissions.rar"
new file mode 100644
index 0000000..1e44c85
--- /dev/null
+++ "b/Client/\344\275\225\345\260\217\350\261\252/code/Permissions.rar"
Binary files differ
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"
new file mode 100644
index 0000000..210dae1
--- /dev/null
+++ "b/Client/\344\275\225\345\260\217\350\261\252/code/quanxian.sql"
@@ -0,0 +1,56 @@
+-- --------------------------------------------------------
+-- 涓绘満:                           127.0.0.1
+-- 鏈嶅姟鍣ㄧ増鏈�:                        8.0.37 - 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 */;
+
+
+-- 瀵煎嚭 uesr 鐨勬暟鎹簱缁撴瀯
+DROP DATABASE IF EXISTS `uesr`;
+CREATE DATABASE IF NOT EXISTS `uesr` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci */ /*!80016 DEFAULT ENCRYPTION='N' */;
+USE `uesr`;
+
+-- 瀵煎嚭  琛� uesr.permissions 缁撴瀯
+DROP TABLE IF EXISTS `permissions`;
+CREATE TABLE IF NOT EXISTS `permissions` (
+  `user_id` int NOT NULL COMMENT '鐢ㄦ埛id',
+  `user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '鐢ㄦ埛鍚�',
+  `role` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '瑙掕壊',
+  KEY `FK_permissions_roles` (`role`),
+  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.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 '瑙掕壊',
+  `Permissions_admin` tinyint unsigned DEFAULT '0' COMMENT '鏉冮檺绠$悊鏉冮檺',
+  `Permissions_query` tinyint unsigned DEFAULT '0' COMMENT '鍘嗗彶鏌ヨ鍒嗘瀽鏉冮檺',
+  `Permissions_alert` tinyint unsigned DEFAULT '0' COMMENT '璀︽姤绠$悊鏉冮檺',
+  `Permissions_Log` tinyint unsigned DEFAULT '0' COMMENT '鏃ュ織鏌ヨ鏉冮檺',
+  `Permissions_map` tinyint unsigned DEFAULT '0' COMMENT '鍦板浘鏍囨敞鏉冮檺',
+  `Permissions_produce` tinyint unsigned DEFAULT '0' COMMENT '鐢熶骇璁″垝鏉冮檺',
+  `Permissions_equipment` tinyint unsigned DEFAULT '0' COMMENT '璁惧绠$悊鏉冮檺',
+  `Permissions_version` tinyint unsigned DEFAULT '0' COMMENT '鐗堟湰绠$悊鏉冮檺',
+  KEY `role` (`role`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- 鏁版嵁瀵煎嚭琚彇娑堥�夋嫨銆�
+
+/*!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/\344\275\225\345\260\217\350\261\252/code/test_tcp_server_0620.rar" "b/Client/\344\275\225\345\260\217\350\261\252/code/test_tcp_server_0620.rar"
new file mode 100644
index 0000000..093f5c5
--- /dev/null
+++ "b/Client/\344\275\225\345\260\217\350\261\252/code/test_tcp_server_0620.rar"
Binary files differ
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_0801.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_0801.doc"
new file mode 100644
index 0000000..5fa13ee
--- /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_0801.doc"
Binary files differ
diff --git "a/Client/\345\274\240\345\201\245\351\222\260/log/\345\234\260\345\233\276\346\240\207\346\263\250\346\227\245\345\277\227_\345\274\240\345\201\245\351\222\260_0801.docx" "b/Client/\345\274\240\345\201\245\351\222\260/log/\345\234\260\345\233\276\346\240\207\346\263\250\346\227\245\345\277\227_\345\274\240\345\201\245\351\222\260_0801.docx"
new file mode 100644
index 0000000..e408feb
--- /dev/null
+++ "b/Client/\345\274\240\345\201\245\351\222\260/log/\345\234\260\345\233\276\346\240\207\346\263\250\346\227\245\345\277\227_\345\274\240\345\201\245\351\222\260_0801.docx"
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_20240731.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_20240731.doc"
new file mode 100644
index 0000000..f804025
--- /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_20240731.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_20240801.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_20240801.doc"
new file mode 100644
index 0000000..e5f2d3f
--- /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_20240801.doc"
Binary files differ
diff --git "a/Client/\350\203\241\345\256\265/log/~WRL1919.tmp" "b/Client/\347\216\213\344\270\200\345\215\232/log/\347\216\213\344\270\200\345\215\232-0801.doc"
similarity index 68%
copy from "Client/\350\203\241\345\256\265/log/~WRL1919.tmp"
copy to "Client/\347\216\213\344\270\200\345\215\232/log/\347\216\213\344\270\200\345\215\232-0801.doc"
index 17a671c..414f229 100644
--- "a/Client/\350\203\241\345\256\265/log/~WRL1919.tmp"
+++ "b/Client/\347\216\213\344\270\200\345\215\232/log/\347\216\213\344\270\200\345\215\232-0801.doc"
Binary files differ
diff --git "a/Client/\350\203\241\345\256\265/log/~WRL1919.tmp" "b/Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
similarity index 81%
copy from "Client/\350\203\241\345\256\265/log/~WRL1919.tmp"
copy to "Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
index 17a671c..f5576a6 100644
--- "a/Client/\350\203\241\345\256\265/log/~WRL1919.tmp"
+++ "b/Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
Binary files differ
diff --git "a/Client/\350\203\241\345\256\265/log/~WRL1919.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.7.31.doc"
similarity index 81%
copy from "Client/\350\203\241\345\256\265/log/~WRL1919.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.7.31.doc"
index 17a671c..f5576a6 100644
--- "a/Client/\350\203\241\345\256\265/log/~WRL1919.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.7.31.doc"
Binary files differ
diff --git "a/Client/\350\203\241\345\256\265/log/~WRL1919.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.1.doc"
similarity index 81%
rename from "Client/\350\203\241\345\256\265/log/~WRL1919.tmp"
rename 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.1.doc"
index 17a671c..3d300fb 100644
--- "a/Client/\350\203\241\345\256\265/log/~WRL1919.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.1.doc"
Binary files differ
diff --git "a/Client/\350\214\203\350\223\211/log/\350\214\203\350\223\211_2024.7.31.doc" "b/Client/\350\214\203\350\223\211/log/\350\214\203\350\223\211_2024.7.31.doc"
new file mode 100644
index 0000000..bd9a13d
--- /dev/null
+++ "b/Client/\350\214\203\350\223\211/log/\350\214\203\350\223\211_2024.7.31.doc"
Binary files differ
diff --git "a/Client/\350\214\203\350\223\211/log/\350\214\203\350\223\211_2024.8.1.doc" "b/Client/\350\214\203\350\223\211/log/\350\214\203\350\223\211_2024.8.1.doc"
new file mode 100644
index 0000000..4f61b31
--- /dev/null
+++ "b/Client/\350\214\203\350\223\211/log/\350\214\203\350\223\211_2024.8.1.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_0801.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_0801.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_0801.doc"
Binary files differ
diff --git "a/Client/\350\203\241\345\256\265/log/~WRL1919.tmp" "b/Server/\345\256\227\347\216\233\345\270\235/log/EF-P\346\227\245\345\277\227_\345\256\227\347\216\233\345\270\235_202040731.doc"
similarity index 77%
copy from "Client/\350\203\241\345\256\265/log/~WRL1919.tmp"
copy to "Server/\345\256\227\347\216\233\345\270\235/log/EF-P\346\227\245\345\277\227_\345\256\227\347\216\233\345\270\235_202040731.doc"
index 17a671c..e5e515f 100644
--- "a/Client/\350\203\241\345\256\265/log/~WRL1919.tmp"
+++ "b/Server/\345\256\227\347\216\233\345\270\235/log/EF-P\346\227\245\345\277\227_\345\256\227\347\216\233\345\270\235_202040731.doc"
Binary files differ
diff --git "a/Client/\350\203\241\345\256\265/log/~WRL1919.tmp" "b/Server/\345\256\227\347\216\233\345\270\235/log/EF-P\346\227\245\345\277\227_\345\256\227\347\216\233\345\270\235_202040801.doc"
similarity index 76%
copy from "Client/\350\203\241\345\256\265/log/~WRL1919.tmp"
copy to "Server/\345\256\227\347\216\233\345\270\235/log/EF-P\346\227\245\345\277\227_\345\256\227\347\216\233\345\270\235_202040801.doc"
index 17a671c..f772c37 100644
--- "a/Client/\350\203\241\345\256\265/log/~WRL1919.tmp"
+++ "b/Server/\345\256\227\347\216\233\345\270\235/log/EF-P\346\227\245\345\277\227_\345\256\227\347\216\233\345\270\235_202040801.doc"
Binary files differ
diff --git "a/Client/\350\203\241\345\256\265/log/~WRL1919.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_0801.doc"
similarity index 71%
copy from "Client/\350\203\241\345\256\265/log/~WRL1919.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_0801.doc"
index 17a671c..a2f36e5 100644
--- "a/Client/\350\203\241\345\256\265/log/~WRL1919.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_0801.doc"
Binary files differ

--
Gitblit v1.8.0