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/core/process/Process.java

@@ -4,14 +4,17 @@ import core.operation.Operation;
 
 public abstract class Process{
 
+    private static String buttonName;
+    protected static String targetURL;
+
+    protected static String iconURL;
+
     private String status;
 
     private String permission;
     private Operation operation;
     private String info;
-    private static String buttonName;
-    protected static String targetURL;
-    protected static String iconURL;
+
 
     protected abstract boolean check();
     public String getPermission() {

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("/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("/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("/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("/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("/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("/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("/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("/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_StudentUploadFinishedProduct.java

@@ -14,7 +14,16 @@ public class S_StudentUploadFinishedProduct extends HttpServlet {
     static String fileType = "graduation_design_finished_product";
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String id = "000";
-        //String id = request.getParameter("id");
-        String fileURL = servlet.Utils.saveFile(request, fileType);
+        //String files = request.getParameter("file");
+        System.out.print("123");
+        System.out.print( request.getPart("file"));
+        System.out.print("123");
+        try {
+            String fileURL = servlet.Utils.saveFile(request, fileType);
+        }catch (Exception e)
+        {
+            System.out.print(e);
+        }
+        System.out.print("222");
     }
 }

src/servlet/S_StudentUploadOpeningReport.java

@@ -18,6 +18,6 @@ public class S_StudentUploadOpeningReport extends HttpServlet {
     static String fileType = "graduation_design_opening_report";
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String id = request.getParameter("id");
-        String fileURL = servlet.Utils.saveFile(request, fileType);
+        //String fileURL = servlet.Utils.saveFile(request, fileType);
     }
 }

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("/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("/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");

src/servlet/Utils.java

@@ -39,10 +39,13 @@ public interface Utils {
         return getFilePath(table)+getFileName(fileName);
     }
     static String saveFile(HttpServletRequest request, String table) throws IOException, ServletException {
-        Part part = request.getPart("graduation_design");
+        System.out.println("utils");
+        Part part = request.getPart("file");
+        System.out.println("part");
         String header = part.getHeader("content-disposition");
         String path = header.substring(header.indexOf("filename=") + 10, header.length() - 1);
         String filePathName = servlet.Utils.getFilePathName(table,path);
+        System.out.println(filePathName);
         File file = new File(filePathName);
         InputStream inputStream = part.getInputStream();
         FileOutputStream outputStream = new FileOutputStream(file);
@@ -54,6 +57,7 @@ public interface Utils {
         outputStream.close();
         inputStream.close();
         part.delete();
+        System.out.println("end");
         return filePathName;
     }
 }

src/servlet/account/S_Login.java

@@ -38,7 +38,7 @@ public class S_Login extends HttpServlet {
             return;
         }
         request.getSession().setAttribute("user",user);
-        response.sendRedirect("/home.jsp");
+        response.sendRedirect("/home/home.jsp");
         return;
     }
 }

src/servlet/account/S_Register.java

@@ -43,7 +43,7 @@ public class S_Register extends HttpServlet {
             response.sendRedirect("/op_fail.jsp");
         }
         request.getSession().setAttribute("user",user);
-        response.sendRedirect("/home.jsp");
+        response.sendRedirect("/home/home.jsp");
         return;
     }
 }

web/home/download.jsp

@@ -9,8 +9,8 @@
 <html>
 <head>
     <title>资料下载</title>
-    <link type="text/css" rel="stylesheet" href="cssFile/download_style.css">
-    <script type="text/javascript" src="jsFile/jquery-3.3.1.js"></script>
+    <link type="text/css" rel="stylesheet" href="../cssFile/download_style.css">
+    <script type="text/javascript" src="../jsFile/jquery-3.3.1.js"></script>
 </head>
 <body>
 <div class="updated">

web/home/fillSbjMsg.jsp

@@ -10,9 +10,9 @@
 <html>
 <head>
     <title>填写选题信息</title>
-    <link type="text/css" rel="stylesheet" href="cssFile/blank-style.css">
-    <script type="text/javascript" src="jsFile/jquery-3.3.1.js"></script>
-    <script type="text/javascript" src="jsFile/sub-msg-input.js"></script>
+    <link type="text/css" rel="stylesheet" href="../cssFile/blank-style.css">
+    <script type="text/javascript" src="../jsFile/jquery-3.3.1.js"></script>
+    <script type="text/javascript" src="../jsFile/sub-msg-input.js"></script>
 </head>
 <body>
 <div class="updated">

web/home/home.jsp

@@ -1,5 +1,8 @@
 <%@ page import="java.util.List" %>
-<%@ page import="java.util.ArrayList" %><%--
+<%@ page import="java.util.ArrayList" %>
+<%@ page import="core.user.User" %>
+<%@ page import="core.process.Condition" %>
+<%@ page import="core.process.Process" %><%--
   Created by IntelliJ IDEA.
   User: lenovo
   Date: 2019/1/9
@@ -11,30 +14,31 @@
 <html>
 <head>
     <title>毕业设计管理系统</title>
-    <link type="text/css" rel="stylesheet" href="cssFile/upload_style.css">
-    <link type="text/css" rel="stylesheet" href="cssFile/home.css">
-    <link type="text/css" rel="stylesheet" href="cssFile/personal.css">
-    <link type="text/css" rel="stylesheet" href="cssFile/select-style.css">
-    <link type="text/css" rel="stylesheet" href="cssFile/fill-style.css">
-    <link type="text/css" rel="stylesheet" href="cssFile/download_style.css">
-    <link type="text/css" rel="stylesheet" href="cssFile/blank-style.css">
-    <script type="text/javascript" src="jsFile/jquery-3.3.1.js"></script>
-    <script type="text/javascript" src="jsFile/homeActive.js"></script>
-    <script type="text/javascript" src="jsFile/home-update.js"></script>
-    <script type="text/javascript" src="jsFile/personal.js"></script>
-    <script type="text/javascript" src="jsFile/search.js"></script>
-    <script type="text/javascript" src="jsFile/fill-action.js"></script>
-    <script type="text/javascript" src="jsFile/upload_action.js"></script>
-    <script type="text/javascript" src="jsFile/sub-msg-input.js"></script>
+    <link type="text/css" rel="stylesheet" href="../cssFile/upload_style.css">
+    <link type="text/css" rel="stylesheet" href="../cssFile/home.css">
+    <link type="text/css" rel="stylesheet" href="../cssFile/personal.css">
+    <link type="text/css" rel="stylesheet" href="../cssFile/select-style.css">
+    <link type="text/css" rel="stylesheet" href="../cssFile/fill-style.css">
+    <link type="text/css" rel="stylesheet" href="../cssFile/download_style.css">
+    <link type="text/css" rel="stylesheet" href="../cssFile/blank-style.css">
+    <script type="text/javascript" src="../jsFile/jquery-3.3.1.js"></script>
+    <script type="text/javascript" src="../jsFile/homeActive.js"></script>
+    <script type="text/javascript" src="../jsFile/home-update.js"></script>
+    <script type="text/javascript" src="../jsFile/personal.js"></script>
+    <script type="text/javascript" src="../jsFile/search.js"></script>
+    <script type="text/javascript" src="../jsFile/fill-action.js"></script>
+    <script type="text/javascript" src="../jsFile/upload_action.js"></script>
+    <script type="text/javascript" src="../jsFile/sub-msg-input.js"></script>
 </head>
 <body>
-<%String type="teacher";pageContext.setAttribute("userType",type);%>
-<%List<String> list=new ArrayList<>();
-    list.add("001");
-    list.add("002");
+<%
+    User user=(User)session.getAttribute("user");
+    String type=user.getType();
+    pageContext.setAttribute("userType",type);
+    Condition condition=user.getCondition();
+    //List<Process> pList=condition.getProcesses();
+    int length=0;
     int index=0;
-    pageContext.setAttribute("list",list);
-    session.setAttribute("list",list);
 %>
 <div class="main">
     <div class="top-bar">
@@ -46,11 +50,11 @@
                     <img src="">
                 </div>
                 <div class="opt">
-                    <img class="img" src="cssFile/images/opt.png">
+                    <img class="img" src="../cssFile/images/opt.png">
                     <div class="opt-options">
                         <div class="opt-to-perm"><a class="update-to-perm" href="personal_setting.jsp">
                             个人信息</a></div>
-                        <div class="to-logout"><a href="login.jsp">退出登录</a></div>
+                        <div class="to-logout"><a href="../login.jsp">退出登录</a></div>
                     </div>
                 </div>
             </div>
@@ -63,7 +67,7 @@
                 <div class="a-process personal-msg">
                     <a href="personal_setting.jsp?001" class="link-point personal-msg-page">
                         <div class="a-process-decoration personal-set">
-                            <img src="cssFile/images/man.png">
+                            <img src="../cssFile/images/man.png">
                         </div>
                         <div class="nav-info">个人信息</div>
                     </a>
@@ -71,7 +75,7 @@
                 <div class="a-process aux-fun">
                     <a href="download.jsp?002" class="link-point aux-fun-page">
                         <div class="a-process-decoration download">
-                            <img src="cssFile/images/download.png">
+                            <img src="../cssFile/images/download.png">
                         </div>
                         <div class="nav-info">资料下载</div>
                     </a>
@@ -79,7 +83,7 @@
                     <div class="a-process">
                         <a href="select.jsp" class="link-point data-download-page">
                             <div class="a-process-decoration select">
-                                <img src="cssFile/images/select.png">
+                                <img src="../cssFile/images/select.png">
                             </div>
                             <div class="nav-info">选择老师</div>
                         </a>
@@ -87,7 +91,7 @@
                     <div class="a-process">
                         <a href="fill_Information.jsp" class="link-point">
                             <div class="a-process-decoration">
-                                <img src="cssFile/images/fill.png">
+                                <img src="../cssFile/images/fill.png">
                             </div>
                             <div class="nav-info">填写信息</div>
                         </a>
@@ -95,7 +99,7 @@
                     <div class="a-process">
                         <a href="upload_file.jsp" class="link-point">
                             <div class="a-process-decoration">
-                                <img src="cssFile/images/upload.png">
+                                <img src="../cssFile/images/upload.png">
                             </div>
                             <div class="nav-info">上传文件</div>
                         </a>
@@ -103,7 +107,7 @@
                     <div class="a-process">
                         <a href="fillSbjMsg.jsp" class="link-point">
                             <div class="a-process-decoration">
-                                <img src="cssFile/images/filText.png">
+                                <img src="../cssFile/images/filText.png">
                             </div>
                             <div class="nav-info">填写选题信息</div>
                         </a>
@@ -112,7 +116,7 @@
                     <div class="a-process">
                         <a href="fillSbjMsg.jsp?<%=index++%>" class="link-point">
                             <div class="a-process-decoration">
-                                <img src="cssFile/images/filText.png">
+                                <img src="../cssFile/images/filText.png">
                             </div>
                             <div class="nav-info">填写选题信息</div>
                         </a>
@@ -129,25 +133,25 @@
                     <ul class="scroll-ads-imgs" style="transform: translateX(0%)">
                         <li class="scroll-child">
                             <a>
-                                <img src="cssFile/images/change.jpg">
+                                <img src="../cssFile/images/change.jpg">
                                 <div class="ads-text">hello</div>
                             </a>
                         </li>
                         <li class="scroll-child">
                             <a>
-                                <img src="cssFile/images/change2.jpg">
+                                <img src="../cssFile/images/change2.jpg">
                                 <div class="ads-text">hello</div>
                             </a>
                         </li>
                         <li class="scroll-child">
                             <a>
-                                <img src="cssFile/images/change3.jpg">
+                                <img src="../cssFile/images/change3.jpg">
                                 <div class="ads-text">hello</div>
                             </a>
                         </li>
                         <li class="scroll-child">
                             <a>
-                                <img src="cssFile/images/change.jpg">
+                                <img src="../cssFile/images/change.jpg">
                                 <div class="ads-text">hello</div>
                             </a>
                         </li>
@@ -190,6 +194,6 @@
         <p>team bys</p>
     </div>
 </div>
-<script type="text/javascript" src="jsFile/personal.js"></script>
+<script type="text/javascript" src="../jsFile/personal.js"></script>
 </body>
 </html>

web/home/personal_setting.jsp

@@ -6,9 +6,9 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<link type="text/css" rel="stylesheet" href="cssFile/personal.css">
-<script type="text/javascript" src="jsFile/jquery-3.3.1.js"></script>
-<script type="text/javascript" src="jsFile/personal.js"></script>
+<link type="text/css" rel="stylesheet" href="../cssFile/personal.css">
+<script type="text/javascript" src="../jsFile/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../jsFile/personal.js"></script>
 <html>
 <head>
     <title>个人信息</title>

web/home/select.jsp

@@ -17,9 +17,9 @@
 <html>
 <head>
     <title>Title</title>
-    <script type="text/javascript" src="jsFile/jquery-3.3.1.js"></script>
-    <link type="text/css" rel="stylesheet" href="cssFile/select-style.css">
-    <script type="text/javascript" src="jsFile/search.js"></script>
+    <script type="text/javascript" src="../jsFile/jquery-3.3.1.js"></script>
+    <link type="text/css" rel="stylesheet" href="../cssFile/select-style.css">
+    <script type="text/javascript" src="../jsFile/search.js"></script>
 </head>
 <body>
 <%

web/home/upload_file.jsp

@@ -9,9 +9,9 @@
 <html>
 <head>
     <title>上传文件</title>
-    <link type="text/css" rel="stylesheet" href="cssFile/upload_style.css">
-    <script type="text/javascript" src="jsFile/jquery-3.3.1.js"></script>
-    <script type="text/javascript" src="jsFile/upload_action.js"></script>
+    <link type="text/css" rel="stylesheet" href="../cssFile/upload_style.css">
+    <script type="text/javascript" src="../jsFile/jquery-3.3.1.js"></script>
+    <script type="text/javascript" src="../jsFile/upload_action.js"></script>
 </head>
 <body>
 <div class="updated">
@@ -19,13 +19,15 @@
         <div class="upload-frame">
             <div class="upload-tips">上传定稿</div>
             <div class="file-msg">
-                <img src="cssFile/images/file-pdf.png">
+                <img src="../cssFile/images/file-pdf.png">
                 <span class="file-name" style="color: rgba(0,0,0,0.72)">
                 </span>
             </div>
-            <div class="file-input-frame"><input class="true-select" type="file" accept="application/pdf" multiple="multiple">
+            <div class="file-input-frame">
+                <input class="true-select" id="select" type="file" accept="application/pdf" multiple="multiple">
                 <div class="upload-button select-file">选择文件</div>
-                <div class="upload-button upload-it">上传文件</div></div>
+                <div class="upload-button upload-it">上传文件</div>
+            </div>
         </div>
 </div>
 </body>

web/jsFile/upload_action.js

@@ -6,17 +6,18 @@ $(document).ready(function () {
 function sendFile() {
   var fileData =new FormData();
   var Url4='student-upload-finished-product';
-  var file=$('.true-select').files;
+  var file=$('#select')[0].files[0];
   if($('.true-select').val()=='')
   {
     alert("请选择文件");
     return;
   }
+  alert(file);
   fileData.append("file",file);
   $.ajax({
     type:"post",
     url:Url4,
-    date:fileData,
+    data:fileData,
     processData:false,
     contentType:false,
     success:function (data,status) {