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

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

diff --git a/src/servlet/account/S_Register.java b/src/servlet/account/S_Register.java
index d19d6e0..cbec93b 100644
--- a/src/servlet/account/S_Register.java
+++ b/src/servlet/account/S_Register.java
@@ -13,8 +13,8 @@ import java.util.Map;
 
 public class S_Register extends HttpServlet {
     @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse resp) throws ServletException, IOException {
-        super.doPost(request, resp);
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        super.doPost(request, response);
         Map<String,String> user_info=new HashMap<>();
         String id=request.getParameter("id");
         user_info.put("id",id);
@@ -32,6 +32,8 @@ 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