diff --git a/.gitignore b/.gitignore index 78fba92..0a553ef 100644 --- a/.gitignore +++ b/.gitignore @@ -2,9 +2,25 @@ *.class # Generated files -bin/ -gen/ -out/ +/gen/ +/Library/gen/ +/Student/gen/ +/Teacher/gen/ + +# build +/build/ +/Library/build/ +/Student/build/ +/Teacher/build/ + +# idea +/out/ +/Library/out/ +/Student/out/ +/Teacher/out/ + +# log +/**/logs/ # Version control vcs.xml \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..c186654 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,12 @@ + + + + + mysql.8 + true + com.mysql.cj.jdbc.Driver + jdbc:mysql://10.14.0.7:3306 + $ProjectFileDir$ + + + \ No newline at end of file diff --git a/.idea/libraries/JUnit5_8_1.xml b/.idea/libraries/JUnit5_8_1.xml new file mode 100644 index 0000000..62c2044 --- /dev/null +++ b/.idea/libraries/JUnit5_8_1.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/log4j_api_2_17_2.xml b/.idea/libraries/log4j_api_2_17_2.xml new file mode 100644 index 0000000..d42e8c7 --- /dev/null +++ b/.idea/libraries/log4j_api_2_17_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/log4j_core_2_17_2.xml b/.idea/libraries/log4j_core_2_17_2.xml new file mode 100644 index 0000000..550753c --- /dev/null +++ b/.idea/libraries/log4j_core_2_17_2.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 0548357..58918f5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,4 @@ - - - + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index f5e8fc2..a10f79e 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,9 +2,16 @@ - - - + + + + + + + + + + \ No newline at end of file diff --git a/ClassroomInteraction.iml b/ClassroomInteraction.iml index c90834f..e33b3b7 100644 --- a/ClassroomInteraction.iml +++ b/ClassroomInteraction.iml @@ -1,11 +1,15 @@ - + + + - + + + \ No newline at end of file diff --git a/Library/ClassroomInteraction.Library.iml b/Library/ClassroomInteraction.Library.iml new file mode 100644 index 0000000..1378535 --- /dev/null +++ b/Library/ClassroomInteraction.Library.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/Library/src/main/ClassroomInteraction.Library.main.iml b/Library/src/main/ClassroomInteraction.Library.main.iml new file mode 100644 index 0000000..b18ed62 --- /dev/null +++ b/Library/src/main/ClassroomInteraction.Library.main.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Library/src/com/cfive/classroom/interaction/library/database/Test.java b/Library/src/main/java/com/cfive/classroom/library/database/Test.java similarity index 65% rename from Library/src/com/cfive/classroom/interaction/library/database/Test.java rename to Library/src/main/java/com/cfive/classroom/library/database/Test.java index a279e51..ea1f736 100644 --- a/Library/src/com/cfive/classroom/interaction/library/database/Test.java +++ b/Library/src/main/java/com/cfive/classroom/library/database/Test.java @@ -1,4 +1,4 @@ -package com.cfive.classroom.interaction.library.database; +package com.cfive.classroom.library.database; public class Test { public static void run() { diff --git a/Library/src/com/cfive/classroom/interaction/library/net/Test.java b/Library/src/main/java/com/cfive/classroom/library/net/Test.java similarity index 66% rename from Library/src/com/cfive/classroom/interaction/library/net/Test.java rename to Library/src/main/java/com/cfive/classroom/library/net/Test.java index c803e02..0d87f21 100644 --- a/Library/src/com/cfive/classroom/interaction/library/net/Test.java +++ b/Library/src/main/java/com/cfive/classroom/library/net/Test.java @@ -1,4 +1,4 @@ -package com.cfive.classroom.interaction.library.net; +package com.cfive.classroom.library.net; public class Test { public static void run() { diff --git a/Library/src/main/resources/log4j2.xml b/Library/src/main/resources/log4j2.xml new file mode 100644 index 0000000..809a36e --- /dev/null +++ b/Library/src/main/resources/log4j2.xml @@ -0,0 +1,36 @@ + + + + + [%d{DEFAULT}] [%t/%-5level] %logger{36}: %msg%n + + logs/latest21.log + logs/%d{yyyy-MM-dd}-%i.log.gz + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Library/src/test/ClassroomInteraction.Library.test.iml b/Library/src/test/ClassroomInteraction.Library.test.iml new file mode 100644 index 0000000..46966c7 --- /dev/null +++ b/Library/src/test/ClassroomInteraction.Library.test.iml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Library/src/test/resources/log4j2.xml b/Library/src/test/resources/log4j2.xml new file mode 100644 index 0000000..809a36e --- /dev/null +++ b/Library/src/test/resources/log4j2.xml @@ -0,0 +1,36 @@ + + + + + [%d{DEFAULT}] [%t/%-5level] %logger{36}: %msg%n + + logs/latest21.log + logs/%d{yyyy-MM-dd}-%i.log.gz + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Library/Library.iml b/Student/ClassroomInteraction.Student.iml similarity index 52% rename from Library/Library.iml rename to Student/ClassroomInteraction.Student.iml index c90834f..a99884c 100644 --- a/Library/Library.iml +++ b/Student/ClassroomInteraction.Student.iml @@ -2,10 +2,11 @@ - - - + + + + \ No newline at end of file diff --git a/Student/Student.iml b/Student/Student.iml deleted file mode 100644 index 15f18d8..0000000 --- a/Student/Student.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/Student/src/main/ClassroomInteraction.Student.main.iml b/Student/src/main/ClassroomInteraction.Student.main.iml new file mode 100644 index 0000000..094a601 --- /dev/null +++ b/Student/src/main/ClassroomInteraction.Student.main.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Teacher/src/com/cfive/classroom/interaction/teacher/MainWindow.form b/Student/src/main/java/com/cfive/classroom/student/MainWindow.form similarity index 87% rename from Teacher/src/com/cfive/classroom/interaction/teacher/MainWindow.form rename to Student/src/main/java/com/cfive/classroom/student/MainWindow.form index 90750c5..714880e 100644 --- a/Teacher/src/com/cfive/classroom/interaction/teacher/MainWindow.form +++ b/Student/src/main/java/com/cfive/classroom/student/MainWindow.form @@ -1,5 +1,5 @@ -
+ diff --git a/Student/src/com/cfive/classroom/interaction/student/MainWindow.java b/Student/src/main/java/com/cfive/classroom/student/MainWindow.java similarity index 68% rename from Student/src/com/cfive/classroom/interaction/student/MainWindow.java rename to Student/src/main/java/com/cfive/classroom/student/MainWindow.java index 12f7bdb..1a34022 100644 --- a/Student/src/com/cfive/classroom/interaction/student/MainWindow.java +++ b/Student/src/main/java/com/cfive/classroom/student/MainWindow.java @@ -1,6 +1,6 @@ -package com.cfive.classroom.interaction.student; +package com.cfive.classroom.student; -import com.cfive.classroom.interaction.library.database.Test; +import com.cfive.classroom.library.database.Test; import javax.swing.*; @@ -15,7 +15,7 @@ public class MainWindow { frame.pack(); frame.setVisible(true); - com.cfive.classroom.interaction.library.net.Test.run(); + com.cfive.classroom.library.net.Test.run(); Test.run(); } } diff --git a/Student/src/main/resources/log4j2.xml b/Student/src/main/resources/log4j2.xml new file mode 100644 index 0000000..809a36e --- /dev/null +++ b/Student/src/main/resources/log4j2.xml @@ -0,0 +1,36 @@ + + + + + [%d{DEFAULT}] [%t/%-5level] %logger{36}: %msg%n + + logs/latest21.log + logs/%d{yyyy-MM-dd}-%i.log.gz + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Student/src/test/ClassroomInteraction.Student.test.iml b/Student/src/test/ClassroomInteraction.Student.test.iml new file mode 100644 index 0000000..6c4c600 --- /dev/null +++ b/Student/src/test/ClassroomInteraction.Student.test.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Student/src/test/resources/log4j2.xml b/Student/src/test/resources/log4j2.xml new file mode 100644 index 0000000..809a36e --- /dev/null +++ b/Student/src/test/resources/log4j2.xml @@ -0,0 +1,36 @@ + + + + + [%d{DEFAULT}] [%t/%-5level] %logger{36}: %msg%n + + logs/latest21.log + logs/%d{yyyy-MM-dd}-%i.log.gz + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Teacher/Teacher.iml b/Teacher/ClassroomInteraction.Teacher.iml similarity index 52% rename from Teacher/Teacher.iml rename to Teacher/ClassroomInteraction.Teacher.iml index 15f18d8..a99884c 100644 --- a/Teacher/Teacher.iml +++ b/Teacher/ClassroomInteraction.Teacher.iml @@ -2,11 +2,11 @@ - - - + - + + + \ No newline at end of file diff --git a/Teacher/src/main/ClassroomInteraction.Teacher.main.iml b/Teacher/src/main/ClassroomInteraction.Teacher.main.iml new file mode 100644 index 0000000..094a601 --- /dev/null +++ b/Teacher/src/main/ClassroomInteraction.Teacher.main.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Student/src/com/cfive/classroom/interaction/student/MainWindow.form b/Teacher/src/main/java/com/cfive/classroom/teacher/MainWindow.form similarity index 87% rename from Student/src/com/cfive/classroom/interaction/student/MainWindow.form rename to Teacher/src/main/java/com/cfive/classroom/teacher/MainWindow.form index 379bfa9..a85b43a 100644 --- a/Student/src/com/cfive/classroom/interaction/student/MainWindow.form +++ b/Teacher/src/main/java/com/cfive/classroom/teacher/MainWindow.form @@ -1,5 +1,5 @@ - + diff --git a/Teacher/src/com/cfive/classroom/interaction/teacher/MainWindow.java b/Teacher/src/main/java/com/cfive/classroom/teacher/MainWindow.java similarity index 70% rename from Teacher/src/com/cfive/classroom/interaction/teacher/MainWindow.java rename to Teacher/src/main/java/com/cfive/classroom/teacher/MainWindow.java index dabd4aa..ed42a7f 100644 --- a/Teacher/src/com/cfive/classroom/interaction/teacher/MainWindow.java +++ b/Teacher/src/main/java/com/cfive/classroom/teacher/MainWindow.java @@ -1,6 +1,6 @@ -package com.cfive.classroom.interaction.teacher; +package com.cfive.classroom.teacher; -import com.cfive.classroom.interaction.library.net.Test; +import com.cfive.classroom.library.net.Test; import javax.swing.*; @@ -16,7 +16,7 @@ public class MainWindow { frame.setVisible(true); Test.run(); - com.cfive.classroom.interaction.library.database.Test.run(); + com.cfive.classroom.library.database.Test.run(); System.out.println("This is a test"); } diff --git a/Teacher/src/main/resources/log4j2.xml b/Teacher/src/main/resources/log4j2.xml new file mode 100644 index 0000000..809a36e --- /dev/null +++ b/Teacher/src/main/resources/log4j2.xml @@ -0,0 +1,36 @@ + + + + + [%d{DEFAULT}] [%t/%-5level] %logger{36}: %msg%n + + logs/latest21.log + logs/%d{yyyy-MM-dd}-%i.log.gz + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Teacher/src/test/ClassroomInteraction.Teacher.test.iml b/Teacher/src/test/ClassroomInteraction.Teacher.test.iml new file mode 100644 index 0000000..023a09e --- /dev/null +++ b/Teacher/src/test/ClassroomInteraction.Teacher.test.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Teacher/src/test/resources/log4j2.xml b/Teacher/src/test/resources/log4j2.xml new file mode 100644 index 0000000..809a36e --- /dev/null +++ b/Teacher/src/test/resources/log4j2.xml @@ -0,0 +1,36 @@ + + + + + [%d{DEFAULT}] [%t/%-5level] %logger{36}: %msg%n + + logs/latest21.log + logs/%d{yyyy-MM-dd}-%i.log.gz + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/apiguardian-api-1.1.2.jar b/lib/apiguardian-api-1.1.2.jar new file mode 100644 index 0000000..2b678e1 Binary files /dev/null and b/lib/apiguardian-api-1.1.2.jar differ diff --git a/lib/junit-jupiter-5.8.1.jar b/lib/junit-jupiter-5.8.1.jar new file mode 100644 index 0000000..730b9ae Binary files /dev/null and b/lib/junit-jupiter-5.8.1.jar differ diff --git a/lib/junit-jupiter-api-5.8.1.jar b/lib/junit-jupiter-api-5.8.1.jar new file mode 100644 index 0000000..8424eca Binary files /dev/null and b/lib/junit-jupiter-api-5.8.1.jar differ diff --git a/lib/junit-jupiter-engine-5.8.1.jar b/lib/junit-jupiter-engine-5.8.1.jar new file mode 100644 index 0000000..cfa38d2 Binary files /dev/null and b/lib/junit-jupiter-engine-5.8.1.jar differ diff --git a/lib/junit-jupiter-params-5.8.1.jar b/lib/junit-jupiter-params-5.8.1.jar new file mode 100644 index 0000000..1e4d0ec Binary files /dev/null and b/lib/junit-jupiter-params-5.8.1.jar differ diff --git a/lib/junit-platform-commons-1.8.1.jar b/lib/junit-platform-commons-1.8.1.jar new file mode 100644 index 0000000..20185cd Binary files /dev/null and b/lib/junit-platform-commons-1.8.1.jar differ diff --git a/lib/junit-platform-engine-1.8.1.jar b/lib/junit-platform-engine-1.8.1.jar new file mode 100644 index 0000000..54ce076 Binary files /dev/null and b/lib/junit-platform-engine-1.8.1.jar differ diff --git a/lib/log4j-api-2.17.2-javadoc.jar b/lib/log4j-api-2.17.2-javadoc.jar new file mode 100644 index 0000000..b954308 Binary files /dev/null and b/lib/log4j-api-2.17.2-javadoc.jar differ diff --git a/lib/log4j-api-2.17.2-sources.jar b/lib/log4j-api-2.17.2-sources.jar new file mode 100644 index 0000000..d32d44a Binary files /dev/null and b/lib/log4j-api-2.17.2-sources.jar differ diff --git a/lib/log4j-api-2.17.2.jar b/lib/log4j-api-2.17.2.jar new file mode 100644 index 0000000..a03f315 Binary files /dev/null and b/lib/log4j-api-2.17.2.jar differ diff --git a/lib/log4j-core-2.17.2-javadoc.jar b/lib/log4j-core-2.17.2-javadoc.jar new file mode 100644 index 0000000..b8e9826 Binary files /dev/null and b/lib/log4j-core-2.17.2-javadoc.jar differ diff --git a/lib/log4j-core-2.17.2-sources.jar b/lib/log4j-core-2.17.2-sources.jar new file mode 100644 index 0000000..3dbc733 Binary files /dev/null and b/lib/log4j-core-2.17.2-sources.jar differ diff --git a/lib/log4j-core-2.17.2-tests.jar b/lib/log4j-core-2.17.2-tests.jar new file mode 100644 index 0000000..c972d8b Binary files /dev/null and b/lib/log4j-core-2.17.2-tests.jar differ diff --git a/lib/log4j-core-2.17.2.jar b/lib/log4j-core-2.17.2.jar new file mode 100644 index 0000000..fbc0641 Binary files /dev/null and b/lib/log4j-core-2.17.2.jar differ diff --git a/lib/opentest4j-1.2.0.jar b/lib/opentest4j-1.2.0.jar new file mode 100644 index 0000000..d500636 Binary files /dev/null and b/lib/opentest4j-1.2.0.jar differ