diff --git a/.gitignore b/.gitignore
index a1c2a238a965f004ff76978ac1086aa6fe95caea..7959d34e17816fb3c84efecbc48e9c9aff8d788c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,64 @@
-# 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*
+<<<<<<< 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
new file mode 100644
index 0000000000000000000000000000000000000000..50d9d22a71b16113919f9a33b76591075029e58b
--- /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 0000000000000000000000000000000000000000..a156f529b94b099aa5d9cb253dc3abcbe0fc3eb0
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d898d05b6216f1608b86b1ca97d845e9bdfab250
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="22" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9661ac713428efbad557d3ba3a62216b5bb7d226
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/README.en.md b/README.en.md
deleted file mode 100644
index bd2cb730acb8953f053bb4efffb6c69acc969952..0000000000000000000000000000000000000000
--- 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/)
diff --git a/README.md b/README.md
index d63e54d903a205fa41d4cab0fa6e8156492ae0dc..4a3a6be20f79d095238a7cd30d9a753a3fb5255a 100644
--- a/README.md
+++ b/README.md
@@ -1,40 +1,48 @@
-# 软件开发与管理课程 - 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插件生成项目文档
+
+## Git操作
+
+#### Fork项目到自己的仓库
+
+* 添加Maven作业的项目代码，文档。
+* 提交代码文件的修改
+* 删除不必要文件
+* 尝试各种操作
+
+## 基于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
new file mode 100644
index 0000000000000000000000000000000000000000..0f49b1f25db1e879120e3afd545912c9346cf842
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.example</groupId>
+    <artifactId>untitled2</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <distributionManagement>
+        <repository>
+            <id>local-repo</id>
+            <url>"C:\maven\apache-maven-3.9.6\localRepository"</url>
+        </repository>
+    </distributionManagement>
+    <properties>
+        <maven.compiler.source>22</maven.compiler.source>
+        <maven.compiler.target>22</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+
+</project>
\ 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 0000000000000000000000000000000000000000..1db8c5c8c275e814aab3009e854ab976dfd82d0f
--- /dev/null
+++ b/src/main/java/org/example/Main.java
@@ -0,0 +1,10 @@
+package org.example;
+
+
+public class Main
+{
+    public static <String> void main(String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}