diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..13566b81b018ad684f3a35fee301741b2734c8f4 --- /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/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000000000000000000000000000000000000..774643cca0a50a010ca6e47075eb0f6197e59cf9 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000000000000000000000000000000000000..712ab9d985c20018a0c97b93d2148ac1ffe588a5 --- /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_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml new file mode 100644 index 0000000000000000000000000000000000000000..d411041745b6e44356035cdd44538daca09388f6 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_12.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..f58bbc11276f98bea2b6c82f21664c5a9f424fe3 --- /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..5755a998780a3352b3706bc6c89e9280257b8d39 --- /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..8e9987035052f276318390db9534dbdd425b2905 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000000000000000000000000000000000000..797acea53eb091cf5b30518802c3073f544adeed --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ 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/web-framework.iml b/.idea/web-framework.iml new file mode 100644 index 0000000000000000000000000000000000000000..975d5da160117c8798507112e8ad4672f202349a --- /dev/null +++ b/.idea/web-framework.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..fdd8dd45f4d937c65212cd377d0629bfb34780db --- /dev/null +++ b/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + org.example + web-framework + 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 0000000000000000000000000000000000000000..cb134cd97c8b5df0222db7420f6910bcb834d834 --- /dev/null +++ b/src/main/java/work1.java @@ -0,0 +1,15 @@ +public class work1 { + public void name(String n) { + System.out.println(n); + } + + public static void main(String[] args) { + System.out.println("hello"); + System.out.println("branch"); + System.out.println("cherry-pick"); + + System.out.println("merge master"); + + System.out.println("merge branch"); + } +} diff --git a/src/test/java/testWork1.java b/src/test/java/testWork1.java new file mode 100644 index 0000000000000000000000000000000000000000..cf0e524031073dcd4d129131e6093f7dc347f32b --- /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("苏博文"); + } +}