From 78ccbe0324d19147c1484736c3783e0a47a28620 Mon Sep 17 00:00:00 2001
From: adiao <1819192616@qq.com>
Date: Wed, 18 May 2022 15:42:41 +0800
Subject: [PATCH] shopping commit

---
 .idea/inspectionProfiles/Project_Default.xml  |  1 +
 .idea/workspace.xml                           | 20 +++++++++++++++---
 .../java/com/example/demo3/Servlet/login.java | 20 ------------------
 .../java/com/example/demo3/pojo/User.java     |  6 +++---
 src/main/resources/UserMapper.xml             | 21 +++++++++++++++----
 src/main/webapp/login.jsp                     | 13 ++++++++----
 6 files changed, 47 insertions(+), 34 deletions(-)
 delete mode 100644 src/main/java/com/example/demo3/Servlet/login.java

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 357c5d6..a30d608 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -8,6 +8,7 @@
       <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="false" />
       <option name="DONT_REPORT_TRUE_ASSERT_STATEMENTS" value="false" />
     </inspection_tool>
+    <inspection_tool class="ELValidationInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="MavenPackageUpdate" enabled="true" level="WEAK WARNING" enabled_by_default="true">
       <option name="excludeList">
         <list>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 375b4d1..130031a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,7 +9,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="841a97d6-fb7a-4203-9936-89f5a7cbed8f" name="变更" comment="shopping commit" />
+    <list default="true" id="841a97d6-fb7a-4203-9936-89f5a7cbed8f" name="变更" comment="shopping commit">
+      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/demo3/Servlet/login.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/demo3/pojo/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/demo3/pojo/User.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/UserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/UserMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/login.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/login.jsp" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -203,7 +210,7 @@
       <workItem from="1652831640701" duration="8942000" />
       <workItem from="1652812498631" duration="5883000" />
       <workItem from="1652815871388" duration="3279000" />
-      <workItem from="1652812440545" duration="2582000" />
+      <workItem from="1652812440545" duration="4987000" />
     </task>
     <task id="LOCAL-00001" summary="shopping commit">
       <created>1652814834331</created>
@@ -219,7 +226,14 @@
       <option name="project" value="LOCAL" />
       <updated>1652814899707</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="shopping commit">
+      <created>1652815114705</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1652815114705</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
diff --git a/src/main/java/com/example/demo3/Servlet/login.java b/src/main/java/com/example/demo3/Servlet/login.java
deleted file mode 100644
index ffd074a..0000000
--- a/src/main/java/com/example/demo3/Servlet/login.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.example.demo3.Servlet;
-
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-@WebServlet (name = "login", value = "/login")
-public class login extends HelloServlet {
-    private login login;
-    private String add;
-    private String update;
-    private String delete;
-    private String change;
-
-    public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        request.getParameter("name");
-        request.getParameter("password");
-    }
-}
diff --git a/src/main/java/com/example/demo3/pojo/User.java b/src/main/java/com/example/demo3/pojo/User.java
index a53579a..2f86609 100644
--- a/src/main/java/com/example/demo3/pojo/User.java
+++ b/src/main/java/com/example/demo3/pojo/User.java
@@ -1,11 +1,11 @@
 package com.example.demo3.pojo;
 
+import java.util.List;
+
 public interface User {
 
     public User getAll2(String username);
-    public void setUserName(String uname);
-
-    public void setUserPwd(String upass);
+    public List<use> findAll();
     //fd
 
 
diff --git a/src/main/resources/UserMapper.xml b/src/main/resources/UserMapper.xml
index eb209b0..1d48ccb 100644
--- a/src/main/resources/UserMapper.xml
+++ b/src/main/resources/UserMapper.xml
@@ -5,16 +5,29 @@
 
 <mapper namespace="com.example.demo3.pojo.User">
     <select id="getAll" parameterType="String" resultType="com.example.demo3.pojo.use">
-        select * from userlist where unnamed = #{username}, unType = #{userType}
+        select *
+        from userlist
+        where unnamed = #{username}, unType = #{userType}
     </select>
     <select id="addAll" parameterType="String" resultType="com.example.demo3.pojo.use">
-        select * from userlist where unnamed = #{username}, unType = #{userType}
+        select *
+        from userlist
+        where unnamed = #{username}, unType = #{userType}
     </select>
     <select id="delAll" parameterType="String" resultType="com.example.demo3.pojo.use">
-        select * from userlist where unnamed = #{username}, unType = #{userType}
+        select *
+        from userlist
+        where unnamed = #{username}, unType = #{userType}
     </select>
     <select id="changeAll" parameterType="String" resultType="com.example.demo3.pojo.use">
-        select * from userlist where unnamed = #{username}, unType = #{userType}
+        select *
+        from userlist
+        where unnamed = #{username}, unType = #{userType}
+    </select>
+    <select id="findAll" resultType="com.example.demo3.pojo.use">
+        select *
+        from userlist
+        where unnamed = #{username}, unType = #{userType}
     </select>
 
 </mapper>
diff --git a/src/main/webapp/login.jsp b/src/main/webapp/login.jsp
index 3b24132..5b9fe38 100644
--- a/src/main/webapp/login.jsp
+++ b/src/main/webapp/login.jsp
@@ -1,3 +1,4 @@
+<jsp:useBean id="messageModel" scope="request" type="com.mysql.jdbc.PreparedStatement.EmulatedPreparedStatementBindings"/>
 <%--
   Created by IntelliJ IDEA.
   User: AiNiSuBing
@@ -5,17 +6,21 @@
   Time: 10:00
   To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" %>
 <html>
 <head>
     <title>LoGiN</title>
 </head>
 <body>
+
 <div>
-    <form action="/login" method="post" id="loign">
-        账号：<input type="text" name="">
-        密码：
+    <form action="${pageContext.request.contextPath}/login" method="post" id="loign">
+        <label for="uname">账号：</label><input type="text" name="uname" id="uname" value="${messageModel.object.username}">
+        <label for="upass">密码：</label><input type="text" name="upass" id="upass" value="${messageModel.object.userPass}">
+        注册：<input type="submit" name="register" id="register">
+        <span>${messageModel.msg}</span>
     </form>
 </div>
+
 </body>
 </html>