From cf09fe5a41503ca855551e354dd74e657991667a Mon Sep 17 00:00:00 2001
From: zhqh <14284394+zhqhs@user.noreply.gitee.com>
Date: Wed, 5 Jun 2024 14:01:38 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat=EF=BC=9A=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/WEB-INF/abc.jsp | 54 +++++++++++++++++++
.../Animal.java" | 9 ++++
.../Cat.java" | 15 ++++++
.../abc.jsp" | 54 +++++++++++++++++++
4 files changed, 132 insertions(+)
create mode 100644 web/WEB-INF/abc.jsp
create mode 100644 "work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Animal.java"
create mode 100644 "work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Cat.java"
create mode 100644 "work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/abc.jsp"
diff --git a/web/WEB-INF/abc.jsp b/web/WEB-INF/abc.jsp
new file mode 100644
index 0000000..171ff1f
--- /dev/null
+++ b/web/WEB-INF/abc.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+
+<%@ page import ="com.java.minxi.java_20240531.java_2302_郑祺海_2344310215.Animal" %>
+<%@ page import ="com.java.minxi.java_20240531.java_2302_郑祺海_2344310215.Cat" %>
+
+
+
+
+ 五月三十一日
+
+
+<%
+ class Animal {
+ public static String sleep(){
+ return "一只动物在睡觉";
+ }
+ }
+%>
+<%
+ class Cat{
+ String name;
+ int time;
+
+ public Cat(String name, int time) {
+ this.name = name;
+ this.time = time;
+ }
+
+ public String sleep(int time) {
+ return name + "睡了" + time + "个小时";
+ }
+ }
+%>
+
+<%
+ Animal animal = new Animal();
+ Cat cat = new Cat("汤姆", 8);
+ out.println (animal.sleep ());
+ out.println (cat.sleep (8));
+%>
+
+<%
+ for (int i = 1; i <= 9; i++) {
+ for (int j = 1; j <= i; j++) {
+ out.println (i + " *" + j + " = " + (i* j));
+ }
+ }
+%>
+
+
+
+
+
+
diff --git "a/work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Animal.java" "b/work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Animal.java"
new file mode 100644
index 0000000..f99f643
--- /dev/null
+++ "b/work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Animal.java"
@@ -0,0 +1,9 @@
+package com.java.minxi.java_20240531.java_2302_郑祺海_2344310215;
+
+
+
+public class Animal {
+ public static String sleep(){
+ return "一只动物在睡觉";
+ }
+}
diff --git "a/work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Cat.java" "b/work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Cat.java"
new file mode 100644
index 0000000..4e17147
--- /dev/null
+++ "b/work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Cat.java"
@@ -0,0 +1,15 @@
+package com.java.minxi.java_20240531.java_2302_郑祺海_2344310215;
+
+public class Cat {
+ public String name;
+ public int time;
+
+ public Cat(String name, int time) {
+ this.name = name;
+ this.time = time;
+ }
+
+ public String sleep(int time) {
+ return name + "睡了" + time + "个小时";
+ }
+}
diff --git "a/work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/abc.jsp" "b/work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/abc.jsp"
new file mode 100644
index 0000000..171ff1f
--- /dev/null
+++ "b/work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/abc.jsp"
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+
+<%@ page import ="com.java.minxi.java_20240531.java_2302_郑祺海_2344310215.Animal" %>
+<%@ page import ="com.java.minxi.java_20240531.java_2302_郑祺海_2344310215.Cat" %>
+
+
+
+
+ 五月三十一日
+
+
+<%
+ class Animal {
+ public static String sleep(){
+ return "一只动物在睡觉";
+ }
+ }
+%>
+<%
+ class Cat{
+ String name;
+ int time;
+
+ public Cat(String name, int time) {
+ this.name = name;
+ this.time = time;
+ }
+
+ public String sleep(int time) {
+ return name + "睡了" + time + "个小时";
+ }
+ }
+%>
+
+<%
+ Animal animal = new Animal();
+ Cat cat = new Cat("汤姆", 8);
+ out.println (animal.sleep ());
+ out.println (cat.sleep (8));
+%>
+
+<%
+ for (int i = 1; i <= 9; i++) {
+ for (int j = 1; j <= i; j++) {
+ out.println (i + " *" + j + " = " + (i* j));
+ }
+ }
+%>
+
+
+
+
+
+
--
Gitee
From 7083e7891dbd660766b3720b9e7048807a0ffe5d Mon Sep 17 00:00:00 2001
From: zhqh <14284394+zhqhs@user.noreply.gitee.com>
Date: Wed, 5 Jun 2024 14:02:43 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat=EF=BC=9A=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Demo1.java" | 2 +-
.../Demo3.java" | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git "a/work/com/java/minxi/java_20240524/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Demo1.java" "b/work/com/java/minxi/java_20240524/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Demo1.java"
index 283acf3..479172b 100644
--- "a/work/com/java/minxi/java_20240524/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Demo1.java"
+++ "b/work/com/java/minxi/java_20240524/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Demo1.java"
@@ -2,7 +2,7 @@ package com.java.minxi.java_20240524.java_2302_郑祺海_2344310215;
import java.sql.*;
-public class Demo1 {
+public class Demo1 {
public static void demo1() {
Connection con = null;
Statement stat = null;
diff --git "a/work/com/java/minxi/java_20240524/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Demo3.java" "b/work/com/java/minxi/java_20240524/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Demo3.java"
index 7fb5649..6df5ee2 100644
--- "a/work/com/java/minxi/java_20240524/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Demo3.java"
+++ "b/work/com/java/minxi/java_20240524/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Demo3.java"
@@ -10,7 +10,7 @@ import java.sql.ResultSet;
public class Demo3 {
private static final String DB_URL = "jdbc:mysql://localhost:3306/student?" + "serverTimezone=Asia/Shanghai";
private static final String USER = "root";
- private static final String PASSWORD = "123456";
+ private static final String PASSWORD = "123456";
@@ -22,7 +22,8 @@ public class Demo3 {
dataSource.setPassword ("123456");
dataSource.setInitialSize(5);
dataSource.setMaxActive(20);
- dataSource.setMinIdle(5);dataSource.init ();
+ dataSource.setMinIdle(5);
+ dataSource.init ();
Connection conn = dataSource.getConnection ();
String sql = "update teacher_info set teacher_name = ? where id = ?";
--
Gitee
From 4ff9b0a671c54bf5ebe5c1ec95b085eb3cb38dfb Mon Sep 17 00:00:00 2001
From: zhqh <14284394+zhqhs@user.noreply.gitee.com>
Date: Wed, 5 Jun 2024 17:23:35 +0800
Subject: [PATCH 3/5] =?UTF-8?q?feat=EF=BC=9Axiugai?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/WEB-INF/abc.jsp | 54 -------------------
.../Animal.java" | 9 ----
.../Cat.java" | 15 ------
.../abc.jsp" | 15 +++---
4 files changed, 7 insertions(+), 86 deletions(-)
delete mode 100644 web/WEB-INF/abc.jsp
delete mode 100644 "work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Animal.java"
delete mode 100644 "work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Cat.java"
diff --git a/web/WEB-INF/abc.jsp b/web/WEB-INF/abc.jsp
deleted file mode 100644
index 171ff1f..0000000
--- a/web/WEB-INF/abc.jsp
+++ /dev/null
@@ -1,54 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-
-<%@ page import ="com.java.minxi.java_20240531.java_2302_郑祺海_2344310215.Animal" %>
-<%@ page import ="com.java.minxi.java_20240531.java_2302_郑祺海_2344310215.Cat" %>
-
-
-
-
- 五月三十一日
-
-
-<%
- class Animal {
- public static String sleep(){
- return "一只动物在睡觉";
- }
- }
-%>
-<%
- class Cat{
- String name;
- int time;
-
- public Cat(String name, int time) {
- this.name = name;
- this.time = time;
- }
-
- public String sleep(int time) {
- return name + "睡了" + time + "个小时";
- }
- }
-%>
-
-<%
- Animal animal = new Animal();
- Cat cat = new Cat("汤姆", 8);
- out.println (animal.sleep ());
- out.println (cat.sleep (8));
-%>
-
-<%
- for (int i = 1; i <= 9; i++) {
- for (int j = 1; j <= i; j++) {
- out.println (i + " *" + j + " = " + (i* j));
- }
- }
-%>
-
-
-
-
-
-
diff --git "a/work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Animal.java" "b/work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Animal.java"
deleted file mode 100644
index f99f643..0000000
--- "a/work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Animal.java"
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.java.minxi.java_20240531.java_2302_郑祺海_2344310215;
-
-
-
-public class Animal {
- public static String sleep(){
- return "一只动物在睡觉";
- }
-}
diff --git "a/work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Cat.java" "b/work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Cat.java"
deleted file mode 100644
index 4e17147..0000000
--- "a/work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/Cat.java"
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.java.minxi.java_20240531.java_2302_郑祺海_2344310215;
-
-public class Cat {
- public String name;
- public int time;
-
- public Cat(String name, int time) {
- this.name = name;
- this.time = time;
- }
-
- public String sleep(int time) {
- return name + "睡了" + time + "个小时";
- }
-}
diff --git "a/work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/abc.jsp" "b/work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/abc.jsp"
index 171ff1f..2773892 100644
--- "a/work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/abc.jsp"
+++ "b/work/com/java/minxi/java_20240531/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/abc.jsp"
@@ -1,7 +1,5 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ page import ="com.java.minxi.java_20240531.java_2302_郑祺海_2344310215.Animal" %>
-<%@ page import ="com.java.minxi.java_20240531.java_2302_郑祺海_2344310215.Cat" %>
@@ -9,15 +7,13 @@
五月三十一日
-<%
- class Animal {
- public static String sleep(){
+<%!
+ public class Animal {
+ public String sleep(){
return "一只动物在睡觉";
}
}
-%>
-<%
- class Cat{
+ public class Cat{
String name;
int time;
@@ -36,7 +32,9 @@
Animal animal = new Animal();
Cat cat = new Cat("汤姆", 8);
out.println (animal.sleep ());
+ out.println("
");
out.println (cat.sleep (8));
+ out.println("
");
%>
<%
@@ -44,6 +42,7 @@
for (int j = 1; j <= i; j++) {
out.println (i + " *" + j + " = " + (i* j));
}
+ out.println("
");
}
%>
--
Gitee
From 476b3a212af94599906a56451e1583e2352e4ff9 Mon Sep 17 00:00:00 2001
From: zhqh <14284394+zhqhs@user.noreply.gitee.com>
Date: Thu, 6 Jun 2024 08:32:33 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat=EF=BC=9A=E6=8F=90=E4=BA=A4=E4=BD=9C?=
=?UTF-8?q?=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../circle.jsp" | 24 ++++++++++++++++
.../ladder.jsp" | 28 +++++++++++++++++++
.../main.jsp" | 27 ++++++++++++++++++
3 files changed, 79 insertions(+)
create mode 100644 "work/com/java/minxi/java_20240605/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/circle.jsp"
create mode 100644 "work/com/java/minxi/java_20240605/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/ladder.jsp"
create mode 100644 "work/com/java/minxi/java_20240605/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/main.jsp"
diff --git "a/work/com/java/minxi/java_20240605/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/circle.jsp" "b/work/com/java/minxi/java_20240605/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/circle.jsp"
new file mode 100644
index 0000000..8ac983d
--- /dev/null
+++ "b/work/com/java/minxi/java_20240605/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/circle.jsp"
@@ -0,0 +1,24 @@
+<%--
+ Created by IntelliJ IDEA.
+ User: Administrator
+ Date: 2024-06-06
+ Time: 08:11
+ To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+
+ 圆形面积计算
+
+
+
+圆形面积计算
+<%
+ String radiusStr = request.getParameter("radius");
+ double radius = Double.parseDouble(radiusStr);
+ double area = Math.PI * Math.pow(radius,2);
+ out.println("圆的面积为:" + area);
+%>
+
+
+
diff --git "a/work/com/java/minxi/java_20240605/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/ladder.jsp" "b/work/com/java/minxi/java_20240605/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/ladder.jsp"
new file mode 100644
index 0000000..d84213b
--- /dev/null
+++ "b/work/com/java/minxi/java_20240605/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/ladder.jsp"
@@ -0,0 +1,28 @@
+<%--
+ Created by IntelliJ IDEA.
+ User: Administrator
+ Date: 2024-06-06
+ Time: 08:12
+ To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+
+ 梯形面积计算
+
+
+
+梯形面积计算
+<%
+ String topStr = request.getParameter("top");
+ String bottomStr = request.getParameter("bottom");
+ String heightStr = request.getParameter("height");
+ double top = Double.parseDouble(topStr);
+ double bottom = Double.parseDouble(bottomStr);
+ double height = Double.parseDouble(heightStr);
+ double area = (top + bottom) * height / 2;
+ out.println("梯形的面积为:" + area);
+%>
+
+
+
diff --git "a/work/com/java/minxi/java_20240605/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/main.jsp" "b/work/com/java/minxi/java_20240605/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/main.jsp"
new file mode 100644
index 0000000..db0763a
--- /dev/null
+++ "b/work/com/java/minxi/java_20240605/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/main.jsp"
@@ -0,0 +1,27 @@
+<%--
+ Created by IntelliJ IDEA.
+ User: Administrator
+ Date: 2024-06-06
+ Time: 08:11
+ To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+
+ Title
+
+
+主页面
+
+
+
+
+
+
+
+
+
+
+
+
+
--
Gitee
From 66ca82816b3fc4f92d23607d1e8bc84a24925215 Mon Sep 17 00:00:00 2001
From: zhqh <14284394+zhqhs@user.noreply.gitee.com>
Date: Thu, 6 Jun 2024 08:46:20 +0800
Subject: [PATCH 5/5] =?UTF-8?q?feat=EF=BC=9A=E6=8F=90=E4=BA=A4=E4=BD=9C?=
=?UTF-8?q?=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main.jsp" | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git "a/work/com/java/minxi/java_20240605/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/main.jsp" "b/work/com/java/minxi/java_20240605/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/main.jsp"
index db0763a..a089772 100644
--- "a/work/com/java/minxi/java_20240605/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/main.jsp"
+++ "b/work/com/java/minxi/java_20240605/java_2302_\351\203\221\347\245\272\346\265\267_2344310215/main.jsp"
@@ -10,7 +10,7 @@
Title
-
+
主页面
--
Gitee