From 1f5b0b6f7ab370c646a2a8c812e7c4ee31b9c774 Mon Sep 17 00:00:00 2001
From: wlf <920607690@qq.com>
Date: Sat, 12 Jan 2019 12:50:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/master' into wlf

# Conflicts:
#	src/core/process/Process.java
---
 GDMS.iml                            | 4 ++--
 src/servlet/account/S_Register.java | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/GDMS.iml b/GDMS.iml
index 0ccb429..34d2f99 100644
--- a/GDMS.iml
+++ b/GDMS.iml
@@ -19,11 +19,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Tomcat 8.5.37" level="application_server_libraries" />
+    <orderEntry type="library" scope="PROVIDED" name="Tomcat 9.0.13" level="application_server_libraries" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib/tomcat-jdbc.jar!/" />
+          <root url="jar://C:/Program Files/apache-tomcat-9.0.13/lib/tomcat-jdbc.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/src/servlet/account/S_Register.java b/src/servlet/account/S_Register.java
index cbec93b..20d558c 100644
--- a/src/servlet/account/S_Register.java
+++ b/src/servlet/account/S_Register.java
@@ -32,8 +32,6 @@ public class S_Register extends HttpServlet {
         } catch (GExcptSQL gExcptSQL) {
             gExcptSQL.printStackTrace();
         }
-        request.getSession().setAttribute("User",user);
         request.getRequestDispatcher("/login.jsp").forward(request,response);
-
     }
 }
\ No newline at end of file