From d8df3a3f81daa99b630fcdfdfe14423303f47187 Mon Sep 17 00:00:00 2001 From: zgl <1021946233@qq.com> Date: Mon, 14 Jan 2019 22:23:16 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1=E3=80=81global=5Ftime=5Fpoint=E5=A1=AB?= =?UTF-8?q?=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gdms/GlobalTimePoint.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gdms/GlobalTimePoint.json b/src/gdms/GlobalTimePoint.json index f1d908e..b5d8112 100644 --- a/src/gdms/GlobalTimePoint.json +++ b/src/gdms/GlobalTimePoint.json @@ -1,9 +1,9 @@ { - "teacher_choose_student_start_date":"";, - "student_choose_teacher_start_date": "",; - "choose_end_date": "",; - "opening_report_opinion_deadline_date": "",; - "finished_product_deadline_date": "",; - "finished_product_review_deadline_date": "",; - "reply_opition_deadline_date": ""; + "teacher_choose_student_start_date":"", + "student_choose_teacher_start_date": "", + "choose_end_date": "", + "opening_report_opinion_deadline_date": "", + "finished_product_deadline_date": "", + "finished_product_review_deadline_date": "", + "reply_opition_deadline_date": "" } \ No newline at end of file From b5ceb5b4198c66701aba363f5d79c54f0b54f4de Mon Sep 17 00:00:00 2001 From: zgl <1021946233@qq.com> Date: Mon, 14 Jan 2019 22:30:06 +0800 Subject: [PATCH 2/5] Merge remote-tracking branch 'remotes/origin/master' into zgl # Conflicts: # src/gdms/GlobalTimePoint.json --- src/gdms/GlobalTimePoint.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gdms/GlobalTimePoint.json b/src/gdms/GlobalTimePoint.json index f1d908e..b5d8112 100644 --- a/src/gdms/GlobalTimePoint.json +++ b/src/gdms/GlobalTimePoint.json @@ -1,9 +1,9 @@ { - "teacher_choose_student_start_date":"";, - "student_choose_teacher_start_date": "",; - "choose_end_date": "",; - "opening_report_opinion_deadline_date": "",; - "finished_product_deadline_date": "",; - "finished_product_review_deadline_date": "",; - "reply_opition_deadline_date": ""; + "teacher_choose_student_start_date":"", + "student_choose_teacher_start_date": "", + "choose_end_date": "", + "opening_report_opinion_deadline_date": "", + "finished_product_deadline_date": "", + "finished_product_review_deadline_date": "", + "reply_opition_deadline_date": "" } \ No newline at end of file From 7a74e1e5ad5e540f632ba5310750ff15b3f6ed37 Mon Sep 17 00:00:00 2001 From: zgl <1021946233@qq.com> Date: Tue, 15 Jan 2019 09:55:28 +0800 Subject: [PATCH 3/5] Merge remote-tracking branch 'remotes/origin/master' into zgl # Conflicts: # src/gdms/GlobalTimePoint.json --- src/servlet/S_CollegeFillOpeningReportOpinion.java | 2 +- src/servlet/S_CollegeFillScoreOpinion.java | 2 +- src/servlet/S_MentorFillOpeningReportOpinion.java | 2 +- src/servlet/S_MentorFillReview.java | 2 +- src/servlet/S_ReviewerFillReview.java | 2 +- src/servlet/S_SchoolFillScoreOpinion.java | 2 +- src/servlet/S_SecretaryFillOpeningReportRecord.java | 2 +- src/servlet/S_TeacherTeamFillScoreOpinion.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/servlet/S_CollegeFillOpeningReportOpinion.java b/src/servlet/S_CollegeFillOpeningReportOpinion.java index 6162fa5..ea991b7 100644 --- a/src/servlet/S_CollegeFillOpeningReportOpinion.java +++ b/src/servlet/S_CollegeFillOpeningReportOpinion.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "S_CollegeFillOpeningReportOpinion") +@WebServlet(name = "college-fill-opening-report-opinion") public class S_CollegeFillOpeningReportOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); diff --git a/src/servlet/S_CollegeFillScoreOpinion.java b/src/servlet/S_CollegeFillScoreOpinion.java index 0d25745..bb9edad 100644 --- a/src/servlet/S_CollegeFillScoreOpinion.java +++ b/src/servlet/S_CollegeFillScoreOpinion.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "S_CollegeFillScoreOpinion") +@WebServlet(name = "college-fill-score-opinion") public class S_CollegeFillScoreOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); diff --git a/src/servlet/S_MentorFillOpeningReportOpinion.java b/src/servlet/S_MentorFillOpeningReportOpinion.java index 625520f..1f46470 100644 --- a/src/servlet/S_MentorFillOpeningReportOpinion.java +++ b/src/servlet/S_MentorFillOpeningReportOpinion.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "S_MentorFillOpeningReportOpinion") +@WebServlet(name = "mentor-fill-opening-report-opinion") public class S_MentorFillOpeningReportOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); diff --git a/src/servlet/S_MentorFillReview.java b/src/servlet/S_MentorFillReview.java index f28b2d1..f2a8343 100644 --- a/src/servlet/S_MentorFillReview.java +++ b/src/servlet/S_MentorFillReview.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "S_MentorFillReview") +@WebServlet(name = "mentor-fill-review") public class S_MentorFillReview extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); diff --git a/src/servlet/S_ReviewerFillReview.java b/src/servlet/S_ReviewerFillReview.java index a23d80a..aa23d5f 100644 --- a/src/servlet/S_ReviewerFillReview.java +++ b/src/servlet/S_ReviewerFillReview.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "S_ReviewerFillReview") +@WebServlet(name = "reviewer-fill-review") public class S_ReviewerFillReview extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); diff --git a/src/servlet/S_SchoolFillScoreOpinion.java b/src/servlet/S_SchoolFillScoreOpinion.java index 97d7cd5..c4c6f2d 100644 --- a/src/servlet/S_SchoolFillScoreOpinion.java +++ b/src/servlet/S_SchoolFillScoreOpinion.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "S_SchoolFillScoreOpinion") +@WebServlet(name = "school-fill-score-opinion") public class S_SchoolFillScoreOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); diff --git a/src/servlet/S_SecretaryFillOpeningReportRecord.java b/src/servlet/S_SecretaryFillOpeningReportRecord.java index 0fc9fb5..8d71b7d 100644 --- a/src/servlet/S_SecretaryFillOpeningReportRecord.java +++ b/src/servlet/S_SecretaryFillOpeningReportRecord.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "S_SecretaryFillOpeningReportRecord") +@WebServlet(name = "secretary-fill-opening-report-record") public class S_SecretaryFillOpeningReportRecord extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); diff --git a/src/servlet/S_TeacherTeamFillScoreOpinion.java b/src/servlet/S_TeacherTeamFillScoreOpinion.java index a72ac08..45fa2aa 100644 --- a/src/servlet/S_TeacherTeamFillScoreOpinion.java +++ b/src/servlet/S_TeacherTeamFillScoreOpinion.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "S_TeacherTeamFillScoreOpinion") +@WebServlet(name = "teacher-team-fill-score-opinion") public class S_TeacherTeamFillScoreOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); From b26ef60873867576f7b1dd19e3351c53e6684fb1 Mon Sep 17 00:00:00 2001 From: zgl <1021946233@qq.com> Date: Tue, 15 Jan 2019 14:46:32 +0800 Subject: [PATCH 4/5] Merge remote-tracking branch 'remotes/origin/master' into zgl # Conflicts: # src/servlet/S_CollegeFillOpeningReportOpinion.java # src/servlet/S_CollegeFillScoreOpinion.java # src/servlet/S_MentorFillOpeningReportOpinion.java # src/servlet/S_MentorFillReview.java # src/servlet/S_ReviewerFillReview.java # src/servlet/S_SchoolFillScoreOpinion.java # src/servlet/S_SecretaryFillOpeningReportRecord.java # src/servlet/S_TeacherTeamFillScoreOpinion.java --- .idea/artifacts/GDMS_war_exploded.xml | 2 + .idea/dataSources.xml | 2 +- .../356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml | 2164 ----------------- .idea/libraries/tomcat_lib.xml | 4 +- .idea/misc.xml | 2 +- GDMS.iml | 31 +- 6 files changed, 33 insertions(+), 2172 deletions(-) delete mode 100644 .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml diff --git a/.idea/artifacts/GDMS_war_exploded.xml b/.idea/artifacts/GDMS_war_exploded.xml index 1d55d9c..ee088c9 100644 --- a/.idea/artifacts/GDMS_war_exploded.xml +++ b/.idea/artifacts/GDMS_war_exploded.xml @@ -10,6 +10,8 @@ + + diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index c00abce..05864f1 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,7 +1,7 @@ - + mariadb true org.mariadb.jdbc.Driver diff --git a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml deleted file mode 100644 index fbbe276..0000000 --- a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml +++ /dev/null @@ -1,2164 +0,0 @@ - - - - - 10.3.10 - MariaDB - InnoDB - lower/lower - - - 1 - 1 - utf8_general_ci - - - utf8_general_ci - - - utf8_general_ci - - - utf8_general_ci - - - latin1_swedish_ci - - - utf8_general_ci - - - armscii8 - 0 - - - armscii8 - 1 - - - armscii8 - 0 - - - armscii8 - 0 - - - ascii - 0 - - - ascii - 1 - - - ascii - 0 - - - ascii - 0 - - - big5 - 0 - - - big5 - 1 - - - big5 - 0 - - - big5 - 0 - - - binary - 1 - - - cp1250 - 0 - - - cp1250 - 0 - - - cp1250 - 0 - - - cp1250 - 1 - - - cp1250 - 0 - - - cp1250 - 0 - - - cp1250 - 0 - - - cp1251 - 0 - - - cp1251 - 0 - - - cp1251 - 1 - - - cp1251 - 0 - - - cp1251 - 0 - - - cp1251 - 0 - - - cp1251 - 0 - - - cp1256 - 0 - - - cp1256 - 1 - - - cp1256 - 0 - - - cp1256 - 0 - - - cp1257 - 0 - - - cp1257 - 1 - - - cp1257 - 0 - - - cp1257 - 0 - - - cp1257 - 0 - - - cp850 - 0 - - - cp850 - 1 - - - cp850 - 0 - - - cp850 - 0 - - - cp852 - 0 - - - cp852 - 1 - - - cp852 - 0 - - - cp852 - 0 - - - cp866 - 0 - - - cp866 - 1 - - - cp866 - 0 - - - cp866 - 0 - - - cp932 - 0 - - - cp932 - 1 - - - cp932 - 0 - - - cp932 - 0 - - - dec8 - 0 - - - dec8 - 0 - - - dec8 - 1 - - - dec8 - 0 - - - eucjpms - 0 - - - eucjpms - 1 - - - eucjpms - 0 - - - eucjpms - 0 - - - euckr - 0 - - - euckr - 1 - - - euckr - 0 - - - euckr - 0 - - - gb2312 - 0 - - - gb2312 - 1 - - - gb2312 - 0 - - - gb2312 - 0 - - - gbk - 0 - - - gbk - 1 - - - gbk - 0 - - - gbk - 0 - - - geostd8 - 0 - - - geostd8 - 1 - - - geostd8 - 0 - - - geostd8 - 0 - - - greek - 0 - - - greek - 1 - - - greek - 0 - - - greek - 0 - - - hebrew - 0 - - - hebrew - 1 - - - hebrew - 0 - - - hebrew - 0 - - - hp8 - 0 - - - hp8 - 1 - - - hp8 - 0 - - - hp8 - 0 - - - keybcs2 - 0 - - - keybcs2 - 1 - - - keybcs2 - 0 - - - keybcs2 - 0 - - - koi8r - 0 - - - koi8r - 1 - - - koi8r - 0 - - - koi8r - 0 - - - koi8u - 0 - - - koi8u - 1 - - - koi8u - 0 - - - koi8u - 0 - - - latin1 - 0 - - - latin1 - 0 - - - latin1 - 0 - - - latin1 - 0 - - - latin1 - 0 - - - latin1 - 0 - - - latin1 - 0 - - - latin1 - 0 - - - latin1 - 1 - - - latin1 - 0 - - - latin2 - 0 - - - latin2 - 0 - - - latin2 - 0 - - - latin2 - 1 - - - latin2 - 0 - - - latin2 - 0 - - - latin2 - 0 - - - latin5 - 0 - - - latin5 - 0 - - - latin5 - 1 - - - latin5 - 0 - - - latin7 - 0 - - - latin7 - 0 - - - latin7 - 1 - - - latin7 - 0 - - - latin7 - 0 - - - latin7 - 0 - - - macce - 0 - - - macce - 1 - - - macce - 0 - - - macce - 0 - - - macroman - 0 - - - macroman - 1 - - - macroman - 0 - - - macroman - 0 - - - sjis - 0 - - - sjis - 1 - - - sjis - 0 - - - sjis - 0 - - - swe7 - 0 - - - swe7 - 0 - - - swe7 - 1 - - - swe7 - 0 - - - tis620 - 0 - - - tis620 - 0 - - - tis620 - 1 - - - tis620 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 1 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ujis - 0 - - - ujis - 1 - - - ujis - 0 - - - ujis - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 1 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16le - 0 - - - utf16le - 1 - - - utf16le - 0 - - - utf16le - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 1 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 1 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 1 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - 管理员 -
- - 公告 -
- - 毕业设计 -
- - 毕设论文 -
- - 指导老师评定成绩 -
- - 评阅老师对论文的评审成绩 -
- - 毕业设计信息 -
- - 开题报告 -
- - 开题报告会纪要 -
- - 答辩 -
- - 答辩记录表 -
- - 开题报告秘书组 -
- - 开题报告老师组 -
- - 专业信息 -
- - 答辩秘书小组 -
- - 答辩教师组 -
- - 学生用户 -
- - 老师用户 -
- - 1 - char(20)|0s - 1 - normal - - - 2 - char(255)|0s - 1 - normal - - - 3 - char(30)|0s - normal - - - 4 - char(40)|0s - normal - - - 5 - char(20)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - text|0s - normal - - - 3 - text|0s - normal - - - 4 - date|0s - normal - - - 5 - varchar(255)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(20)|0s - normal - - - 3 - char(20)|0s - normal - - - 4 - char(1)|0s - normal - - - 5 - char(1)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - int(11)|0s - normal - - - 3 - date|0s - normal - - - 4 - varchar(255)|0s - normal - - - 5 - text|0s - normal - - - 6 - text|0s - normal - - - 7 - text|0s - normal - - - 8 - text|0s - normal - - - 9 - float|0s - normal - - - 10 - char(1)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - float|0s - normal - - - 3 - float|0s - normal - - - 4 - float|0s - normal - - - 5 - float|0s - normal - - - 6 - float|0s - normal - - - 7 - float|0s - normal - - - 8 - float|0s - normal - - - 9 - float|0s - normal - - - 10 - float|0s - normal - - - 11 - float|0s - normal - - - 12 - float|0s - normal - - - 13 - float|0s - normal - - - 14 - float|0s - normal - - - 15 - float|0s - normal - - - 16 - float|0s - normal - - - 17 - text|0s - normal - - - 18 - date|0s - normal - - - 19 - char(1)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(20)|0s - normal - - - 3 - float|0s - normal - - - 4 - text|0s - normal - - - 5 - date|0s - normal - - - 6 - char(1)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - varchar(255)|0s - normal - - - 3 - varchar(255)|0s - normal - - - 4 - varchar(255)|0s - normal - - - 5 - varchar(255)|0s - normal - - - 6 - varchar(255)|0s - normal - - - 7 - text|0s - normal - - - 8 - char(1)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - date|0s - normal - - - 3 - varchar(255)|0s - normal - - - 4 - varchar(255)|0s - normal - - - 5 - char(20)|0s - normal - - - 6 - char(20)|0s - normal - - - 7 - int(11)|0s - normal - - - 8 - char(1)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(20)|0s - normal - - - 3 - text|0s - normal - - - 4 - date|0s - normal - - - 5 - text|0s - normal - - - 6 - date|0s - normal - - - 7 - text|0s - normal - - - 8 - date|0s - normal - - - 9 - text|0s - normal - - - 10 - date|0s - normal - - - 11 - char(1)|0s - normal - - - 12 - char(1)|0s - normal - - - 13 - char(1)|0s - normal - - - 14 - char(1)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - date|0s - normal - - - 3 - varchar(255)|0s - normal - - - 4 - char(20)|0s - normal - - - 5 - char(20)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(20)|0s - normal - - - 3 - char(20)|0s - normal - - - 4 - text|0s - normal - - - 5 - date|0s - normal - - - 6 - text|0s - normal - - - 7 - date|0s - normal - - - 8 - text|0s - normal - - - 9 - float|0s - normal - - - 10 - date|0s - normal - - - 11 - text|0s - normal - - - 12 - float|0s - normal - - - 13 - date|0s - normal - - - 14 - text|0s - normal - - - 15 - float|0s - normal - - - 16 - date|0s - normal - - - 17 - char(1)|0s - normal - - - 18 - char(1)|0s - normal - - - 19 - char(1)|0s - normal - - - 20 - char(1)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(20)|0s - normal - - - 3 - char(20)|0s - normal - - - 1 - leader_student_id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(20)|0s - normal - - - 3 - char(20)|0s - normal - - - 1 - leader_teacher_id - 1 - - - 1 - char(8)|0s - 1 - normal - - - 2 - varchar(255)|0s - normal - - - 3 - varchar(255)|0s - normal - - - 4 - varchar(255)|0s - normal - - - 1 - profession_code - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(20)|0s - normal - - - 3 - char(20)|0s - normal - - - 1 - leader_student_id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(20)|0s - normal - - - 3 - char(20)|0s - normal - - - 1 - leader_teacher_id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(255)|0s - 1 - normal - - - 3 - char(30)|0s - normal - - - 4 - char(40)|0s - normal - - - 5 - char(20)|0s - normal - - - 6 - char(4)|0s - normal - - - 7 - char(8)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(255)|0s - 1 - normal - - - 3 - char(30)|0s - normal - - - 4 - char(40)|0s - normal - - - 5 - char(20)|0s - normal - - - 6 - varchar(255)|0s - normal - - - 7 - varchar(255)|0s - normal - - - 8 - char(8)|0s - normal - - - 1 - id - 1 - - - \ No newline at end of file diff --git a/.idea/libraries/tomcat_lib.xml b/.idea/libraries/tomcat_lib.xml index 569121d..19e08f8 100644 --- a/.idea/libraries/tomcat_lib.xml +++ b/.idea/libraries/tomcat_lib.xml @@ -1,10 +1,10 @@ - + - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 11bca97..35bdbab 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/GDMS.iml b/GDMS.iml index 23fde1f..0aad383 100644 --- a/GDMS.iml +++ b/GDMS.iml @@ -17,14 +17,37 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + - + From e744730651259da467c01f77b98b8b320a132188 Mon Sep 17 00:00:00 2001 From: zgl <1021946233@qq.com> Date: Tue, 15 Jan 2019 14:47:12 +0800 Subject: [PATCH 5/5] Merge remote-tracking branch 'remotes/origin/master' into zgl # Conflicts: # src/servlet/S_CollegeFillOpeningReportOpinion.java # src/servlet/S_CollegeFillScoreOpinion.java # src/servlet/S_MentorFillOpeningReportOpinion.java # src/servlet/S_MentorFillReview.java # src/servlet/S_ReviewerFillReview.java # src/servlet/S_SchoolFillScoreOpinion.java # src/servlet/S_SecretaryFillOpeningReportRecord.java # src/servlet/S_TeacherTeamFillScoreOpinion.java --- .../8fdf8c26-c4fe-4cb5-9941-72889c26fde4.xml | 2161 +++++++++++++++++ 1 file changed, 2161 insertions(+) create mode 100644 .idea/dataSources/8fdf8c26-c4fe-4cb5-9941-72889c26fde4.xml diff --git a/.idea/dataSources/8fdf8c26-c4fe-4cb5-9941-72889c26fde4.xml b/.idea/dataSources/8fdf8c26-c4fe-4cb5-9941-72889c26fde4.xml new file mode 100644 index 0000000..c17251b --- /dev/null +++ b/.idea/dataSources/8fdf8c26-c4fe-4cb5-9941-72889c26fde4.xml @@ -0,0 +1,2161 @@ + + + + + 10.3.12 + MARIADB + InnoDB + lower/lower + + + 1 + 1 + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + latin1_swedish_ci + + + armscii8 + 0 + + + armscii8 + 1 + + + armscii8 + 0 + + + armscii8 + 0 + + + ascii + 0 + + + ascii + 1 + + + ascii + 0 + + + ascii + 0 + + + big5 + 0 + + + big5 + 1 + + + big5 + 0 + + + big5 + 0 + + + binary + 1 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 1 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 1 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1256 + 0 + + + cp1256 + 1 + + + cp1256 + 0 + + + cp1256 + 0 + + + cp1257 + 0 + + + cp1257 + 1 + + + cp1257 + 0 + + + cp1257 + 0 + + + cp1257 + 0 + + + cp850 + 0 + + + cp850 + 1 + + + cp850 + 0 + + + cp850 + 0 + + + cp852 + 0 + + + cp852 + 1 + + + cp852 + 0 + + + cp852 + 0 + + + cp866 + 0 + + + cp866 + 1 + + + cp866 + 0 + + + cp866 + 0 + + + cp932 + 0 + + + cp932 + 1 + + + cp932 + 0 + + + cp932 + 0 + + + dec8 + 0 + + + dec8 + 0 + + + dec8 + 1 + + + dec8 + 0 + + + eucjpms + 0 + + + eucjpms + 1 + + + eucjpms + 0 + + + eucjpms + 0 + + + euckr + 0 + + + euckr + 1 + + + euckr + 0 + + + euckr + 0 + + + gb2312 + 0 + + + gb2312 + 1 + + + gb2312 + 0 + + + gb2312 + 0 + + + gbk + 0 + + + gbk + 1 + + + gbk + 0 + + + gbk + 0 + + + geostd8 + 0 + + + geostd8 + 1 + + + geostd8 + 0 + + + geostd8 + 0 + + + greek + 0 + + + greek + 1 + + + greek + 0 + + + greek + 0 + + + hebrew + 0 + + + hebrew + 1 + + + hebrew + 0 + + + hebrew + 0 + + + hp8 + 0 + + + hp8 + 1 + + + hp8 + 0 + + + hp8 + 0 + + + keybcs2 + 0 + + + keybcs2 + 1 + + + keybcs2 + 0 + + + keybcs2 + 0 + + + koi8r + 0 + + + koi8r + 1 + + + koi8r + 0 + + + koi8r + 0 + + + koi8u + 0 + + + koi8u + 1 + + + koi8u + 0 + + + koi8u + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 1 + + + latin1 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 1 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin5 + 0 + + + latin5 + 0 + + + latin5 + 1 + + + latin5 + 0 + + + latin7 + 0 + + + latin7 + 0 + + + latin7 + 1 + + + latin7 + 0 + + + latin7 + 0 + + + latin7 + 0 + + + macce + 0 + + + macce + 1 + + + macce + 0 + + + macce + 0 + + + macroman + 0 + + + macroman + 1 + + + macroman + 0 + + + macroman + 0 + + + sjis + 0 + + + sjis + 1 + + + sjis + 0 + + + sjis + 0 + + + swe7 + 0 + + + swe7 + 0 + + + swe7 + 1 + + + swe7 + 0 + + + tis620 + 0 + + + tis620 + 0 + + + tis620 + 1 + + + tis620 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 1 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ujis + 0 + + + ujis + 1 + + + ujis + 0 + + + ujis + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 1 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16le + 0 + + + utf16le + 1 + + + utf16le + 0 + + + utf16le + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 1 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 1 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 1 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + 管理员 +
+ + 公告 +
+ + 毕业设计 +
+ + 毕设论文 +
+ + 指导老师评定成绩 +
+ + 评阅老师对论文的评审成绩 +
+ + 毕业设计信息 +
+ + 开题报告 +
+ + 开题报告会纪要 +
+ + 答辩 +
+ + 答辩记录表 +
+ + 开题报告秘书组 +
+ + 开题报告老师组 +
+ + 专业信息 +
+ + 答辩秘书小组 +
+ + 答辩教师组 +
+ + 学生用户 +
+ + 老师用户 +
+ + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + text|0s + normal + + + 3 + text|0s + normal + + + 4 + date|0s + normal + + + 5 + varchar(255)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 4 + char(1)|0s + normal + + + 5 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + int(11)|0s + normal + + + 3 + date|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + text|0s + normal + + + 6 + text|0s + normal + + + 7 + text|0s + normal + + + 8 + text|0s + normal + + + 9 + float|0s + normal + + + 10 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + float|0s + normal + + + 3 + float|0s + normal + + + 4 + float|0s + normal + + + 5 + float|0s + normal + + + 6 + float|0s + normal + + + 7 + float|0s + normal + + + 8 + float|0s + normal + + + 9 + float|0s + normal + + + 10 + float|0s + normal + + + 11 + float|0s + normal + + + 12 + float|0s + normal + + + 13 + float|0s + normal + + + 14 + float|0s + normal + + + 15 + float|0s + normal + + + 16 + float|0s + normal + + + 17 + text|0s + normal + + + 18 + date|0s + normal + + + 19 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + float|0s + normal + + + 4 + text|0s + normal + + + 5 + date|0s + normal + + + 6 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + varchar(255)|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + varchar(255)|0s + normal + + + 6 + varchar(255)|0s + normal + + + 7 + text|0s + normal + + + 8 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + date|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + char(20)|0s + normal + + + 7 + int(11)|0s + normal + + + 8 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + text|0s + normal + + + 4 + date|0s + normal + + + 5 + text|0s + normal + + + 6 + date|0s + normal + + + 7 + text|0s + normal + + + 8 + date|0s + normal + + + 9 + text|0s + normal + + + 10 + date|0s + normal + + + 11 + char(1)|0s + normal + + + 12 + char(1)|0s + normal + + + 13 + char(1)|0s + normal + + + 14 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + date|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + char(20)|0s + normal + + + 5 + char(20)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 4 + text|0s + normal + + + 5 + date|0s + normal + + + 6 + text|0s + normal + + + 7 + date|0s + normal + + + 8 + text|0s + normal + + + 9 + float|0s + normal + + + 10 + date|0s + normal + + + 11 + text|0s + normal + + + 12 + float|0s + normal + + + 13 + date|0s + normal + + + 14 + text|0s + normal + + + 15 + float|0s + normal + + + 16 + date|0s + normal + + + 17 + char(1)|0s + normal + + + 18 + char(1)|0s + normal + + + 19 + char(1)|0s + normal + + + 20 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_student_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_teacher_id + 1 + + + 1 + char(8)|0s + 1 + normal + + + 2 + varchar(255)|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 1 + profession_code + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_student_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_teacher_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + char(4)|0s + normal + + + 7 + char(8)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + varchar(255)|0s + normal + + + 7 + varchar(255)|0s + normal + + + 8 + char(8)|0s + normal + + + 1 + id + 1 + + + \ No newline at end of file