From a4e4c862e029498f6d89c929fd07cdcffe206d38 Mon Sep 17 00:00:00 2001
From: zhai_lw <zhai_lw@outlook.com>
Date: Tue, 15 Jan 2019 09:57:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5C=5FProcess?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                  |  2 +-
 GDMS.iml                                        | 16 ++++++++++++----
 src/gdms/test.java                              | 12 ------------
 src/servlet/S_StudentUploadFinishedProduct.java |  3 ++-
 src/servlet/Utils.java                          |  1 -
 web/jsFile/upload_action.js                     |  4 ++--
 6 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9486b47..11bca97 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="10" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="10" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/GDMS.iml b/GDMS.iml
index 20dda90..23fde1f 100644
--- a/GDMS.iml
+++ b/GDMS.iml
@@ -17,10 +17,18 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="10" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" scope="PROVIDED" name="lib" level="project" />
-    <orderEntry type="library" exported="" scope="PROVIDED" name="Tomcat 8.5.37" level="application_server_libraries" />
-    <orderEntry type="library" scope="PROVIDED" name="tomcat-lib" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Tomcat 8.5.37" level="application_server_libraries" />
+    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib/tomcat-jdbc.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>
\ No newline at end of file
diff --git a/src/gdms/test.java b/src/gdms/test.java
index ffdddc1..55dbfa0 100644
--- a/src/gdms/test.java
+++ b/src/gdms/test.java
@@ -17,18 +17,6 @@ public class test {
             System.out.println(i);
         }while(i<3);
 
-        List<String> list = new ArrayList<>();
-        list.add("q");
-        list.add("w");
-        Map<String,String> map=new HashMap<>();
-        map.put("a","b");
-        map.put("c","d");
-        Select sql = new Select(list,"zx",map,1,2);
-        System.out.println(sql.getSQL());
-        System.out.println(Utils.getFilePathName("a","b"));
-        String a = "a";
-        changeB(a);
-        System.out.println(a);
     }
     static void changeB(String a){
         a="B";
diff --git a/src/servlet/S_StudentUploadFinishedProduct.java b/src/servlet/S_StudentUploadFinishedProduct.java
index 266671c..20f2fb5 100644
--- a/src/servlet/S_StudentUploadFinishedProduct.java
+++ b/src/servlet/S_StudentUploadFinishedProduct.java
@@ -13,7 +13,8 @@ import java.io.IOException;
 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 = request.getParameter("id");
+        String id = "000";
+        //String id = request.getParameter("id");
         String fileURL = servlet.Utils.saveFile(request, fileType);
     }
 }
diff --git a/src/servlet/Utils.java b/src/servlet/Utils.java
index 687b7e9..3cea1d0 100644
--- a/src/servlet/Utils.java
+++ b/src/servlet/Utils.java
@@ -1,7 +1,6 @@
 package servlet;
 
 import gdms.Configuration;
-import org.apache.coyote.Request;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
diff --git a/web/jsFile/upload_action.js b/web/jsFile/upload_action.js
index c3214c9..c756a06 100644
--- a/web/jsFile/upload_action.js
+++ b/web/jsFile/upload_action.js
@@ -4,8 +4,8 @@ $(document).ready(function () {
   $(document).off('change',showMsg).on('change','.true-select',showMsg)
 })
 function sendFile() {
-  var fileData =new FormData;
-  var Url4='testfrom.jsp';
+  var fileData =new FormData();
+  var Url4='student-upload-finished-product';
   var file=$('.true-select').files;
   if($('.true-select').val()=='')
   {