Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/com/hellogithub/dao/AdminDao.java

src/com/hellogithub/service/AdminService.java

@@ -8,7 +8,20 @@ public class AdminService {
     AdminDao adminDao=new AdminDao();
 
     public adminEntity adminLogin(String userName, String password,String loginTime){
+        int num=adminDao.updateAdminLoginTime(userName,loginTime);
+        if(num==1){
             return AdminDao.AdminLogin(userName,password,loginTime);
         }
+        else {
+            return null;
+        }
 
     }
+    public adminEntity findByAdminName(String adminName){
+        return adminDao.findByAdminName(adminName);
+    }
+
+    public int adminRegister(String adminName,String pwd){
+        return adminDao.adminRegister(adminName,pwd);
+    }
+}

src/com/hellogithub/servlet/systemAdmin/AdminLoginServlet.java

@@ -16,6 +16,9 @@ import org.apache.commons.lang3.StringUtils;
 import javax.servlet.http.Cookie;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.HashMap;
 
 @WebServlet("/adminLogin")
@@ -23,7 +26,7 @@ public class AdminLoginServlet extends HttpServlet {
     AdminService adminService=new AdminService();
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        doGet(req, resp);
+        doPost(req, resp);
     }
 
     @Override
@@ -46,7 +49,6 @@ public class AdminLoginServlet extends HttpServlet {
             setResultError("用户名不能够是为空！", writer);
             return;
         }
-
         String adminPwd = req.getParameter("password");
         // 参数验证
         if (StringUtils.isEmpty(adminPwd)) {
@@ -54,13 +56,10 @@ public class AdminLoginServlet extends HttpServlet {
             setResultError("密码不能够是为空！", writer);
             return;
         }
-
+        Date now = new Date();
-        String loginTime=req.getParameter("loginTime");
+        SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        if (StringUtils.isEmpty(loginTime)){
+        String loginTime=sdf.format(now);
-            //转发到错误页面
+        System.out.println(loginTime);
-            setResultError("登陆时间不能够是为空！", writer);
-            return;
-        }
 
         // 从session中获取图形验证码
         HttpSession session = req.getSession();

src/com/hellogithub/servlet/systemAdmin/AdminRegisterServlet.java

@@ -0,0 +1,88 @@
+package com.hellogithub.servlet.systemAdmin;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hellogithub.entity.adminEntity;
+import com.hellogithub.entity.userEntity;
+import com.hellogithub.service.AdminService;
+import com.hellogithub.utils.RandomValidateCode;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.HashMap;
+@WebServlet("/adminRegister")
+public class AdminRegisterServlet extends HttpServlet {
+    AdminService adminService=new AdminService();
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        doPost(req, resp);
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        resp.setCharacterEncoding("UTF-8");
+        resp.setContentType("text/html; charset=utf-8");
+        //        设置响应头允许ajax跨域访问
+        String curOrigin = req.getHeader("Origin");
+        resp.setHeader("Access-Control-Allow-Origin", curOrigin == null ? "true" : curOrigin);
+        resp.setHeader("Access-Control-Allow-Credentials", "true");
+        resp.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, HEAD");
+        resp.setHeader("Access-Control-Max-Age", "3600");
+        resp.setHeader("Access-Control-Allow-Headers", "access-control-allow-origin, authority, content-type, version-info, X-Requested-With");
+        resp.setContentType("application/json;charset=UTF-8");
+        PrintWriter writer = resp.getWriter();
+        String adminName = req.getParameter("adminname");
+        if (StringUtils.isEmpty(adminName)) {
+            setResultError("用户名称不能够是为空", writer);
+            return;
+        }
+        String adminPwd = req.getParameter("password");
+        // 参数验证
+        if (StringUtils.isEmpty(adminPwd)) {
+            setResultError("密码不能够是为空", writer);
+            return;
+        }
+
+        // 管理员注册之前根据用户名称查询该管理员是否存在如果不存在的情况下才可以注册 如果存在的话就无法注册
+        adminEntity adminEntity = adminService.findByAdminName(adminName);
+        if (adminEntity != null) {
+            setResultError("用户名: " + adminName + "已被注册！", writer);
+            return;
+        }
+        //用户数据注册
+        int register = adminService.adminRegister(adminName, adminPwd);
+        if (register <= 0) {
+            // 注册失败了   //转发到错误页面
+            setResultError("注册失败！", writer);
+            return;
+        }
+        setResultOK("注册成功！", writer);
+    }
+
+    @Override
+    protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        super.doDelete(req, resp);
+    }
+    public void setResult(Integer code, String msg, PrintWriter writer) {
+        HashMap<String, Object> result = new HashMap<>();
+        result.put("code", code);
+        result.put("msg", msg);
+        String jsonString = JSONObject.toJSONString(result);
+        writer.println(jsonString);
+        writer.close();
+    }
+
+    public void setResultError(String msg, PrintWriter writer) {
+        setResult(500, msg, writer);
+    }
+
+    public void setResultOK(String msg, PrintWriter writer) {
+        setResult(200, msg, writer);
+    }
+}