From 3761ec21fcf62d07c860a7b0fb79f81ff284992d Mon Sep 17 00:00:00 2001 From: shangguilong <1751220476@qq.com> Date: Tue, 16 Apr 2024 10:30:43 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0maven=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 9 +++++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ .idea/web-framework1.iml | 9 +++++++++ .idea/workspace.xml | 15 +++++++++++++++ pom.xml | 28 ++++++++++++++++++++++++++++ src/main/java/work1.java | 5 +++++ src/test/java/testWork1.java | 9 +++++++++ 8 files changed, 89 insertions(+) create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/web-framework1.iml create mode 100644 .idea/workspace.xml create mode 100644 pom.xml create mode 100644 src/main/java/work1.java create mode 100644 src/test/java/testWork1.java diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..d4b854b --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..0c9ff98 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/web-framework1.iml b/.idea/web-framework1.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/web-framework1.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..c4115f4 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,15 @@ + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..7139e33 --- /dev/null +++ b/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + org.example + homework01 + 1.0-SNAPSHOT + + + 8 + 8 + + + + + + + junit + junit + 4.12 + test + + + + + \ No newline at end of file diff --git a/src/main/java/work1.java b/src/main/java/work1.java new file mode 100644 index 0000000..c798f8f --- /dev/null +++ b/src/main/java/work1.java @@ -0,0 +1,5 @@ +public class work1 { + public void name(String n) { + System.out.println(n); + } +} diff --git a/src/test/java/testWork1.java b/src/test/java/testWork1.java new file mode 100644 index 0000000..cf0e524 --- /dev/null +++ b/src/test/java/testWork1.java @@ -0,0 +1,9 @@ +import org.junit.Test; + +public class testWork1 { + @Test + public void testName() { + work1 w1 = new work1(); + w1.name("苏博文"); + } +} -- Gitee From 3a6292e122baf01038d21cfb5caf3613a6d49e0e Mon Sep 17 00:00:00 2001 From: shangguilong <1751220476@qq.com> Date: Tue, 16 Apr 2024 10:39:21 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 90 +++++++++++++++++++++++++++++++++++++++- src/main/java/work1.java | 4 ++ 2 files changed, 93 insertions(+), 1 deletion(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c4115f4..62187f2 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,5 +1,33 @@ + + + + + + + + + + + + + + + + + - + + + - diff --git a/src/main/java/work1.java b/src/main/java/work1.java index 8166442..cab3e9b 100644 --- a/src/main/java/work1.java +++ b/src/main/java/work1.java @@ -5,5 +5,6 @@ public class work1 { public static void main(String[] args) { System.out.println("hello"); + System.out.println("cherry 1"); } } -- Gitee From aee55dfabcd46678ee07e7f26e70cc265affe4be Mon Sep 17 00:00:00 2001 From: shangguilong <1751220476@qq.com> Date: Tue, 16 Apr 2024 10:43:44 +0800 Subject: [PATCH 5/7] cherry 2 --- src/main/java/work1.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/work1.java b/src/main/java/work1.java index cab3e9b..efad388 100644 --- a/src/main/java/work1.java +++ b/src/main/java/work1.java @@ -6,5 +6,6 @@ public class work1 { public static void main(String[] args) { System.out.println("hello"); System.out.println("cherry 1"); + System.out.println("cherry 2"); } } -- Gitee From 9fe1e828d137c9f3c5e90df3535b688e1eb7c54c Mon Sep 17 00:00:00 2001 From: shangguilong <1751220476@qq.com> Date: Tue, 16 Apr 2024 10:45:33 +0800 Subject: [PATCH 6/7] 1 --- .idea/workspace.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 83b4ec6..a00ace9 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -110,10 +110,10 @@ - + - + -- Gitee From 43488bc05c5ad2216d327e811a89b79b05010e9b Mon Sep 17 00:00:00 2001 From: shangguilong <1751220476@qq.com> Date: Tue, 16 Apr 2024 10:48:50 +0800 Subject: [PATCH 7/7] merge test --- .idea/workspace.xml | 27 +++++++++++++++++++++++++-- src/main/java/work1.java | 1 + 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 83b4ec6..1d0a1ce 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -16,7 +16,13 @@ - + + + + + + @@ -26,6 +32,11 @@ + @@ -93,7 +104,19 @@ - + + + diff --git a/src/main/java/work1.java b/src/main/java/work1.java index efad388..c4c9f5f 100644 --- a/src/main/java/work1.java +++ b/src/main/java/work1.java @@ -7,5 +7,6 @@ public class work1 { System.out.println("hello"); System.out.println("cherry 1"); System.out.println("cherry 2"); + System.out.println("merge"); } } -- Gitee