diff --git "a/work/com/java/minxi/java_20240425/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Logon.java" "b/work/com/java/minxi/java_20240425/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Logon.java"
new file mode 100644
index 0000000000000000000000000000000000000000..c1f782b516b7fce5da2c19e500d59795b3fd27ca
--- /dev/null
+++ "b/work/com/java/minxi/java_20240425/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Logon.java"
@@ -0,0 +1,12 @@
+package com.java.minxi.java_20240425.java_2302_易志昀_2344310235;
+public class Logon {
+    public static void main(String[] args) {
+        Staff staff=new Staff();
+        staff.setPassword("123456");
+        staff.setAccount("qaz13");
+        staff.setId(1);
+        staff.register();
+        staff.card();
+        staff.out();
+    }
+}
diff --git "a/work/com/java/minxi/java_20240425/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Staff.java" "b/work/com/java/minxi/java_20240425/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Staff.java"
new file mode 100644
index 0000000000000000000000000000000000000000..f84bf80c178aa7c8084129d99585bcd7d75f7c89
--- /dev/null
+++ "b/work/com/java/minxi/java_20240425/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Staff.java"
@@ -0,0 +1,77 @@
+package com.java.minxi.java_20240425.java_2302_易志昀_2344310235;
+public class Staff {
+    private int id;
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+    private String account;
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    private String password;
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    private int age;
+    public void setAge(int age) {
+        this.age = age;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public Staff(){
+    }
+    public Staff(int id,String account,String password,String nmae,int age){
+
+    }
+
+    public static void main(String[] args) {
+
+    }
+    public void register() {
+    if (account.equals("qaz13")&&password== "123456"){
+        System.out.println("登录成功");
+    }else {
+        System.out.println("密码或账号错误，登录失败");
+    }
+    }
+
+    public void card(){
+        if (id==1&&password=="123456"){
+            System.out.println("打卡成功");
+        }else{
+            System.out.println("打卡失败");
+        }
+    }
+    public void out(){
+        System.out.println("退出成功");
+    }
+}
diff --git "a/work/com/java/minxi/java_20240426/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Person.java" "b/work/com/java/minxi/java_20240426/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Person.java"
new file mode 100644
index 0000000000000000000000000000000000000000..a66a3590edf8dcd528cedb589f0328560f2fb37c
--- /dev/null
+++ "b/work/com/java/minxi/java_20240426/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Person.java"
@@ -0,0 +1,31 @@
+package com.java.minxi.java_20240426.java_2302_易志昀_2344310235;
+
+public class Person{
+
+        public String name;
+        public int age;
+    public Person(String name, int age) {
+        this.name = name;
+        this.age = age;
+    }
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(int age) {
+        this.age = age;
+    }
+
+
+
+}
diff --git "a/work/com/java/minxi/java_20240426/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Sc.java" "b/work/com/java/minxi/java_20240426/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Sc.java"
new file mode 100644
index 0000000000000000000000000000000000000000..fbfa6da07d74a4c5bf06dfb256bd09a1e2eadb9c
--- /dev/null
+++ "b/work/com/java/minxi/java_20240426/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Sc.java"
@@ -0,0 +1,8 @@
+package com.java.minxi.java_20240426.java_2302_易志昀_2344310235;
+
+public class Sc {public static void main(String[] args) {
+    Student student = new Student("张三", 18);
+    student.setSchool("龙岩学院");
+    student.intro();
+}
+}
diff --git "a/work/com/java/minxi/java_20240426/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Student.java" "b/work/com/java/minxi/java_20240426/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Student.java"
new file mode 100644
index 0000000000000000000000000000000000000000..7d991a254cc2b6028dbf50d6d349b336f18614df
--- /dev/null
+++ "b/work/com/java/minxi/java_20240426/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Student.java"
@@ -0,0 +1,18 @@
+package com.java.minxi.java_20240426.java_2302_易志昀_2344310235;
+
+public class Student extends Person{
+    private String school;
+
+    public Student(String name,int age) {
+        super(name,age);
+    }
+
+
+    public void setSchool(String school) {
+        this.school = school;
+    }
+
+    public void intro(){
+        System.out.println("姓名："+this.name+"，年龄："+this.age+"，学校："+this.school);
+    }
+}
diff --git "a/work/com/java/minxi/java_20240508/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/AirPlane.java" "b/work/com/java/minxi/java_20240508/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/AirPlane.java"
new file mode 100644
index 0000000000000000000000000000000000000000..3b467dc481d968fe471a4ce79360435040c94b5e
--- /dev/null
+++ "b/work/com/java/minxi/java_20240508/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/AirPlane.java"
@@ -0,0 +1,10 @@
+package java2302.work.com.java.minxi.java_20240508.java_2302_易志昀_2344310235;
+
+public class AirPlane extends Vehicles {
+    public void travel(){
+        System.out.println("开着"+getColor()+getBrand()+getType()+"前往"+getPlace()+"旅游");
+    }
+    public String combination(String color,String type){
+        return color+type+"汽车";
+    }
+}
diff --git "a/work/com/java/minxi/java_20240508/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Car.java" "b/work/com/java/minxi/java_20240508/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Car.java"
new file mode 100644
index 0000000000000000000000000000000000000000..5d8b2e55d596bb9268643c7e06dd38c127f09663
--- /dev/null
+++ "b/work/com/java/minxi/java_20240508/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Car.java"
@@ -0,0 +1,12 @@
+package java2302.work.com.java.minxi.java_20240508.java_2302_易志昀_2344310235;
+
+public class Car extends Vehicles {
+
+    public void travel(){
+System.out.println("开着"+getColor()+getBrand()+getType()+"前往"+getPlace()+"旅游");
+    }
+    public String combination(String color,String type){
+    return color+type+"飞机";
+    }
+
+}
diff --git "a/work/com/java/minxi/java_20240508/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Main.java" "b/work/com/java/minxi/java_20240508/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Main.java"
new file mode 100644
index 0000000000000000000000000000000000000000..e4b352966e603556c914dd745b401100ad81ff70
--- /dev/null
+++ "b/work/com/java/minxi/java_20240508/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Main.java"
@@ -0,0 +1,29 @@
+package java2302.work.com.java.minxi.java_20240508.java_2302_易志昀_2344310235;
+
+import java2302.work.com.java.minxi.java_20240508.java_2302_易志昀_2344310235.AirPlane;
+import java2302.work.com.java.minxi.java_20240508.java_2302_易志昀_2344310235.Car;
+
+public class Main {
+    public static void main(String[] args) {
+        Car Car =new Car();
+        Car Car1=new Car();
+        Car1.setPlace("北京");
+        Car.setPlace("东山岛");
+        Car.setColor("白色");
+        Car.setBrand("大众");
+        Car1.setBrand("奔驰");
+        Car.setType("汽车");
+        Car.travel();
+        Car1.travel();
+        AirPlane AirPlane =new AirPlane();
+        AirPlane AirPlane1 =new AirPlane();
+        AirPlane.setPlace("大理");
+        AirPlane1.setPlace("哈尔滨岛");
+        AirPlane.setColor("蓝色");
+        AirPlane.setBrand("波音客机");
+        AirPlane1.setBrand("空客客机");
+        AirPlane.setType("飞机");
+        AirPlane.travel();
+        AirPlane1.travel();
+    }
+}
\ No newline at end of file
diff --git "a/work/com/java/minxi/java_20240508/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Vehicles.java" "b/work/com/java/minxi/java_20240508/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Vehicles.java"
new file mode 100644
index 0000000000000000000000000000000000000000..8ee59e3ea75329b8387ffc810dadaf1d4b37846e
--- /dev/null
+++ "b/work/com/java/minxi/java_20240508/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Vehicles.java"
@@ -0,0 +1,54 @@
+package java2302.work.com.java.minxi.java_20240508.java_2302_易志昀_2344310235;
+
+public class Vehicles {
+    String type;
+    String brand;
+    String color;
+    String place;
+
+
+
+    public String getPlace() {
+        return place;
+    }
+
+    public void setPlace(String place) {
+        this.place = place;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+    public Vehicles(){
+
+    }
+    public Vehicles(String place,String color,String brand,String type){
+        this.color=color;
+        this.place=place;
+        this.brand=brand;
+        this.type=type;
+    }
+   public void travel(String place,String color,String brand,String type){
+        System.out.println("开着"+color+brand+type+"前往"+place+"旅游");
+   }
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Bus.java" "b/work/com/java/minxi/java_20240509/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Bus.java"
new file mode 100644
index 0000000000000000000000000000000000000000..5edf00ef27d94a791dc3c70b5d639e74d13e6f35
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Bus.java"
@@ -0,0 +1,14 @@
+package java2302.work.com.java.minxi.java_20240509.java_2302_易志昀_2344310235;
+
+public class Bus extends MotorVehicles implements MoneyFare {
+
+    @Override
+    public void charge(String c) {
+ System.out.println("公共汽车:"+c+"元/张"+",不计算公里数");
+    }
+
+    @Override
+    public void brake(String s) {
+    System.out.println("公共汽车的刹车技术:"+s);
+    }
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ControlTemperature.java" "b/work/com/java/minxi/java_20240509/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ControlTemperature.java"
new file mode 100644
index 0000000000000000000000000000000000000000..1b4f03c3d2e9469e3ccd8a6174c81d16d6f15448
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ControlTemperature.java"
@@ -0,0 +1,5 @@
+package java2302.work.com.java.minxi.java_20240509.java_2302_易志昀_2344310235;
+
+public interface ControlTemperature {
+    public void controlAirTemperature(String t);
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Main.java" "b/work/com/java/minxi/java_20240509/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Main.java"
new file mode 100644
index 0000000000000000000000000000000000000000..546ede016e3ae0eab6eb1a0e23242482beb90b5e
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Main.java"
@@ -0,0 +1,17 @@
+package java2302.work.com.java.minxi.java_20240509.java_2302_易志昀_2344310235;
+
+import java2302.work.com.java.minxi.java_20240509.java_2302_易志昀_2344310235.Bus;
+
+public class Main {
+    public static void main(String[] args) {
+        
+Bus bus=new Bus();
+bus.brake("气式");
+bus.charge("2");
+Taxi taxi=new Taxi();
+taxi.brake("油式");
+taxi.charge("1");
+taxi.controlAirTemperature("嵌入式空调");
+
+    }
+}
\ No newline at end of file
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/MoneyFare.java" "b/work/com/java/minxi/java_20240509/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/MoneyFare.java"
new file mode 100644
index 0000000000000000000000000000000000000000..e22e6a38fb13f1b92e0765ac4c51b0a050c1bb2f
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/MoneyFare.java"
@@ -0,0 +1,5 @@
+package java2302.work.com.java.minxi.java_20240509.java_2302_易志昀_2344310235;
+
+public interface MoneyFare {
+    public void charge(String c);
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/MotorVehicles.java" "b/work/com/java/minxi/java_20240509/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/MotorVehicles.java"
new file mode 100644
index 0000000000000000000000000000000000000000..656f9cc07b3b372df25c67fa886e7ac5b402e981
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/MotorVehicles.java"
@@ -0,0 +1,8 @@
+package java2302.work.com.java.minxi.java_20240509.java_2302_易志昀_2344310235;
+
+public abstract class MotorVehicles {
+
+    abstract public void brake(String s);
+
+
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Taxi.java" "b/work/com/java/minxi/java_20240509/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Taxi.java"
new file mode 100644
index 0000000000000000000000000000000000000000..2e3df7ae7d77d83aa851a5e8c86c7a01d13731fd
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Taxi.java"
@@ -0,0 +1,23 @@
+package java2302.work.com.java.minxi.java_20240509.java_2302_易志昀_2344310235;
+
+import java2302.work.com.java.minxi.java_20240509.java_2302_易志昀_2344310235.ControlTemperature;
+import java2302.work.com.java.minxi.java_20240509.java_2302_易志昀_2344310235.MoneyFare;
+import java2302.work.com.java.minxi.java_20240509.java_2302_易志昀_2344310235.MotorVehicles;
+
+public class Taxi extends MotorVehicles implements MoneyFare, ControlTemperature {
+
+    @Override
+    public void controlAirTemperature(String t) {
+    System.out.println("出租车安装了"+t);
+    }
+
+    @Override
+    public void charge(String c) {
+ System.out.println("出租车："+c+"元/公里,"+"起步价"+3+"元/公里");
+    }
+
+    @Override
+    public void brake(String s) {
+     System.out.println("出租车使用的刹车技术："+s);
+    }
+}
diff --git "a/work/com/java/minxi/java_20240512/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Bbb.java" "b/work/com/java/minxi/java_20240512/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Bbb.java"
new file mode 100644
index 0000000000000000000000000000000000000000..b115cf7f59cbc0f1144f8a1c1e6a50ce7de82763
--- /dev/null
+++ "b/work/com/java/minxi/java_20240512/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Bbb.java"
@@ -0,0 +1,70 @@
+package com.java.minxi.java_20240512.java_2302_易志昀_2344310235;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
+public class Bbb {
+    public static int search(LinkedList<Integer> linkedList, int target) {
+        for (int i = 0; i < linkedList.size(); i++) {
+            if (linkedList.get(i).equals(target)) {
+                return i; // 找到目标，返回当前索引
+            }
+        }
+        return -1; // 未找到目标，返回-1
+    }
+    public static void main(String[] args) {
+        ArrayList<String> PeopleName = new ArrayList<>();
+        PeopleName.add ("小明");
+        PeopleName.add ("中明");
+        PeopleName.add ("大明");
+        PeopleName.add ("小刚");
+        PeopleName.add ("大刚");
+        PeopleName.add(0,"Old");
+        for (int i = 0; i <PeopleName.size() ; i++) {
+         if (PeopleName.get(i).equals("Old")){
+             PeopleName.set(i,"New");
+         }
+        }//将`ArrayList`中所有出现的"Old"字符串替换为"New"。
+        PeopleName.remove(2);
+        PeopleName.set(1,"New Element");
+
+        System.out.println(PeopleName.get(3));//获取`ArrayList`中索引为3的元素。
+
+        int position = PeopleName.indexOf("Target");
+        if (position != -1) {
+            System.out.println("'Target' found at index: " + position);
+        } else {
+            System.out.println("'Target' not found in the list.");
+        }//在`ArrayList`中搜索字符串"Target"的位置。
+
+        System.out.println(PeopleName);//打印修改的东西
+        Collections.reverse(PeopleName);
+        for (String fruit : PeopleName) {
+            System.out.println(fruit);
+        }//反转`ArrayList`中的元素顺序。
+
+        System.out.println("-----------------------------------------");
+        LinkedList<Integer> figure=new LinkedList<>();
+        figure.add(0);
+        figure.add(8);
+        figure.add(4);
+        figure.add(7);
+        figure.add(10);
+        figure.addLast(4);
+        figure.removeFirst();
+        figure.set(0,42);
+        for (int i = 0; i <figure.size() ; i++) {
+            if (figure.get(i).equals(10)){
+                figure.set(i,20);
+            }
+        }//将`LinkedList`中所有出现的数字10替换为20。
+        int position1 = search(figure,42);
+        System.out.println(figure.getLast());//获取`LinkedList`中最后一个元素。
+        System.out.println("整数的位置是"+position1);//在`LinkedList`中搜索整数42的位置。
+        System.out.println(figure);////打印修改的东西
+        figure.descendingIterator();
+
+
+
+
+    }
+}
diff --git "a/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/A.java" "b/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/A.java"
new file mode 100644
index 0000000000000000000000000000000000000000..c242a24489211161ec4b9b691acc692d3037b985
--- /dev/null
+++ "b/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/A.java"
@@ -0,0 +1,16 @@
+package com.java.minxi.java_20240516.java_2302_易志昀_2344310235;
+public class A {
+    public static void main(String[] args) {
+        int maxValue = 100; // 用户指定的最大值，可以是任何正整数
+        double randomNumber = getRandomNumberInRange(maxValue);
+        System.out.println("Generated random number between 0 and " + maxValue + ": " + randomNumber);
+    }
+
+    private static double getRandomNumberInRange(int maxValue) {
+        if (maxValue <= 0) {
+            throw new IllegalArgumentException("Max value must be greater than 0");
+        }
+        return Math.random() * maxValue;
+    }
+
+}
diff --git "a/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/B.java" "b/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/B.java"
new file mode 100644
index 0000000000000000000000000000000000000000..22c203594095779820469fc0708157fb9898254f
--- /dev/null
+++ "b/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/B.java"
@@ -0,0 +1,29 @@
+package com.java.minxi.java_20240516.java_2302_易志昀_2344310235;
+public class B {
+
+        /**
+         * 计算整数数组的平均值
+         *
+         * @param numbers 整数数组
+         * @return 数组的平均值，如果数组为空则返回0
+         */
+        public static double calculateAverage(int[] numbers) {
+            if (numbers == null || numbers.length == 0) {
+                return 0; // 如果数组为空，返回0
+            }
+
+            int sum = 0;
+            for (int number : numbers) {
+                sum += number; // 计算数组元素的总和
+            }
+
+            return (double) sum / numbers.length; // 返回平均值
+        }
+
+        public static void main(String[] args) {
+            int[] array = {1, 2, 3, 4, 5}; // 示例数组
+            double average = calculateAverage(array);
+            System.out.println("数组的平均值是: " + average);
+        }
+
+}
diff --git "a/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/DATE.java" "b/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/DATE.java"
new file mode 100644
index 0000000000000000000000000000000000000000..7a2989c1c771834a5b2ab0cae8c176c56a900e5c
--- /dev/null
+++ "b/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/DATE.java"
@@ -0,0 +1,52 @@
+package com.java.minxi.java_20240516.java_2302_易志昀_2344310235;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class DATE {
+    public static void main(String[] args) throws Exception {
+        // 1. 创建一个Date对象，表示当前时间
+        Date currentDate = new Date();
+        System.out.println("Current Date: " + currentDate);
+
+        // 2. 获取Date对象的年份、月份、天数等
+        int year = getYearMonthDay(currentDate)[0];
+        int month = getYearMonthDay(currentDate)[1];
+        int day = getYearMonthDay(currentDate)[2];
+        System.out.println("Year: " + year + ", Month: " + month + ", Day: " + day);
+
+        // 3. 格式化Date对象
+        String formattedDate = formatDate(currentDate, "yyyy-MM-dd HH:mm:ss");
+        System.out.println("Formatted Date: " + formattedDate);
+
+        // 4. Date转字符串再转回Date
+        Date parsedDate = stringToDate(formattedDate, "yyyy-MM-dd HH:mm:ss");
+        System.out.println("Parsed Date: " + parsedDate);
+
+        // 5. 使用System类获得当前时间戳，转换成Date对象并打印
+        long timestamp = System.currentTimeMillis();
+        Date timestampDate = new Date(timestamp);
+        System.out.println("Timestamp Date: " + timestampDate);
+        String timestampFormatted = formatDate(timestampDate, "yyyy-MM-dd HH:mm:ss");
+        System.out.println("Formatted Timestamp: " + timestampFormatted);
+    }
+
+    // 2. 创建一个方法，接受一个Date对象作为参数，返回该日期的年份、月份和天数
+    private static int[] getYearMonthDay(Date date) {
+        int year = date.getYear() + 1900; // Java's Date.getYear() returns years since 1900
+        int month = date.getMonth() + 1; // Java's Date.getMonth() returns 0-11
+        int day = date.getDate();
+        return new int[]{year, month, day};
+    }
+
+    // 3. 使用SimpleDateFormat类将Date对象格式化为指定的日期格式字符串
+    private static String formatDate(Date date, String pattern) {
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        return sdf.format(date);
+    }
+
+    // 4. 实现一个程序，将Date对象转换为字符串，然后将该字符串重新解析回Date对象
+    private static Date stringToDate(String dateString, String pattern) throws Exception {
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        return sdf.parse(dateString);
+    }
+}
diff --git "a/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Jsq.java" "b/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Jsq.java"
new file mode 100644
index 0000000000000000000000000000000000000000..50fda59293ab8b22e8b3a1e8c6169852f2e8a6c5
--- /dev/null
+++ "b/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Jsq.java"
@@ -0,0 +1,15 @@
+package com.java.minxi.java_20240516.java_2302_易志昀_2344310235;
+import java.util.Scanner;
+
+public class Jsq {
+    public static void main(String[] args) {
+        Scanner sr =new Scanner(System.in);
+        System.out.println("请输入数字");
+        double abc= sr.nextDouble();
+        if (abc>0){
+        System.out.println("绝对值："+abc);
+        }if (abc<0){
+            System.out.println("绝对值："+-1*abc);
+        }
+    }
+}
diff --git "a/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/MAXIN.java" "b/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/MAXIN.java"
new file mode 100644
index 0000000000000000000000000000000000000000..4611cbb54b3a09e1f0b820d8a2b72ee43c15fec4
--- /dev/null
+++ "b/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/MAXIN.java"
@@ -0,0 +1,20 @@
+package com.java.minxi.java_20240516.java_2302_易志昀_2344310235;
+import java.util.Scanner;
+
+public class MAXIN {
+    public static void main(String[] args) {
+        int []cc=new int[3];
+        Scanner CC=new Scanner(System.in);
+        System.out.println("请输入三个整数：");
+        for (int i = 0; i <=2; i++) {
+            cc[i]= CC.nextInt();
+            int min= Math.min(cc[0],Math.min(cc[1],cc[2]));
+            int max= Math.max(cc[0],Math.max(cc[1],cc[2] ) );
+System.out.println(min);
+System.out.println(max);
+        }
+    }
+
+}
+
+
diff --git "a/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Main.java" "b/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Main.java"
new file mode 100644
index 0000000000000000000000000000000000000000..28c27e1139da85a251180e4fdc1caea764d98fb2
--- /dev/null
+++ "b/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Main.java"
@@ -0,0 +1,6 @@
+package com.java.minxi.java_20240516.java_2302_易志昀_2344310235;
+public class Main {
+    public static void main(String[] args) {
+        System.out.println("Hello world!");
+    }
+}
\ No newline at end of file
diff --git "a/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Person.java" "b/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Person.java"
new file mode 100644
index 0000000000000000000000000000000000000000..ef27f9412bc86424c4490ad572199e1684227d1a
--- /dev/null
+++ "b/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Person.java"
@@ -0,0 +1,26 @@
+package com.java.minxi.java_20240516.java_2302_易志昀_2344310235;
+public class Person {
+    private String name;
+    private int age;
+
+    public Person(String name) {
+        this.name = name;
+    }
+
+    public Person(int age) {
+        this.age = age;
+    }
+
+    @Override
+    public String toString(){
+        return "name="+name+"age+"+age;
+    }
+    public boolean equals(){
+        if (name.equals(age)){
+            equals(true);
+        }else {
+            equals(false);
+        }
+
+    return equals();}
+}
diff --git "a/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Sda.java" "b/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Sda.java"
new file mode 100644
index 0000000000000000000000000000000000000000..413a3d99331338e28d995957c84b31acd3717e1f
--- /dev/null
+++ "b/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Sda.java"
@@ -0,0 +1,17 @@
+package com.java.minxi.java_20240516.java_2302_易志昀_2344310235;
+import java.util.Scanner;
+public class Sda {
+
+
+        public static void main(String[] args) {
+            Scanner scanner = new Scanner(System.in);
+            System.out.print("请输入一个浮点数：");
+            double number = scanner.nextDouble();
+
+            // 使用Math.round()方法进行四舍五入
+            long roundedNumber = Math.round(number);
+
+            System.out.println("四舍五入后的整数是：" + roundedNumber);
+        }
+
+}
diff --git "a/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/StringOperations.java" "b/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/StringOperations.java"
new file mode 100644
index 0000000000000000000000000000000000000000..a39fafe2cfbdcfa24cb07bf023fb0e62e6a8ed36
--- /dev/null
+++ "b/work/com/java/minxi/java_20240516/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/StringOperations.java"
@@ -0,0 +1,116 @@
+package com.java.minxi.java_20240516.java_2302_易志昀_2344310235;
+public class StringOperations {
+
+    // 1. 连接两个字符串
+    public static String concatStrings(String str1, String str2) {
+        return str1 + str2;
+    }
+
+    // 2. 字符串长度
+    public static int stringLength(String str) {
+        return str.length();
+    }
+
+    // 3. 字符串分割
+    public static String[] splitString(String str, char delimiter) {
+        return str.split(Character.toString(delimiter));
+    }
+
+    // 4. 字符串反转
+    public static String reverseString(String str) {
+        return new StringBuilder(str).reverse().toString();
+    }
+
+    // 5. 字符串大小写转换
+    public static String convertCase(String str, boolean toUpperCase) {
+        return toUpperCase ? str.toUpperCase() : str.toLowerCase();
+    }
+
+    // 6. 字符串搜索
+    public static boolean containsSubstring(String str, String subStr) {
+        return str.contains(subStr);
+    }
+
+    // 7. 字符串替换
+    public static String replaceCharacters(String str, char oldChar, char newChar) {
+        return str.replace(oldChar, newChar);
+    }
+
+    // 8. 字符串修剪
+    public static String trimString(String str) {
+        return str.trim();
+    }
+
+    // 9. 字符串比较
+    public static boolean equalsIgnoreCase(String str1, String str2) {
+        return str1.equalsIgnoreCase(str2);
+    }
+
+    // 10. 子串操作
+    public static String substring(String str, int startIndex, int endIndex) {
+        return str.substring(startIndex, endIndex);
+    }
+
+    // 12. 字符串结束符检查
+    public static boolean endsWithSuffix(String str, String suffix) {
+        return str.endsWith(suffix);
+    }
+
+    // 13. 字符串开始符检查
+    public static boolean startsWithPrefix(String str, String prefix) {
+        return str.startsWith(prefix);
+    }
+
+    // 14. 字符串中字符的出现次数
+    public static int countOccurrences(String str, char target) {
+        int count = 0;
+        for (char c : str.toCharArray()) {
+            if (c == target) {
+                count++;
+            }
+        }
+        return count;
+    }
+
+    // 16. 字符串与数字的转换
+    public static double stringToDouble(String str) throws NumberFormatException {
+        return Double.parseDouble(str);
+    }
+
+    public static String doubleToString(double num) {
+        return String.valueOf(num);
+    }
+
+    // 20. StringBuilder拼接
+    public static String appendStrings(String str1, String str2, String str3) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(str1).append(str2).append(str3);
+        return sb.toString();
+    }
+
+    public static void main(String[] args) {
+        // 示例调用
+        System.out.println(concatStrings("Hello", " World"));
+        System.out.println(stringLength("Hello World"));
+        for (String word : splitString("one,two,three", ',')) {
+            System.out.println(word);
+        }
+        System.out.println(reverseString("Hello World"));
+        System.out.println(convertCase("Hello World", true));
+        System.out.println(containsSubstring("Hello World", "World"));
+        System.out.println(replaceCharacters("Hello World", 'o', 'a'));
+        System.out.println(trimString(" Hello World "));
+        System.out.println(equalsIgnoreCase("Hello World", "hello world"));
+        System.out.println(substring("Hello World", 6, 11));
+        System.out.println(endsWithSuffix("Hello World", "World"));
+        System.out.println(startsWithPrefix("Hello World", "Hello"));
+        System.out.println(countOccurrences("Hello World", 'o'));
+        try {
+            System.out.println(stringToDouble("3.14"));
+            System.out.println(doubleToString(3.14));
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+        }
+        System.out.println(appendStrings("Hello", " ", "World"));
+    }
+}
\ No newline at end of file
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/SetAndMap/map1.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/SetAndMap/map1.java"
deleted file mode 100644
index 541b282e1d8a61440877b21e1632ef9de860e32d..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/SetAndMap/map1.java"
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.SetAndMap;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-    public class map1 {/*1. **创建和添加键值对**
-    创建一个 `HashMap` 并添加至少3对键值对，键可以是字符串，值可以是整数。*/
-
-        public static void main(String[] args) {
-            Map<String, String> map = new HashMap<>();
-            map.put("狗", "1");
-            map.put("猫", "2");
-            map.put("鼠", "3");
-
-            /*2. **获取和打印值**
-    使用键来获取对应的值，并打印出来。         */
-            String keytofind = "鼠";
-            String value = map.get(keytofind);
-            if (value != null) {
-                System.out.println(keytofind + "," + value);
-            } else {
-                System.out.println(keytofind + "not found");
-            }
-           /* 3. **检查键是否存在**
-    检查一个特定的键是否存在于 `HashMap` 中。*/
-            String keytocheck = "猫";
-            if (map.containsKey(keytocheck)) {
-                System.out.println(keytocheck + "exists in the hashmap");
-            } else {
-                System.out.println(keytocheck + "dose not exist in the hashmap");
-            }
-
-           /* 4. **键集合遍历**
-    遍历 `HashMap` 的键集合，并打印每个键。*/
-            Set<String> keys = map.keySet();
-
-            for (String mapkey : keys) {
-                System.out.println(keys);
-            }
-
-           /* 5. **值集合遍历**
-    遍历 `HashMap` 的值集合，并打印每个值。*/
-            Collection<String> values = map.values();
-
-            for (String mapvalue : values) {
-                System.out.println(value);
-            }
-
-           /* 6. **键值对遍历**
-    使用 `entrySet()` 遍历 `HashMap` 的所有键值对，并打印。*/
-            for (Map.Entry<String, String> entry : map.entrySet()) {
-                System.out.println("key:" + entry.getKey() + ",value:" + entry.getValue());
-            }
-
-           /* 7. **更新值**
-    对一个已存在的键更新其对应的值。*/
-            String keytoupdate = "鼠";
-            int newValue = 0;
-            map.put(keytoupdate, String.valueOf(newValue));
-            System.out.println(map);
-
-            /*8. **移除键值对**
-    移除一个特定的键值对，并确认它已被移除。*/
-            String keytoremove = "鼠";
-            String removedvalue = map.remove(keytoremove);
-            if (removedvalue != null) {
-                System.out.println("已移除:" + keytoremove );
-            } else {
-                System.out.println("不存在:" + keytoremove);
-            }
-            System.out.println("剩余" + map);
-       /* 9. **Map 的大小**
-        打印出 `HashMap` 的大小。*/
-            System.out.println("size:" + map.size());
-        }
-    }
-
-
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/SetAndMap/map2.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/SetAndMap/map2.java"
deleted file mode 100644
index 0e3fea171b3357b8886a5433bfd9ea31e31fe3a4..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/SetAndMap/map2.java"
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.SetAndMap;
-
-import java.util.HashMap;
-
-       /*10. **使用泛型**
-        创建一个泛型 `HashMap`，键为自定义对象，值为字符串，并添加键值对。*/
-
-    class CustomKey {
-        int id;
-        public CustomKey(int id) {
-            this.id = id;
-        }
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-
-            CustomKey that = (CustomKey) o;
-
-            return id == that.id;
-        }
-        @Override
-        public int hashCode() {
-            return id;
-        }
-    }
-    public class map2 {
-        public void main(String[] args) {
-
-            HashMap<CustomKey, String> customHashMap = new HashMap<>();
-
-            CustomKey customKey = new CustomKey(1);
-
-            customHashMap.put(customKey, "Example Value");
-
-            System.out.println(customHashMap);
-        }
-    }
-
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/SetAndMap/set.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/SetAndMap/set.java"
deleted file mode 100644
index e797ae4d7b660bc872e452629ed549907291a8ae..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/SetAndMap/set.java"
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.SetAndMap;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-    public class set {/*1. **创建和添加元素**
-    创建一个 `HashSet` 并添加至少5个不同的字符串元素。*/
-
-        public static <object> void main(String[] args) {
-            Set<String> set = new HashSet<>();
-            set.add("a");
-            set.add("b");
-            set.add("c");
-            set.add("d");
-
-           /* 2. **元素检查**
-    检查一个特定的字符串是否已经存在于你创建的 `HashSet` 中。*/
-            System.out.println("是否存在某个元素" + set.contains("a"));
-
-            /*3. **元素移除**
-    从 `HashSet` 中移除一个已存在的元素，并确认它已被移除。*/
-            set.remove("a");
-            System.out.println("已移除" + set);
-
-           /* 4. **集合大小**
-    打印出 `HashSet` 的大小。*/
-            System.out.println("大小" + set.size());
-
-           /* 5. **集合遍历**
-    使用增强型 `for` 循环遍历 `HashSet` 并打印每个元素。*/
-            for (String ele : set) {
-                System.out.println(ele);
-            }
-
-            /*6. **集合转换为数组**
-    将 `HashSet` 转换为数组，并打印数组中的每个元素。*/
-            String[] array = set.toArray(new String[0]);
-            System.out.println(Arrays.toString(array));
-
-        /*7. **集合的并集**
-创建两个 `HashSet` 对象，实现它们的并集操作。*/
-            HashSet<String> setA = new HashSet<>();
-            setA.add("1");
-            setA.add("2");
-            setA.add("3");
-
-            HashSet<String> setB = new HashSet<>();
-            setB.add("2");
-            setB.add("3");
-            setB.add("4");
-
-            HashSet<String> result = new HashSet<>();
-
-            result.addAll(setA);
-            result.addAll(setB);
-            System.out.println("并集:"+ result);
-       /* Iterator<String> it =  resset.iterator();
-        while(it.hasNext()){
-            object ele = (object) it.next();
-            System.out.println(ele);
-        };*/
-        /* 8. **集合的交集**
-对上面创建的两个 `HashSet` 对象实现交集操作。*/
-            result.clear();
-            result.addAll(setA);
-            result.retainAll(setB);
-            System.out.println("交集"+ result);
-            /*9. **集合的差集**
-对上面创建的两个 `HashSet` 对象实现差集操作。*/
-            result.clear();
-            result.addAll(setA);
-            result.removeAll(setB);
-            System.out.println("差集"+ result);
-        }
-    }
-
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/bigdecimal/bigdecimal1to2.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/bigdecimal/bigdecimal1to2.java"
deleted file mode 100644
index be6dea7fd09a0d20c05426f52474d9a12d0bae5f..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/bigdecimal/bigdecimal1to2.java"
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.bigdecimal;
-import java.math.BigDecimal;
-
-public class bigdecimal1to2 {
-
-        public static BigDecimal add(BigDecimal a, BigDecimal b) {
-            return a.add(b);
-        }
-
-        public static BigDecimal subtract(BigDecimal a, BigDecimal b) {
-            return a.subtract(b);
-        }
-
-        public static BigDecimal multiply(BigDecimal a, BigDecimal b) {
-            return a.multiply(b);
-        }
-
-        public static BigDecimal divide(BigDecimal a, BigDecimal b) {
-            return a.divide(b);
-        }
-
-        public static void main(String[] args) {
-            BigDecimal a = new BigDecimal("10.5");
-            BigDecimal b = new BigDecimal("2.3");
-
-            System.out.println("加法: " + add(a, b));
-            System.out.println("减法: " + subtract(a, b));
-            System.out.println("乘法: " + multiply(a, b));
-            System.out.println("除法: " + divide(a, b));
-        }
-    }
-
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/bigdecimal/bigdecimal3.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/bigdecimal/bigdecimal3.java"
deleted file mode 100644
index 9e2a4a4aae4f7ddad540b80876d5455f666d248a..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/bigdecimal/bigdecimal3.java"
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.bigdecimal;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-public class bigdecimal3 {
-
-        public static void main(String[] args) {
-            BigDecimal originalValue = new BigDecimal("3.1415926535897932384");
-            int scale = 5;
-            RoundingMode roundingMode = RoundingMode.HALF_UP;
-
-            BigDecimal roundedValue = originalValue.setScale(scale, roundingMode);
-            System.out.println("Rounded Value: " + roundedValue);
-        }
-    }
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/bigdecimal/bigdecimal4.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/bigdecimal/bigdecimal4.java"
deleted file mode 100644
index 8282a8f7dcfe3bbff4358e25d57190aea0a5fdc5..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/bigdecimal/bigdecimal4.java"
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.bigdecimal;
-import java.math.BigDecimal;
-public class bigdecimal4 {
-
-        public static int compareBigDecimals(BigDecimal bd1, BigDecimal bd2) {
-            return bd1.compareTo(bd2);
-        }
-
-        public static void main(String[] args) {
-            BigDecimal bd1 = new BigDecimal("10.0");
-            BigDecimal bd2 = new BigDecimal("10.000");
-
-            int comparisonResult = compareBigDecimals(bd1, bd2);
-
-            if (comparisonResult == -1) {
-                System.out.println("bd1 is less than bd2");
-            } else if (comparisonResult == 0) {
-                System.out.println("bd1 is equal to bd2");
-            } else if (comparisonResult == 1) {
-                System.out.println("bd1 is greater than bd2");
-            }
-        }
-    }
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/date/date1.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/date/date1.java"
deleted file mode 100644
index 04a4eb69a67ed1b240d6361f5201f794e50b780c..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/date/date1.java"
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.date;
-
-import java.util.Date;
-
-public class date1 {
-    public static void main(String[] args) {
-        Date now = new Date();
-        System.out.println("time:"+now);}
-
-}
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/date/date2.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/date/date2.java"
deleted file mode 100644
index e93a4ce94216832b85cb6436f9f8ef94ac13f727..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/date/date2.java"
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.date;
-
-import java.util.Calendar;
-import java.util.Date;
-
-public class date2 {
-    public static int getYear(Date date) {
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(date);
-        return calendar.get(Calendar.YEAR);
-    }
-
-    public static int getMonth(Date date) {
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(date);
-        return calendar.get(Calendar.MONTH) + 1;
-    }
-
-    public static int getDayOfMonth(Date date) {
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(date);
-        return calendar.get(Calendar.DAY_OF_MONTH);
-    }
-
-    public static void main(String[] args) {
-        Date date = new Date();
-        System.out.println("Year:" + getYear(date));
-        System.out.println("Month:" + getMonth(date));
-        System.out.println("Day of Month" + getDayOfMonth(date));
-    }
-}
\ No newline at end of file
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/date/date3and4.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/date/date3and4.java"
deleted file mode 100644
index 09815d485fcb1e3cbee9286d65af0ae75809a944..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/date/date3and4.java"
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.date;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class date3and4 {
-    public static void main(String[] args) {
-        Date currentDate = new Date();
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String formattedDate = formatter.format(currentDate);
-        System.out.println("Formatted Date:"+formattedDate);
-
-        try{
-            Date newDate = formatter.parse(formattedDate);
-            System.out.println("Formatted String:"+newDate);
-        } catch (ParseException e){
-            e.printStackTrace();
-        }
-    }
-}
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/date/date5.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/date/date5.java"
deleted file mode 100644
index fae56bbed0d0ec42c5029b0e02662f46a24d408d..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/date/date5.java"
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.date;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class date5 {
-    public static void main(String[] args) {
-        long timestamp = System.currentTimeMillis();
-        Date date = new Date(timestamp);
-        System.out.println("timestamp:"+timestamp);
-        System.out.println("translatedDate"+date);
-
-    }
-}
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/math/absolutevalue.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/math/absolutevalue.java"
deleted file mode 100644
index 47375ebeb1dc1fef1523255592d5c2e74374d2a3..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/math/absolutevalue.java"
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.math;/*`Math` 类练习题：
-
-        1. 绝对值
-        - 编写一个程序，接受一个用户输入的数字，然后输出该数字的绝对值。*/
-
-import java.util.Scanner;
-
-public class absolutevalue {
-    public static void main(String[] args) {
-        Scanner scanner = new Scanner(System.in);
-
-        System.out.println("please add a number");
-        double number = scanner.nextDouble();
-
-        double absolutevalue = Math.abs(number);
-        System.out.println("math.absolutevalue:"+absolutevalue);
-
-        scanner.close();
-    }
-}
-
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/math/avg.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/math/avg.java"
deleted file mode 100644
index 8688fbc89c9db74ffceda14a9c99fcd3152e1755..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/math/avg.java"
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.math;
-
-/*5.计算平均值
-
-        - 创建一个方法，接受一个整数数组，并返回数组的平均值。*/
-public class avg {
-    public static double caculateAverage(int[] numbers) {
-        if (numbers == null || numbers.length == 0) {
-            throw new IllegalArgumentException("the numbers array is false");
-        }
-        int sum = 0;
-        for (int number : numbers) {
-            sum += number;
-        }
-        return sum / (double) numbers.length;
-    }
-
-
-    public static void main(String[] args) {
-        int[] numbers = {1, 2, 3, 4, 5};
-        double average = caculateAverage(numbers);
-        System.out.println("the average is:" + average);
-    }
-}
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/math/minmax.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/math/minmax.java"
deleted file mode 100644
index d8e1037275e51582df5e589248b38afab1b1490d..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/math/minmax.java"
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.math;
-
-
-/*2.最小值和最大值
-
-        - 创建一个方法，接受三个整数作为参数，返回这三个整数中的最小值和最大值。*/
-public class minmax {
-    public static void main(String[] args) {
-        int a = 5;
-        int b = 10;
-        int c = 15;
-
-        int min = findMin(a,b,c);
-        int max = findMax(a,b,c);
-
-        System.out.println("minimum:"+ min);
-        System.out.println("maximum:"+ max);
-    }
-
-    public static int findMin(int num1,int num2,int num3){
-        return Math.min(Math.min(num1,num2),num3);
-    }
-
-    public static int findMax(int num1,int num2,int num3){
-        return Math.max(Math.max(num1,num2),num3);
-    }
-
-}
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/math/random.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/math/random.java"
deleted file mode 100644
index 47ece2119924c4f01c02588b923b2b53b4770289..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/math/random.java"
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.math;
-
-/*4.随机数生成
-
-        - 使用 `Math.math.random()` 方法生成一个 0 到 1 之间的随机数，并将其乘以一个用户指定的最大值。*/
-public class random {
-    public static void main(String[] args) {
-        int upperBound = 2;
-        int randomNumber = (int)(Math.random() * upperBound);
-        System.out.println("randomNumber:"+randomNumber);
-    }
-}
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/math/round.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/math/round.java"
deleted file mode 100644
index 2d0c822f7eb14656b9bf4f127609a09673f65672..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/math/round.java"
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.math;
-
-import java.util.Scanner;
-
-/*3.四舍五入
-
-        - 编写一个程序，接受一个浮点数作为输入，并将其四舍五入到最近的整数。*/
-public class round {
-    public static void main(String[] args) {
-        Scanner scanner = new Scanner(System.in);
-
-        System.out.println("please add a floatnumber");
-        double floatnumber = scanner.nextDouble();
-
-        int roundedNumber = (int) Math.round(floatnumber);
-        System.out.println("math.round:"+ roundedNumber);
-
-        scanner.close();
-    }
-
-}
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/person.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/person.java"
deleted file mode 100644
index f3187b0d55ffd1f72efa1c20d5b5abf29ebd7726..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/person.java"
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224;
-
-import java.util.Objects;
-
-/*`Object` 类练习题：
-
-        1. 重写 `toString` 方法
-        - 创建一个 `Person` 类，包含 `name` 和 `age` 属性。重写 `toString` 方法，使其返回一个字符串，包含对象的 `name` 和 `age`。*/
-public class person {
-    private String name;
-    private int age;
-
-
-
-
-    public person(String name, int age){
-            this.name = name;
-            this.age = age;
-        }
-
-        public String getName () {
-            return name;
-        }
-
-        public void setName (String name){
-            this.name = name;
-        }
-
-        public int getAge () {
-            return age;
-        }
-
-        public void setAge ( int age){
-            this.age = age;
-        }
-
-        @Override
-        public String toString () {
-            return "name=" + name + ",age=" + age;
-        }
-
-
-/*使用 `equals` 方法
-
-        - 在 `Person` 类中重写 `equals` 方法，使得可以通过 `name` 和 `age` 属性比较两个 `Person` 对象是否相等。*/
-        @Override
-        public boolean equals (Object o){
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            person person = (person) o;
-            return age == person.age &&
-                    Objects.equals(name, person.name);
-        }
-
-        @Override
-        public int hashCode () {
-            return Objects.hash(name, age);
-        }
-    }
-
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string13.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string13.java"
deleted file mode 100644
index 99a512872fbc94ee6565d19c51a1b76258bec547..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string13.java"
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.string;
-
-public class string13 {
-    public static void main(String[] args) {
-        String str = "Hello, World!";
-        char charToFind = 'o';
-        int count = countChar(str, charToFind);
-        System.out.println("The character '" + charToFind + "' appears " + count + " times.");
-    }
-
-    public static int countChar(String str, char charToFind) {
-        int count = 0;
-        for (int i = 0; i < str.length(); i++) {
-            if (str.charAt(i) == charToFind) {
-                count++;
-            }
-        }
-        return count;
-    }
-}
-
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string14.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string14.java"
deleted file mode 100644
index c3200fa2b6fe0e1d613c756b32e28c5ab02d1b66..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string14.java"
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.string;
-
-public class string14 {
-
-    public static void main(String[] args) {
-        String intString = "123";
-        String floatString = "123.45";
-
-        int intValue = Integer.parseInt(intString);
-        float floatValue = Float.parseFloat(floatString);
-
-        System.out.println("整数转换结果: " + intValue);
-        System.out.println("浮点数转换结果: " + floatValue);
-
-        String intStringValue = String.valueOf(intValue);
-        String floatStringValue = String.valueOf(floatValue);
-
-        System.out.println("整数转换为字符串: " + intStringValue);
-        System.out.println("浮点数转换为字符串: " + floatStringValue);
-    }
-}
-
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string15.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string15.java"
deleted file mode 100644
index c0ab1ff3a8a18492fd8794fb407b8410945f7ba9..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string15.java"
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.string;
-
-public class string15 {
-    public static void main(String[] args) {
-        String str1 = "Hello";
-        String str2 = "World";
-        String str3 = "Java";
-
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < 3; i++) {
-            if (i > 0) {
-                sb.append("*");
-            }
-            sb.append(str1);
-            sb.append("*");
-            sb.append(str2);
-            sb.append("*");
-            sb.append(str3);
-        }
-
-        System.out.println(sb.toString());
-    }
-}
-
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string1and2.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string1and2.java"
deleted file mode 100644
index 5bf276d9e09c1a1a5a1b3282b2d3424e53351020..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string1and2.java"
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.string;
-import static java.lang.reflect.Array.getLength;
-
-public class string1and2 {
-    public static void main(String[] args) {
-        String str1 = "Hello";
-        String str2 = "World";
-        String concatenatedString = str1 + "" + str2;
-        System.out.println(concatenatedString);
-
-        int length = getLength(str1);
-        System.out.println("length:" + length);
-    }
-
-}
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string3.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string3.java"
deleted file mode 100644
index d7319caba79b61f0c0ea10e4d648bd4b29cc85a7..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string3.java"
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.string;
-
-public class string3 {
-    public static void main(String[] args) {
-        String input = "Hello,World";
-        String[] words = input.split(",");
-        for (String word : words){
-            System.out.println(word);
-        }
-    }
-}
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string4.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string4.java"
deleted file mode 100644
index bbf73d4b10c0ee99622b50bf885fc76e81d423fd..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string4.java"
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.string;
-
-public class string4 {
-    public static String reverse(String original){
-        if (original == null){
-            return null;
-        }
-        return new StringBuilder(original).reverse().toString();
-    }
-
-    public static void main(String[] args) {
-        String original = "Hello World";
-        String reversed =reverse(original);
-        System.out.println(reversed);
-    }
-}
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string5.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string5.java"
deleted file mode 100644
index c2481200dcce2b403e1e74b042ea18acaabbab77..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string5.java"
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.string;
-
-public class string5 {
-
-    public static String toLowerCase(String input) {
-        return input.toLowerCase();
-    }
-
-    public static String toUpperCase(String input) {
-        return input.toUpperCase();
-    }
-
-    public static void main(String[] args) {
-        String original = "Java Programming";
-
-        String lowerCase = toLowerCase(original);
-        System.out.println("小写: " + lowerCase);
-
-        String upperCase = toUpperCase(original);
-        System.out.println("大写: " + upperCase);
-    }
-}
-
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string6.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string6.java"
deleted file mode 100644
index 2b1532f0155b66b22f2535db1dfe0887b6d942a3..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string6.java"
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.string;
-
-public class string6 {
-    public static void main(String[] args) {
-        String haystack = "Hello, this is a simple test!";
-        String needle = "simple";
-
-        boolean contains = haystack.contains(needle);
-        System.out.println("字符串 '" + haystack + "' 是否包含子字符串 '" + needle + "': " + contains);
-    }
-}
-
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string7.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string7.java"
deleted file mode 100644
index d11cc582d78b8fd64607f2dfca7f0a91dcc43639..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string7.java"
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.string;
-
-public class string7 {
-    public static String replaceAll(String str, char oldChar, char newChar) {
-        if (str == null) {
-            return null;
-        }
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < str.length(); i++) {
-            char c = str.charAt(i);
-            if (c == oldChar) {
-                sb.append(newChar);
-            } else {
-                sb.append(c);
-            }
-        }
-        return sb.toString();
-    }
-
-    public static void main(String[] args) {
-        String original = "Hello World!";
-        char oldChar = 'o';
-        char newChar = '0';
-
-        String replaced = replaceAll(original, oldChar, newChar);
-        System.out.println(replaced);
-    }
-}
-
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string8.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string8.java"
deleted file mode 100644
index ae40295f53e6a1427bdc60aa7a00571bb3a1df88..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string8.java"
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.string;
-
-public class string8 {
-    public static void main(String[] args) {
-        String originalString = "  Hello, World!  ";
-        String trimmedString = trim(originalString);
-        System.out.println("Original String: " + originalString);
-        System.out.println("Trimmed String: " + trimmedString);
-    }
-
-    public static String trim(String s) {
-        return s.trim();
-    }
-}
-
diff --git "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string9to12.java" "b/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string9to12.java"
deleted file mode 100644
index dece8456eb850f8037c622465f79fd6522e966a9..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240517/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/string/string9to12.java"
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.java.minxi.java_20240517.java_2302_吴憶豪_2244310224.string;
-
-public class string9to12 {
-    public static void main(String[] args) {
-        String str1 = "Hello";
-        String str2 = "hello";
-
-        boolean areEqual = str1.equalsIgnoreCase(str2);
-        System.out.println("Strings are equal (ignoring case): " + areEqual);
-
-        String substring = str1.substring(1,3);
-        System.out.println(substring);
-
-        boolean result1 = str1.endsWith("o");
-        System.out.println("结果:"+result1);
-
-        boolean result2 = str2.startsWith("H");
-        System.out.println("结果:"+result2);
-    }
-}
-
diff --git "a/work/com/java/minxi/java_20240522/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/person.java" "b/work/com/java/minxi/java_20240522/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/person.java"
deleted file mode 100644
index 425488bf4a53224a838db0fbe695f6deff965e72..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240522/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/person.java"
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.java.minxi.java_20240522.java_2302_吴憶豪_2244310224;
-
-public class person {
-    private String firstName;
-    private String lastName;
-
-    public person(String firstName, String lastName) {
-        this.firstName = firstName;
-        this.lastName = lastName;
-    }
-    public void printFullName(){
-        System.out.println(firstName+""+lastName);
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-}
-
diff --git "a/work/com/java/minxi/java_20240522/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/rectangle.java" "b/work/com/java/minxi/java_20240522/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/rectangle.java"
deleted file mode 100644
index 17b3764a51dacc5d89bb301610bd080492abb314..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240522/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/rectangle.java"
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.java.minxi.java_20240522.java_2302_吴憶豪_2244310224;
-
-import java.util.Scanner;
-
-class Rectangle {
-    private double width;
-    private double height;
-
-    public Rectangle(double width, double height) {
-        this.width = width;
-        this.height = height;
-    }
-
-    public double getArea(){
-        return width * height;
-    }
-    public double getPerimeter(){
-        return 2*(width+height);
-    }
-}
-public class rectangle {
-    public static void main(String[] args) {
-        Scanner scanner = new Scanner(System.in);
-
-        System.out.println("please add width:");
-        double width = scanner.nextDouble();
-
-        System.out.println("please add height");
-        double height = scanner.nextDouble();
-
-        Rectangle rectangle = new Rectangle(width, height);
-
-        double area = rectangle.getArea();
-        double perimeter = rectangle.getPerimeter();
-
-        System.out.println("area:" + area);
-        System.out.println("perimeter:" + perimeter);
-
-    }
-}
\ No newline at end of file
diff --git "a/work/com/java/minxi/java_20240524/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/jdbc1.java" "b/work/com/java/minxi/java_20240524/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/jdbc1.java"
deleted file mode 100644
index 4cb032584a77e5ed3ea7fd29761f15f7c348cd9f..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240524/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/jdbc1.java"
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.java.minxi.java_20240524.java_2302_吴憶豪_2244310224;
-
-import java.sql.*;
-
-public class jdbc1 {
-    public static void main(String[] args) {
-        String url = "jdbc:mysql://locallhost:3306/root";
-        String user = "username";
-        String password = "password";
-
-        try {
-            Class.forName("com.java.minxi.java_20240524.java_2302_吴憶豪_2244310224.jdbc1.Driver");
-
-            System.out.println("link start");
-            Connection conn = DriverManager.getConnection(url, user, password);
-
-            System.out.println("select infomaion");
-            Statement stmt = conn.createStatement();
-            ResultSet rs = stmt.executeQuery("select id,teacher_name,teacher_age from users");
-
-            while (rs.next()) {
-                int id = rs.getInt("id");
-                String teacher_name = rs.getString("name");
-                System.out.println("id:" + id);
-                System.out.println("name:" + teacher_name);
-            }
-            rs.close();
-            stmt.close();
-            conn.close();
-        }
-        catch(Exception e){
-            e.printStackTrace();
-        }
-    }
-}
diff --git "a/work/com/java/minxi/java_20240524/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/jdbc2.java" "b/work/com/java/minxi/java_20240524/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/jdbc2.java"
deleted file mode 100644
index b93514127365e522d0c6bd68d561f481a289ebad..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240524/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/jdbc2.java"
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.java.minxi.java_20240524.java_2302_吴憶豪_2244310224;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-
-public class jdbc2 {
-    public static void main(String[] args) {
-        String url = "jdbc:mysql://localhost:3306/root";
-        String user = "username";
-        String password = "password";
-
-        String sql = "select * from users where id = ? and age = ?";
-        try {
-            Class.forName("com.mysql.cj.jdbc.Driver");
-            Connection conn = DriverManager.getConnection(url, user, password);
-            PreparedStatement pstmt = conn.prepareStatement(sql);
-            pstmt.setInt(1, 1);
-            pstmt.setInt(2, 35);
-            ResultSet rs = pstmt.executeQuery();
-            while (rs.next()) {
-                int id = rs.getInt("id");
-                String name = rs.getString("teacher_name");
-                int age = rs.getInt("teacher_age");
-                System.out.println("id:" + id + ",name:" + name + ",age" + age);
-            }
-            rs.close();
-            pstmt.close();
-            conn.close();
-        }
-        catch (Exception e){
-            e.printStackTrace();
-
-            }
-        }
-    }
-
diff --git "a/work/com/java/minxi/java_20240524/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/jdbc3.java" "b/work/com/java/minxi/java_20240524/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/jdbc3.java"
deleted file mode 100644
index 908971db4347e9cd0e966a10768ddd81f61fd0e3..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240524/java_2302_\345\220\264\346\206\266\350\261\252_2244310224/jdbc3.java"
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.java.minxi.java_20240524.java_2302_吴憶豪_2244310224;
-
-import java.io.File;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-public class jdbc3 {
-    public static void main(String[] args) {
-        Map<String, String> druid = getConnectionData("druid");
-        DruidDataSource dataSource = new DruidDataSource();
-        dataSource.setUrl("jdbc:mysql://localhost:3306/root");
-        dataSource.setUsername("username");
-        dataSource.setPassword("password");
-        dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
-
-        try {
-            Connection connection = dataSource.getConnection();
-            String sql = "UPDATE users SET username = ? WHERE id = ?";
-            PreparedStatement statement = connection.prepareStatement(sql);
-            statement.setString(1, "小严");
-            statement.setInt(2, 3);
-
-            int affectedRows = statement.executeUpdate();
-
-            statement.close();
-            connection.close();
-
-            if (affectedRows > 0) {
-                System.out.println("true");
-            } else {
-                System.out.println("false");
-            }
-        }catch(Exception e){
-            e.printStackTrace();
-        }
-    }
-    public static Map<String, String> getConnectionData(String fileName) {
-        Map<String, String> map = new HashMap<>();
-        try {
-            Properties properties = new Properties();
-            String property = System.getProperty("user.dir");
-            File file = new File(property + "\\" + fileName + ".properties");
-            InputStreamReader inputStreamReader = new InputStreamReader(Files.newInputStream(file.toPath()), StandardCharsets.UTF_8);
-            properties.load(inputStreamReader);
-            for (Object o : properties.keySet()) {
-                String key = (String) o;
-                String value = properties.getProperty(key);
-                map.put(key, value);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return map;
-}
diff --git "a/work/com/java/minxi/java_20240524/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/SJK.java" "b/work/com/java/minxi/java_20240524/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/SJK.java"
new file mode 100644
index 0000000000000000000000000000000000000000..18e7ff0fd781dcb2894b4f4438b988db7105e941
--- /dev/null
+++ "b/work/com/java/minxi/java_20240524/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/SJK.java"
@@ -0,0 +1,77 @@
+package com.java.minxi.java_20240524.java_2302_易志昀_2344310235;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+public class SJK {
+    public class Main {
+        public static void main(String[] args) throws Exception{
+            Main_1();
+            Main_2();
+            Main_3();
+        }
+
+        private  static void Main_3() throws Exception{
+            String url="jdbc:mysql://student?serverTimezone=Asia/Shanghai";
+            String username="root";
+            String password="123456";
+            Connection connection= DriverManager.getConnection(url,username,password);
+            String sql="update teacher_info set teacher_name='小严' where id=3;";
+            Statement statement=connection.createStatement();
+            int i=statement.executeUpdate(sql);
+            if (i>0){
+                System.out.println("修改成功");
+            }else{
+                System.out.println("修改失败");
+            }
+            statement.close();
+            connection.close();
+        }
+        private  static void Main_2() throws Exception{
+            String url="jdbc:mysql://student?serverTimezone=Asia/Shanghai";
+            String username="root";
+            String password="123456";
+            Connection connection= DriverManager.getConnection(url,username,password);
+            String sql="select* from teacher_info where id=1 && teacher_age=35";
+            Statement statement= connection.createStatement();
+            ResultSet resultSet=statement.executeQuery(sql);
+            System.out.println("id为1，且年龄为35岁的用户：");
+            System.out.println("id\t\t teacher_name\t teacher_age");
+            while(resultSet.next()){
+                int id=resultSet.getInt(1);
+                String name=resultSet.getString(2);
+                int age=resultSet.getInt(3);
+                System.out.println(id+"\t\t"+name+"\t\t\t"+age);
+            }
+            System.out.println();
+            resultSet.close();
+            statement.close();
+            connection.close();
+        }
+
+        private  static void Main_1() throws Exception{
+            String url="jdbc:mysql://student?serverTimezone=Asia/Shanghai";
+            String username="root";
+            String password="123456";
+            Connection connection= DriverManager.getConnection(url,username,password);
+            String sql="select*from teacher_info ;";
+            Statement statement=connection.createStatement();
+            ResultSet resultSet=statement.executeQuery(sql);
+            System.out.println("所有用户信息");
+            System.out.println("id\t\t teacher_name\t teacher_age");
+            while (resultSet.next()){
+                int id=resultSet.getInt("id");
+                String name=resultSet.getNString("teacher_name");
+                int age=resultSet.getInt("teacher_age");
+                System.out.println(id+"\t\t"+name+"\t\t"+age);
+            }
+            System.out.println();
+            resultSet.close();
+            statement.close();
+            connection.close();
+
+        }
+    }
+
+}
diff --git "a/work/com/java/minxi/java_20240531/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Sleep.jsp" "b/work/com/java/minxi/java_20240531/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Sleep.jsp"
new file mode 100644
index 0000000000000000000000000000000000000000..91248436869a541852a9c0a1b0b4749d3eb8cb1f
--- /dev/null
+++ "b/work/com/java/minxi/java_20240531/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Sleep.jsp"
@@ -0,0 +1,39 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: Administrator
+  Date: 2024-06-11
+  Time: 19:13
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Title</title>
+</head>
+<body>
+<%! public class Animals{
+    String sleep(int time){
+        return "一只动物在睡觉";
+    }
+} %>
+<%! public class Cat{
+    String name;
+    int time;
+    String sleep(int time){
+        return "一只汤姆猫睡觉睡了8个小时";
+    }
+
+} %>
+<% Animals animals =new Animals();
+    Cat cat =new Cat();
+    cat.name="汤姆猫";
+    System.out.println(animals.sleep(0));
+    System.out.println(cat.sleep(8));
+%>
+<% for (int i = 1; i <=9 ; i++) {
+    for (int j = 1; j <i ; j++) {
+        System.out.println(i+"*"+j+"="+i*j);
+    }
+}%>
+</body>
+</html>
diff --git "a/work/com/java/minxi/java_20240605/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Dfen.jsp" "b/work/com/java/minxi/java_20240605/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Dfen.jsp"
new file mode 100644
index 0000000000000000000000000000000000000000..ef7adc4b3d314725708b266296480bdf3e18ed04
--- /dev/null
+++ "b/work/com/java/minxi/java_20240605/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Dfen.jsp"
@@ -0,0 +1,27 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: Administrator
+  Date: 2024-06-11
+  Time: 19:23
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Title</title>
+</head>
+<body>
+<%
+    String SideA = request.getParameter("SideA");
+    double a = Double.parseDouble(SideA);
+
+%>
+<%! public Double circle(Double a){
+    return Math.PI*a*a;
+};
+%>
+
+<p>圆形的面积为：</p><%=circle(a)%>
+
+</body>
+</html>
diff --git "a/work/com/java/minxi/java_20240605/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Fen.jsp" "b/work/com/java/minxi/java_20240605/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Fen.jsp"
new file mode 100644
index 0000000000000000000000000000000000000000..5d5b2ac73bf7ff183b6e59d3248d718c2ce74e57
--- /dev/null
+++ "b/work/com/java/minxi/java_20240605/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Fen.jsp"
@@ -0,0 +1,30 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: Administrator
+  Date: 2024-06-11
+  Time: 19:26
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Title</title>
+</head>
+<body>
+<%
+    String SideB = request.getParameter("SideB");
+    String SideC = request.getParameter("SideC");
+    String SideD = request.getParameter("SideD");
+    double b = Double.parseDouble(SideB);
+    double c = Double.parseDouble(SideC);
+    double d = Double.parseDouble(SideD);
+
+%>
+<%! public Double ladder(Double b,Double c,Double d){
+    return (b+c)*d/2;
+};
+%>
+
+<p>梯形的面积为：</p><%=ladder(b,c,d)%>
+</body>
+</html>
diff --git "a/work/com/java/minxi/java_20240605/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Main.jsp" "b/work/com/java/minxi/java_20240605/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Main.jsp"
new file mode 100644
index 0000000000000000000000000000000000000000..e469a138a328d42f5f073e5f7f952b9ce3dd99e1
--- /dev/null
+++ "b/work/com/java/minxi/java_20240605/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/Main.jsp"
@@ -0,0 +1,33 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: Administrator
+  Date: 2024-06-11
+  Time: 19:26
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Title</title>
+</head>
+<body>
+<% double a = 2;
+  double b = 3;
+  double c = 4;
+  double d = 5;
+%>
+<h1>计算圆的面积</h1>
+<br> 加载circle.jsp 计算半径<%=a%>圆的面积
+<jsp:include page="Dfen.jsp">
+  <jsp:param name="SideA" value="<%=a%>"/>
+</jsp:include>
+
+<h1>计算梯形的面积</h1>
+<br> 加载ladder.jsp 计算半径<%=b%>,<%=c%>,<%=d%>梯形的面积
+<jsp:include page="Fen.jsp">
+  <jsp:param name="SideB" value="<%=b%>"/>
+  <jsp:param name="SideC" value="<%=c%>"/>
+  <jsp:param name="SideD" value="<%=d%>"/>
+</jsp:include>
+</body>
+</html>
diff --git "a/work/com/java/minxi/java_20240606/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/AC.jsp" "b/work/com/java/minxi/java_20240606/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/AC.jsp"
new file mode 100644
index 0000000000000000000000000000000000000000..ec15c63c1b2322db153ed55c33b2bab1d51103f7
--- /dev/null
+++ "b/work/com/java/minxi/java_20240606/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/AC.jsp"
@@ -0,0 +1,90 @@
+<%@ page import="com.mysql.cj.x.protobuf.MysqlxDatatypes" %>
+<%@ page import="com.mysql.cj.xdevapi.Expression" %>
+<%@ page import="com.mysql.cj.exceptions.ExceptionFactory" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.ArrayList" %>
+<%@ page import="java.sql.Connection" %>
+<%@ page import="java.sql.DatabaseMetaData" %>
+<%@ page import="java.sql.Statement" %>
+<%@ page import="java.sql.ResultSet" %><%--
+<%--
+  Created by IntelliJ IDEA.
+  User: Administrator
+  Date: 2024-06-11
+  Time: 20:10
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Title</title>
+</head>
+<body>
+<%!
+    public class Userinfo{
+        private int id;
+        private MysqlxDatatypes.Scalar.String userinfo;
+        private MysqlxDatatypes.Scalar.String userphone;
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+
+        public MysqlxDatatypes.Scalar.String getUserinfo() {
+            return userinfo;
+        }
+
+        public void setUserinfo(MysqlxDatatypes.Scalar.String userinfo) {
+            this.userinfo = userinfo;
+        }
+
+        public MysqlxDatatypes.Scalar.String getUserphone() {
+            return userphone;
+        }
+
+        public void setUserphone(MysqlxDatatypes.Scalar.String userphone) {
+            this.userphone = userphone;
+        }
+
+        public Userinfo(int id, MysqlxDatatypes.Scalar.String userinfo, MysqlxDatatypes.Scalar.String userphone) {
+            this.id = id;
+            this.userinfo = userinfo;
+            this.userphone = userphone;
+        }
+
+        public String Userdata(){
+            return "Userinfo{" +
+                    "id=" + id +
+                    ", userInfo='" +userinfo + '\'' +
+                    ", userPhone='" +userphone + '\'' +
+                    '}';
+        }
+    }
+
+    public List<Userinfo> JDBC() throws Exception {
+        List<Userinfo> userinfo1=new ArrayList<>();
+        String url="jdbc:mysql://localhost:3306/student?serverTimezone=Asia/Shanghai";
+        String username="root";
+        String password="123456";
+
+        DatabaseMetaData DriverManger = null;
+        Connection con=DriverManger.getConnection();
+
+        String sql="select id,user_name,user_phone from user_info";
+
+        Statement sta=con.createStatement();
+        ResultSet res=sta.executeQuery(sql);
+
+        res.close();
+        sta.close();
+        con.close();
+
+        return userinfo1;
+    }
+%>
+</body>
+</html>