From 7b9300cf9e8b4d2fe79483ddc1101fe3364d3551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9C=E7=A9=BF=E7=9D=80=E8=A3=A4=E8=A1=A9=E5=8E=BB?= =?UTF-8?q?=E8=BF=9C=E6=96=B9=E2=80=9D?= <1071951333@qq.com> Date: Tue, 9 Apr 2024 15:47:25 +0800 Subject: [PATCH 1/4] test --- .gitignore | 41 +++++++++ .idea/.gitignore | 8 ++ .idea/encodings.xml | 7 ++ .idea/misc.xml | 14 ++++ .idea/uiDesigner.xml | 124 ++++++++++++++++++++++++++++ .idea/vcs.xml | 6 ++ pom.xml | 44 ++++++++++ src/main/java/org/example/Main.java | 7 ++ src/test/java/MyAppTest.java | 10 +++ 9 files changed, 261 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/encodings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/uiDesigner.xml create mode 100644 .idea/vcs.xml create mode 100644 pom.xml create mode 100644 src/main/java/org/example/Main.java create mode 100644 src/test/java/MyAppTest.java diff --git a/.gitignore b/.gitignore index a1c2a23..8442745 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +<<<<<<< HEAD # Compiled class file *.class @@ -21,3 +22,43 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +======= +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store +>>>>>>> a4465c7 (test) 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/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..aa00ffa --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..132404b --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..c913ce8 --- /dev/null +++ b/pom.xml @@ -0,0 +1,44 @@ + + + 4.0.0 + + org.example + homework1 + 1.0-SNAPSHOT + + + 8 + 8 + UTF-8 + + + + + org.junit.jupiter + junit-jupiter-api + 5.7.0 + test + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.2.0 + + + + jar + + + + + + + + diff --git a/src/main/java/org/example/Main.java b/src/main/java/org/example/Main.java new file mode 100644 index 0000000..407f157 --- /dev/null +++ b/src/main/java/org/example/Main.java @@ -0,0 +1,7 @@ +package org.example; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} \ No newline at end of file diff --git a/src/test/java/MyAppTest.java b/src/test/java/MyAppTest.java new file mode 100644 index 0000000..36cf5d4 --- /dev/null +++ b/src/test/java/MyAppTest.java @@ -0,0 +1,10 @@ +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class MyAppTest { + + @Test + public void testSomething() { + assertEquals(1, 1); + } +} \ No newline at end of file -- Gitee From fdcadaf41891535daea240014d2eb227ee238810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9C=E7=A9=BF=E7=9D=80=E8=A3=A4=E8=A1=A9=E5=8E=BB?= =?UTF-8?q?=E8=BF=9C=E6=96=B9=E2=80=9D?= <1071951333@qq.com> Date: Tue, 9 Apr 2024 15:51:23 +0800 Subject: [PATCH 2/4] test1 --- src/main/java/org/example/Main.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/example/Main.java b/src/main/java/org/example/Main.java index 407f157..0447d57 100644 --- a/src/main/java/org/example/Main.java +++ b/src/main/java/org/example/Main.java @@ -3,5 +3,6 @@ package org.example; public class Main { public static void main(String[] args) { System.out.println("Hello world!"); + System.out.println("Hello world!"); } } \ No newline at end of file -- Gitee From 28745d72f4b07d2945a57c62a736e4c6bbadbd30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A9=BF=E7=9D=80=E8=A3=A4=E8=A1=A9=E5=8E=BB=E8=BF=9C?= =?UTF-8?q?=E6=96=B9?= <12327694+qq1071951333@user.noreply.gitee.com> Date: Tue, 9 Apr 2024 08:33:56 +0000 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20.ide?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 8 --- .idea/encodings.xml | 7 --- .idea/misc.xml | 14 ----- .idea/uiDesigner.xml | 124 ------------------------------------------- .idea/vcs.xml | 6 --- 5 files changed, 159 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/uiDesigner.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# 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/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index aa00ffa..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 132404b..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index 2b63946..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file -- Gitee From 97c8665669468e8abbc9f1cf53b69a4072cb9691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A9=BF=E7=9D=80=E8=A3=A4=E8=A1=A9=E5=8E=BB=E8=BF=9C?= =?UTF-8?q?=E6=96=B9?= <12327694+qq1071951333@user.noreply.gitee.com> Date: Tue, 9 Apr 2024 08:34:07 +0000 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20READ?= =?UTF-8?q?ME.en.md?= 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