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 283acf37e9c73f02c1b2f55dfbcfcf5f1c1e1008..479172be686abebb2fee1899fd4b152197d80163 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 7fb564992b2d5c7930b21fa8180bba0ac896f1e4..6df5ee2e5eb9863d90e44e180b079c87b4200df2 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 = ?";
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 0000000000000000000000000000000000000000..2773892a7ad1279b5d6f8a106ac91c181282135c
--- /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,53 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+
+
+
+
+
+ 五月三十一日
+
+
+<%!
+ public class Animal {
+ public String sleep(){
+ return "一只动物在睡觉";
+ }
+ }
+ public 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("
");
+ out.println (cat.sleep (8));
+ out.println("
");
+%>
+
+<%
+ for (int i = 1; i <= 9; i++) {
+ for (int j = 1; j <= i; j++) {
+ out.println (i + " *" + j + " = " + (i* j));
+ }
+ out.println("
");
+ }
+%>
+
+
+
+
+
+
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 0000000000000000000000000000000000000000..8ac983d065e7c43ec0b1b23e10d7a81e8f2ee2ea
--- /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 0000000000000000000000000000000000000000..d84213b0ccf93e9b8366804daf988e586a3420de
--- /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 0000000000000000000000000000000000000000..a089772bc35501a1e9c4e0a8bf4d351527ec3667
--- /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
+
+
+主页面
+
+
+
+
+
+
+
+
+
+
+
+
+