Merge remote-tracking branch 'remotes/origin/hechu1'

.idea/artifacts/GDMS_war_exploded.xml

@@ -0,0 +1,16 @@
+<component name="ArtifactManager">
+  <artifact type="exploded-war" name="GDMS:war exploded">
+    <output-path>$PROJECT_DIR$/out/artifacts/GDMS_war_exploded</output-path>
+    <root id="root">
+      <element id="directory" name="WEB-INF">
+        <element id="directory" name="classes">
+          <element id="module-output" name="GDMS" />
+        </element>
+        <element id="directory" name="lib">
+          <element id="file-copy" path="C:/Program Files/Apache Software Foundation/Tomcat 9.0/lib/tomcat-jdbc.jar" />
+        </element>
+      </element>
+      <element id="javaee-facet-resources" facet="GDMS/web/Web" />
+    </root>
+  </artifact>
+</component>

.idea/libraries/com_hynnet_json_lib_2_4.xml

@@ -2,12 +2,12 @@
   <library name="com.hynnet:json-lib:2.4" type="repository">
     <properties maven-id="com.hynnet:json-lib:2.4" />
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/json-lib-2.4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/commons-beanutils-1.8.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/commons-collections-3.2.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/commons-lang-2.5.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/commons-logging-1.1.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/ezmorph-1.0.6.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/hynnet/json-lib/2.4/json-lib-2.4.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.5/commons-lang-2.5.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

GDMS.iml

@@ -19,7 +19,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Tomcat 9.0.14" level="application_server_libraries" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -29,6 +28,7 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" scope="PROVIDED" name="Tomcat 9" level="application_server_libraries" />
     <orderEntry type="library" name="com.hynnet:json-lib:2.4" level="project" />
   </component>
 </module>

src/core/process/C_StudentSearchTeacher.java

@@ -8,7 +8,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class C_StudentSearchTeacher extends TempProcess{
+public class C_StudentSearchTeacher{
     String teacherID;
 
     protected static String buttonName = "";
@@ -71,22 +71,22 @@ public class C_StudentSearchTeacher extends TempProcess{
     public void setTeacherID(String teacherID){
         this.teacherID=teacherID;
     }
-    @Override
+
     public String getInfo() {
         return info;
     }
 
-    @Override
+
     public String getTargetURL() {
         return targetURL;
     }
 
-    @Override
+
     public String getIconURL() {
         return iconURL;
     }
 
-    @Override
+
     public String getButtonName() {
         return buttonName;
     }

src/core/process/C_TeacherSearchStudent.java

@@ -8,7 +8,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class C_TeacherSearchStudent extends TempProcess  {
+public class C_TeacherSearchStudent {
      String studentId;
 
     protected static String buttonName = "";
@@ -71,22 +71,21 @@ public class C_TeacherSearchStudent extends TempProcess  {
         this.studentId=studentId;
     }
 
-    @Override
     public String getInfo() {
         return info;
     }
 
-    @Override
+
     public String getTargetURL() {
         return targetURL;
     }
 
-    @Override
+
     public String getIconURL() {
         return iconURL;
     }
 
-    @Override
+
     public String getButtonName() {
         return buttonName;
     }

src/core/process/Process.java

@@ -9,6 +9,8 @@ public abstract class Process{
     private String permission;
     private Operation operation;
 
+    public abstract String getJspURL();
+
 
     protected abstract boolean check();
     public String getPermission() {

web/home/home.jsp

@@ -2,7 +2,8 @@
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="core.user.User" %>
 <%@ page import="core.process.Condition" %>
-<%@ page import="core.process.Process" %><%--
+<%@ page import="core.process.Process" %>
+<%@ page import="core.process.C_FillInformation" %><%--
   Created by IntelliJ IDEA.
   User: lenovo
   Date: 2019/1/9
@@ -92,7 +93,7 @@
                 </div>
                 <c:forEach items="${list}">
                     <div class="a-process">
-                        <a href="<!%=condition.get(num).getJspURL()%>?<%=index++%>" class="link-point">
+                        <a href="<%=condition.get(num).getJspURL()%>?<%=index++%>" class="link-point">
                             <div class="a-process-decoration">
                                 <img src=<%=condition.get(num).getIconURL()%>>
                             </div>

web/jsFile/test.js

@@ -0,0 +1,7 @@
+$(document).ready(
+    function () {
+      alert("你好");
+    })
+function alet() {
+  alert("成功");
+}

web/manage/manage_time.jsp

@@ -0,0 +1,20 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: lenovo
+  Date: 2019/1/16
+  Time: 9:58
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>毕业设计管理系统</title>
+</head>
+<body>
+<div class="updated">
+    <form>
+        <input type="date">
+    </form>
+</div>
+</body>
+</html>

web/test.jsp

@@ -0,0 +1,19 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: lenovo
+  Date: 2019/1/16
+  Time: 1:11
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Title</title>
+    <script type="text/javascript" src="jsFile/jquery-3.3.1.js" language="JavaScript"></script>
+    <script charset="GBK" type="text/javascript" src="jsFile/test.js" language="JavaScript"></script>
+</head>
+<body>
+<button class="but">nihao</button>
+<div>hhhhhhhhhhhhhh</div>
+</body>
+</html>