From ed71ba0354101573c0d9a9491214c559fa7ac324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E4=BA=8E=E8=80=80=E5=AE=87=E2=80=99?= <‘1045227562@qq.com’> Date: Wed, 10 Apr 2024 22:07:14 +0800 Subject: [PATCH 01/19] 1 --- .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ .idea/web-framework.iml | 9 +++++++++ javase_01 | 1 + 4 files changed, 24 insertions(+) create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/web-framework.iml create mode 160000 javase_01 diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..8e99870 --- /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-framework.iml b/.idea/web-framework.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/web-framework.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/javase_01 b/javase_01 new file mode 160000 index 0000000..c6ba65c --- /dev/null +++ b/javase_01 @@ -0,0 +1 @@ +Subproject commit c6ba65c5d7d35e74f900e324b6fa35ba1b11bf7e -- Gitee From 20fd86ffaa81de8374a36ecb61ce7ed989ea08ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E4=BA=8E=E8=80=80=E5=AE=87=E2=80=99?= <‘1045227562@qq.com’> Date: Wed, 10 Apr 2024 22:23:05 +0800 Subject: [PATCH 02/19] 2 --- .idea/compiler.xml | 16 ++++++++++++++++ .idea/misc.xml | 10 ++++++++++ .idea/modules.xml | 1 + maven_work01/maven_work01.iml | 15 +++++++++++++++ maven_work01/pom.xml | 12 ++++++++++++ 5 files changed, 54 insertions(+) create mode 100644 .idea/compiler.xml create mode 100644 .idea/misc.xml create mode 100644 maven_work01/maven_work01.iml create mode 100644 maven_work01/pom.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..01fa0c4 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..80469fa --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 8e99870..781a6ff 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,6 +2,7 @@ + diff --git a/maven_work01/maven_work01.iml b/maven_work01/maven_work01.iml new file mode 100644 index 0000000..62eef8f --- /dev/null +++ b/maven_work01/maven_work01.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/maven_work01/pom.xml b/maven_work01/pom.xml new file mode 100644 index 0000000..26f4a52 --- /dev/null +++ b/maven_work01/pom.xml @@ -0,0 +1,12 @@ + + + 4.0.0 + + work01 + maven_work01 + 1.0-SNAPSHOT + + + \ No newline at end of file -- Gitee From d8e62508852d04cde2752cae42254851b9e708cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E4=BA=8E=E8=80=80=E5=AE=87=E2=80=99?= <‘1045227562@qq.com’> Date: Wed, 10 Apr 2024 22:36:12 +0800 Subject: [PATCH 03/19] 3 --- maven_work01/maven_work01.iml | 5 +- maven_work01/pom.xml | 67 ++++++++++++++++++- maven_work01/src/main/java/com/yyy/Main.java | 7 ++ .../src/main/java/com/yyy/work01.java | 30 +++++++++ .../src/test/java/com/yyy/work01Test.java | 36 ++++++++++ 5 files changed, 141 insertions(+), 4 deletions(-) create mode 100644 maven_work01/src/main/java/com/yyy/Main.java create mode 100644 maven_work01/src/main/java/com/yyy/work01.java create mode 100644 maven_work01/src/test/java/com/yyy/work01Test.java diff --git a/maven_work01/maven_work01.iml b/maven_work01/maven_work01.iml index 62eef8f..156f690 100644 --- a/maven_work01/maven_work01.iml +++ b/maven_work01/maven_work01.iml @@ -7,9 +7,12 @@ + - + + + \ No newline at end of file diff --git a/maven_work01/pom.xml b/maven_work01/pom.xml index 26f4a52..8acdae8 100644 --- a/maven_work01/pom.xml +++ b/maven_work01/pom.xml @@ -4,9 +4,70 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - work01 - maven_work01 + com.yyy + javase_01 1.0-SNAPSHOT - + + + junit + junit + 4.12 + test + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.1.1 + + private + true + UTF-8 + UTF-8 + UTF-8 + none + + + + date + a + + + + + + compile + + jar + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.0 + + + package + + shade + + + + + com.yyy.Main + + + + + + + + + \ No newline at end of file diff --git a/maven_work01/src/main/java/com/yyy/Main.java b/maven_work01/src/main/java/com/yyy/Main.java new file mode 100644 index 0000000..2774eb6 --- /dev/null +++ b/maven_work01/src/main/java/com/yyy/Main.java @@ -0,0 +1,7 @@ +package com.yyy; + +public class Main { + public static void main(String[] args) { + System.out.println(work01.calculate(1, '+', 2)); + } +} diff --git a/maven_work01/src/main/java/com/yyy/work01.java b/maven_work01/src/main/java/com/yyy/work01.java new file mode 100644 index 0000000..b3496f1 --- /dev/null +++ b/maven_work01/src/main/java/com/yyy/work01.java @@ -0,0 +1,30 @@ +package com.yyy; + +import java.util.Scanner; +public class work01 { + public static double calculate(double num1, char operator, double num2) { + double result = 0.0; + switch (operator) { + case '+': + result = num1 + num2; + break; + case '-': + result = num1 - num2; + break; + case '*': + result = num1 * num2; + break; + case '/': + if (num2 != 0) { + result = num1 / num2; + } else { + System.out.println("除数不能为0"); + return Double.NaN; + } + break; + default: + System.out.println("无效的运算符"); + } + return result; + } +} diff --git a/maven_work01/src/test/java/com/yyy/work01Test.java b/maven_work01/src/test/java/com/yyy/work01Test.java new file mode 100644 index 0000000..5e72f98 --- /dev/null +++ b/maven_work01/src/test/java/com/yyy/work01Test.java @@ -0,0 +1,36 @@ +package com.yyy; + +import org.junit.Assert; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + + +//@FixMethodOrder(MethodSorters.NAME_ASCENDING) +public class work01Test { + @Test + public void testAddition() { + Assert.assertEquals(5.0, work01.calculate(2.0, '+', 3.0), 0.001); + System.out.println(work01.calculate(2.0, '+', 3.0)); + } + + @Test + public void testSubtraction() { + Assert.assertEquals(4.0, work01.calculate(7.0, '-', 3.0), 0.001); + System.out.println(work01.calculate(7.0, '-', 3.0)); + } + + @Test + public void testMultiplication() { + Assert.assertEquals(15.0, work01.calculate(5.0, '*', 3.0), 0.001); + System.out.println(work01.calculate(5.0, '*', 3.0)); + } + + @Test + public void testDivision() { + Assert.assertEquals(4.0, work01.calculate(12.0, '/', 3.0), 0.001); + System.out.println(work01.calculate(12.0, '/', 3.0)); + } + + +} -- Gitee From 61cf63e375609c4646fa92012894144836275449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=80=80=E5=AE=87?= <1045227562@qq.com> Date: Wed, 10 Apr 2024 14:36:56 +0000 Subject: [PATCH 04/19] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20.i?= =?UTF-8?q?dea?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 16 ---------------- .idea/misc.xml | 10 ---------- .idea/modules.xml | 9 --------- .idea/vcs.xml | 6 ------ .idea/web-framework.iml | 9 --------- 5 files changed, 50 deletions(-) delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/web-framework.iml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 01fa0c4..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 80469fa..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 781a6ff..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/web-framework.iml b/.idea/web-framework.iml deleted file mode 100644 index d6ebd48..0000000 --- a/.idea/web-framework.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file -- Gitee From 0c5874ae2541bfd74992441345d0ed6d4b2d519c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=80=80=E5=AE=87?= <1045227562@qq.com> Date: Wed, 10 Apr 2024 14:37:03 +0000 Subject: [PATCH 05/19] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AD=90=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=20javase=5F01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- javase_01 | 1 - 1 file changed, 1 deletion(-) delete mode 160000 javase_01 diff --git a/javase_01 b/javase_01 deleted file mode 160000 index c6ba65c..0000000 --- a/javase_01 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c6ba65c5d7d35e74f900e324b6fa35ba1b11bf7e -- Gitee From 35ddb1e4bf3c1fc2e89671049b2d42237f8150ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E4=BA=8E=E8=80=80=E5=AE=87=E2=80=99?= <‘1045227562@qq.com’> Date: Mon, 15 Apr 2024 16:39:13 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E6=8F=90=E4=BA=A4Maven=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maven_work01/src/main/java/com/yyy/Main.java | 1 + 1 file changed, 1 insertion(+) diff --git a/maven_work01/src/main/java/com/yyy/Main.java b/maven_work01/src/main/java/com/yyy/Main.java index 2774eb6..f2010d9 100644 --- a/maven_work01/src/main/java/com/yyy/Main.java +++ b/maven_work01/src/main/java/com/yyy/Main.java @@ -4,4 +4,5 @@ public class Main { public static void main(String[] args) { System.out.println(work01.calculate(1, '+', 2)); } + } -- Gitee From 307efff7498551bd72ea25e76ba45a7555440d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E4=BA=8E=E8=80=80=E5=AE=87=E2=80=99?= <‘1045227562@qq.com’> Date: Mon, 15 Apr 2024 16:44:07 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E6=8F=90=E4=BA=A4Maven=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maven_work01/src/main/java/com/yyy/Main.java | 1 - 1 file changed, 1 deletion(-) diff --git a/maven_work01/src/main/java/com/yyy/Main.java b/maven_work01/src/main/java/com/yyy/Main.java index f2010d9..2774eb6 100644 --- a/maven_work01/src/main/java/com/yyy/Main.java +++ b/maven_work01/src/main/java/com/yyy/Main.java @@ -4,5 +4,4 @@ public class Main { public static void main(String[] args) { System.out.println(work01.calculate(1, '+', 2)); } - } -- Gitee From 25c657cc035f1b272c8e05e1496aa042f657293b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E4=BA=8E=E8=80=80=E5=AE=87=E2=80=99?= <‘1045227562@qq.com’> Date: Mon, 15 Apr 2024 16:53:57 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9Main=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E8=BE=93=E5=85=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maven_work01/src/main/java/com/yyy/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven_work01/src/main/java/com/yyy/Main.java b/maven_work01/src/main/java/com/yyy/Main.java index 2774eb6..81b6edf 100644 --- a/maven_work01/src/main/java/com/yyy/Main.java +++ b/maven_work01/src/main/java/com/yyy/Main.java @@ -2,6 +2,6 @@ package com.yyy; public class Main { public static void main(String[] args) { - System.out.println(work01.calculate(1, '+', 2)); + System.out.println(work01.calculate(3, '-', 1)); } } -- Gitee From b8d37818fd906ff5b13eba2294bf14b27abca673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E4=BA=8E=E8=80=80=E5=AE=87=E2=80=99?= <‘1045227562@qq.com’> Date: Mon, 15 Apr 2024 17:03:04 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a1c2a23..23df5e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.idea # Compiled class file *.class -- Gitee From 2bef40165bbc06d13f945e6ab7d8a6e8d097d716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E4=BA=8E=E8=80=80=E5=AE=87=E2=80=99?= <‘1045227562@qq.com’> Date: Mon, 15 Apr 2024 17:06:03 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 23df5e0..2128081 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -.idea + # Compiled class file *.class -- Gitee From 76d8cb231886fdc05054a5a9f0718ea27686064e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E4=BA=8E=E8=80=80=E5=AE=87=E2=80=99?= <‘1045227562@qq.com’> Date: Mon, 15 Apr 2024 17:10:57 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maven_work01/.idea/compiler.xml | 13 + maven_work01/.idea/jarRepositories.xml | 20 + maven_work01/.idea/misc.xml | 12 + .../shelf/_2024_4_15_16_39___Default_.xml | 4 + .../shelf/_2024_4_15_16_39___Default_1.xml | 4 + .../shelved.patch" | 55 ++ .../shelved.patch" | 28 + maven_work01/.idea/vcs.xml | 6 + maven_work01/.idea/workspace.xml | 490 ++++++++++++++++++ 9 files changed, 632 insertions(+) create mode 100644 maven_work01/.idea/compiler.xml create mode 100644 maven_work01/.idea/jarRepositories.xml create mode 100644 maven_work01/.idea/misc.xml create mode 100644 maven_work01/.idea/shelf/_2024_4_15_16_39___Default_.xml create mode 100644 maven_work01/.idea/shelf/_2024_4_15_16_39___Default_1.xml create mode 100644 "maven_work01/.idea/shelf/\345\234\250\350\277\233\350\241\214\346\233\264\346\226\260\344\271\213\345\211\215\344\272\216_2024_4_15_16_39_\345\217\226\346\266\210\346\217\220\344\272\244\344\272\206\346\233\264\346\224\271_[Default]/shelved.patch" create mode 100644 "maven_work01/.idea/shelf/\345\234\250\350\277\233\350\241\214\346\233\264\346\226\260\344\271\213\345\211\215\344\272\216_2024_4_15_16_39_\345\217\226\346\266\210\346\217\220\344\272\244\344\272\206\346\233\264\346\224\271_[Default]1/shelved.patch" create mode 100644 maven_work01/.idea/vcs.xml create mode 100644 maven_work01/.idea/workspace.xml diff --git a/maven_work01/.idea/compiler.xml b/maven_work01/.idea/compiler.xml new file mode 100644 index 0000000..ec75455 --- /dev/null +++ b/maven_work01/.idea/compiler.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/maven_work01/.idea/jarRepositories.xml b/maven_work01/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/maven_work01/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/maven_work01/.idea/misc.xml b/maven_work01/.idea/misc.xml new file mode 100644 index 0000000..ca276f5 --- /dev/null +++ b/maven_work01/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/maven_work01/.idea/shelf/_2024_4_15_16_39___Default_.xml b/maven_work01/.idea/shelf/_2024_4_15_16_39___Default_.xml new file mode 100644 index 0000000..6203fd4 --- /dev/null +++ b/maven_work01/.idea/shelf/_2024_4_15_16_39___Default_.xml @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/maven_work01/.idea/shelf/_2024_4_15_16_39___Default_1.xml b/maven_work01/.idea/shelf/_2024_4_15_16_39___Default_1.xml new file mode 100644 index 0000000..4ad3efa --- /dev/null +++ b/maven_work01/.idea/shelf/_2024_4_15_16_39___Default_1.xml @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git "a/maven_work01/.idea/shelf/\345\234\250\350\277\233\350\241\214\346\233\264\346\226\260\344\271\213\345\211\215\344\272\216_2024_4_15_16_39_\345\217\226\346\266\210\346\217\220\344\272\244\344\272\206\346\233\264\346\224\271_[Default]/shelved.patch" "b/maven_work01/.idea/shelf/\345\234\250\350\277\233\350\241\214\346\233\264\346\226\260\344\271\213\345\211\215\344\272\216_2024_4_15_16_39_\345\217\226\346\266\210\346\217\220\344\272\244\344\272\206\346\233\264\346\224\271_[Default]/shelved.patch" new file mode 100644 index 0000000..a770743 --- /dev/null +++ "b/maven_work01/.idea/shelf/\345\234\250\350\277\233\350\241\214\346\233\264\346\226\260\344\271\213\345\211\215\344\272\216_2024_4_15_16_39_\345\217\226\346\266\210\346\217\220\344\272\244\344\272\206\346\233\264\346\224\271_[Default]/shelved.patch" @@ -0,0 +1,55 @@ +Index: .idea/compiler.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n +=================================================================== +diff --git a/.idea/compiler.xml b/.idea/compiler.xml +--- a/.idea/compiler.xml ++++ b/.idea/compiler.xml +@@ -6,7 +6,7 @@ + + + +- ++ + + + +Index: .idea/modules.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n +=================================================================== +diff --git a/.idea/modules.xml b/.idea/modules.xml +--- a/.idea/modules.xml ++++ b/.idea/modules.xml +@@ -2,7 +2,6 @@ + + + +- + + + +Index: .idea/misc.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\r\n\r\n \r\n \r\n \r\n +=================================================================== +diff --git a/.idea/misc.xml b/.idea/misc.xml +--- a/.idea/misc.xml ++++ b/.idea/misc.xml +@@ -1,5 +1,6 @@ + + ++ + + + ++ + +\ No newline at end of file diff --git "a/maven_work01/.idea/shelf/\345\234\250\350\277\233\350\241\214\346\233\264\346\226\260\344\271\213\345\211\215\344\272\216_2024_4_15_16_39_\345\217\226\346\266\210\346\217\220\344\272\244\344\272\206\346\233\264\346\224\271_[Default]1/shelved.patch" "b/maven_work01/.idea/shelf/\345\234\250\350\277\233\350\241\214\346\233\264\346\226\260\344\271\213\345\211\215\344\272\216_2024_4_15_16_39_\345\217\226\346\266\210\346\217\220\344\272\244\344\272\206\346\233\264\346\224\271_[Default]1/shelved.patch" new file mode 100644 index 0000000..bf84227 --- /dev/null +++ "b/maven_work01/.idea/shelf/\345\234\250\350\277\233\350\241\214\346\233\264\346\226\260\344\271\213\345\211\215\344\272\216_2024_4_15_16_39_\345\217\226\346\266\210\346\217\220\344\272\244\344\272\206\346\233\264\346\224\271_[Default]1/shelved.patch" @@ -0,0 +1,28 @@ +Index: .idea/jarRepositories.xml +=================================================================== +diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml +new file mode 100644 +--- /dev/null ++++ b/.idea/jarRepositories.xml +@@ -0,0 +1,20 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file diff --git a/maven_work01/.idea/vcs.xml b/maven_work01/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/maven_work01/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/maven_work01/.idea/workspace.xml b/maven_work01/.idea/workspace.xml new file mode 100644 index 0000000..7ee362c --- /dev/null +++ b/maven_work01/.idea/workspace.xml @@ -0,0 +1,490 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1712757851136 + + + 1712758035007 + + + 1712758985436 + + + 1712759772416 + + + 1713170355824 + + + 1713170650631 + + + 1713171237972 + + + 1713171786794 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No facets are configured + + + + + + + + + + + + + + + 1.8 + + + + + + + + maven_work01 + + + + + + + + Maven: junit:junit:4.12 + + + + + + + + \ No newline at end of file -- Gitee From 8e40a20526f81a6653af3c64713febf49c7b9fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E4=BA=8E=E8=80=80=E5=AE=87=E2=80=99?= <‘1045227562@qq.com’> Date: Mon, 15 Apr 2024 17:12:36 +0800 Subject: [PATCH 12/19] delete .idea --- maven_work01/.idea/compiler.xml | 13 - maven_work01/.idea/jarRepositories.xml | 20 - maven_work01/.idea/misc.xml | 12 - .../shelf/_2024_4_15_16_39___Default_.xml | 4 - .../shelf/_2024_4_15_16_39___Default_1.xml | 4 - .../shelved.patch" | 55 -- .../shelved.patch" | 28 - maven_work01/.idea/vcs.xml | 6 - maven_work01/.idea/workspace.xml | 490 ------------------ 9 files changed, 632 deletions(-) delete mode 100644 maven_work01/.idea/compiler.xml delete mode 100644 maven_work01/.idea/jarRepositories.xml delete mode 100644 maven_work01/.idea/misc.xml delete mode 100644 maven_work01/.idea/shelf/_2024_4_15_16_39___Default_.xml delete mode 100644 maven_work01/.idea/shelf/_2024_4_15_16_39___Default_1.xml delete mode 100644 "maven_work01/.idea/shelf/\345\234\250\350\277\233\350\241\214\346\233\264\346\226\260\344\271\213\345\211\215\344\272\216_2024_4_15_16_39_\345\217\226\346\266\210\346\217\220\344\272\244\344\272\206\346\233\264\346\224\271_[Default]/shelved.patch" delete mode 100644 "maven_work01/.idea/shelf/\345\234\250\350\277\233\350\241\214\346\233\264\346\226\260\344\271\213\345\211\215\344\272\216_2024_4_15_16_39_\345\217\226\346\266\210\346\217\220\344\272\244\344\272\206\346\233\264\346\224\271_[Default]1/shelved.patch" delete mode 100644 maven_work01/.idea/vcs.xml delete mode 100644 maven_work01/.idea/workspace.xml diff --git a/maven_work01/.idea/compiler.xml b/maven_work01/.idea/compiler.xml deleted file mode 100644 index ec75455..0000000 --- a/maven_work01/.idea/compiler.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/maven_work01/.idea/jarRepositories.xml b/maven_work01/.idea/jarRepositories.xml deleted file mode 100644 index 712ab9d..0000000 --- a/maven_work01/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/maven_work01/.idea/misc.xml b/maven_work01/.idea/misc.xml deleted file mode 100644 index ca276f5..0000000 --- a/maven_work01/.idea/misc.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/maven_work01/.idea/shelf/_2024_4_15_16_39___Default_.xml b/maven_work01/.idea/shelf/_2024_4_15_16_39___Default_.xml deleted file mode 100644 index 6203fd4..0000000 --- a/maven_work01/.idea/shelf/_2024_4_15_16_39___Default_.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/maven_work01/.idea/shelf/_2024_4_15_16_39___Default_1.xml b/maven_work01/.idea/shelf/_2024_4_15_16_39___Default_1.xml deleted file mode 100644 index 4ad3efa..0000000 --- a/maven_work01/.idea/shelf/_2024_4_15_16_39___Default_1.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git "a/maven_work01/.idea/shelf/\345\234\250\350\277\233\350\241\214\346\233\264\346\226\260\344\271\213\345\211\215\344\272\216_2024_4_15_16_39_\345\217\226\346\266\210\346\217\220\344\272\244\344\272\206\346\233\264\346\224\271_[Default]/shelved.patch" "b/maven_work01/.idea/shelf/\345\234\250\350\277\233\350\241\214\346\233\264\346\226\260\344\271\213\345\211\215\344\272\216_2024_4_15_16_39_\345\217\226\346\266\210\346\217\220\344\272\244\344\272\206\346\233\264\346\224\271_[Default]/shelved.patch" deleted file mode 100644 index a770743..0000000 --- "a/maven_work01/.idea/shelf/\345\234\250\350\277\233\350\241\214\346\233\264\346\226\260\344\271\213\345\211\215\344\272\216_2024_4_15_16_39_\345\217\226\346\266\210\346\217\220\344\272\244\344\272\206\346\233\264\346\224\271_[Default]/shelved.patch" +++ /dev/null @@ -1,55 +0,0 @@ -Index: .idea/compiler.xml -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP -<+>\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n -=================================================================== -diff --git a/.idea/compiler.xml b/.idea/compiler.xml ---- a/.idea/compiler.xml -+++ b/.idea/compiler.xml -@@ -6,7 +6,7 @@ - - - -- -+ - - - -Index: .idea/modules.xml -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP -<+>\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n -=================================================================== -diff --git a/.idea/modules.xml b/.idea/modules.xml ---- a/.idea/modules.xml -+++ b/.idea/modules.xml -@@ -2,7 +2,6 @@ - - - -- - - - -Index: .idea/misc.xml -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP -<+>\r\n\r\n \r\n \r\n \r\n -=================================================================== -diff --git a/.idea/misc.xml b/.idea/misc.xml ---- a/.idea/misc.xml -+++ b/.idea/misc.xml -@@ -1,5 +1,6 @@ - - -+ - - - -+ - -\ No newline at end of file diff --git "a/maven_work01/.idea/shelf/\345\234\250\350\277\233\350\241\214\346\233\264\346\226\260\344\271\213\345\211\215\344\272\216_2024_4_15_16_39_\345\217\226\346\266\210\346\217\220\344\272\244\344\272\206\346\233\264\346\224\271_[Default]1/shelved.patch" "b/maven_work01/.idea/shelf/\345\234\250\350\277\233\350\241\214\346\233\264\346\226\260\344\271\213\345\211\215\344\272\216_2024_4_15_16_39_\345\217\226\346\266\210\346\217\220\344\272\244\344\272\206\346\233\264\346\224\271_[Default]1/shelved.patch" deleted file mode 100644 index bf84227..0000000 --- "a/maven_work01/.idea/shelf/\345\234\250\350\277\233\350\241\214\346\233\264\346\226\260\344\271\213\345\211\215\344\272\216_2024_4_15_16_39_\345\217\226\346\266\210\346\217\220\344\272\244\344\272\206\346\233\264\346\224\271_[Default]1/shelved.patch" +++ /dev/null @@ -1,28 +0,0 @@ -Index: .idea/jarRepositories.xml -=================================================================== -diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml -new file mode 100644 ---- /dev/null -+++ b/.idea/jarRepositories.xml -@@ -0,0 +1,20 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -\ No newline at end of file diff --git a/maven_work01/.idea/vcs.xml b/maven_work01/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/maven_work01/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/maven_work01/.idea/workspace.xml b/maven_work01/.idea/workspace.xml deleted file mode 100644 index 7ee362c..0000000 --- a/maven_work01/.idea/workspace.xml +++ /dev/null @@ -1,490 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1712757851136 - - - 1712758035007 - - - 1712758985436 - - - 1712759772416 - - - 1713170355824 - - - 1713170650631 - - - 1713171237972 - - - 1713171786794 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No facets are configured - - - - - - - - - - - - - - - 1.8 - - - - - - - - maven_work01 - - - - - - - - Maven: junit:junit:4.12 - - - - - - - - \ No newline at end of file -- Gitee From 02171f2ab8d2ff744936614e87a0c0e83b69693d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E4=BA=8E=E8=80=80=E5=AE=87=E2=80=99?= <‘1045227562@qq.com’> Date: Mon, 15 Apr 2024 17:14:37 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9.gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2128081..23df5e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ - +.idea # Compiled class file *.class -- Gitee From 234639626c425841b6372dadd9bc3ce6e4b9798c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E4=BA=8E=E8=80=80=E5=AE=87=E2=80=99?= <‘1045227562@qq.com’> Date: Mon, 15 Apr 2024 17:37:56 +0800 Subject: [PATCH 14/19] =?UTF-8?q?=E5=9C=A8merge=5Fbranch=E4=B8=8A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maven_work01/src/main/java/com/yyy/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven_work01/src/main/java/com/yyy/Main.java b/maven_work01/src/main/java/com/yyy/Main.java index 81b6edf..02603cb 100644 --- a/maven_work01/src/main/java/com/yyy/Main.java +++ b/maven_work01/src/main/java/com/yyy/Main.java @@ -2,6 +2,6 @@ package com.yyy; public class Main { public static void main(String[] args) { - System.out.println(work01.calculate(3, '-', 1)); + System.out.println(work01.calculate(3, '*', 1)); } } -- Gitee From 89f97807a72b95cd388379d65df5895389f691f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E4=BA=8E=E8=80=80=E5=AE=87=E2=80=99?= <‘1045227562@qq.com’> Date: Mon, 15 Apr 2024 19:22:59 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maven_work01/src/main/java/com/yyy/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven_work01/src/main/java/com/yyy/Main.java b/maven_work01/src/main/java/com/yyy/Main.java index 02603cb..2f0ac85 100644 --- a/maven_work01/src/main/java/com/yyy/Main.java +++ b/maven_work01/src/main/java/com/yyy/Main.java @@ -2,6 +2,6 @@ package com.yyy; public class Main { public static void main(String[] args) { - System.out.println(work01.calculate(3, '*', 1)); + System.out.println(work01.calculate(3, '+', 1)); } } -- Gitee From 7d5640a30094b037ada3340b7db6002bf69761a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E4=BA=8E=E8=80=80=E5=AE=87=E2=80=99?= <‘1045227562@qq.com’> Date: Mon, 15 Apr 2024 19:32:12 +0800 Subject: [PATCH 16/19] =?UTF-8?q?merge=5Fbranch=E5=88=86=E6=94=AF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maven_work01/src/main/java/com/yyy/Main.java | 1 + 1 file changed, 1 insertion(+) diff --git a/maven_work01/src/main/java/com/yyy/Main.java b/maven_work01/src/main/java/com/yyy/Main.java index 02603cb..bf4caea 100644 --- a/maven_work01/src/main/java/com/yyy/Main.java +++ b/maven_work01/src/main/java/com/yyy/Main.java @@ -3,5 +3,6 @@ package com.yyy; public class Main { public static void main(String[] args) { System.out.println(work01.calculate(3, '*', 1)); + System.out.println(work01.calculate(1,'+',2)); } } -- Gitee From 09e0530fbbd2ad70bee624a32465d71f8cf8d2fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E4=BA=8E=E8=80=80=E5=AE=87=E2=80=99?= <‘1045227562@qq.com’> Date: Mon, 15 Apr 2024 19:44:40 +0800 Subject: [PATCH 17/19] =?UTF-8?q?merge=5Fbranch=E5=88=86=E6=94=AF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maven_work01/src/main/java/com/yyy/Main.java | 2 +- maven_work01/src/main/java/com/yyy/work02.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 maven_work01/src/main/java/com/yyy/work02.java diff --git a/maven_work01/src/main/java/com/yyy/Main.java b/maven_work01/src/main/java/com/yyy/Main.java index bf4caea..45c97e3 100644 --- a/maven_work01/src/main/java/com/yyy/Main.java +++ b/maven_work01/src/main/java/com/yyy/Main.java @@ -3,6 +3,6 @@ package com.yyy; public class Main { public static void main(String[] args) { System.out.println(work01.calculate(3, '*', 1)); - System.out.println(work01.calculate(1,'+',2)); + work02.printMessage("hello world"); } } diff --git a/maven_work01/src/main/java/com/yyy/work02.java b/maven_work01/src/main/java/com/yyy/work02.java new file mode 100644 index 0000000..7d10f1b --- /dev/null +++ b/maven_work01/src/main/java/com/yyy/work02.java @@ -0,0 +1,7 @@ +package com.yyy; + +public class work02 { + public static void printMessage(String message) { + System.out.println(message); + } +} -- Gitee From 03bb862020567e6815fd554873a96f9d38dcab98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E4=BA=8E=E8=80=80=E5=AE=87=E2=80=99?= <‘1045227562@qq.com’> Date: Mon, 15 Apr 2024 20:07:35 +0800 Subject: [PATCH 18/19] =?UTF-8?q?rebase=5Fbranch=E5=88=86=E6=94=AF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maven_work01/src/main/java/com/yyy/work03.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 maven_work01/src/main/java/com/yyy/work03.java diff --git a/maven_work01/src/main/java/com/yyy/work03.java b/maven_work01/src/main/java/com/yyy/work03.java new file mode 100644 index 0000000..029cc8f --- /dev/null +++ b/maven_work01/src/main/java/com/yyy/work03.java @@ -0,0 +1,4 @@ +package com.yyy; + +public class work03 { +} -- Gitee From 30e2e26fdbcfb35adc055f1647e7ff908dd3c953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E4=BA=8E=E8=80=80=E5=AE=87=E2=80=99?= <‘1045227562@qq.com’> Date: Mon, 15 Apr 2024 20:08:51 +0800 Subject: [PATCH 19/19] =?UTF-8?q?rebase=5Fbranch=E5=88=86=E6=94=AF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maven_work01/src/main/java/com/yyy/Main.java | 1 + maven_work01/src/main/java/com/yyy/work03.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/maven_work01/src/main/java/com/yyy/Main.java b/maven_work01/src/main/java/com/yyy/Main.java index 45c97e3..324fa42 100644 --- a/maven_work01/src/main/java/com/yyy/Main.java +++ b/maven_work01/src/main/java/com/yyy/Main.java @@ -4,5 +4,6 @@ public class Main { public static void main(String[] args) { System.out.println(work01.calculate(3, '*', 1)); work02.printMessage("hello world"); + work03.printMessage("work03"); } } diff --git a/maven_work01/src/main/java/com/yyy/work03.java b/maven_work01/src/main/java/com/yyy/work03.java index 029cc8f..d2012d9 100644 --- a/maven_work01/src/main/java/com/yyy/work03.java +++ b/maven_work01/src/main/java/com/yyy/work03.java @@ -1,4 +1,7 @@ package com.yyy; public class work03 { + public static void printMessage(String message) { + System.out.println(message); + } } -- Gitee