From 6d1ee2f0d1b8aa6db4466e0d667b58b16d486191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E6=A5=9A?= <823169880@qq.com>
Date: Wed, 16 Jan 2019 16:49:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/master' into
 hechu1

# Conflicts:
#	src/gdms/GDMS.java
---
 .idea/artifacts/gdms_war_exploded.xml | 39 +++++++++++++++++++++++++++
 src/init/Init.java                    | 10 +------
 web/home/fillSbjMsg.jsp               | 12 +++++----
 3 files changed, 47 insertions(+), 14 deletions(-)
 create mode 100644 .idea/artifacts/gdms_war_exploded.xml

diff --git a/.idea/artifacts/gdms_war_exploded.xml b/.idea/artifacts/gdms_war_exploded.xml
new file mode 100644
index 0000000..2a7e3df
--- /dev/null
+++ b/.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>
\ No newline at end of file
diff --git a/src/init/Init.java b/src/init/Init.java
index 7dea8d1..4384957 100644
--- a/src/init/Init.java
+++ b/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");
     }
diff --git a/web/home/fillSbjMsg.jsp b/web/home/fillSbjMsg.jsp
index 278f529..add09b0 100644
--- a/web/home/fillSbjMsg.jsp
+++ b/web/home/fillSbjMsg.jsp
@@ -20,12 +20,12 @@
 <body>
 <div class="updated">
     <%
-        int processIndex=Integer.parseInt(request.getParameter("proccessIndex"));
-        User user=(User)session.getAttribute("user");
-        TempProcess process= (TempProcess) user.getCondition().get(processIndex);
+       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 class="subform">
@@ -64,8 +64,10 @@
                         <div class="sub-tips">题目描述:</div>
                         <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="提交">
-                    <input class="id" type="text" value="<%=process.getGraduationDesignId()%>">
+
                 </form>
             </div>
     </div>