From 8deabbe56e6504ce304e6eac79e4e69e393c52d1 Mon Sep 17 00:00:00 2001
From: Never <2209886811@qq.com>
Date: Mon, 15 Apr 2024 00:01:08 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0maven=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 41 +++++++++++++++++++++++++++++
.idea/.gitignore | 3 +++
.idea/encodings.xml | 7 +++++
.idea/misc.xml | 14 ++++++++++
.idea/vcs.xml | 6 +++++
pom.xml | 32 ++++++++++++++++++++++
src/main/java/org/example/Main.java | 10 +++++++
7 files changed, 113 insertions(+)
create mode 100644 .idea/.gitignore
create mode 100644 .idea/encodings.xml
create mode 100644 .idea/misc.xml
create mode 100644 .idea/vcs.xml
create mode 100644 pom.xml
create mode 100644 src/main/java/org/example/Main.java
diff --git a/.gitignore b/.gitignore
index a1c2a23..f1781a6 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
+>>>>>>> 48cd780 (第一次提交)
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..359bb53
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# 默认忽略的文件
+/shelf/
+/workspace.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..363582b
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
\ 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..2803320
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,32 @@
+
+
+ 4.0.0
+
+ org.example
+ untitled2
+ 1.0-SNAPSHOT
+
+
+
+ local-repo
+ "C:\maven\apache-maven-3.9.6\localRepository"
+
+
+
+ 22
+ 22
+ UTF-8
+
+
+
+ junit
+ junit
+ 4.12
+ test
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/org/example/Main.java b/src/main/java/org/example/Main.java
new file mode 100644
index 0000000..ea268e0
--- /dev/null
+++ b/src/main/java/org/example/Main.java
@@ -0,0 +1,10 @@
+package org.example;
+
+
+public class Main
+{
+ public static void main(String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
--
Gitee
From efdf9cdf37d69ce2ce7d0f6e675c0068dad48982 Mon Sep 17 00:00:00 2001
From: Never <2209886811@qq.com>
Date: Mon, 15 Apr 2024 00:15:54 +0800
Subject: [PATCH 2/4] =?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
---
.gitignore | 128 ++++++++++++++--------------
.idea/.gitignore | 6 +-
.idea/encodings.xml | 12 +--
.idea/misc.xml | 26 +++---
.idea/vcs.xml | 10 +--
README.en.md | 72 ++++++++--------
README.md | 80 ++++++++---------
pom.xml | 62 +++++++-------
src/main/java/org/example/Main.java | 20 ++---
9 files changed, 208 insertions(+), 208 deletions(-)
diff --git a/.gitignore b/.gitignore
index f1781a6..7959d34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,64 +1,64 @@
-<<<<<<< HEAD
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# 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
->>>>>>> 48cd780 (第一次提交)
+<<<<<<< HEAD
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# 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
+>>>>>>> 48cd780 (第一次提交)
diff --git a/.idea/.gitignore b/.idea/.gitignore
index 359bb53..50d9d22 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,3 +1,3 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
+# 默认忽略的文件
+/shelf/
+/workspace.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index aa00ffa..a156f52 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,7 @@
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 363582b..d898d05 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,14 +1,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..9661ac7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/README.en.md b/README.en.md
index bd2cb73..872b8cd 100644
--- a/README.en.md
+++ b/README.en.md
@@ -1,36 +1,36 @@
-# 软件开发与管理
-
-#### 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/)
+# 软件开发与管理
+
+#### 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/)
diff --git a/README.md b/README.md
index d63e54d..93f69e0 100644
--- a/README.md
+++ b/README.md
@@ -1,40 +1,40 @@
-# 软件开发与管理课程 - Java EE
-
-## 基于Maven的JavaSE项目
-
-#### 介绍
-在IDEA中创建基于Maven的JavaSE或Web项目,实现任意功能,并完成以下Maven功能的验证:
-
-* 添加JUnit(版本不限)依赖,指定Scope。
-* 运行Maven测试
-* 部署运行项目
-* 使用Javadoc插件生成项目文档
-
-
-## 基于Model2的登录功能
-
-#### 介绍
-基于Model2的登录功能
-包括:
-* 页面:Login.jsp,LoginSuccess(main).jsp
-* Java类:LoginServlet.java,User.java
-* 数据库:user表
-
-## 基于Filter的用户登录验证
-
-#### 介绍
-- 类:LoginFilter.java
-- 要求:退出系统后不能访问main.jsp,跳转到login.jsp
-- 方法:点击退出,清除session
-
-更复杂的验证例子,参考
-http://www.cnblogs.com/coderland/p/5902878.html
-
-
-## 基于Listener完成在线人数和登陆用户统计
-
-#### 介绍
-- 要求:显示在线人数和登陆用户数
-- 方法:
-1. 使用监听器(HttpSessionListener)完成功能
-2. 加入用户退出功能
+# 软件开发与管理课程 - Java EE
+
+## 基于Maven的JavaSE项目
+
+#### 介绍
+在IDEA中创建基于Maven的JavaSE或Web项目,实现任意功能,并完成以下Maven功能的验证:
+
+* 添加JUnit(版本不限)依赖,指定Scope。
+* 运行Maven测试
+* 部署运行项目
+* 使用Javadoc插件生成项目文档
+
+
+## 基于Model2的登录功能
+
+#### 介绍
+基于Model2的登录功能
+包括:
+* 页面:Login.jsp,LoginSuccess(main).jsp
+* Java类:LoginServlet.java,User.java
+* 数据库:user表
+
+## 基于Filter的用户登录验证
+
+#### 介绍
+- 类:LoginFilter.java
+- 要求:退出系统后不能访问main.jsp,跳转到login.jsp
+- 方法:点击退出,清除session
+
+更复杂的验证例子,参考
+http://www.cnblogs.com/coderland/p/5902878.html
+
+
+## 基于Listener完成在线人数和登陆用户统计
+
+#### 介绍
+- 要求:显示在线人数和登陆用户数
+- 方法:
+1. 使用监听器(HttpSessionListener)完成功能
+2. 加入用户退出功能
diff --git a/pom.xml b/pom.xml
index 2803320..0f49b1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,32 +1,32 @@
-
-
- 4.0.0
-
- org.example
- untitled2
- 1.0-SNAPSHOT
-
-
-
- local-repo
- "C:\maven\apache-maven-3.9.6\localRepository"
-
-
-
- 22
- 22
- UTF-8
-
-
-
- junit
- junit
- 4.12
- test
-
-
-
-
+
+
+ 4.0.0
+
+ org.example
+ untitled2
+ 1.0-SNAPSHOT
+
+
+
+ local-repo
+ "C:\maven\apache-maven-3.9.6\localRepository"
+
+
+
+ 22
+ 22
+ UTF-8
+
+
+
+ junit
+ junit
+ 4.12
+ test
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/org/example/Main.java b/src/main/java/org/example/Main.java
index ea268e0..1db8c5c 100644
--- a/src/main/java/org/example/Main.java
+++ b/src/main/java/org/example/Main.java
@@ -1,10 +1,10 @@
-package org.example;
-
-
-public class Main
-{
- public static void main(String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
+package org.example;
+
+
+public class Main
+{
+ public static void main(String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
--
Gitee
From 36727bc9f0ae995aa958fc21aab1e9c637da02c8 Mon Sep 17 00:00:00 2001
From: Never <2209886811@qq.com>
Date: Mon, 15 Apr 2024 00:32:17 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/README.md b/README.md
index 93f69e0..4a3a6be 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,14 @@
* 部署运行项目
* 使用Javadoc插件生成项目文档
+## Git操作
+
+#### Fork项目到自己的仓库
+
+* 添加Maven作业的项目代码,文档。
+* 提交代码文件的修改
+* 删除不必要文件
+* 尝试各种操作
## 基于Model2的登录功能
--
Gitee
From a0045f85757a1266c70c228035dabab9f2646c37 Mon Sep 17 00:00:00 2001
From: Never <2209886811@qq.com>
Date: Mon, 15 Apr 2024 00:38:30 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=A0=E9=99=A4?=
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 872b8cd..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