From 7420a3362a57c98bd2f1fbff59abe8eca27a0438 Mon Sep 17 00:00:00 2001
From: zhai_lw <zhai_lw@outlook.com>
Date: Mon, 14 Jan 2019 09:26:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{select => }/S_StudentSelectTeacher.java  |  4 ++--
 .../{select => }/S_TeacherSelectStudent.java  |  4 ++--
 .../account/S_TeacherSelectStudent.java       | 19 ---------------
 src/servlet/account/login.java                |  7 +-----
 src/servlet/account/service.java              | 23 -------------------
 5 files changed, 5 insertions(+), 52 deletions(-)
 rename src/servlet/{select => }/S_StudentSelectTeacher.java (90%)
 rename src/servlet/{select => }/S_TeacherSelectStudent.java (89%)
 delete mode 100644 src/servlet/account/S_TeacherSelectStudent.java
 delete mode 100644 src/servlet/account/service.java

diff --git a/src/servlet/select/S_StudentSelectTeacher.java b/src/servlet/S_StudentSelectTeacher.java
similarity index 90%
rename from src/servlet/select/S_StudentSelectTeacher.java
rename to src/servlet/S_StudentSelectTeacher.java
index 625fbbc..57d6432 100644
--- a/src/servlet/select/S_StudentSelectTeacher.java
+++ b/src/servlet/S_StudentSelectTeacher.java
@@ -1,4 +1,4 @@
-package servlet.select;
+package servlet;
 
 import core.process.C_StudentSearchTeacher;
 import core.process.C_StudentSelectTeacher;
@@ -13,7 +13,7 @@ public class S_StudentSelectTeacher extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         super.doPost(request, response);
         String student_id=request.getParameter("id");
-        User user=(User)request.getSession().getAttribute("User");
+        User user=(User)request.getSession().getAttribute("user");
         String teacher_id=user.getId();
         try {
             new C_StudentSelectTeacher().select(student_id,teacher_id);
diff --git a/src/servlet/select/S_TeacherSelectStudent.java b/src/servlet/S_TeacherSelectStudent.java
similarity index 89%
rename from src/servlet/select/S_TeacherSelectStudent.java
rename to src/servlet/S_TeacherSelectStudent.java
index bcf2b4b..0d3d44d 100644
--- a/src/servlet/select/S_TeacherSelectStudent.java
+++ b/src/servlet/S_TeacherSelectStudent.java
@@ -1,4 +1,4 @@
-package servlet.select;
+package servlet;
 
 import core.process.C_TeacherSelectStudent;
 import core.user.User;
@@ -13,7 +13,7 @@ public class S_TeacherSelectStudent extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         super.doPost(request, response);
         String teacher_id=request.getParameter("id");
-        User user=(User)request.getSession().getAttribute("User");
+        User user=(User)request.getSession().getAttribute("user");
         String student_id=user.getId();
         try {
             new C_TeacherSelectStudent().select(teacher_id,student_id);
diff --git a/src/servlet/account/S_TeacherSelectStudent.java b/src/servlet/account/S_TeacherSelectStudent.java
deleted file mode 100644
index a9040e8..0000000
--- a/src/servlet/account/S_TeacherSelectStudent.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package servlet.account;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-@WebServlet(name = "S_TeacherSelectStudent")
-public class S_TeacherSelectStudent extends HttpServlet {
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
-    }
-
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
-    }
-}
diff --git a/src/servlet/account/login.java b/src/servlet/account/login.java
index 08269c3..0afd51b 100644
--- a/src/servlet/account/login.java
+++ b/src/servlet/account/login.java
@@ -31,12 +31,7 @@ public class login extends HttpServlet {
       } catch (Exception e) {
         e.printStackTrace();
       }
-    request.getSession().setAttribute("User",user);
+    request.getSession().setAttribute("user",user);
       request.getRequestDispatcher("/home.jsp").forward(request,response);
   }
-
-  protected void doGet(HttpServletRequest request, HttpServletResponse response)
-      throws ServletException, IOException {
-
-  }
 }
diff --git a/src/servlet/account/service.java b/src/servlet/account/service.java
deleted file mode 100644
index 0f6cadf..0000000
--- a/src/servlet/account/service.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package servlet.account;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@WebServlet( "/service")
-public class service extends HttpServlet {
-  protected void doPost(HttpServletRequest request, HttpServletResponse response)
-      throws ServletException, IOException {
-    System.out.print(request.getParameter("id"));
-
-  }
-
-  protected void doGet(HttpServletRequest request, HttpServletResponse response)
-      throws ServletException, IOException {
-
-  }
-}