diff --git a/.gitignore b/.gitignore
index a1c2a238a965f004ff76978ac1086aa6fe95caea..5ff6309b7199129c1afe4f4ec1906e640bec48c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,38 @@
-# Compiled class file
-*.class
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
 
-# Log file
-*.log
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
 
-# BlueJ files
-*.ctxt
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
 
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
 
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
+### VS Code ###
+.vscode/
 
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+### Mac OS ###
+.DS_Store
\ No newline at end of file
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/.name b/.idea/.name
new file mode 100644
index 0000000000000000000000000000000000000000..99e944e7c186b2209237fd5140f5efeba854c816
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+maven_test
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..041c81f55031a73ac76175c281e909f46fac368c
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/maven_web/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/maven_web/src/main/resources" charset="UTF-8" />
+    <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..5d930b2002c2f7d18cb49a08f50334d554b650bf
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,16 @@
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="JavadocGenerationManager">
+    <option name="OUTPUT_DIRECTORY" value="$PROJECT_DIR$/../../../Maven/zuoye" />
+  </component>
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8 (2)" 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..94a25f7f4cb416c083d265558da75d457237d671
--- /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
deleted file mode 100644
index d63e54d903a205fa41d4cab0fa6e8156492ae0dc..0000000000000000000000000000000000000000
--- a/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# 软件开发与管理课程 - 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/maven_web/pom.xml b/maven_web/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ed294a283acc5478c7998ded3daf25e6d9181900
--- /dev/null
+++ b/maven_web/pom.xml
@@ -0,0 +1,59 @@
+<?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>
+    <parent>
+        <groupId>com.jisuanji.maven</groupId>
+        <artifactId>maven_test</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <packaging>war</packaging>
+
+    <artifactId>maven_web</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.8.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.24</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <id>generate-javadoc</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>javadoc</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/maven_web/src/main/java/com/jisuanji/maven/Main.java b/maven_web/src/main/java/com/jisuanji/maven/Main.java
new file mode 100644
index 0000000000000000000000000000000000000000..82966db5d24f1fd08a4320c89f2ab2d78b263f32
--- /dev/null
+++ b/maven_web/src/main/java/com/jisuanji/maven/Main.java
@@ -0,0 +1,19 @@
+package com.jisuanji.maven;
+
+// Press Shift twice to open the Search Everywhere dialog and type `show whitespaces`,
+// then press Enter. You can now see whitespace characters in your code.
+public class Main {
+    public static void main(String[] args) {
+        // Press Alt+Enter with your caret at the highlighted text to see how
+        // IntelliJ IDEA suggests fixing it.
+        System.out.printf("Hello and welcome!");
+
+        // Press Shift+F10 or click the green arrow button in the gutter to run the code.
+        for (int i = 1; i <= 5; i++) {
+
+            // Press Shift+F9 to start debugging your code. We have set one breakpoint
+            // for you, but you can always add more by pressing Ctrl+F8.
+            System.out.println("i = " + i);
+        }
+    }
+}
\ No newline at end of file
diff --git a/maven_web/src/main/webapp/WEB-INF/index.html b/maven_web/src/main/webapp/WEB-INF/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..81c3757d6e4205295602ef428ee1edc88293f82e
--- /dev/null
+++ b/maven_web/src/main/webapp/WEB-INF/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>首页</title>
+</head>
+<body>
+<h1>学号：32309232</h1>
+<h1>姓名：阿斯布尔</h1>
+<h1>专业：人工智能</h1>
+<h1>提交修改</h1>
+
+</body>
+</html>
diff --git a/maven_web/src/main/webapp/WEB-INF/web.xml b/maven_web/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d80081d1318531b6c30eaf0d748bf80a0b2e042a
--- /dev/null
+++ b/maven_web/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+         version="4.0">
+</web-app>
\ No newline at end of file
diff --git a/maven_web/src/test/java/test.java b/maven_web/src/test/java/test.java
new file mode 100644
index 0000000000000000000000000000000000000000..05766408e23d9f44e4b91a89749af6a5acbb6e9a
--- /dev/null
+++ b/maven_web/src/test/java/test.java
@@ -0,0 +1,9 @@
+import org.junit.jupiter.api.Assertions;
+
+public class test {
+    public static void main(String[] args) {
+        int a=50;
+        int b=40;
+        Assertions.assertEquals(a+b,100);
+    }
+}
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..283d15ef13d7b886d7c821e470d2b7b6af7f64c4
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,21 @@
+<?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>com.jisuanji.maven</groupId>
+    <artifactId>maven_test</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <modules>
+        <module>maven_web</module>
+    </modules>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/src/main/java/com/jisuanji/maven/Main.java b/src/main/java/com/jisuanji/maven/Main.java
new file mode 100644
index 0000000000000000000000000000000000000000..9bc4b6213fc13865a1fa8b22c560330a2dbe19f6
--- /dev/null
+++ b/src/main/java/com/jisuanji/maven/Main.java
@@ -0,0 +1,23 @@
+package com.jisuanji.maven;
+
+// Press Shift twice to open the Search Everywhere dialog and type `show whitespaces`,
+// then press Enter. You can now see whitespace characters in your code.
+public class Main {
+    public static void main(String[] args) {
+        // Press Alt+Enter with your caret at the highlighted text to see how
+        // IntelliJ IDEA suggests fixing it.
+        System.out.printf("Hello and welcome!");
+
+        // Press Shift+F10 or click the green arrow button in the gutter to run the code.
+        for (int i = 1; i <= 5; i++) {
+
+            // Press Shift+F9 to start debugging your code. We have set one breakpoint
+            // for you, but you can always add more by pressing Ctrl+F8.
+            System.out.println("i = " + i);
+        }
+    }
+
+    public void example() {
+        System.out.printf("本功能由branch添加");
+    }
+}
\ No newline at end of file