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

# Conflicts:
#	src/gdms/GDMS.java

.idea/artifacts/GDMS_war_exploded.xml

@@ -1,16 +0,0 @@
-<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="javaee-facet-resources" facet="gdms/web/Web" />
-      <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>
-    </root>
-  </artifact>
-</component>

.idea/artifacts/gdms_war_exploded.xml

@@ -0,0 +1,39 @@
+<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 id="file-copy" path="$PROJECT_DIR$/lib/json-lib-2.4.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/lib/ezmorph-1.0.6.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/lib/jsonunicode-1.0.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/lib/commons-lang-2.5.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/lib/hutool-core-4.2.1.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/lib/hutool-json-4.2.1.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/lib/commons-logging-1.1.1.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/lib/commons-beanutils-1.8.0.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/lib/commons-collections-3.2.1.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/jstl.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/standard.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/json-lib-2.4.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/ezmorph-1.0.6.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/commons-io-2.6.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/jsonunicode-1.0.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/commons-lang-2.5.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/hutool-core-4.2.1.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/hutool-json-4.2.1.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/commons-logging-1.1.1.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/commons-beanutils-1.8.0.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/commons-fileupload-1.3.1.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/commons-collections-3.2.1.jar" />
+          <element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/mariadb-java-client-2.3.0.jar" />
+        </element>
+      </element>
+      <element id="javaee-facet-resources" facet="gdms/web/Web" />
+    </root>
+  </artifact>
+</component>

.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>

.idea/vcs.xml

@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

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>
@@ -30,5 +29,26 @@
       </library>
     </orderEntry>
     <orderEntry type="library" scope="PROVIDED" name="com.hynnet:json-lib:2.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Tomcat 9" level="application_server_libraries" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/web/WEB-INF/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/web/WEB-INF/lib" recursive="false" />
+      </library>
+    </orderEntry>
   </component>
 </module>

src/init/Init.java

@@ -20,15 +20,7 @@ public class Init extends HttpServlet {
         if(ifInit) return;
         System.out.println("init start");
         DBManagement.init();
-        try {
-            GDMS.init();
-        } catch (GExcptInit gExcptInit) {
-            gExcptInit.printStackTrace();
-            System.exit(1);
-        } catch (GExcptFormat gExcptFormat) {
-            gExcptFormat.printStackTrace();
-            System.exit(1);
-        }
+
         ifInit = true;
         System.out.println("init finished");
     }

web/home/fillSbjMsg.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.Process" %>
+<%@ page import="core.process.TempProcess" %><%--
   Created by IntelliJ IDEA.
   User: lenovo
   Date: 2019/1/14
@@ -16,26 +19,31 @@
 </head>
 <body>
 <div class="updated">
+    <%
+       String index=request.getParameter("processIndex");
+       // User user=(User)session.getAttribute("user");
+        //TempProcess process= (TempProcess) user.getCondition().get(processIndex);
+    %>
     <div class="blank-frame-sub">
-        <div class="fill-top-blank"><div class="model-info">填写选题信息</div></div>
+        <div class="fill-top-blank"><div class="model-info">填写选题信息<%=index%></div></div>
 
             <div class="sub-msg">
-                <form>
+                <form class="subform">
                 <div class="sub-fill-frame sub-name">
                     <div class="sub-tips">论文题目:</div>
-                    <input class="sub-input" name="chinese_name" value="" type="text"
+                    <input class="sub-input chinese_name" name="chinese_name" value="" type="text"
                     placeholder="中文名">
-                    <input class="sub-input" name="english_name" type="text" value=""
+                    <input class="sub-input english_name" name="english_name" type="text" value=""
                     placeholder="英文名">
                 </div>
                 <div class="sub-fill-frame sub-class">
                     <div class="sub-tips">题目类别:</div>
-                    <input class="sub-input" name="type_of_topic" value=""
+                    <input class="sub-input type_of_topic" name="type_of_topic" value=""
                     placeholder="请输入类别">
                 </div>
                 <div class="sub-fill-frame sub-src">
                     <div class="sub-tips">题目来源:</div>
-                    <select class="sub-select" name="source_of_design">
+                    <select class="sub-select source_of_design" name="source_of_design">
                         <option value="">请选择来源</option>
                         <option value="教师科研课题">教师科研课题</option>
                         <option value="企事业单位委托课题">企事业单位委托课题</option>
@@ -44,7 +52,7 @@
                 </div>
                 <div class="sub-fill-frame sub-ct">
                     <div class="sub-tips">题目性质:</div>
-                    <select class="sub-select" name="nature_of_design">
+                    <select class="sub-select nature_of_design" name="nature_of_design">
                         <option value="">请选择题目性质</option>
                         <option value="教学研究">教学研究</option>
                         <option value="应用研究">应用研究</option>
@@ -54,9 +62,12 @@
                 </div>
                     <div class="sub-fill-frame sub-scb">
                         <div class="sub-tips">题目描述:</div>
-                        <textarea class="sub-scb-text" placeholder="请填写题目描述" name="description_of_topic"></textarea>
+                        <textarea class="sub-scb-text description_of_topic" placeholder="请填写题目描述" name="description_of_topic"></textarea>
                     </div>
+                    <input class="sub-input" name="id" type="text" value="<!%=process.getGraduationDesignId()%>"
+                           placeholder="id">
                     <input class="sub-input-button" type="button" value="提交">
+
                 </form>
             </div>
     </div>

web/home/home.jsp

@@ -83,17 +83,9 @@
                         <div class="nav-info">资料下载</div>
                     </a>
                 </div>
-                <div class="a-process aux-fun">
-                    <a href="fill_Information.jsp?002" class="link-point aux-fun-page">
-                        <div class="a-process-decoration download">
-                            <img src="../cssFile/images/fill.png">
-                        </div>
-                        <div class="nav-info">资料下载</div>
-                    </a>
-                </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/home-update.js

@@ -6,6 +6,7 @@ function upadateFrame(e) {
   var updateUrl=$(this).attr('href');
   var arr=updateUrl.split('?');
   var proccessIndex=arr[1];
+  alert(proccessIndex);
   var indexData={"index":proccessIndex};
   $('.update-frame').load(updateUrl+' .updated',indexData,function (data) {
   });

web/jsFile/sub-msg-input.js

@@ -4,7 +4,7 @@
     }
 )
 function sendSub() {
-  var Url3='testfrom.jsp';
+  var Url3='/home/student-fill-graduation-design-information';
     if( $('.sub-input').eq(0).val()==''|| $('.sub-input').eq(1).val()==''
     || $('.sub-input').eq(2).val()=='')
     {
@@ -22,12 +22,11 @@ function sendSub() {
     alert("请将信息填写完整");
     return;
   }
-  var fillDate=$(this).parent().serialize();
-  $.post(Url3,fillDate,function(data,status) {
-        if(status=='success')
-        {
-          alert("提交成功");
-        }
+  var fillData=$('.subform').serialize();
+  alert(fillData);
+  $.post(Url3,fillData,function(data,status) {
+        alert(status);
       }
   );
+  alert(333);
 }

web/jsFile/test.js

@@ -1,6 +1,7 @@
-$(document).ready(
+$(document).ready(
     function () {
-      alert("你好");
+      sessionStorage.setItem("hello","hha");
+      alert(sessionStorage.getItem("hello"));
     })
 function alet() {
   alert("成功");

web/test.jsp

@@ -13,7 +13,12 @@
     <script charset="GBK" type="text/javascript" src="jsFile/test.js" language="JavaScript"></script>
 </head>
 <body>
+<%
+    String a=request.getParameter("chinese_name");
+    response.getWriter().write(a);
+    System.out.println(a);
+%>
 <button class="but">nihao</button>
-<div>hhhhhhhhhhhhhh</div>
+<div></div>
 </body>
 </html>

web/testfrom.jsp

@@ -1,10 +1,4 @@
 <%@ page import="java.util.List" %>
-<%@page import="org.apache.commons.fileupload.FileItem" %>
-<%@page import="org.apache.commons.fileupload.FileUploadBase"%>
-<%@page import="org.apache.commons.fileupload.FileUploadException"%>
-<%@page import="org.apache.commons.fileupload.ProgressListener"%>
-<%@page import="org.apache.commons.fileupload.disk.DiskFileItemFactory"%>
-<%@page import="org.apache.commons.fileupload.servlet.ServletFileUpload"%>
 <%@page import="java.io.File"%>
 <%@ page import="java.io.PrintWriter" %>
 <%--
@@ -16,5 +10,7 @@
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%
+    String name=request.getParameter("chinese_name");
+    response.getWriter().write(name);
 %>
-<div>hello</div>
+<div></div>