From 98198e2d26284a25a669ca35953e8bc12769ed5d Mon Sep 17 00:00:00 2001
From: hyb <10370607+AloneN@user.noreply.gitee.com>
Date: Tue, 16 Apr 2024 05:55:50 +0000
Subject: [PATCH 1/8] add
Signed-off-by: hyb <10370607+AloneN@user.noreply.gitee.com>
---
web-framework-master/.idea/compiler.xml | 16 +++++++++++
.../.idea/jarRepositories.xml | 20 +++++++++++++
.../libraries/Maven__junit_junit_4_12.xml | 13 +++++++++
.../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 +++++++++
web-framework-master/.idea/misc.xml | 13 +++++++++
web-framework-master/.idea/modules.xml | 8 ++++++
.../.idea/runConfigurations.xml | 10 +++++++
web-framework-master/.idea/vcs.xml | 6 ++++
web-framework-master/.idea/web-framework.iml | 17 +++++++++++
web-framework-master/pom.xml | 28 +++++++++++++++++++
web-framework-master/src/main/java/work1.java | 15 ++++++++++
.../src/test/java/testWork1.java | 9 ++++++
12 files changed, 168 insertions(+)
create mode 100644 web-framework-master/.idea/compiler.xml
create mode 100644 web-framework-master/.idea/jarRepositories.xml
create mode 100644 web-framework-master/.idea/libraries/Maven__junit_junit_4_12.xml
create mode 100644 web-framework-master/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
create mode 100644 web-framework-master/.idea/misc.xml
create mode 100644 web-framework-master/.idea/modules.xml
create mode 100644 web-framework-master/.idea/runConfigurations.xml
create mode 100644 web-framework-master/.idea/vcs.xml
create mode 100644 web-framework-master/.idea/web-framework.iml
create mode 100644 web-framework-master/pom.xml
create mode 100644 web-framework-master/src/main/java/work1.java
create mode 100644 web-framework-master/src/test/java/testWork1.java
diff --git a/web-framework-master/.idea/compiler.xml b/web-framework-master/.idea/compiler.xml
new file mode 100644
index 0000000..774643c
--- /dev/null
+++ b/web-framework-master/.idea/compiler.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web-framework-master/.idea/jarRepositories.xml b/web-framework-master/.idea/jarRepositories.xml
new file mode 100644
index 0000000..712ab9d
--- /dev/null
+++ b/web-framework-master/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web-framework-master/.idea/libraries/Maven__junit_junit_4_12.xml b/web-framework-master/.idea/libraries/Maven__junit_junit_4_12.xml
new file mode 100644
index 0000000..d411041
--- /dev/null
+++ b/web-framework-master/.idea/libraries/Maven__junit_junit_4_12.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web-framework-master/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/web-framework-master/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
new file mode 100644
index 0000000..f58bbc1
--- /dev/null
+++ b/web-framework-master/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web-framework-master/.idea/misc.xml b/web-framework-master/.idea/misc.xml
new file mode 100644
index 0000000..5755a99
--- /dev/null
+++ b/web-framework-master/.idea/misc.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web-framework-master/.idea/modules.xml b/web-framework-master/.idea/modules.xml
new file mode 100644
index 0000000..8e99870
--- /dev/null
+++ b/web-framework-master/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web-framework-master/.idea/runConfigurations.xml b/web-framework-master/.idea/runConfigurations.xml
new file mode 100644
index 0000000..797acea
--- /dev/null
+++ b/web-framework-master/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web-framework-master/.idea/vcs.xml b/web-framework-master/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/web-framework-master/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web-framework-master/.idea/web-framework.iml b/web-framework-master/.idea/web-framework.iml
new file mode 100644
index 0000000..975d5da
--- /dev/null
+++ b/web-framework-master/.idea/web-framework.iml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web-framework-master/pom.xml b/web-framework-master/pom.xml
new file mode 100644
index 0000000..fdd8dd4
--- /dev/null
+++ b/web-framework-master/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/web-framework-master/src/main/java/work1.java b/web-framework-master/src/main/java/work1.java
new file mode 100644
index 0000000..cb134cd
--- /dev/null
+++ b/web-framework-master/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/web-framework-master/src/test/java/testWork1.java b/web-framework-master/src/test/java/testWork1.java
new file mode 100644
index 0000000..cf0e524
--- /dev/null
+++ b/web-framework-master/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("苏博文");
+ }
+}
--
Gitee
From 864561eee5baaead118eef47cb7c7bd694d1059c Mon Sep 17 00:00:00 2001
From: hyb <10370607+AloneN@user.noreply.gitee.com>
Date: Tue, 16 Apr 2024 05:59:03 +0000
Subject: [PATCH 2/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20web-?=
=?UTF-8?q?framework-master?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web-framework-master/.idea/compiler.xml | 16 -----------
.../.idea/jarRepositories.xml | 20 -------------
.../libraries/Maven__junit_junit_4_12.xml | 13 ---------
.../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 ---------
web-framework-master/.idea/misc.xml | 13 ---------
web-framework-master/.idea/modules.xml | 8 ------
.../.idea/runConfigurations.xml | 10 -------
web-framework-master/.idea/vcs.xml | 6 ----
web-framework-master/.idea/web-framework.iml | 17 -----------
web-framework-master/pom.xml | 28 -------------------
web-framework-master/src/main/java/work1.java | 15 ----------
.../src/test/java/testWork1.java | 9 ------
12 files changed, 168 deletions(-)
delete mode 100644 web-framework-master/.idea/compiler.xml
delete mode 100644 web-framework-master/.idea/jarRepositories.xml
delete mode 100644 web-framework-master/.idea/libraries/Maven__junit_junit_4_12.xml
delete mode 100644 web-framework-master/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
delete mode 100644 web-framework-master/.idea/misc.xml
delete mode 100644 web-framework-master/.idea/modules.xml
delete mode 100644 web-framework-master/.idea/runConfigurations.xml
delete mode 100644 web-framework-master/.idea/vcs.xml
delete mode 100644 web-framework-master/.idea/web-framework.iml
delete mode 100644 web-framework-master/pom.xml
delete mode 100644 web-framework-master/src/main/java/work1.java
delete mode 100644 web-framework-master/src/test/java/testWork1.java
diff --git a/web-framework-master/.idea/compiler.xml b/web-framework-master/.idea/compiler.xml
deleted file mode 100644
index 774643c..0000000
--- a/web-framework-master/.idea/compiler.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/web-framework-master/.idea/jarRepositories.xml b/web-framework-master/.idea/jarRepositories.xml
deleted file mode 100644
index 712ab9d..0000000
--- a/web-framework-master/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/web-framework-master/.idea/libraries/Maven__junit_junit_4_12.xml b/web-framework-master/.idea/libraries/Maven__junit_junit_4_12.xml
deleted file mode 100644
index d411041..0000000
--- a/web-framework-master/.idea/libraries/Maven__junit_junit_4_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/web-framework-master/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/web-framework-master/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
deleted file mode 100644
index f58bbc1..0000000
--- a/web-framework-master/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/web-framework-master/.idea/misc.xml b/web-framework-master/.idea/misc.xml
deleted file mode 100644
index 5755a99..0000000
--- a/web-framework-master/.idea/misc.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/web-framework-master/.idea/modules.xml b/web-framework-master/.idea/modules.xml
deleted file mode 100644
index 8e99870..0000000
--- a/web-framework-master/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/web-framework-master/.idea/runConfigurations.xml b/web-framework-master/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea..0000000
--- a/web-framework-master/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/web-framework-master/.idea/vcs.xml b/web-framework-master/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/web-framework-master/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/web-framework-master/.idea/web-framework.iml b/web-framework-master/.idea/web-framework.iml
deleted file mode 100644
index 975d5da..0000000
--- a/web-framework-master/.idea/web-framework.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/web-framework-master/pom.xml b/web-framework-master/pom.xml
deleted file mode 100644
index fdd8dd4..0000000
--- a/web-framework-master/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
- 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/web-framework-master/src/main/java/work1.java b/web-framework-master/src/main/java/work1.java
deleted file mode 100644
index cb134cd..0000000
--- a/web-framework-master/src/main/java/work1.java
+++ /dev/null
@@ -1,15 +0,0 @@
-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/web-framework-master/src/test/java/testWork1.java b/web-framework-master/src/test/java/testWork1.java
deleted file mode 100644
index cf0e524..0000000
--- a/web-framework-master/src/test/java/testWork1.java
+++ /dev/null
@@ -1,9 +0,0 @@
-import org.junit.Test;
-
-public class testWork1 {
- @Test
- public void testName() {
- work1 w1 = new work1();
- w1.name("苏博文");
- }
-}
--
Gitee
From a439b8b78517c37ff999b9886fdea1f25a14c3d2 Mon Sep 17 00:00:00 2001
From: hyb <10370607+AloneN@user.noreply.gitee.com>
Date: Tue, 16 Apr 2024 06:35:22 +0000
Subject: [PATCH 3/8] =?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
Signed-off-by: hyb <10370607+AloneN@user.noreply.gitee.com>
---
web-framework-master/.idea/misc.xml | 13 +++++++++
web-framework-master/.idea/modules.xml | 8 ++++++
web-framework-master/.idea/vcs.xml | 6 ++++
web-framework-master/.idea/web-framework.iml | 17 +++++++++++
web-framework-master/pom.xml | 28 +++++++++++++++++++
web-framework-master/src/main/java/work1.java | 15 ++++++++++
.../src/test/java/testWork1.java | 9 ++++++
7 files changed, 96 insertions(+)
create mode 100644 web-framework-master/.idea/misc.xml
create mode 100644 web-framework-master/.idea/modules.xml
create mode 100644 web-framework-master/.idea/vcs.xml
create mode 100644 web-framework-master/.idea/web-framework.iml
create mode 100644 web-framework-master/pom.xml
create mode 100644 web-framework-master/src/main/java/work1.java
create mode 100644 web-framework-master/src/test/java/testWork1.java
diff --git a/web-framework-master/.idea/misc.xml b/web-framework-master/.idea/misc.xml
new file mode 100644
index 0000000..5755a99
--- /dev/null
+++ b/web-framework-master/.idea/misc.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web-framework-master/.idea/modules.xml b/web-framework-master/.idea/modules.xml
new file mode 100644
index 0000000..8e99870
--- /dev/null
+++ b/web-framework-master/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web-framework-master/.idea/vcs.xml b/web-framework-master/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/web-framework-master/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web-framework-master/.idea/web-framework.iml b/web-framework-master/.idea/web-framework.iml
new file mode 100644
index 0000000..975d5da
--- /dev/null
+++ b/web-framework-master/.idea/web-framework.iml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web-framework-master/pom.xml b/web-framework-master/pom.xml
new file mode 100644
index 0000000..fdd8dd4
--- /dev/null
+++ b/web-framework-master/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/web-framework-master/src/main/java/work1.java b/web-framework-master/src/main/java/work1.java
new file mode 100644
index 0000000..cb134cd
--- /dev/null
+++ b/web-framework-master/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/web-framework-master/src/test/java/testWork1.java b/web-framework-master/src/test/java/testWork1.java
new file mode 100644
index 0000000..e28e941
--- /dev/null
+++ b/web-framework-master/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("hyb");
+ }
+}
--
Gitee
From 4c9505c358eea747e407a7bc38aa47be5acd4f33 Mon Sep 17 00:00:00 2001
From: hyb <10370607+AloneN@user.noreply.gitee.com>
Date: Tue, 16 Apr 2024 06:36:10 +0000
Subject: [PATCH 4/8] update README.md.
Signed-off-by: hyb <10370607+AloneN@user.noreply.gitee.com>
---
README.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/README.md b/README.md
index d63e54d..41b64e0 100644
--- a/README.md
+++ b/README.md
@@ -38,3 +38,6 @@ http://www.cnblogs.com/coderland/p/5902878.html
- 方法:
1. 使用监听器(HttpSessionListener)完成功能
2. 加入用户退出功能
+
+
+修改 --git操作作业
--
Gitee
From 56cca0147f8c7d65d3eb7591658d786763641869 Mon Sep 17 00:00:00 2001
From: hyb <10370607+AloneN@user.noreply.gitee.com>
Date: Tue, 16 Apr 2024 06:36:20 +0000
Subject: [PATCH 5/8] =?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
From f957dc565b0b6d9503ad5497af1c7bb5becdecbc Mon Sep 17 00:00:00 2001
From: hyb <10370607+AloneN@user.noreply.gitee.com>
Date: Tue, 16 Apr 2024 06:36:43 +0000
Subject: [PATCH 6/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20web-?=
=?UTF-8?q?framework-master?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web-framework-master/.idea/misc.xml | 13 ---------
web-framework-master/.idea/modules.xml | 8 ------
web-framework-master/.idea/vcs.xml | 6 ----
web-framework-master/.idea/web-framework.iml | 17 -----------
web-framework-master/pom.xml | 28 -------------------
web-framework-master/src/main/java/work1.java | 15 ----------
.../src/test/java/testWork1.java | 9 ------
7 files changed, 96 deletions(-)
delete mode 100644 web-framework-master/.idea/misc.xml
delete mode 100644 web-framework-master/.idea/modules.xml
delete mode 100644 web-framework-master/.idea/vcs.xml
delete mode 100644 web-framework-master/.idea/web-framework.iml
delete mode 100644 web-framework-master/pom.xml
delete mode 100644 web-framework-master/src/main/java/work1.java
delete mode 100644 web-framework-master/src/test/java/testWork1.java
diff --git a/web-framework-master/.idea/misc.xml b/web-framework-master/.idea/misc.xml
deleted file mode 100644
index 5755a99..0000000
--- a/web-framework-master/.idea/misc.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/web-framework-master/.idea/modules.xml b/web-framework-master/.idea/modules.xml
deleted file mode 100644
index 8e99870..0000000
--- a/web-framework-master/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/web-framework-master/.idea/vcs.xml b/web-framework-master/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/web-framework-master/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/web-framework-master/.idea/web-framework.iml b/web-framework-master/.idea/web-framework.iml
deleted file mode 100644
index 975d5da..0000000
--- a/web-framework-master/.idea/web-framework.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/web-framework-master/pom.xml b/web-framework-master/pom.xml
deleted file mode 100644
index fdd8dd4..0000000
--- a/web-framework-master/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
- 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/web-framework-master/src/main/java/work1.java b/web-framework-master/src/main/java/work1.java
deleted file mode 100644
index cb134cd..0000000
--- a/web-framework-master/src/main/java/work1.java
+++ /dev/null
@@ -1,15 +0,0 @@
-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/web-framework-master/src/test/java/testWork1.java b/web-framework-master/src/test/java/testWork1.java
deleted file mode 100644
index e28e941..0000000
--- a/web-framework-master/src/test/java/testWork1.java
+++ /dev/null
@@ -1,9 +0,0 @@
-import org.junit.Test;
-
-public class testWork1 {
- @Test
- public void testName() {
- work1 w1 = new work1();
- w1.name("hyb");
- }
-}
--
Gitee
From d9c430d381feac8bb74105360fee4a75873549b8 Mon Sep 17 00:00:00 2001
From: hyb <10370607+AloneN@user.noreply.gitee.com>
Date: Tue, 16 Apr 2024 06:37:32 +0000
Subject: [PATCH 7/8] =?UTF-8?q?maven=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: hyb <10370607+AloneN@user.noreply.gitee.com>
---
.idea/misc.xml | 13 +++++++++++++
.idea/modules.xml | 8 ++++++++
.idea/vcs.xml | 6 ++++++
.idea/web-framework.iml | 17 +++++++++++++++++
pom.xml | 28 ++++++++++++++++++++++++++++
testWork1.java | 9 +++++++++
6 files changed, 81 insertions(+)
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 testWork1.java
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..5755a99
--- /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 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..975d5da
--- /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 0000000..fdd8dd4
--- /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/testWork1.java b/testWork1.java
new file mode 100644
index 0000000..e28e941
--- /dev/null
+++ b/testWork1.java
@@ -0,0 +1,9 @@
+import org.junit.Test;
+
+public class testWork1 {
+ @Test
+ public void testName() {
+ work1 w1 = new work1();
+ w1.name("hyb");
+ }
+}
--
Gitee
From ae220202c129253e52d1e945eeab4f9501fa4b7b Mon Sep 17 00:00:00 2001
From: hyb <10370607+AloneN@user.noreply.gitee.com>
Date: Tue, 16 Apr 2024 06:38:29 +0000
Subject: [PATCH 8/8] =?UTF-8?q?=E5=B0=9D=E8=AF=95pull-request?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: hyb <10370607+AloneN@user.noreply.gitee.com>
---
work1.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 work1.java
diff --git a/work1.java b/work1.java
new file mode 100644
index 0000000..cb134cd
--- /dev/null
+++ b/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");
+ }
+}
--
Gitee