From d68788a76780b04d079048f17f117a7e2035333b Mon Sep 17 00:00:00 2001 From: wang <981931449@qq.com> Date: Sun, 14 Apr 2024 16:50:37 +0800 Subject: [PATCH 1/8] =?UTF-8?q?maven=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 45 ++++++++++++ src/main/java/net/xyx/bean/User.java | 64 +++++++++++++++++ src/main/java/net/xyx/dao/UserDao.java | 51 +++++++++++++ .../net/xyx/dbutils/ConnectionManager.java | 72 +++++++++++++++++++ .../java/net/xyx/servlet/LoginServlet.java | 50 +++++++++++++ src/main/webapp/WEB-INF/web.xml | 7 ++ src/main/webapp/failure.jsp | 9 +++ src/main/webapp/index.jsp | 32 +++++++++ src/main/webapp/success.jsp | 9 +++ src/test/java/TestJava.java | 36 ++++++++++ 10 files changed, 375 insertions(+) create mode 100644 pom.xml create mode 100644 src/main/java/net/xyx/bean/User.java create mode 100644 src/main/java/net/xyx/dao/UserDao.java create mode 100644 src/main/java/net/xyx/dbutils/ConnectionManager.java create mode 100644 src/main/java/net/xyx/servlet/LoginServlet.java create mode 100644 src/main/webapp/WEB-INF/web.xml create mode 100644 src/main/webapp/failure.jsp create mode 100644 src/main/webapp/index.jsp create mode 100644 src/main/webapp/success.jsp create mode 100644 src/test/java/TestJava.java diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..d99a07c --- /dev/null +++ b/pom.xml @@ -0,0 +1,45 @@ + + 4.0.0 + org.example + web_tes + war + 1.0-SNAPSHOT + web_tes Maven Webapp + http://maven.apache.org + + + + + junit + junit + 3.8.1 + test + + + + + + mysql + mysql-connector-java + 5.1.48 + + + + javax.servlet + javax.servlet-api + 4.0.1 + provided + + + junit + junit + 4.13.2 + test + + + + + web_tes + + diff --git a/src/main/java/net/xyx/bean/User.java b/src/main/java/net/xyx/bean/User.java new file mode 100644 index 0000000..a5e67f9 --- /dev/null +++ b/src/main/java/net/xyx/bean/User.java @@ -0,0 +1,64 @@ +package net.xyx.bean; + +import java.util.Date; + + +public class User { + private int id; + private String username; + private String password; + private String telephone; + private Date registerTime; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public Date getRegisterTime() { + return registerTime; + } + + public void setRegisterTime(Date registerTime) { + this.registerTime = registerTime; + } + + @Override + public String toString() { + return "User{" + + "id=" + id + + ", username='" + username + '\'' + + ", password='" + password + '\'' + + ", telephone='" + telephone + '\'' + + ", registerTime=" + registerTime + + '}'; + } +} + diff --git a/src/main/java/net/xyx/dao/UserDao.java b/src/main/java/net/xyx/dao/UserDao.java new file mode 100644 index 0000000..5e0df9b --- /dev/null +++ b/src/main/java/net/xyx/dao/UserDao.java @@ -0,0 +1,51 @@ +package net.xyx.dao; + +import net.xyx.bean.User; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import net.xyx.dbutils.ConnectionManager; + +public class UserDao { + + + public User login(String username, String password) { + // 声明用户对象 + User user = null; + + // 获取数据库连接 + Connection conn = ConnectionManager.getConnection(); + try { + // 定义SQL字符串 + String strSQL = "SELECT * FROM t_user WHERE username = ? AND password = ?"; + // 创建预备语句对象 + PreparedStatement pstmt = conn.prepareStatement(strSQL); + // 设置占位符 + pstmt.setString(1, username); + pstmt.setString(2, password); + // 执行查询，返回结果集 + ResultSet rs = pstmt.executeQuery(); + // 判断结果集是否为空 + if (rs.next()) { + // 创建用户对象 + user = new User(); + // 利用当前记录字段值来设置用户对象属性 + user.setId(rs.getInt("id")); + user.setUsername(rs.getString("username")); + user.setPassword(rs.getString("password")); + user.setTelephone(rs.getString("telephone")); + user.setRegisterTime(rs.getTimestamp("register_time")); + } + } catch (SQLException e) { + System.err.println(e.getMessage()); + } finally { + // 关闭数据库连接 + ConnectionManager.closeConnection(conn); + } + + // 返回用户对象 + return user; + } +} + diff --git a/src/main/java/net/xyx/dbutils/ConnectionManager.java b/src/main/java/net/xyx/dbutils/ConnectionManager.java new file mode 100644 index 0000000..3fcd163 --- /dev/null +++ b/src/main/java/net/xyx/dbutils/ConnectionManager.java @@ -0,0 +1,72 @@ +package net.xyx.dbutils; + +import javax.swing.*; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; + + +public class ConnectionManager { + private static final String DRIVER = "com.mysql.jdbc.Driver"; // 数据库驱动程序 + private static final String URL = "jdbc:mysql://localhost:3306/test?useSSL=false"; // 数据库统一资源标识符 + private static final String USER = "root"; // 数据库用户 + private static final String PASSWORD = "root"; // 数据库密码 + + //私有化构造方法，拒绝实例化 + private ConnectionManager() { + } + + /** + * 获取数据库连接静态方法 + * + * @return 数据库连接对象 + */ + public static Connection getConnection() { + // 定义数据库连接 + Connection conn = null; + + try { + // 安装数据库驱动程序 + Class.forName(DRIVER); + // 获取数据库连接 + conn = DriverManager.getConnection(URL, USER, PASSWORD); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } catch (SQLException e) { + e.printStackTrace(); + } + + // 返回数据库连接 + return conn; + } + + + public static void closeConnection(Connection conn) { + // 判断数据库连接是否非空 + if (conn != null) { + try { + // 判断连接是否未关闭 + if (!conn.isClosed()) { + // 关闭数据库连接 + conn.close(); + } + } catch (SQLException e) { + e.printStackTrace(); + } + } + } + + + public static void main(String[] args) { + // 获取数据库连接 + Connection conn = getConnection(); + // 判断数据库连接是否成功 + if (conn != null) { + JOptionPane.showMessageDialog(null, "恭喜，数据库连接成功！"); + } else { + JOptionPane.showMessageDialog(null, "遗憾，数据库连接失败！"); + } + // 关闭数据库连接 + closeConnection(conn); + } +} diff --git a/src/main/java/net/xyx/servlet/LoginServlet.java b/src/main/java/net/xyx/servlet/LoginServlet.java new file mode 100644 index 0000000..45a6877 --- /dev/null +++ b/src/main/java/net/xyx/servlet/LoginServlet.java @@ -0,0 +1,50 @@ +package net.xyx.servlet; + +import net.xyx.dao.UserDao; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.net.URLEncoder; + +@WebServlet(name = "LoginServlet", urlPatterns = "/login") +public class LoginServlet extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + // 设置请求对象字符编码格式 + request.setCharacterEncoding("utf-8"); + // 获取登录表单数据 + String username = request.getParameter("username"); + String password = request.getParameter("password"); + // 判断登录是否成功 + UserDao userDao=new UserDao(); + userDao.login(username,password); + System.out.println("asdasdas"); + System.out.println("11222"); + if ( userDao.login(username,password)!=null) { + // 采用重定向，跳转到登录成功页面 + response.sendRedirect("success.jsp?username=" + URLEncoder.encode(username, "utf-8")); + } else { + // 采用重定向，跳转到登录失败页面 + response.sendRedirect("failure.jsp?username=" + URLEncoder.encode(username, "utf-8")); + } + System.out.println("rebase"); + System.out.println("base"); + } + + /** + * + * + * @param request + * @param response + * @throws ServletException + * @throws IOException + */ + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + doPost(request, response); + } +} diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..9f88c1f --- /dev/null +++ b/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,7 @@ + + + + Archetype Created Web Application + diff --git a/src/main/webapp/failure.jsp b/src/main/webapp/failure.jsp new file mode 100644 index 0000000..a70c7d3 --- /dev/null +++ b/src/main/webapp/failure.jsp @@ -0,0 +1,9 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + 登录失败 + + +

遗憾，<%=request.getParameter("username")%>，登录失败！

+ + diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp new file mode 100644 index 0000000..b3b031e --- /dev/null +++ b/src/main/webapp/index.jsp @@ -0,0 +1,32 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + 用户登录 + + +

用户登录

+
+ + + + + + + + + + + + + +
账号
密码
+ + +
+
+ + + diff --git a/src/main/webapp/success.jsp b/src/main/webapp/success.jsp new file mode 100644 index 0000000..5ce3e77 --- /dev/null +++ b/src/main/webapp/success.jsp @@ -0,0 +1,9 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + 登录成功 + + +

恭喜，<%=request.getParameter("username")%>，登录成功！

+ + diff --git a/src/test/java/TestJava.java b/src/test/java/TestJava.java new file mode 100644 index 0000000..55e627d --- /dev/null +++ b/src/test/java/TestJava.java @@ -0,0 +1,36 @@ +import net.xyx.bean.User; +import net.xyx.dao.UserDao; +import org.junit.Test; + + + + +public class TestJava { + UserDao userDao = new UserDao(); + @Test + public void testLogin2(){ + String username = "root"; + String password = "12345"; + // 调用登录方法，返回用户对象 + User user = userDao.login(username, password); + // 判断用户登录是否成功 + if (user != null) { // 成功 + System.out.println("恭喜，用户[" + username + "]登录成功~"); + } else { // 失败 + System.out.println("遗憾，用户[" + username + "]登录失败~"); + } + } + @Test + public void testLogin() { + String username = "root"; + String password = "12345"; + // 调用登录方法，返回用户对象 + User user = userDao.login(username, password); + // 判断用户登录是否成功 + if (user != null) { // 成功 + System.out.println("恭喜，用户[" + username + "]登录成功~"); + } else { // 失败 + System.out.println("遗憾，用户[" + username + "]登录失败~"); + } + } +} -- Gitee From d805ba960b3f3c28467d1b46b6c84ef049ce7c40 Mon Sep 17 00:00:00 2001 From: wang <981931449@qq.com> Date: Sun, 14 Apr 2024 16:54:04 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/net/xyx/dbutils/ConnectionManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/xyx/dbutils/ConnectionManager.java b/src/main/java/net/xyx/dbutils/ConnectionManager.java index 3fcd163..2475a6a 100644 --- a/src/main/java/net/xyx/dbutils/ConnectionManager.java +++ b/src/main/java/net/xyx/dbutils/ConnectionManager.java @@ -65,6 +65,7 @@ public class ConnectionManager { JOptionPane.showMessageDialog(null, "恭喜，数据库连接成功！"); } else { JOptionPane.showMessageDialog(null, "遗憾，数据库连接失败！"); + System.out.println("连接成功"); } // 关闭数据库连接 closeConnection(conn); -- Gitee From a13e585e33ff40e706fbab184003103fe6c68b24 Mon Sep 17 00:00:00 2001 From: wang <981931449@qq.com> Date: Sun, 14 Apr 2024 16:58:33 +0800 Subject: [PATCH 3/8] .idea --- .idea/artifacts/web_tes_war.xml | 14 + .idea/artifacts/web_tes_war_exploded.xml | 26 ++ .idea/compiler.xml | 17 + .idea/jarRepositories.xml | 20 + ..._javax_servlet_javax_servlet_api_4_0_1.xml | 13 + .idea/libraries/Maven__junit_junit_4_13_2.xml | 13 + ...ven__mysql_mysql_connector_java_5_1_48.xml | 13 + .../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 + .idea/misc.xml | 14 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + .idea/workspace.xml | 359 ++++++++++++++++++ target/web_tes/META-INF/MANIFEST.MF | 5 + target/web_tes/WEB-INF/web.xml | 7 + target/web_tes/failure.jsp | 9 + target/web_tes/index.jsp | 32 ++ target/web_tes/success.jsp | 9 + web_tes.iml | 35 ++ 18 files changed, 613 insertions(+) create mode 100644 .idea/artifacts/web_tes_war.xml create mode 100644 .idea/artifacts/web_tes_war_exploded.xml create mode 100644 .idea/compiler.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml create mode 100644 .idea/libraries/Maven__junit_junit_4_13_2.xml create mode 100644 .idea/libraries/Maven__mysql_mysql_connector_java_5_1_48.xml create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml create mode 100644 target/web_tes/META-INF/MANIFEST.MF create mode 100644 target/web_tes/WEB-INF/web.xml create mode 100644 target/web_tes/failure.jsp create mode 100644 target/web_tes/index.jsp create mode 100644 target/web_tes/success.jsp create mode 100644 web_tes.iml diff --git a/.idea/artifacts/web_tes_war.xml b/.idea/artifacts/web_tes_war.xml new file mode 100644 index 0000000..f47dc86 --- /dev/null +++ b/.idea/artifacts/web_tes_war.xml @@ -0,0 +1,14 @@ + + + $PROJECT_DIR$/target + + + web_tes + war + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/web_tes_war_exploded.xml b/.idea/artifacts/web_tes_war_exploded.xml new file mode 100644 index 0000000..7caba60 --- /dev/null +++ b/.idea/artifacts/web_tes_war_exploded.xml @@ -0,0 +1,26 @@ + + + $PROJECT_DIR$/target/web_tes + + + true + web_tes + war + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..ac566a9 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..be5f5c6 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml new file mode 100644 index 0000000..b187a30 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_13_2.xml b/.idea/libraries/Maven__junit_junit_4_13_2.xml new file mode 100644 index 0000000..bd3a351 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_13_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_48.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_48.xml new file mode 100644 index 0000000..80ee88b --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_48.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..700f2b3 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..0adbe1d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..e2691a6 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..02e5366 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + "keyToString": { + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "WebServerToolWindowFactoryState": "false", + "last_opened_file_path": "D:/java_project/web-framework", + "nodejs_package_manager_path": "npm", + "project.structure.last.edited": "Artifacts", + "project.structure.proportion": "0.0", + "project.structure.side.proportion": "0.2", + "settings.editor.selected.configurable": "MavenSettings" + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1711893796051 + + + 1711894578307 + + + 1711895635499 + + + 1712756823125 + + + 1712756892318 + + + 1712759788130 + + + 1712759847107 + + + 1712761270287 + + + 1712761290346 + + + 1712763192560 + + + 1712763597085 + + + 1712763667636 + + + 1713084637758 + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/web_tes/META-INF/MANIFEST.MF b/target/web_tes/META-INF/MANIFEST.MF new file mode 100644 index 0000000..aa2c77d --- /dev/null +++ b/target/web_tes/META-INF/MANIFEST.MF @@ -0,0 +1,5 @@ +Manifest-Version: 1.0 +Created-By: IntelliJ IDEA +Built-By: 98193 +Build-Jdk: Oracle OpenJDK version 1.8.0_381 + diff --git a/target/web_tes/WEB-INF/web.xml b/target/web_tes/WEB-INF/web.xml new file mode 100644 index 0000000..9f88c1f --- /dev/null +++ b/target/web_tes/WEB-INF/web.xml @@ -0,0 +1,7 @@ + + + + Archetype Created Web Application + diff --git a/target/web_tes/failure.jsp b/target/web_tes/failure.jsp new file mode 100644 index 0000000..a70c7d3 --- /dev/null +++ b/target/web_tes/failure.jsp @@ -0,0 +1,9 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + 登录失败 + + +

遗憾，<%=request.getParameter("username")%>，登录失败！

+ + diff --git a/target/web_tes/index.jsp b/target/web_tes/index.jsp new file mode 100644 index 0000000..b3b031e --- /dev/null +++ b/target/web_tes/index.jsp @@ -0,0 +1,32 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + 用户登录 + + +

用户登录

+
+ + + + + + + + + + + + + +
账号
密码
+ + +
+
+ + + diff --git a/target/web_tes/success.jsp b/target/web_tes/success.jsp new file mode 100644 index 0000000..5ce3e77 --- /dev/null +++ b/target/web_tes/success.jsp @@ -0,0 +1,9 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + 登录成功 + + +

恭喜，<%=request.getParameter("username")%>，登录成功！

+ + diff --git a/web_tes.iml b/web_tes.iml new file mode 100644 index 0000000..097da30 --- /dev/null +++ b/web_tes.iml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- Gitee From d14cb1cc7ee0e80809ea45c03d7a20f639677f9f Mon Sep 17 00:00:00 2001 From: wang <981931449@qq.com> Date: Sun, 14 Apr 2024 17:01:18 +0800 Subject: [PATCH 4/8] delete .idea --- .idea/artifacts/web_tes_war.xml | 14 - .idea/artifacts/web_tes_war_exploded.xml | 26 -- .idea/compiler.xml | 17 - .idea/jarRepositories.xml | 20 - ..._javax_servlet_javax_servlet_api_4_0_1.xml | 13 - .idea/libraries/Maven__junit_junit_4_13_2.xml | 13 - ...ven__mysql_mysql_connector_java_5_1_48.xml | 13 - .../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 - .idea/misc.xml | 14 - .idea/modules.xml | 8 - .idea/vcs.xml | 6 - .idea/workspace.xml | 359 ------------------ 12 files changed, 516 deletions(-) delete mode 100644 .idea/artifacts/web_tes_war.xml delete mode 100644 .idea/artifacts/web_tes_war_exploded.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml delete mode 100644 .idea/libraries/Maven__junit_junit_4_13_2.xml delete mode 100644 .idea/libraries/Maven__mysql_mysql_connector_java_5_1_48.xml delete mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml diff --git a/.idea/artifacts/web_tes_war.xml b/.idea/artifacts/web_tes_war.xml deleted file mode 100644 index f47dc86..0000000 --- a/.idea/artifacts/web_tes_war.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - $PROJECT_DIR$/target - - - web_tes - war - - - - - - - \ No newline at end of file diff --git a/.idea/artifacts/web_tes_war_exploded.xml b/.idea/artifacts/web_tes_war_exploded.xml deleted file mode 100644 index 7caba60..0000000 --- a/.idea/artifacts/web_tes_war_exploded.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - $PROJECT_DIR$/target/web_tes - - - true - web_tes - war - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index ac566a9..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index be5f5c6..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml deleted file mode 100644 index b187a30..0000000 --- a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_13_2.xml b/.idea/libraries/Maven__junit_junit_4_13_2.xml deleted file mode 100644 index bd3a351..0000000 --- a/.idea/libraries/Maven__junit_junit_4_13_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_48.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_48.xml deleted file mode 100644 index 80ee88b..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_48.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml deleted file mode 100644 index 700f2b3..0000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 0adbe1d..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index e2691a6..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 02e5366..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,359 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { - "keyToString": { - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "WebServerToolWindowFactoryState": "false", - "last_opened_file_path": "D:/java_project/web-framework", - "nodejs_package_manager_path": "npm", - "project.structure.last.edited": "Artifacts", - "project.structure.proportion": "0.0", - "project.structure.side.proportion": "0.2", - "settings.editor.selected.configurable": "MavenSettings" - } -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1711893796051 - - - 1711894578307 - - - 1711895635499 - - - 1712756823125 - - - 1712756892318 - - - 1712759788130 - - - 1712759847107 - - - 1712761270287 - - - 1712761290346 - - - 1712763192560 - - - 1712763597085 - - - 1712763667636 - - - 1713084637758 - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file -- Gitee From 2926bea6f0ea7427ad6f5045d37e65654d040d4a Mon Sep 17 00:00:00 2001 From: wang <981931449@qq.com> Date: Sun, 14 Apr 2024 17:23:35 +0800 Subject: [PATCH 5/8] =?UTF-8?q?master=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/net/xyx/servlet/LoginServlet.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/xyx/servlet/LoginServlet.java b/src/main/java/net/xyx/servlet/LoginServlet.java index 45a6877..00dd205 100644 --- a/src/main/java/net/xyx/servlet/LoginServlet.java +++ b/src/main/java/net/xyx/servlet/LoginServlet.java @@ -33,6 +33,7 @@ public class LoginServlet extends HttpServlet { } System.out.println("rebase"); System.out.println("base"); + System.out.println("base"); } /** -- Gitee From 918b3c63131afbf7a879e21ef8e78bcdd2a8f99e Mon Sep 17 00:00:00 2001 From: wang <981931449@qq.com> Date: Sun, 14 Apr 2024 17:24:45 +0800 Subject: [PATCH 6/8] =?UTF-8?q?test=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/net/xyx/servlet/LoginServlet.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/xyx/servlet/LoginServlet.java b/src/main/java/net/xyx/servlet/LoginServlet.java index 45a6877..3d8fd70 100644 --- a/src/main/java/net/xyx/servlet/LoginServlet.java +++ b/src/main/java/net/xyx/servlet/LoginServlet.java @@ -24,6 +24,7 @@ public class LoginServlet extends HttpServlet { userDao.login(username,password); System.out.println("asdasdas"); System.out.println("11222"); + System.out.println("rebase"); if ( userDao.login(username,password)!=null) { // 采用重定向，跳转到登录成功页面 response.sendRedirect("success.jsp?username=" + URLEncoder.encode(username, "utf-8")); -- Gitee From 83cf9695d7bc6b387b99650248517264e5265622 Mon Sep 17 00:00:00 2001 From: wang <981931449@qq.com> Date: Sun, 14 Apr 2024 18:06:59 +0800 Subject: [PATCH 7/8] rebase-test --- src/main/java/net/xyx/servlet/LoginServlet.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/xyx/servlet/LoginServlet.java b/src/main/java/net/xyx/servlet/LoginServlet.java index 49853af..8489e60 100644 --- a/src/main/java/net/xyx/servlet/LoginServlet.java +++ b/src/main/java/net/xyx/servlet/LoginServlet.java @@ -35,6 +35,7 @@ public class LoginServlet extends HttpServlet { System.out.println("rebase"); System.out.println("base"); System.out.println("base"); + System.out.println("base"); } /** -- Gitee From d87690bb6e8e0e2b18b455127069b8f12c01190f Mon Sep 17 00:00:00 2001 From: wang <981931449@qq.com> Date: Sun, 14 Apr 2024 18:11:57 +0800 Subject: [PATCH 8/8] pick --- src/main/java/net/xyx/servlet/LoginServlet.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/xyx/servlet/LoginServlet.java b/src/main/java/net/xyx/servlet/LoginServlet.java index 8489e60..5322e75 100644 --- a/src/main/java/net/xyx/servlet/LoginServlet.java +++ b/src/main/java/net/xyx/servlet/LoginServlet.java @@ -49,5 +49,6 @@ public class LoginServlet extends HttpServlet { protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { doPost(request, response); + System.out.println("pick"); } } -- Gitee