From ed5ef6ddd6b4f6d3c3f953cc6c6de2a768a6ddbf Mon Sep 17 00:00:00 2001 From: 24498 <2449854324@qq.com> Date: Mon, 15 Apr 2024 19:05:12 +0800 Subject: [PATCH 1/9] =?UTF-8?q?maven=E4=BD=9C=E4=B8=9A=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 8 ++++++++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ .idea/web-framework.iml | 9 +++++++++ pom.xml | 19 +++++++++++++++++++ src/main/java/docTest.java | 11 +++++++++++ src/test/java/homework.java | 9 +++++++++ 8 files changed, 76 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/web-framework.iml create mode 100644 pom.xml create mode 100644 src/main/java/docTest.java create mode 100644 src/test/java/homework.java diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..e6be3f1 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file 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/pom.xml b/pom.xml new file mode 100644 index 0000000..50d14e4 --- /dev/null +++ b/pom.xml @@ -0,0 +1,19 @@ + + + 4.0.0 + + org.example + mevan + 1.0-SNAPSHOT + + + + junit + junit + 4.12 + sugar + + + \ No newline at end of file diff --git a/src/main/java/docTest.java b/src/main/java/docTest.java new file mode 100644 index 0000000..501df99 --- /dev/null +++ b/src/main/java/docTest.java @@ -0,0 +1,11 @@ +public class docTest { + public void hello() { + System.out.println("hello"); + + } + public int sub(int a ,int b){ + //返回a减b的值 + return a-b; + } + +} diff --git a/src/test/java/homework.java b/src/test/java/homework.java new file mode 100644 index 0000000..1e3b798 --- /dev/null +++ b/src/test/java/homework.java @@ -0,0 +1,9 @@ +import org.junit.Test; + +public class homework { + @Test + public void testH() { + docTest h = new docTest(); + h.hello(); + } +} -- Gitee From ffdbe3b1bd1909f6c85c2dd8fce4d4638891256d Mon Sep 17 00:00:00 2001 From: 24498 <2449854324@qq.com> Date: Mon, 15 Apr 2024 19:10:13 +0800 Subject: [PATCH 2/9] =?UTF-8?q?maven=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/docTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/docTest.java b/src/main/java/docTest.java index 501df99..4787945 100644 --- a/src/main/java/docTest.java +++ b/src/main/java/docTest.java @@ -1,7 +1,7 @@ public class docTest { public void hello() { System.out.println("hello"); - + System.out.println("modi"); } public int sub(int a ,int b){ //返回a减b的值 -- Gitee From ffeef05034a56a5930acee41d7c3a60cf24a775d Mon Sep 17 00:00:00 2001 From: 24498 <2449854324@qq.com> Date: Mon, 15 Apr 2024 19:17:36 +0800 Subject: [PATCH 3/9] =?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 --- README.en.md | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 README.en.md diff --git a/README.en.md b/README.en.md deleted file mode 100644 index bd2cb73..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# 软件开发与管理 - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) -- Gitee From 4707463c33f775ff382071cebc6111c6e262b088 Mon Sep 17 00:00:00 2001 From: 24498 <2449854324@qq.com> Date: Mon, 15 Apr 2024 19:25:05 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=88=9B=E5=BB=BAnewBranch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/docTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/docTest.java b/src/main/java/docTest.java index 4787945..6d84f03 100644 --- a/src/main/java/docTest.java +++ b/src/main/java/docTest.java @@ -1,7 +1,7 @@ public class docTest { public void hello() { System.out.println("hello"); - System.out.println("modi"); + System.out.println("branch02"); } public int sub(int a ,int b){ //返回a减b的值 -- Gitee From 41d3e00a46d69e1a9d4cf72630f2205e09dc96d6 Mon Sep 17 00:00:00 2001 From: 24498 <2449854324@qq.com> Date: Mon, 15 Apr 2024 19:26:53 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=88=9B=E5=BB=BAnewBranch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/docTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/docTest.java b/src/main/java/docTest.java index 4787945..6d84f03 100644 --- a/src/main/java/docTest.java +++ b/src/main/java/docTest.java @@ -1,7 +1,7 @@ public class docTest { public void hello() { System.out.println("hello"); - System.out.println("modi"); + System.out.println("branch02"); } public int sub(int a ,int b){ //返回a减b的值 -- Gitee From aa05e2bf5f465ee47ee6c32ea3812a03d8dbf79c Mon Sep 17 00:00:00 2001 From: 24498 <2449854324@qq.com> Date: Mon, 15 Apr 2024 19:30:37 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=88=9B=E5=BB=BAnewBranch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/docTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/docTest.java b/src/main/java/docTest.java index 6d84f03..9e50ac1 100644 --- a/src/main/java/docTest.java +++ b/src/main/java/docTest.java @@ -4,8 +4,8 @@ public class docTest { System.out.println("branch02"); } public int sub(int a ,int b){ - //返回a减b的值 - return a-b; + + return a*b; } } -- Gitee From 6f8f6166854cf33cbe12a33d33b2861e51331727 Mon Sep 17 00:00:00 2001 From: 24498 <2449854324@qq.com> Date: Mon, 15 Apr 2024 19:30:37 +0800 Subject: [PATCH 7/9] cherry_pick --- src/main/java/docTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/docTest.java b/src/main/java/docTest.java index 9e50ac1..4c85c26 100644 --- a/src/main/java/docTest.java +++ b/src/main/java/docTest.java @@ -1,7 +1,7 @@ public class docTest { public void hello() { System.out.println("hello"); - System.out.println("branch02"); + System.out.println("cherry_pickTest"); } public int sub(int a ,int b){ -- Gitee From 9aa1936cee7f9938f95d6984f78047df1bb05ed6 Mon Sep 17 00:00:00 2001 From: 24498 <2449854324@qq.com> Date: Mon, 15 Apr 2024 19:44:09 +0800 Subject: [PATCH 8/9] rebase1 --- src/main/java/docTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/docTest.java b/src/main/java/docTest.java index 4787945..a4be073 100644 --- a/src/main/java/docTest.java +++ b/src/main/java/docTest.java @@ -1,7 +1,7 @@ public class docTest { public void hello() { System.out.println("hello"); - System.out.println("modi"); + System.out.println("rebase02"); } public int sub(int a ,int b){ //返回a减b的值 -- Gitee From 2aeb0599242e5b20a6728d79e07e692409c73642 Mon Sep 17 00:00:00 2001 From: 24498 <2449854324@qq.com> Date: Mon, 15 Apr 2024 19:44:30 +0800 Subject: [PATCH 9/9] rebase2 --- src/main/java/docTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/docTest.java b/src/main/java/docTest.java index a4be073..cb1c6c4 100644 --- a/src/main/java/docTest.java +++ b/src/main/java/docTest.java @@ -1,6 +1,7 @@ public class docTest { public void hello() { System.out.println("hello"); + System.out.println("rebase2"); System.out.println("rebase02"); } public int sub(int a ,int b){ -- Gitee