diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..5d26a3c3cc9ae278c30603e1a63d103a2c0dd089 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/../../../../../:\postgraduate\sd\work2\.idea/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000000000000000000000000000000000000..a55e7a179bde3e4e772c29c0c85e53354aa54618 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000000000000000000000000000000000000..a78a236728d80b0dfa75943850d5ec9af4834cee --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000000000000000000000000000000000000..aa00ffab7828f4818589659c804ec2cfd99baed3 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000000000000000000000000000000000000..b074d705c41794bb9ff14278885c187b9e758432 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_11.xml b/.idea/libraries/Maven__junit_junit_4_11.xml new file mode 100644 index 0000000000000000000000000000000000000000..40a9cab9e361e3c4b310e64078ef4586a1706101 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..112797ef5ff85c2953ce462997c1d6b241b293d9 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000000000000000000000000000000000000..e8942bd657de5d563106553e3b4591f01eb45fe8 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000000000000000000000000000000000000..d7cac3295c7195b512c2d9230bb285c48a97a426 --- /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 0000000000000000000000000000000000000000..35eb1ddfbbc029bcab630581847471d7f238ec53 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/work2.iml b/.idea/work2.iml new file mode 100644 index 0000000000000000000000000000000000000000..f8ba30f4d8cd064f7a737fc261f6c3927d396532 --- /dev/null +++ b/.idea/work2.iml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..b03932e9fd71428e49f5f03a13920e7b29bde4b9 --- /dev/null +++ b/pom.xml @@ -0,0 +1,24 @@ + + + 4.0.0 + + + UTF-8 + + + org.example + work2 + 1.0-SNAPSHOT + + + + + junit + junit + 4.11 + test + + + diff --git a/src/main/java/HelloWorld.java b/src/main/java/HelloWorld.java new file mode 100644 index 0000000000000000000000000000000000000000..e6258f9e3780196cdd1a344b54c73c3fc6037fc8 --- /dev/null +++ b/src/main/java/HelloWorld.java @@ -0,0 +1,25 @@ +/** + * 这是一个示例类,用于生成Javadoc文档。 + */ + +public class HelloWorld { + /** + * 这是一个示例方法,用于生成Javadoc文档。 + * @author yxp + * @param name 姓名 + * @return 欢迎消息 + */ + public String sayHello(String name) { + return "Hello, " + name + "!"; + } + + public static void main(String[] args) { + System.out.println("test new branch"); + System.out.println("test cherry-pick"); + System.out.println("hello world"); + System.out.println("尝试merge"); + System.out.println("test rebase"); + System.out.println("rebase"); + System.out.println("rebase 1"); + } +} diff --git a/src/test/java/TestHello.java b/src/test/java/TestHello.java new file mode 100644 index 0000000000000000000000000000000000000000..d7bf663090f12092c77f09fb06f3f46e819d4c12 --- /dev/null +++ b/src/test/java/TestHello.java @@ -0,0 +1,11 @@ +import org.junit.Test; + +public class TestHello { + + @Test + public void testHelloWorld() { + HelloWorld hw = new HelloWorld(); + System.out.println(hw.sayHello("yxp")); + } + +}