From 7387c146b0652fcac58ae7435ff3eabcf57c5571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=96=E7=9D=80=E8=B5=B0=E8=B7=AF?= <1115094931@qq.com> Date: Sat, 13 Apr 2024 00:23:00 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0maven=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- untitled1/.idea/.gitignore | 8 ++ untitled1/.idea/codeStyles/Project.xml | 7 ++ .../.idea/codeStyles/codeStyleConfig.xml | 5 ++ untitled1/.idea/compiler.xml | 13 ++++ untitled1/.idea/encodings.xml | 7 ++ untitled1/.idea/jarRepositories.xml | 20 +++++ untitled1/.idea/misc.xml | 22 ++++++ untitled1/pom.xml | 76 +++++++++++++++++++ .../src/main/java/org/qiu/Calculate.java | 17 +++++ untitled1/src/main/webapp/WEB-INF/web.xml | 7 ++ untitled1/src/main/webapp/index.jsp | 5 ++ untitled1/src/main/webapp/test.html | 10 +++ .../src/test/java/org/qiu/CalculateTest.java | 28 +++++++ .../target/untitled1/META-INF/MANIFEST.MF | 5 ++ untitled1/target/untitled1/WEB-INF/web.xml | 7 ++ untitled1/target/untitled1/index.jsp | 5 ++ untitled1/target/untitled1/test.html | 10 +++ 17 files changed, 252 insertions(+) create mode 100644 untitled1/.idea/.gitignore create mode 100644 untitled1/.idea/codeStyles/Project.xml create mode 100644 untitled1/.idea/codeStyles/codeStyleConfig.xml create mode 100644 untitled1/.idea/compiler.xml create mode 100644 untitled1/.idea/encodings.xml create mode 100644 untitled1/.idea/jarRepositories.xml create mode 100644 untitled1/.idea/misc.xml create mode 100644 untitled1/pom.xml create mode 100644 untitled1/src/main/java/org/qiu/Calculate.java create mode 100644 untitled1/src/main/webapp/WEB-INF/web.xml create mode 100644 untitled1/src/main/webapp/index.jsp create mode 100644 untitled1/src/main/webapp/test.html create mode 100644 untitled1/src/test/java/org/qiu/CalculateTest.java create mode 100644 untitled1/target/untitled1/META-INF/MANIFEST.MF create mode 100644 untitled1/target/untitled1/WEB-INF/web.xml create mode 100644 untitled1/target/untitled1/index.jsp create mode 100644 untitled1/target/untitled1/test.html diff --git a/untitled1/.idea/.gitignore b/untitled1/.idea/.gitignore new file mode 100644 index 0000000..73f69e0 --- /dev/null +++ b/untitled1/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/untitled1/.idea/codeStyles/Project.xml b/untitled1/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..919ce1f --- /dev/null +++ b/untitled1/.idea/codeStyles/Project.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/untitled1/.idea/codeStyles/codeStyleConfig.xml b/untitled1/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..a55e7a1 --- /dev/null +++ b/untitled1/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/untitled1/.idea/compiler.xml b/untitled1/.idea/compiler.xml new file mode 100644 index 0000000..443c136 --- /dev/null +++ b/untitled1/.idea/compiler.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/untitled1/.idea/encodings.xml b/untitled1/.idea/encodings.xml new file mode 100644 index 0000000..aa00ffa --- /dev/null +++ b/untitled1/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/untitled1/.idea/jarRepositories.xml b/untitled1/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/untitled1/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/untitled1/.idea/misc.xml b/untitled1/.idea/misc.xml new file mode 100644 index 0000000..e04082e --- /dev/null +++ b/untitled1/.idea/misc.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/untitled1/pom.xml b/untitled1/pom.xml new file mode 100644 index 0000000..1befed5 --- /dev/null +++ b/untitled1/pom.xml @@ -0,0 +1,76 @@ + + + + 4.0.0 + + org.example + untitled1 + 1.0-SNAPSHOT + war + + untitled1 Maven Webapp + + http://www.example.com + + + UTF-8 + 1.7 + 1.7 + + + + + junit + junit + 4.11 + test + + + + + + + + + + + + + + untitled1 + + + + maven-clean-plugin + 3.1.0 + + + + maven-resources-plugin + 3.0.2 + + + maven-compiler-plugin + 3.8.0 + + + maven-surefire-plugin + 2.22.1 + + + maven-war-plugin + 3.2.2 + + + maven-install-plugin + 2.5.2 + + + maven-deploy-plugin + 2.8.2 + + + + + diff --git a/untitled1/src/main/java/org/qiu/Calculate.java b/untitled1/src/main/java/org/qiu/Calculate.java new file mode 100644 index 0000000..48c2bab --- /dev/null +++ b/untitled1/src/main/java/org/qiu/Calculate.java @@ -0,0 +1,17 @@ +package org.qiu; + +public class Calculate { + public int add(int x,int y){ + return x+y; + } + public int mul(int x,int y){ + return x*y; + } + public float div(int x,int y){ + return x/y; + } + public int sub(int x,int y){ + return x-y; + } + +} diff --git a/untitled1/src/main/webapp/WEB-INF/web.xml b/untitled1/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..9f88c1f --- /dev/null +++ b/untitled1/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,7 @@ + + + + Archetype Created Web Application + diff --git a/untitled1/src/main/webapp/index.jsp b/untitled1/src/main/webapp/index.jsp new file mode 100644 index 0000000..c38169b --- /dev/null +++ b/untitled1/src/main/webapp/index.jsp @@ -0,0 +1,5 @@ + + +

Hello World!

+ + diff --git a/untitled1/src/main/webapp/test.html b/untitled1/src/main/webapp/test.html new file mode 100644 index 0000000..8fa34b2 --- /dev/null +++ b/untitled1/src/main/webapp/test.html @@ -0,0 +1,10 @@ + + + + + Title + + +我是测试页！ + + \ No newline at end of file diff --git a/untitled1/src/test/java/org/qiu/CalculateTest.java b/untitled1/src/test/java/org/qiu/CalculateTest.java new file mode 100644 index 0000000..44bc4c8 --- /dev/null +++ b/untitled1/src/test/java/org/qiu/CalculateTest.java @@ -0,0 +1,28 @@ +package org.qiu; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class CalculateTest { + private Calculate calculate=new Calculate(); + @Test + public void add() { + System.out.println(calculate.add(15,5)); + } + + @Test + public void mul() { + System.out.println(calculate.mul(2,5)); + } + + @Test + public void div() { + System.out.println(calculate.div(5,6)); + } + + @Test + public void sub() { + System.out.println(calculate.sub(15,3)); + } +} \ No newline at end of file diff --git a/untitled1/target/untitled1/META-INF/MANIFEST.MF b/untitled1/target/untitled1/META-INF/MANIFEST.MF new file mode 100644 index 0000000..cceb555 --- /dev/null +++ b/untitled1/target/untitled1/META-INF/MANIFEST.MF @@ -0,0 +1,5 @@ +Manifest-Version: 1.0 +Created-By: IntelliJ IDEA +Built-By: ASUS +Build-Jdk: 1.8.0_191 + diff --git a/untitled1/target/untitled1/WEB-INF/web.xml b/untitled1/target/untitled1/WEB-INF/web.xml new file mode 100644 index 0000000..9f88c1f --- /dev/null +++ b/untitled1/target/untitled1/WEB-INF/web.xml @@ -0,0 +1,7 @@ + + + + Archetype Created Web Application + diff --git a/untitled1/target/untitled1/index.jsp b/untitled1/target/untitled1/index.jsp new file mode 100644 index 0000000..c38169b --- /dev/null +++ b/untitled1/target/untitled1/index.jsp @@ -0,0 +1,5 @@ + + +

Hello World!

+ + diff --git a/untitled1/target/untitled1/test.html b/untitled1/target/untitled1/test.html new file mode 100644 index 0000000..8fa34b2 --- /dev/null +++ b/untitled1/target/untitled1/test.html @@ -0,0 +1,10 @@ + + + + + Title + + +我是测试页！ + + \ No newline at end of file -- Gitee From 4d0ca28ba7a9b45a6e15331fa0179ed30702dbb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=96=E7=9D=80=E8=B5=B0=E8=B7=AF?= <1115094931@qq.com> Date: Sat, 13 Apr 2024 00:26:27 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0maven=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- untitled1/src/main/java/org/qiu/Calculate.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/untitled1/src/main/java/org/qiu/Calculate.java b/untitled1/src/main/java/org/qiu/Calculate.java index 48c2bab..6d6e51f 100644 --- a/untitled1/src/main/java/org/qiu/Calculate.java +++ b/untitled1/src/main/java/org/qiu/Calculate.java @@ -10,8 +10,8 @@ public class Calculate { public float div(int x,int y){ return x/y; } - public int sub(int x,int y){ - return x-y; - } +// public int sub(int x,int y){ +// return x-y; +// } } -- Gitee From 46da5108442adb0a677a2b32fc513ce77094afee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=96=E7=9D=80=E8=B5=B0=E8=B7=AF?= <1115094931@qq.com> Date: Sat, 13 Apr 2024 00:39:29 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0maven=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- untitled1/src/main/java/org/qiu/Calculate.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/untitled1/src/main/java/org/qiu/Calculate.java b/untitled1/src/main/java/org/qiu/Calculate.java index 6d6e51f..48c2bab 100644 --- a/untitled1/src/main/java/org/qiu/Calculate.java +++ b/untitled1/src/main/java/org/qiu/Calculate.java @@ -10,8 +10,8 @@ public class Calculate { public float div(int x,int y){ return x/y; } -// public int sub(int x,int y){ -// return x-y; -// } + public int sub(int x,int y){ + return x-y; + } } -- Gitee From 35250730a595ccf5a6fc2bbb29d80dca57eae0ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=96=E7=9D=80=E8=B5=B0=E8=B7=AF?= <1115094931@qq.com> Date: Sat, 13 Apr 2024 09:58:30 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=9C=A8test1=E5=88=86=E6=94=AF=E4=B8=AD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84sub=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- untitled1/src/test/java/org/qiu/CalculateTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/untitled1/src/test/java/org/qiu/CalculateTest.java b/untitled1/src/test/java/org/qiu/CalculateTest.java index 44bc4c8..d5a6d0e 100644 --- a/untitled1/src/test/java/org/qiu/CalculateTest.java +++ b/untitled1/src/test/java/org/qiu/CalculateTest.java @@ -23,6 +23,10 @@ public class CalculateTest { @Test public void sub() { - System.out.println(calculate.sub(15,3)); + System.out.println(calculate.sub(18,3)); + } + @Test + public void sub(){ + System.out.println(calculate.sub(18,3)); } } \ No newline at end of file -- Gitee From 6717aa100539d14fdcbb4632cbc8ddadd59c78d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=96=E7=9D=80=E8=B5=B0=E8=B7=AF?= <1115094931@qq.com> Date: Sat, 13 Apr 2024 10:04:50 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=AE=9E=E7=8E=B0rebase=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- untitled1/src/test/java/org/qiu/CalculateTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/untitled1/src/test/java/org/qiu/CalculateTest.java b/untitled1/src/test/java/org/qiu/CalculateTest.java index d5a6d0e..3d1498a 100644 --- a/untitled1/src/test/java/org/qiu/CalculateTest.java +++ b/untitled1/src/test/java/org/qiu/CalculateTest.java @@ -25,8 +25,5 @@ public class CalculateTest { public void sub() { System.out.println(calculate.sub(18,3)); } - @Test - public void sub(){ - System.out.println(calculate.sub(18,3)); - } + } \ No newline at end of file -- Gitee From 8125aa9760edc92a0793eaf1f93bdb2521b1e5ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=96=E7=9D=80=E8=B5=B0=E8=B7=AF?= <1115094931@qq.com> Date: Sat, 13 Apr 2024 10:09:42 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=88=86=E6=94=AFtest2=E4=B8=8A=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- untitled1/src/test/java/org/qiu/CalculateTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/untitled1/src/test/java/org/qiu/CalculateTest.java b/untitled1/src/test/java/org/qiu/CalculateTest.java index 3d1498a..ea682c3 100644 --- a/untitled1/src/test/java/org/qiu/CalculateTest.java +++ b/untitled1/src/test/java/org/qiu/CalculateTest.java @@ -25,5 +25,7 @@ public class CalculateTest { public void sub() { System.out.println(calculate.sub(18,3)); } - -} \ No newline at end of file + public void sub(){ + System.out.println("分支二上第一次修改"); + } +} -- Gitee From c986f2ad19cd6e0a1bd5ddfb7ad2953d155aa201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=96=E7=9D=80=E8=B5=B0=E8=B7=AF?= <1115094931@qq.com> Date: Sat, 13 Apr 2024 10:10:16 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=88=86=E6=94=AFtest2=E4=B8=8A=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- untitled1/src/test/java/org/qiu/CalculateTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/untitled1/src/test/java/org/qiu/CalculateTest.java b/untitled1/src/test/java/org/qiu/CalculateTest.java index ea682c3..477d163 100644 --- a/untitled1/src/test/java/org/qiu/CalculateTest.java +++ b/untitled1/src/test/java/org/qiu/CalculateTest.java @@ -28,4 +28,7 @@ public class CalculateTest { public void sub(){ System.out.println("分支二上第一次修改"); } + public void sub(){ + System.out.println("分支二上第二次修改"); + } } -- Gitee From 1fab68f41e661d6f2801d3134251b7eeac95a3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=96=E7=9D=80=E8=B5=B0=E8=B7=AF?= <1115094931@qq.com> Date: Sat, 13 Apr 2024 10:10:54 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=88=86=E6=94=AFtest2=E4=B8=8A=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=AC=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- untitled1/src/test/java/org/qiu/CalculateTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/untitled1/src/test/java/org/qiu/CalculateTest.java b/untitled1/src/test/java/org/qiu/CalculateTest.java index 477d163..c6f4f57 100644 --- a/untitled1/src/test/java/org/qiu/CalculateTest.java +++ b/untitled1/src/test/java/org/qiu/CalculateTest.java @@ -31,4 +31,7 @@ public class CalculateTest { public void sub(){ System.out.println("分支二上第二次修改"); } + public void sub(){ + System.out.println("分支二上第三次修改"); + } } -- Gitee From 48f7fdb8bd269d6f6e5dbc6db64a8e7820734de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=96=E7=9D=80=E8=B5=B0=E8=B7=AF?= <1115094931@qq.com> Date: Sat, 13 Apr 2024 17:00:31 +0800 Subject: [PATCH 09/10] =?UTF-8?q?cherrypick=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- untitled1/src/main/java/org/qiu/Calculate.java | 1 + 1 file changed, 1 insertion(+) diff --git a/untitled1/src/main/java/org/qiu/Calculate.java b/untitled1/src/main/java/org/qiu/Calculate.java index 48c2bab..70a95fc 100644 --- a/untitled1/src/main/java/org/qiu/Calculate.java +++ b/untitled1/src/main/java/org/qiu/Calculate.java @@ -12,6 +12,7 @@ public class Calculate { } public int sub(int x,int y){ return x-y; + System.out.println("cherrypick"); } } -- Gitee From 3662ec02c32177de395349d6676aa4b794cf9110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=96=E7=9D=80=E8=B5=B0=E8=B7=AF?= <1115094931@qq.com> Date: Sat, 13 Apr 2024 18:38:34 +0800 Subject: [PATCH 10/10] cherrypick --- Servlet_login/.idea/.gitignore | 8 +++++ Servlet_login/.idea/artifacts/LoginDemo02.xml | 13 +++++++ Servlet_login/.idea/codeStyles/Project.xml | 7 ++++ .../.idea/codeStyles/codeStyleConfig.xml | 5 +++ Servlet_login/.idea/misc.xml | 6 ++++ Servlet_login/.idea/modules.xml | 8 +++++ .../out/artifacts/LoginDemo02/WEB-INF/web.xml | 6 ++++ .../out/artifacts/LoginDemo02/failure.jsp | 16 +++++++++ .../out/artifacts/LoginDemo02/index.jsp | 17 ++++++++++ .../out/artifacts/LoginDemo02/login.jsp | 34 +++++++++++++++++++ .../out/artifacts/LoginDemo02/success.jsp | 16 +++++++++ .../src/net/lh/servlet/LoginServlet.java | 32 +++++++++++++++++ Servlet_login/web/WEB-INF/web.xml | 6 ++++ Servlet_login/web/failure.jsp | 16 +++++++++ Servlet_login/web/index.jsp | 17 ++++++++++ Servlet_login/web/login.jsp | 34 +++++++++++++++++++ Servlet_login/web/success.jsp | 16 +++++++++ 17 files changed, 257 insertions(+) create mode 100644 Servlet_login/.idea/.gitignore create mode 100644 Servlet_login/.idea/artifacts/LoginDemo02.xml create mode 100644 Servlet_login/.idea/codeStyles/Project.xml create mode 100644 Servlet_login/.idea/codeStyles/codeStyleConfig.xml create mode 100644 Servlet_login/.idea/misc.xml create mode 100644 Servlet_login/.idea/modules.xml create mode 100644 Servlet_login/out/artifacts/LoginDemo02/WEB-INF/web.xml create mode 100644 Servlet_login/out/artifacts/LoginDemo02/failure.jsp create mode 100644 Servlet_login/out/artifacts/LoginDemo02/index.jsp create mode 100644 Servlet_login/out/artifacts/LoginDemo02/login.jsp create mode 100644 Servlet_login/out/artifacts/LoginDemo02/success.jsp create mode 100644 Servlet_login/src/net/lh/servlet/LoginServlet.java create mode 100644 Servlet_login/web/WEB-INF/web.xml create mode 100644 Servlet_login/web/failure.jsp create mode 100644 Servlet_login/web/index.jsp create mode 100644 Servlet_login/web/login.jsp create mode 100644 Servlet_login/web/success.jsp diff --git a/Servlet_login/.idea/.gitignore b/Servlet_login/.idea/.gitignore new file mode 100644 index 0000000..73f69e0 --- /dev/null +++ b/Servlet_login/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/Servlet_login/.idea/artifacts/LoginDemo02.xml b/Servlet_login/.idea/artifacts/LoginDemo02.xml new file mode 100644 index 0000000..2a09861 --- /dev/null +++ b/Servlet_login/.idea/artifacts/LoginDemo02.xml @@ -0,0 +1,13 @@ + + + $PROJECT_DIR$/out/artifacts/LoginDemo02 + + + + + + + + + + \ No newline at end of file diff --git a/Servlet_login/.idea/codeStyles/Project.xml b/Servlet_login/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..919ce1f --- /dev/null +++ b/Servlet_login/.idea/codeStyles/Project.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/Servlet_login/.idea/codeStyles/codeStyleConfig.xml b/Servlet_login/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..a55e7a1 --- /dev/null +++ b/Servlet_login/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/Servlet_login/.idea/misc.xml b/Servlet_login/.idea/misc.xml new file mode 100644 index 0000000..0548357 --- /dev/null +++ b/Servlet_login/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Servlet_login/.idea/modules.xml b/Servlet_login/.idea/modules.xml new file mode 100644 index 0000000..bf440b4 --- /dev/null +++ b/Servlet_login/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Servlet_login/out/artifacts/LoginDemo02/WEB-INF/web.xml b/Servlet_login/out/artifacts/LoginDemo02/WEB-INF/web.xml new file mode 100644 index 0000000..d80081d --- /dev/null +++ b/Servlet_login/out/artifacts/LoginDemo02/WEB-INF/web.xml @@ -0,0 +1,6 @@ + + + \ No newline at end of file diff --git a/Servlet_login/out/artifacts/LoginDemo02/failure.jsp b/Servlet_login/out/artifacts/LoginDemo02/failure.jsp new file mode 100644 index 0000000..84fafc6 --- /dev/null +++ b/Servlet_login/out/artifacts/LoginDemo02/failure.jsp @@ -0,0 +1,16 @@ +<%-- + Created by IntelliJ IDEA. + User: ASUS + Date: 2024/4/13 + Time: 17:46 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + 登陆失败 + + +

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

+ + diff --git a/Servlet_login/out/artifacts/LoginDemo02/index.jsp b/Servlet_login/out/artifacts/LoginDemo02/index.jsp new file mode 100644 index 0000000..5f3a21b --- /dev/null +++ b/Servlet_login/out/artifacts/LoginDemo02/index.jsp @@ -0,0 +1,17 @@ +<%-- + Created by IntelliJ IDEA. + User: ASUS + Date: 2024/4/13 + Time: 17:21 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + 首页 + + +

JSP+Servlet方式实现用户登录功能

+

跳转到登录页面

+ + diff --git a/Servlet_login/out/artifacts/LoginDemo02/login.jsp b/Servlet_login/out/artifacts/LoginDemo02/login.jsp new file mode 100644 index 0000000..a369603 --- /dev/null +++ b/Servlet_login/out/artifacts/LoginDemo02/login.jsp @@ -0,0 +1,34 @@ +<%-- + Created by IntelliJ IDEA. + User: ASUS + Date: 2024/4/13 + Time: 17:24 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + 用户登录 + + +

用户登录

+
+ + + + + + + + + + + + +
账号
密码
+ + +
+
+ + diff --git a/Servlet_login/out/artifacts/LoginDemo02/success.jsp b/Servlet_login/out/artifacts/LoginDemo02/success.jsp new file mode 100644 index 0000000..7ab7a7d --- /dev/null +++ b/Servlet_login/out/artifacts/LoginDemo02/success.jsp @@ -0,0 +1,16 @@ +<%-- + Created by IntelliJ IDEA. + User: ASUS + Date: 2024/4/13 + Time: 17:44 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + 登录成功 + + +

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

+ + diff --git a/Servlet_login/src/net/lh/servlet/LoginServlet.java b/Servlet_login/src/net/lh/servlet/LoginServlet.java new file mode 100644 index 0000000..b9a7a34 --- /dev/null +++ b/Servlet_login/src/net/lh/servlet/LoginServlet.java @@ -0,0 +1,32 @@ +package net.lh.servlet; + +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"); + //判断是否登录成功 + if (username.equals("高剑锋")&&password.equals("903213")){ + response.sendRedirect("success.jsp?username="+ URLEncoder.encode(username,"utf-8")); + }else { + response.sendRedirect("failure.jsp?username="+URLEncoder.encode(username,"utf-8")); + } + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + doPost(request,response); + } + } + diff --git a/Servlet_login/web/WEB-INF/web.xml b/Servlet_login/web/WEB-INF/web.xml new file mode 100644 index 0000000..d80081d --- /dev/null +++ b/Servlet_login/web/WEB-INF/web.xml @@ -0,0 +1,6 @@ + + + \ No newline at end of file diff --git a/Servlet_login/web/failure.jsp b/Servlet_login/web/failure.jsp new file mode 100644 index 0000000..84fafc6 --- /dev/null +++ b/Servlet_login/web/failure.jsp @@ -0,0 +1,16 @@ +<%-- + Created by IntelliJ IDEA. + User: ASUS + Date: 2024/4/13 + Time: 17:46 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + 登陆失败 + + +

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

+ + diff --git a/Servlet_login/web/index.jsp b/Servlet_login/web/index.jsp new file mode 100644 index 0000000..5f3a21b --- /dev/null +++ b/Servlet_login/web/index.jsp @@ -0,0 +1,17 @@ +<%-- + Created by IntelliJ IDEA. + User: ASUS + Date: 2024/4/13 + Time: 17:21 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + 首页 + + +

JSP+Servlet方式实现用户登录功能

+

跳转到登录页面

+ + diff --git a/Servlet_login/web/login.jsp b/Servlet_login/web/login.jsp new file mode 100644 index 0000000..a369603 --- /dev/null +++ b/Servlet_login/web/login.jsp @@ -0,0 +1,34 @@ +<%-- + Created by IntelliJ IDEA. + User: ASUS + Date: 2024/4/13 + Time: 17:24 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + 用户登录 + + +

用户登录

+
+ + + + + + + + + + + + +
账号
密码
+ + +
+
+ + diff --git a/Servlet_login/web/success.jsp b/Servlet_login/web/success.jsp new file mode 100644 index 0000000..7ab7a7d --- /dev/null +++ b/Servlet_login/web/success.jsp @@ -0,0 +1,16 @@ +<%-- + Created by IntelliJ IDEA. + User: ASUS + Date: 2024/4/13 + Time: 17:44 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + 登录成功 + + +

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

+ + -- Gitee