Browse Source

修复验证码刷新失效bug,完善判断用户账号是否为管理员且进行相应分发的处理逻辑

一杆老烟枪 1 year ago
parent
commit
dceb0ceb83

+ 2 - 1
.idea/misc.xml

@@ -6,8 +6,9 @@
         <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
+    <option name="workspaceImportForciblyTurnedOn" value="true" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="17 (3)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17 (3)" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

+ 5 - 3
src/main/java/com/bing/controller/LoginServlet.java

@@ -36,7 +36,7 @@ public class LoginServlet extends HttpServlet {
 
         if (!text.equalsIgnoreCase(imageText)) {
             request.setAttribute("imageMess", "验证码输入错误!");
-            request.getRequestDispatcher("calendar1.jsp").forward(request, response);
+            // request.getRequestDispatcher("calendar1.jsp").forward(request, response);
         }
 
         String email = request.getParameter("email");
@@ -44,10 +44,12 @@ public class LoginServlet extends HttpServlet {
 
         int k = userService.judgeLogin(email, pwd);
         System.out.println(k);
-        if (k > 0&& "admin".equals(email)) {
+        if (k > 0 && k < 2 && "admin".equals(email)) {
             request.getRequestDispatcher("calendar.jsp").forward(request, response);
-        } else {
+        } else if (k >= 2) {
             request.getRequestDispatcher("calendar1.jsp").forward(request, response);
+        } else{
+            request.getRequestDispatcher("userlogin.jsp").forward(request, response);
         }
     }
 }

+ 2 - 0
src/main/java/com/bing/controller/VerifyCodeServlet.java

@@ -1,5 +1,7 @@
 package com.bing.controller;
 
+import com.mysql.cj.Session;
+
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;

+ 3 - 0
src/main/java/com/bing/service/UserServiceImpl.java

@@ -31,8 +31,11 @@ public class UserServiceImpl implements UserService {
      */
     @Override
     public int judgeLogin(String email, String pwd) {
+
         if (email == null || email.isEmpty() || pwd == null || pwd.isEmpty()) {
             return 0;
+        } else if (!"admin".equals(email)) {
+            return 2;
         }
 
         User user = userDao.selectByName(email);

+ 1 - 1
src/main/java/com/bing/util/ConnectionUtil.java

@@ -9,7 +9,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 public class ConnectionUtil {
-    private static final String url = "jdbc:mysql://localhost:3306/apple?allowPublicKeyRetrieval=true&useSSL=false";
+    private static final String url = "jdbc:mysql://10.248.44.131/apple?allowPublicKeyRetrieval=true&useSSL=false";
     private static final String rootName = "zhangsan";
     private static final String rootPwd = "123456";
 

+ 23 - 23
src/main/webapp/userlogin.jsp

@@ -17,7 +17,6 @@
     <title>SHIXUN</title>
     <!-- 导入字体图标 -->
     <link rel="stylesheet" href="./font_mw3z7ts489g/iconfont.css">
-
     <style>
         * {
             margin: 0;
@@ -291,15 +290,7 @@
             }
         }
     </style>
-    <script type="text/javascript">
-
-        document.getElementById("btn").onclick = function () {
-            // 获取img元素
-            // 为了让浏览器发送请求到servlet, 所以一定要改变src
-            document.getElementsByTagName("img")[0].src =
-                "VerifyCodeServlet?time=" + new Date().getTime();
-        };
-    </script>
+
 </head>
 
 <body>
@@ -332,20 +323,29 @@
         </div>
     </div>
 </div>
+<script type="text/javascript">
+
+    document.getElementById("btn").onclick = function () {
+        // 获取img元素
+        // 为了让浏览器发送请求到servlet, 所以一定要改变src
+        document.getElementsByTagName("img")[0].src =
+            "VerifyCodeServlet?time=" + new Date().getTime();
+    };
+</script>
 </body>
-<%
-
-    // 获取浏览器发送过来的cookie, 获取用户信息
-    Cookie[] cookies = request.getCookies();
-    String email = "";
-    if (cookies != null) {
-        for (Cookie cookie : cookies) {
-            if ("email".equals(cookie.getName())) {
-                email = cookie.getValue();
-            }
-        }
-    }
-%>
+<%--<%--%>
+
+<%--    // 获取浏览器发送过来的cookie, 获取用户信息--%>
+<%--    Cookie[] cookies = request.getCookies();--%>
+<%--    String email = "";--%>
+<%--    if (cookies != null) {--%>
+<%--        for (Cookie cookie : cookies) {--%>
+<%--            if ("email".equals(cookie.getName())) {--%>
+<%--                email = cookie.getValue();--%>
+<%--            }--%>
+<%--        }--%>
+<%--    }--%>
+<%--%>--%>
 
 </html>
 

BIN
target/untitled.war