From 8649595ca100ac2ff83970126e23af330732c73f Mon Sep 17 00:00:00 2001
From: TMac <2647455144@qq.com>
Date: Thu, 15 Jul 2021 12:56:22 +0800
Subject: [PATCH] =?UTF-8?q?fixed:=E9=AD=8F=E5=AE=87=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=20package=20info?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/swpu/Pck.java           |  4 --
 .../src/main/java/com/swpu/lvlTest/Test1.java | 37 -----------------
 .../src/main/java/com/swpu/lvlTest/Test2.java | 39 ------------------
 .../src/main/java/com/swpu/weiyu/psk.java     | 41 +++++++++++++++++++
 4 files changed, 41 insertions(+), 80 deletions(-)
 delete mode 100644 java-base-projects-task/src/main/java/com/swpu/Pck.java
 delete mode 100644 java-base-projects-task/src/main/java/com/swpu/lvlTest/Test1.java
 delete mode 100644 java-base-projects-task/src/main/java/com/swpu/lvlTest/Test2.java
 create mode 100644 java-base-projects-task/src/main/java/com/swpu/weiyu/psk.java

diff --git a/java-base-projects-task/src/main/java/com/swpu/Pck.java b/java-base-projects-task/src/main/java/com/swpu/Pck.java
deleted file mode 100644
index c820e96..0000000
--- a/java-base-projects-task/src/main/java/com/swpu/Pck.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.swpu;
-
-public class Pck {
-}
diff --git a/java-base-projects-task/src/main/java/com/swpu/lvlTest/Test1.java b/java-base-projects-task/src/main/java/com/swpu/lvlTest/Test1.java
deleted file mode 100644
index dde7c68..0000000
--- a/java-base-projects-task/src/main/java/com/swpu/lvlTest/Test1.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.swpu.lvlTest;
-
-import java.util.Scanner;
-
-public class Test1 {
-    public static void main(String[] args) {
-
-        Test2 test2 = new Test2();
-        //
-        test2.helloWorldPrint();
-
-        int num1 = test2.sum();
-        System.out.println("整型，无参数输出：" + num1);
-
-
-        int arr1 = 1;
-        int arr2 = 1;
-        int sum = test2.sum1(arr1,arr2);
-        System.out.println("整型，有参数输出：" + arr1 + " + " + arr2 + " = " + sum);
-
-        String str1 = test2.stringMethod();
-        System.out.println(str1);
-
-        String str2 = "String";
-        String str3 = test2.stringMethod2(str2);
-        System.out.println(str3);
-
-        //
-
-
-
-
-
-
-
-    }
-}
diff --git a/java-base-projects-task/src/main/java/com/swpu/lvlTest/Test2.java b/java-base-projects-task/src/main/java/com/swpu/lvlTest/Test2.java
deleted file mode 100644
index 2ec835f..0000000
--- a/java-base-projects-task/src/main/java/com/swpu/lvlTest/Test2.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.swpu.lvlTest;
-
-import java.sql.SQLOutput;
-import java.util.Scanner;
-
-public class Test2 {
-
-    //无返回值方法
-    public void helloWorldPrint(){
-        System.out.println("Hello World !");
-    }
-
-    //int 无参数，有返回值方法
-    public int sum(){
-        int arr1=2;
-        int arr2=3;
-        return arr1+arr2;
-    }
-
-    //int 有参数，有返回值方法
-    public int sum1(int num1,int num2){
-        return num1+num2;
-    }
-
-    //String 无参数，有返回值方法；
-    public String stringMethod(){
-        return "String 无参数，返回方法";
-    }
-
-    //String 有参数，有返回值方法；
-    public String stringMethod2(String str){
-        return str+"有参数，有返回值方法";
-    }
-
-
-
-
-
-}
diff --git a/java-base-projects-task/src/main/java/com/swpu/weiyu/psk.java b/java-base-projects-task/src/main/java/com/swpu/weiyu/psk.java
new file mode 100644
index 0000000..eb67ba8
--- /dev/null
+++ b/java-base-projects-task/src/main/java/com/swpu/weiyu/psk.java
@@ -0,0 +1,41 @@
+package com.swpu.weiyu;
+
+import java.util.List;
+import java.util.Map;
+
+public class psk {
+    public static void main(String[] args) {
+        Task2 psk = new Task2();
+        psk.test1();
+
+        var add = psk.addMethod();
+        System.out.println("整型、有返回值、没有参数 的方法调用: " + add);
+
+        var multi = psk.multiMethod(3);
+        System.out.println("整型、有返回值、有参数 的方法调用: " + multi);
+
+        var string = psk.stringMethod();
+        System.out.println("字符 - 有返回值、没有参数 的方法调用: " + string);
+
+        var string2 = psk.stringMethod2(" String类型 ");
+        System.out.println("字符 - 有返回值、有参数 的方法调用: " + string2);
+
+        List<String> list = psk.listMethod();
+        System.out.println("List - 有返回值、没有参数 的方法调用: " + list);
+
+        List<String> list1 = psk.listMethod2("List 类型");
+        System.out.println("List - 有返回值、有参数 的方法调用: " + list1);
+
+        Map<String, Object> map = psk.mapMethod();
+        System.out.println("Map - 有返回值、没有参数 的方法调用: " + map);
+
+        Map<String, Object> map1 = psk.mapMethod2("Map 类型");
+        System.out.println("Map - 有返回值、有参数 的方法调用: " + map1);
+
+        Object object = psk.objectMethod();
+        System.out.println("Object - 有返回值、没有参数 的方法调用: " + object);
+
+        Object object1 = psk.objectMethod2("Object 类型");
+        System.out.println("Object - 有返回值、有参数 的方法调用: " + object1);
+    }
+}
-- 
Gitee