diff --git a/project2/.idea/artifacts/project2_war_exploded.xml b/project2/.idea/artifacts/project2_war_exploded.xml
index da8803b..4cf4e7b 100644
--- a/project2/.idea/artifacts/project2_war_exploded.xml
+++ b/project2/.idea/artifacts/project2_war_exploded.xml
@@ -8,21 +8,39 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -40,10 +58,8 @@
+
-
-
-
diff --git a/project2/Minio Console.url b/project2/Minio Console.url
new file mode 100644
index 0000000..d04c727
--- /dev/null
+++ b/project2/Minio Console.url
@@ -0,0 +1,5 @@
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2
+[InternetShortcut]
+IDList=
+URL=http://192.168.8.149:9001/
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/annotations-13.0.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/annotations-13.0.jar
new file mode 100644
index 0000000..fb794be
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/annotations-13.0.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/bcprov-jdk15on-1.69.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/bcprov-jdk15on-1.69.jar
new file mode 100644
index 0000000..8647635
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/bcprov-jdk15on-1.69.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/checker-qual-3.8.0.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/checker-qual-3.8.0.jar
new file mode 100644
index 0000000..d30059e
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/checker-qual-3.8.0.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/commons-compress-1.21.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/commons-compress-1.21.jar
new file mode 100644
index 0000000..4892334
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/commons-compress-1.21.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/error_prone_annotations-2.5.1.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/error_prone_annotations-2.5.1.jar
new file mode 100644
index 0000000..fbc220c
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/error_prone_annotations-2.5.1.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/failureaccess-1.0.1.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/failureaccess-1.0.1.jar
new file mode 100644
index 0000000..9b56dc7
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/failureaccess-1.0.1.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/guava-30.1.1-jre.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/guava-30.1.1-jre.jar
new file mode 100644
index 0000000..93ebf3b
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/guava-30.1.1-jre.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/j2objc-annotations-1.3.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/j2objc-annotations-1.3.jar
new file mode 100644
index 0000000..a429c72
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/j2objc-annotations-1.3.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/jackson-annotations-2.13.4.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/jackson-annotations-2.13.4.jar
new file mode 100644
index 0000000..0c5e9c1
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/jackson-annotations-2.13.4.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/jackson-core-2.13.4.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/jackson-core-2.13.4.jar
new file mode 100644
index 0000000..0cb7a37
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/jackson-core-2.13.4.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/jackson-databind-2.13.4.2.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/jackson-databind-2.13.4.2.jar
new file mode 100644
index 0000000..5b653d6
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/jackson-databind-2.13.4.2.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/jsr305-3.0.2.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/jsr305-3.0.2.jar
new file mode 100644
index 0000000..59222d9
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/jsr305-3.0.2.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/kotlin-stdlib-1.6.20.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/kotlin-stdlib-1.6.20.jar
new file mode 100644
index 0000000..222a076
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/kotlin-stdlib-1.6.20.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/kotlin-stdlib-common-1.6.20.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/kotlin-stdlib-common-1.6.20.jar
new file mode 100644
index 0000000..dbd2ed6
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/kotlin-stdlib-common-1.6.20.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/kotlin-stdlib-jdk7-1.6.20.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/kotlin-stdlib-jdk7-1.6.20.jar
new file mode 100644
index 0000000..62aa91e
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/kotlin-stdlib-jdk7-1.6.20.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/kotlin-stdlib-jdk8-1.6.20.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/kotlin-stdlib-jdk8-1.6.20.jar
new file mode 100644
index 0000000..fb1b450
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/kotlin-stdlib-jdk8-1.6.20.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
new file mode 100644
index 0000000..45832c0
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/minio-8.5.3.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/minio-8.5.3.jar
new file mode 100644
index 0000000..62f1cc3
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/minio-8.5.3.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/okhttp-4.10.0.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/okhttp-4.10.0.jar
new file mode 100644
index 0000000..020be6e
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/okhttp-4.10.0.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/okio-jvm-3.1.0.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/okio-jvm-3.1.0.jar
new file mode 100644
index 0000000..c2dedb2
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/okio-jvm-3.1.0.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/simple-xml-safe-2.7.1.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/simple-xml-safe-2.7.1.jar
new file mode 100644
index 0000000..d4ce9f1
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/simple-xml-safe-2.7.1.jar differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/snappy-java-1.1.8.4.jar b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/snappy-java-1.1.8.4.jar
new file mode 100644
index 0000000..aa5231e
Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/lib/snappy-java-1.1.8.4.jar differ
diff --git a/project2/pom.xml b/project2/pom.xml
index d582c87..b46af88 100644
--- a/project2/pom.xml
+++ b/project2/pom.xml
@@ -97,22 +97,22 @@
8.0.28
-
- com.alibaba
- druid
- 1.1.20
-
+
+
+
+
+
junit
junit
4.13.1
compile
-
- com.github.pagehelper
- pagehelper
- 5.3.3
-
+
+
+
+
+
jstl
jstl
@@ -127,40 +127,23 @@
com.fasterxml.jackson.core
jackson-core
- 2.12.7
+ 2.13.4
com.fasterxml.jackson.core
jackson-databind
- 2.12.7.1
+ 2.13.4.2
com.fasterxml.jackson.core
jackson-annotations
- 2.12.7
+ 2.13.4
-
-
-
-
-
-
log4j
log4j
1.2.17
-
-
-
-
-
-
-
-
-
-
-
org.apache.commons
commons-csv
@@ -171,5 +154,31 @@
commons-io
2.12.0
+
+ io.minio
+ minio
+ 8.5.3
+
+
+ com.squareup.okio
+ okio-jvm
+
+
+
+
+ com.squareup.okio
+ okio-jvm
+ 3.1.0
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/project2/project2.sql b/project2/project2.sql
index ae6e555..a13b071 100644
--- a/project2/project2.sql
+++ b/project2/project2.sql
@@ -11,7 +11,7 @@
Target Server Version : 80033 (8.0.33)
File Encoding : 65001
- Date: 17/06/2023 10:27:53
+ Date: 19/06/2023 10:39:55
*/
SET NAMES utf8mb4;
@@ -220,21 +220,21 @@ CREATE TABLE `student` (
`classes` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '班级',
`removed` int NULL DEFAULT 0 COMMENT '移除的记录(default: 0 false)',
`photo` blob NULL COMMENT '照片(可选)(暂未实现)',
- `user_id` int NOT NULL COMMENT '对应的user表id',
+ `user_id` int NULL DEFAULT NULL COMMENT '对应的user表id',
PRIMARY KEY (`id`) USING BTREE,
INDEX `fk_student_classes`(`classes` ASC) USING BTREE,
CONSTRAINT `fk_student_classes` FOREIGN KEY (`classes`) REFERENCES `class` (`class_id`) ON DELETE RESTRICT ON UPDATE RESTRICT
-) ENGINE = InnoDB AUTO_INCREMENT = 1004 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 1005 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of student
-- ----------------------------
-INSERT INTO `student` VALUES (1, '123', '男', '2023-08-05', '123', '1班', 1, NULL, 0);
-INSERT INTO `student` VALUES (2, '任睿', '男', '2023-06-08', '755-932-5038', '4班', 1, NULL, 0);
+INSERT INTO `student` VALUES (1, '666', '男', '2023-08-05', '123', '1班', 1, NULL, 0);
+INSERT INTO `student` VALUES (2, '任睿', '男', '2023-06-08', '755-932-5038', '4班', 0, NULL, 0);
INSERT INTO `student` VALUES (3, '123', '男', '2022-04-02', '755-903-5159', '2班', 0, NULL, 0);
INSERT INTO `student` VALUES (4, '于晓明', '男', '2012-06-14', '184-5561-7225', '4班', 0, NULL, 0);
INSERT INTO `student` VALUES (5, '朱詩涵', '女', '2017-12-15', '769-7113-1277', '4班', 0, NULL, 0);
-INSERT INTO `student` VALUES (6, '蒋嘉伦', '男', '2013-12-08', '10-6915-9301', '1班', 0, NULL, 0);
+INSERT INTO `student` VALUES (6, '无名氏', '男', '2013-12-08', '10-6915-9301', '1班', 0, NULL, 0);
INSERT INTO `student` VALUES (7, '萧杰宏', '男', '2015-11-20', '163-1608-7816', '5班', 0, NULL, 0);
INSERT INTO `student` VALUES (8, '魏震南', '男', '2008-05-08', '188-4895-8847', '5班', 0, NULL, 0);
INSERT INTO `student` VALUES (9, '马睿', '男', '2019-01-08', '194-2348-7153', '1班', 0, NULL, 0);
@@ -1232,6 +1232,7 @@ INSERT INTO `student` VALUES (1000, '吕嘉伦', '男', '2002-02-03', '755-304-2
INSERT INTO `student` VALUES (1001, '测试数据1', '男', '2023-08-05', '4086769184', '2班', 0, NULL, 0);
INSERT INTO `student` VALUES (1002, '测试2', '男', '2023-09-05', '123', '1班', 0, NULL, 0);
INSERT INTO `student` VALUES (1003, '陈', '男', '2023-06-09', '221', '5班', 0, NULL, 0);
+INSERT INTO `student` VALUES (1004, '测试21', '男', '2023-06-18', '123', '1班', 0, NULL, NULL);
-- ----------------------------
-- Table structure for teacher
@@ -1248,9 +1249,9 @@ CREATE TABLE `teacher` (
PRIMARY KEY (`id`) USING BTREE,
INDEX `fk_teacher_course`(`course_id` ASC) USING BTREE,
INDEX `fk_teacher_classes`(`classes` ASC) USING BTREE,
- CONSTRAINT `fk_teacher_course` FOREIGN KEY (`course_id`) REFERENCES `course` (`CourseID`) ON DELETE RESTRICT ON UPDATE RESTRICT,
- CONSTRAINT `fk_teacher_classes` FOREIGN KEY (`classes`) REFERENCES `class` (`class_id`) ON DELETE RESTRICT ON UPDATE RESTRICT
-) ENGINE = InnoDB AUTO_INCREMENT = 21 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
+ CONSTRAINT `fk_teacher_classes` FOREIGN KEY (`classes`) REFERENCES `class` (`class_id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+ CONSTRAINT `fk_teacher_course` FOREIGN KEY (`course_id`) REFERENCES `course` (`CourseID`) ON DELETE RESTRICT ON UPDATE RESTRICT
+) ENGINE = InnoDB AUTO_INCREMENT = 23 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of teacher
@@ -1275,6 +1276,8 @@ INSERT INTO `teacher` VALUES (17, '刘秀英', '女', '1999-02-18', 9, '2班', 0
INSERT INTO `teacher` VALUES (18, '孟宇宁', '男', '1984-12-24', 10, '1班', 0);
INSERT INTO `teacher` VALUES (19, '吕睿', '男', '1989-02-22', 1, '1班', 0);
INSERT INTO `teacher` VALUES (20, '段嘉伦', '男', '1995-02-08', 10, '1班', 0);
+INSERT INTO `teacher` VALUES (21, '无名氏3', '男', '2023-06-17', 1, '1班', 0);
+INSERT INTO `teacher` VALUES (22, '无名氏4', '男', '2023-06-17', 1, '2班', 0);
-- ----------------------------
-- Table structure for user
@@ -1288,7 +1291,7 @@ CREATE TABLE `user` (
`disabled` int NULL DEFAULT 0 COMMENT '禁用(default: 0 false)',
`detail` int NULL DEFAULT NULL COMMENT 'link to roles id',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of user
@@ -1301,5 +1304,6 @@ INSERT INTO `user` VALUES (5, 'newuser1', '7dcf407fa84a0e0519c7991154c4148de0244
INSERT INTO `user` VALUES (6, 'guest2', '6b93ccba414ac1d0ae1e77f3fac560c748a6701ed6946735a49d463351518e16', 'admin', 0, NULL);
INSERT INTO `user` VALUES (7, 'student1', '49fe07d0f041bced9ba827a10c2cd31b2089229d4b4e3a63b074ed7a4370e88f', 'student', 0, 0);
INSERT INTO `user` VALUES (8, 'student2', '2d850eb5460ffb6bb9ae11186a2d78cc22d9df387f9cdbd3a297e0d1ea08a54b', 'student', 0, 4);
+INSERT INTO `user` VALUES (9, 'teacher1', '0829db2785c8de0ad7d0231c903be3083f6729679bc69b092bf4cfd3dc629006', 'teacher', 0, 1);
SET FOREIGN_KEY_CHECKS = 1;