From 317172aa4bf88c42a10de858f4d9509b4909e104 Mon Sep 17 00:00:00 2001
From: Chenx221 <chenx221@yandex.com>
Date: Fri, 16 Jun 2023 13:06:33 +0800
Subject: [PATCH] fix login fail issue

Signed-off-by: Chenx221 <chenx221@yandex.com>
---
 .../chenx221/controller/ViewController.class  | Bin 1414 -> 1414 bytes
 .../CustomAuthenticationSuccessHandler.class  | Bin 0 -> 1282 bytes
 .../WEB-INF/classes/spring-security.xml       |   1 +
 .../WEB-INF/views/teachermanage.jsp           |  39 +++++++-----------
 .../chenx221/controller/ViewController.java   |   1 +
 .../CustomAuthenticationSuccessHandler.java   |  20 +++++++++
 .../src/main/resources/spring-security.xml    |   1 +
 project2/web/WEB-INF/views/teachermanage.jsp  |  39 +++++++-----------
 8 files changed, 53 insertions(+), 48 deletions(-)
 create mode 100644 project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/handler/CustomAuthenticationSuccessHandler.class
 create mode 100644 project2/src/main/java/cyou/chenx221/handler/CustomAuthenticationSuccessHandler.java

diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/controller/ViewController.class b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/controller/ViewController.class
index f7da260782bd3e5dc00af0c9dd35274f4f5f217a..b8a281fe45c3beaa97b44a14ca5575299341d592 100644
GIT binary patch
delta 13
UcmZqUZsXn{!OAEzS&}su02o38D*ylh

delta 13
UcmZqUZsXn{!OAE-S&}su02n<3DgXcg

diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/handler/CustomAuthenticationSuccessHandler.class b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/handler/CustomAuthenticationSuccessHandler.class
new file mode 100644
index 0000000000000000000000000000000000000000..bb67392c1e77bd9244786ec6b0cb18f3b82992d8
GIT binary patch
literal 1282
zcmbVMTTc@~6#k|Z7GVLoRKN==inQf2ktbu-gftpViY8S0zFm&(=<ZIPo#pcGAM%Od
zgFnC@WjwpBm@3fdZgMtr=A7@$eCIp+{m0jD0G>mRA%`Icc^AVN5!lzJCF71!QR}_&
zLORmsqm0Q<jIt;4h?>$%Y?~she9tN!$+`+V0qvV$yU$-we4pZY$BPaEG6EydRHW<+
zfuUllF^*AOb1>#&9In912k+23<|^heAS>I}cH|D5de^Z>pAw3#z*viHok6**z;dxv
zyEHG0sf=P$z$Ig}+2u5^MdP@RX$LbdW-%wQbTxp$l%Y@`(zdlmH4{q$g<@7!242*X
zb#_OsN~w{Oc*Dg!76j&XbRiW2pS!sOZ(6zhVi`kw6nAtKQ>AugvwUqx_8*0h>folp
z6aPdf(&s)NZ*4u6?QWN3HHobb`&0gGWWK5on1`vFis(%eHp#s6ngM%eYTEaLhG$f|
z?m6?etzv<vwf`+x5pc{e0jv%rCQ}OMjG7)t0)t8Ku_-X=^=VjO>)#n>nZ7*ssgn*z
z?4T$xo2pDIEnmMq-*Hg>OMX4MpT{s#T_?t;S1RRqb#Qk!(@Fx1dkN2HNDUP$ZpC&K
zX`2lzccOgpjVu|`_M}6yszVkR4|oOlvB<hkpBzN`dtiHuSCYSizr*EIh%edpZMNw)
zFo8R4-EIJuaF<s+6j)%8G?|d+7bvWq!C}=*oM9@5^4j{wDGI;ACNac8(+oF*IiA)O
uwA@YXfieW{@fp*i1uWx1cGdzOVuf=bv3G<$t0=Ku<5dpp*vPyBo4`-imvx%}

literal 0
HcmV?d00001

diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/spring-security.xml b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/spring-security.xml
index d5f54d4..28a1779 100644
--- a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/spring-security.xml
+++ b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/spring-security.xml
@@ -30,6 +30,7 @@
         <!--        未登录状态下会自动跳转到/login登录页-->
         <security:form-login login-page="/login"
                              default-target-url="/dashboard"
+                             authentication-success-handler-ref="customAuthenticationSuccessHandler"
                              authentication-failure-handler-ref="customAuthenticationFailureHandler"/>
         <security:logout logout-url="/logout"/>
         <security:logout logout-success-url="/login?logout=true"/>
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/views/teachermanage.jsp b/project2/out/artifacts/project2_war_exploded/WEB-INF/views/teachermanage.jsp
index 682206f..b9de02b 100644
--- a/project2/out/artifacts/project2_war_exploded/WEB-INF/views/teachermanage.jsp
+++ b/project2/out/artifacts/project2_war_exploded/WEB-INF/views/teachermanage.jsp
@@ -146,7 +146,7 @@
                             <th scope="col">授课课程ID</th>
                             <th scope="col">授课课程名</th>
                             <th scope="col">授课班级</th>
-                            <%--                            <th scope="col" class="text-center">操作</th>--%>
+                            <th scope="col" class="text-center">操作</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -159,26 +159,16 @@
                                 <td>${teacher.course.courseID}</td>
                                 <td>${teacher.course.courseName}</td>
                                 <td>${teacher.classes}</td>
-                                    <%--                                <td class="text-center">--%>
-                                    <%--                                    <div class="btn-group" role="group" aria-label="Basic example">--%>
-                                    <%--                                        <c:choose>--%>
-                                    <%--                                            <c:when test="${user.disabled_str == false}">--%>
-                                    <%--                                                <button type="button" class="btn btn-danger"><i--%>
-                                    <%--                                                        class="fas fa-ban me-1"></i>禁用账户--%>
-                                    <%--                                                </button>--%>
-                                    <%--                                            </c:when>--%>
-                                    <%--                                            <c:when test="${user.disabled_str == true}">--%>
-                                    <%--                                                <button type="button" class="btn btn-success"><i--%>
-                                    <%--                                                        class="fas fa-circle-check me-1"--%>
-                                    <%--                                                        onclick="userenabled(${user.id})"></i>启用账户--%>
-                                    <%--                                                </button>--%>
-                                    <%--                                            </c:when>--%>
-                                    <%--                                        </c:choose>--%>
-                                    <%--                                        <button type="button" class="btn btn-primary" onclick="resetPWD(${user.id})"><i--%>
-                                    <%--                                                class="fas fa-arrow-rotate-right me-1"></i>重设密码--%>
-                                    <%--                                        </button>--%>
-                                    <%--                                    </div>--%>
-                                    <%--                                </td>--%>
+                                <td class="text-center">
+                                    <div class="btn-group" role="group" aria-label="Basic example">
+                                        <button type="button" class="btn btn-danger">
+                                            <i class="fas fa-pencil me-1"></i>禁用账户
+                                        </button>
+                                        <button type="button" class="btn btn-primary">
+                                            <i class="fas fa-trash me-1"></i>重设密码
+                                        </button>
+                                    </div>
+                                </td>
                             </tr>
                         </c:forEach>
                         </tbody>
@@ -282,7 +272,8 @@
                                                 <div class="form-outline">
                                                     <input type="text" id="typeText8" class="form-control"
                                                            name="classes"/>
-                                                    <label class="form-label" for="typeText8">授课班级(一班~五班)</label>
+                                                    <label class="form-label"
+                                                           for="typeText8">授课班级(一班~五班)</label>
                                                 </div>
                                             </div>
                                         </div>
@@ -361,7 +352,8 @@
                                                 <div class="form-outline">
                                                     <input type="text" id="typeText15" class="form-control"
                                                            name="classes"/>
-                                                    <label class="form-label" for="typeText15">授课班级(一班~五班)</label>
+                                                    <label class="form-label"
+                                                           for="typeText15">授课班级(一班~五班)</label>
                                                 </div>
                                             </div>
                                         </div>
@@ -466,7 +458,6 @@
                             </div>
                         </div>
                         <!-- Tabs content -->
-
                     </div>
                 </div>
             </div>
diff --git a/project2/src/main/java/cyou/chenx221/controller/ViewController.java b/project2/src/main/java/cyou/chenx221/controller/ViewController.java
index c93196c..b1d25e6 100644
--- a/project2/src/main/java/cyou/chenx221/controller/ViewController.java
+++ b/project2/src/main/java/cyou/chenx221/controller/ViewController.java
@@ -24,6 +24,7 @@ public class ViewController {
         if (username != null) {
             model.addAttribute("username", username);
         }
+//        model.addAttribute("errorMessage","null");
         return "dashboard"; // 返回 dashboard 视图名
     }
 
diff --git a/project2/src/main/java/cyou/chenx221/handler/CustomAuthenticationSuccessHandler.java b/project2/src/main/java/cyou/chenx221/handler/CustomAuthenticationSuccessHandler.java
new file mode 100644
index 0000000..c7f06db
--- /dev/null
+++ b/project2/src/main/java/cyou/chenx221/handler/CustomAuthenticationSuccessHandler.java
@@ -0,0 +1,20 @@
+package cyou.chenx221.handler;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@Component
+public class CustomAuthenticationSuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
+
+    @Override
+    public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {
+        request.getSession().removeAttribute("errorMessage");
+        super.onAuthenticationSuccess(request, response, authentication);
+    }
+}
\ No newline at end of file
diff --git a/project2/src/main/resources/spring-security.xml b/project2/src/main/resources/spring-security.xml
index d5f54d4..28a1779 100644
--- a/project2/src/main/resources/spring-security.xml
+++ b/project2/src/main/resources/spring-security.xml
@@ -30,6 +30,7 @@
         <!--        未登录状态下会自动跳转到/login登录页-->
         <security:form-login login-page="/login"
                              default-target-url="/dashboard"
+                             authentication-success-handler-ref="customAuthenticationSuccessHandler"
                              authentication-failure-handler-ref="customAuthenticationFailureHandler"/>
         <security:logout logout-url="/logout"/>
         <security:logout logout-success-url="/login?logout=true"/>
diff --git a/project2/web/WEB-INF/views/teachermanage.jsp b/project2/web/WEB-INF/views/teachermanage.jsp
index 682206f..b9de02b 100644
--- a/project2/web/WEB-INF/views/teachermanage.jsp
+++ b/project2/web/WEB-INF/views/teachermanage.jsp
@@ -146,7 +146,7 @@
                             <th scope="col">授课课程ID</th>
                             <th scope="col">授课课程名</th>
                             <th scope="col">授课班级</th>
-                            <%--                            <th scope="col" class="text-center">操作</th>--%>
+                            <th scope="col" class="text-center">操作</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -159,26 +159,16 @@
                                 <td>${teacher.course.courseID}</td>
                                 <td>${teacher.course.courseName}</td>
                                 <td>${teacher.classes}</td>
-                                    <%--                                <td class="text-center">--%>
-                                    <%--                                    <div class="btn-group" role="group" aria-label="Basic example">--%>
-                                    <%--                                        <c:choose>--%>
-                                    <%--                                            <c:when test="${user.disabled_str == false}">--%>
-                                    <%--                                                <button type="button" class="btn btn-danger"><i--%>
-                                    <%--                                                        class="fas fa-ban me-1"></i>禁用账户--%>
-                                    <%--                                                </button>--%>
-                                    <%--                                            </c:when>--%>
-                                    <%--                                            <c:when test="${user.disabled_str == true}">--%>
-                                    <%--                                                <button type="button" class="btn btn-success"><i--%>
-                                    <%--                                                        class="fas fa-circle-check me-1"--%>
-                                    <%--                                                        onclick="userenabled(${user.id})"></i>启用账户--%>
-                                    <%--                                                </button>--%>
-                                    <%--                                            </c:when>--%>
-                                    <%--                                        </c:choose>--%>
-                                    <%--                                        <button type="button" class="btn btn-primary" onclick="resetPWD(${user.id})"><i--%>
-                                    <%--                                                class="fas fa-arrow-rotate-right me-1"></i>重设密码--%>
-                                    <%--                                        </button>--%>
-                                    <%--                                    </div>--%>
-                                    <%--                                </td>--%>
+                                <td class="text-center">
+                                    <div class="btn-group" role="group" aria-label="Basic example">
+                                        <button type="button" class="btn btn-danger">
+                                            <i class="fas fa-pencil me-1"></i>禁用账户
+                                        </button>
+                                        <button type="button" class="btn btn-primary">
+                                            <i class="fas fa-trash me-1"></i>重设密码
+                                        </button>
+                                    </div>
+                                </td>
                             </tr>
                         </c:forEach>
                         </tbody>
@@ -282,7 +272,8 @@
                                                 <div class="form-outline">
                                                     <input type="text" id="typeText8" class="form-control"
                                                            name="classes"/>
-                                                    <label class="form-label" for="typeText8">授课班级(一班~五班)</label>
+                                                    <label class="form-label"
+                                                           for="typeText8">授课班级(一班~五班)</label>
                                                 </div>
                                             </div>
                                         </div>
@@ -361,7 +352,8 @@
                                                 <div class="form-outline">
                                                     <input type="text" id="typeText15" class="form-control"
                                                            name="classes"/>
-                                                    <label class="form-label" for="typeText15">授课班级(一班~五班)</label>
+                                                    <label class="form-label"
+                                                           for="typeText15">授课班级(一班~五班)</label>
                                                 </div>
                                             </div>
                                         </div>
@@ -466,7 +458,6 @@
                             </div>
                         </div>
                         <!-- Tabs content -->
-
                     </div>
                 </div>
             </div>