Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf

# Conflicts:
#	GDMS.iml
#	src/servlet/account/login.java

GDMS.iml

@@ -19,15 +19,15 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <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 />
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="PROVIDED" name="Tomcat 8.5.37" level="application_server_libraries" />
   </component>
 </module>

src/servlet/S_TeaccherSelectStudent.java

@@ -1,4 +0,0 @@
-package servlet;
-
-public class S_TeaccherSelectStudent {
-}

src/servlet/S_TeacherSelectStudent.java

@@ -0,0 +1,19 @@
+package servlet;
+
+import core.user.User;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+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");
+        String student_id=user.getId();
+
+    }
+}

src/servlet/account/S_Register.java

@@ -2,12 +2,14 @@ package servlet.account;
 
 import core.user.User;
 import core.user.utils.AccountManagement;
+import error.GExcptAccount;
 import error.GExcptSQL;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -31,6 +33,10 @@ public class S_Register extends HttpServlet {
             user = AccountManagement.register("student",user_info);
         } catch (GExcptSQL gExcptSQL) {
             gExcptSQL.printStackTrace();
+        } catch (GExcptAccount gExcptAccount) {
+            gExcptAccount.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         //注册失败
         request.getSession().setAttribute("User",user);

src/servlet/basic_settings/S_Filter.java

@@ -1,17 +1,53 @@
 package servlet.basic_settings;
 
 import javax.servlet.*;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.io.IOException;
-
+@WebFilter(filterName = "sessionFilter",urlPatterns = {"/*"})
 public class S_Filter implements Filter {
+    String NO_LOGIN="/notLogin";
+    String[] includeUrls=new String[]{"redirect:http://localhost:8080/firstproject/demo/Front-end/Login/Login.html","redirect:http://localhost:8080/firstproject/demo/Front-end/Login/Login1.html"};
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws ServletException,IOException{
+        HttpServletRequest request=(HttpServletRequest) servletRequest;
+        HttpServletResponse response=(HttpServletResponse) servletResponse;
+        HttpSession session=request.getSession(false);
+        String uri=request.getRequestURI();
+        //是否需要过滤
+        boolean needFilter=isNeedFilter(uri);
+        if(!needFilter){
+            filterChain.doFilter(servletRequest,servletResponse);
+        }else{
+            //需要过滤器
+            //session中包含user对象，则是登录状态
+            if(session!=null&&session.getAttribute("user")!=null){
+                filterChain.doFilter(servletRequest,servletResponse);
+            }else{
+                String requestType=request.getHeader("X-Requested-with");
+                //判断是否是ajax请求
+                if(requestType!=null&&"XMLHttpRequest".equals(requestType)){
+                    response.sendRedirect(NO_LOGIN);
+                }else{
+                    //重定向到登录页(需要在static文件夹下建立此html文件)
+                    response.sendRedirect(request.getContextPath()+"redirect:http://localhost:8080/firstproject/demo/Front-end/Login/Login.html");
+                }
+                return;
+            }
+        }
 
-    public void init(FilterConfig filterConfig) throws ServletException {
 
     }
-    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+    public boolean isNeedFilter(String uri) {
-
+        for (String includeUrl : includeUrls) {
+            if (includeUrl.equals(uri)) {
+                return false;
+            }
+        }
+        return true;
     }
-    public void destory(){
 
-    }
+
 }

web/login.jsp

@@ -56,7 +56,7 @@
             <select class="id-check">
                 <option value="">身份</option>
                 <option value="student">学生</option>
-                <option value="teacher">老师</option>
+                <option v   alue="teacher">老师</option>
             </select>
             <input class="register-submit-style" type="submit" value="注册">
         </form>