Merge remote-tracking branches 'remotes/origin/master' and 'remotes/origin/wlf' into wmj

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

src/dao/DBManagement.java

@@ -1,6 +1,7 @@
 package dao;
 
 import java.sql.*;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -28,6 +29,18 @@ public class DBManagement {
         "graduation_design_reply",
         "graduation_design_reply_opinion_record_score"
     };
+    //<table.field,permission>
+    public static Map<String,String> graduationDesignStudentTables = new HashMap<>(){
+        {
+            put("graduation_design.student_id","student");
+            put("opening_report_secretary_team.leader_student_id","opening_report_secretary_leader");
+            put("opening_report_secretary_team.student1_id","opening_report_secretary_member");
+            put("opening_report_secretary_team.student2_id","opening_report_secretary_member");
+            put("reply_secretary_team.leader_student_id","reply_secretary_leader");
+            put("reply_secretary_team.student1_id","reply_secretary_member");
+            put("reply_secretary_team.student2_id","reply_secretary_member");
+        }
+    };
     public static String driverClassName="org.mariadb.jdbc.Driver";
 
 

src/servlet/account/S_Register.java

@@ -0,0 +1,4 @@
+package servlet.account;
+
+public class S_Register {
+}

src/servlet/account/login.java

@@ -31,8 +31,13 @@ public class login extends HttpServlet {
       } catch (Exception e) {
         e.printStackTrace();
       }
+<<<<<<< .merge_file_a01548
     request.getSession().setAttribute("User",user);
       request.getRequestDispatcher("/home.jsp").forward(request,response);
+=======
+      request.getSession().setAttribute("User",user);
+    request.getRequestDispatcher("/home.jsp").forward(request,response);
+>>>>>>> .merge_file_a15580
   }
 
   protected void doGet(HttpServletRequest request, HttpServletResponse response)