From 6c2c77b772bf7715f47d444bedcad98ebc478d42 Mon Sep 17 00:00:00 2001 From: zhangshjw Date: Thu, 27 May 2021 18:46:50 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9demo1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 15 ++++++++ .idea/encodings.xml | 6 ++++ .idea/gitResorce.iml | 9 +++++ .idea/inspectionProfiles/Project_Default.xml | 36 ++++++++++++++++++++ .idea/misc.xml | 6 ++++ .idea/modules.xml | 8 +++++ .idea/vcs.xml | 6 ++++ "\346\265\213\350\257\225/demo1.txt" | 3 +- 8 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/encodings.xml create mode 100644 .idea/gitResorce.iml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..e09b5f8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,15 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/../../../../:\workSpace\gitResorce\.idea/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ +.gitignore +encodings.xml +gitResorce.iml +misc.xml +modules.xml +Project_Default.xml +vcs.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..4987eca --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gitResorce.iml b/.idea/gitResorce.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/gitResorce.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..6560a98 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,36 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..e208459 --- /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..bfd8251 --- /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/\346\265\213\350\257\225/demo1.txt" "b/\346\265\213\350\257\225/demo1.txt" index d46a312..af5c3af 100644 --- "a/\346\265\213\350\257\225/demo1.txt" +++ "b/\346\265\213\350\257\225/demo1.txt" @@ -1 +1,2 @@ -demo1 \ No newline at end of file +demo1 +demo2 \ No newline at end of file -- Gitee From f87b4b8a6778111b7a567ac4d5ec450045f29b70 Mon Sep 17 00:00:00 2001 From: zhangshjw Date: Thu, 27 May 2021 18:53:01 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9demo2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "\346\265\213\350\257\225/demo2.html" | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 "\346\265\213\350\257\225/demo2.html" diff --git "a/\346\265\213\350\257\225/demo2.html" "b/\346\265\213\350\257\225/demo2.html" new file mode 100644 index 0000000..5b0f3a0 --- /dev/null +++ "b/\346\265\213\350\257\225/demo2.html" @@ -0,0 +1,10 @@ + + + + + demo2 + + + 我是张少杰 + + \ No newline at end of file -- Gitee From e97159c20e23d3d0dd06f99de5609dae95636a13 Mon Sep 17 00:00:00 2001 From: zhangshjw Date: Thu, 27 May 2021 19:00:25 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9demo2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/encodings.xml | 6 + .idea/gitResorce.iml | 9 ++ .idea/inspectionProfiles/Project_Default.xml | 36 +++++ .idea/misc.xml | 6 + .idea/modules.xml | 8 ++ .idea/vcs.xml | 6 + .idea/workspace.xml | 141 +++++++++++++++++++ 7 files changed, 212 insertions(+) create mode 100644 .idea/encodings.xml create mode 100644 .idea/gitResorce.iml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gitResorce.iml b/.idea/gitResorce.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/gitResorce.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..6560a98 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,36 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..639900d --- /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..bfd8251 --- /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/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..67e92e8 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + - + + + + - + + + + @@ -86,7 +92,14 @@ - @@ -107,17 +120,27 @@ - + + + + + + + + - - + + + diff --git "a/\346\265\213\350\257\225/java.com.service/lin/Revert.java" "b/\346\265\213\350\257\225/java.com.service/lin/Revert.java" index 919c79c..7f3e91e 100644 --- "a/\346\265\213\350\257\225/java.com.service/lin/Revert.java" +++ "b/\346\265\213\350\257\225/java.com.service/lin/Revert.java" @@ -30,4 +30,8 @@ public class Revert{ this.code = code; } + + public static void main(String[] args) { + System.out.printf("hello git , i like you !!"); + } } \ No newline at end of file -- Gitee From 34cab3ed96ec2739847e92ed874d5561dfcf92dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=B0=91=E6=9D=B0?= <5530654+zhang_shaojie@user.noreply.gitee.com> Date: Wed, 7 Jul 2021 16:45:11 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!3?= =?UTF-8?q?=20:=20=E6=B7=BB=E5=8A=A0git.html'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 48 ++++++++----------- .../java.com.service/lin/Revert.java" | 4 -- .../java.com.service/lin/git.html" | 10 ---- 3 files changed, 20 insertions(+), 42 deletions(-) delete mode 100644 "\346\265\213\350\257\225/java.com.service/lin/git.html" diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b47e920..67e92e8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -19,10 +19,7 @@