Merge remote-tracking branch 'remotes/origin/master' into zgl

# Conflicts:
#	.idea/artifacts/GDMS_war_exploded.xml
#	.idea/dataSources.xml
#	.idea/dataSources/8fdf8c26-c4fe-4cb5-9941-72889c26fde4.xml
#	.idea/libraries/tomcat_lib.xml
#	.idea/misc.xml
#	GDMS.iml

src/servlet/S_CollegeFillOpeningReportOpinion.java

@@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/college-fill-opening-report-opinion")
+@WebServlet("/home/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");

src/servlet/S_CollegeFillScoreOpinion.java

@@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/college-fill-score-opinion")
+@WebServlet("/home/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");

src/servlet/S_MentorFillOpeningReportOpinion.java

@@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/mentor-fill-opening-report-opinion")
+@WebServlet("/home/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");

src/servlet/S_MentorFillReview.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/mentor-fill-review")
+@WebServlet("/home/mentor-fill-review")
 public class S_MentorFillReview extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String id = request.getParameter("id");

src/servlet/S_ReviewerFillReview.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/reviewer-fill-review")
+@WebServlet("/home/reviewer-fill-review")
 public class S_ReviewerFillReview extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String id = request.getParameter("id");

src/servlet/S_SchoolFillScoreOpinion.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/school-fill-score-opinion")
+@WebServlet("/home/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");

src/servlet/S_SecretaryFillOpeningReportRecord.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/secretary-fill-opening-report-record")
+@WebServlet("/home/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");

src/servlet/S_SecretaryFillReplyRecord.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/secretary-fill-reply-record")
+@WebServlet("/home/secretary-fill-reply-record")
 public class S_SecretaryFillReplyRecord extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String id = request.getParameter("id");

src/servlet/S_StudentFillGraduationDesignInformation.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/student-fill-graduation-design-information")
+@WebServlet("/home/student-fill-graduation-design-information")
 public class S_StudentFillGraduationDesignInformation extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 

src/servlet/S_StudentSelectTeacher.java

@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-@WebServlet("/student-select-teacher")
+@WebServlet("/home/student-select-teacher")
 public class S_StudentSelectTeacher extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         super.doPost(request, response);

src/servlet/S_StudentUploadFinishedProduct.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-@WebServlet("/student-upload-finished-product")
+@WebServlet("/home/student-upload-finished-product")
 @MultipartConfig
 public class S_StudentUploadFinishedProduct extends HttpServlet {
     static String fileType = "graduation_design_finished_product";

src/servlet/S_StudentUploadOpeningReport.java

@@ -12,7 +12,7 @@ import javax.servlet.http.Part;
 import java.io.IOException;
 import java.util.UUID;
 
-@WebServlet("/student-upload-opening-report")
+@WebServlet("/home/student-upload-opening-report")
 @MultipartConfig
 public class S_StudentUploadOpeningReport extends HttpServlet {
     static String fileType = "graduation_design_opening_report";

src/servlet/S_TeacherSelectStudent.java

@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-@WebServlet("/teacher-select-student")
+@WebServlet("/home/teacher-select-student")
 public class S_TeacherSelectStudent extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         super.doPost(request, response);

src/servlet/S_TeacherTeamFillOpeningReportOpinion.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/teacher-team-fill-opening-report-opinion")
+@WebServlet("/home/teacher-team-fill-opening-report-opinion")
 public class S_TeacherTeamFillOpeningReportOpinion extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String id = request.getParameter("id");

src/servlet/S_TeacherTeamFillScoreOpinion.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/teacher-team-fill-score-opinion")
+@WebServlet("/home/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");