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

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

src/servlet/account/S_Register.java

@@ -5,6 +5,7 @@ import core.user.utils.AccountManagement;
 import error.GExcptAccount;
 import error.GExcptSQL;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -12,7 +13,7 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
-
+@WebServlet("/register")
 public class S_Register extends HttpServlet {
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -22,15 +23,16 @@ public class S_Register extends HttpServlet {
         user_info.put("id",id);
         String name=request.getParameter("name");
         user_info.put("name",name);
-        String e_mail=request.getParameter("e-mail");
-        user_info.put("e_mail",e_mail);
-        String phone_number=request.getParameter("phone-number");
+        String e_mail_location=request.getParameter("e_mail_location");
+        user_info.put("e_mail_location",e_mail_location);
+        String phone_number=request.getParameter("phone_number");
         user_info.put("phone_number",phone_number);
         String password=request.getParameter("password");
         user_info.put("password",password);
         User user=null;
         try {
-            user = AccountManagement.register("student",user_info);
+            String Identity=request.getParameter("Identity");
+            user = AccountManagement.register(Identity,user_info);
         } catch (GExcptSQL gExcptSQL) {
             gExcptSQL.printStackTrace();
         } catch (GExcptAccount gExcptAccount) {

web/login.jsp

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