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] 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 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + - +