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/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000000000000000000000000000000000000..de3f5b54715173faeda02da38b0dc246e086b560
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="untitled12" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..63574ec0afb84f7375a0ec33a00da97c7de2310b
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000000000000000000000000000000000000..712ab9d985c20018a0c97b93d2148ac1ffe588a5
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000000000000000000000000000000000000..800d44b9e8a339a7c876a4602a74472c9365700f
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MavenRunner">
+    <option name="jreName" value="jbr-17.0.9" />
+    <option name="vmOptions" value="-DarchetypeCatalog=internal" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8e9987035052f276318390db9534dbdd425b2905
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/web-framework.iml" filepath="$PROJECT_DIR$/.idea/web-framework.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000000000000000000000000000000000..35eb1ddfbbc029bcab630581847471d7f238ec53
--- /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="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/web-framework.iml b/.idea/web-framework.iml
new file mode 100644
index 0000000000000000000000000000000000000000..d6ebd4805981b8400db3e3291c74a743fef9a824
--- /dev/null
+++ b/.idea/web-framework.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/README.md b/README.md
index d63e54d903a205fa41d4cab0fa6e8156492ae0dc..a32f1c55ee5c8b3a0ca9e04e902526864f0e2527 100644
--- a/README.md
+++ b/README.md
@@ -1,40 +1,21 @@
-# 软件开发与管理课程 - Java EE
-
-## 基于Maven的JavaSE项目
+# 软件开发与管理项目
 
 #### 介绍
-在IDEA中创建基于Maven的JavaSE或Web项目，实现任意功能，并完成以下Maven功能的验证：
-
-* 添加JUnit（版本不限）依赖，指定Scope。
-* 运行Maven测试
-* 部署运行项目
-* 使用Javadoc插件生成项目文档
+本仓库属于软件开发与管理课程。
+包含作业和项目两个部分。
 
+#### 要求
+* 每次提交前填写以下的完成内容
+* 并在提交消息中写明具体内容
 
-## 基于Model2的登录功能 
+#### 完成内容列表
+1. 搭建环境
+2.  xxxx
+3.  xxxx
 
-#### 介绍
-基于Model2的登录功能
-包括：
-* 页面：Login.jsp，LoginSuccess(main).jsp
-* Java类：LoginServlet.java，User.java
-* 数据库：user表
+#### 补充说明
 
-## 基于Filter的用户登录验证
-
-#### 介绍
-- 类：LoginFilter.java
-- 要求：退出系统后不能访问main.jsp，跳转到login.jsp
-- 方法：点击退出，清除session
+1.  xxxx
+2.  xxxx
+3.  xxxx
 
-更复杂的验证例子，参考
-http://www.cnblogs.com/coderland/p/5902878.html
-
-
-## 基于Listener完成在线人数和登陆用户统计
-
-#### 介绍
-- 要求：显示在线人数和登陆用户数
-- 方法：
-1. 使用监听器（HttpSessionListener）完成功能
-2. 加入用户退出功能
diff --git a/READMEen.md b/READMEen.md
new file mode 100644
index 0000000000000000000000000000000000000000..bd2cb730acb8953f053bb4efffb6c69acc969952
--- /dev/null
+++ b/READMEen.md
@@ -0,0 +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/)
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..77b4e884ca3d683e98a2f35e2775ca893d94f8ef
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,71 @@
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.example</groupId>
+  <artifactId>untitled12</artifactId>
+  <packaging>war</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>untitled12 Maven Webapp</name>
+  <url>http://maven.apache.org</url>
+
+
+    <dependencies>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.12</version>
+        <scope>test</scope>
+      </dependency>
+    </dependencies>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+
+    <!-- 解决编译时，编码警告乱码 -->
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <!--   解决test命令执行时乱码     -->
+    <argLine>-Dfile.encoding=UTF-8</argLine>
+    <!-- 其他乱码问题解决 -->
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+
+    <maven.test.skip>true</maven.test.skip>
+    <maven.javadoc.skip>true</maven.javadoc.skip>
+
+  </properties>
+  <build>
+    <finalName>untitled12</finalName>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.tomcat.maven</groupId>
+        <artifactId>tomcat7-maven-plugin</artifactId>
+        <version>2.2</version>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>3.3.0</version>
+        <configuration>
+          <doclint>none</doclint> <!-- 可选配置，禁用HTML验证 -->
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.2.0</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+
+
+    </plugins>
+
+
+
+  </build>
+</project>
diff --git a/src/main/java/imu/MyCalender.java b/src/main/java/imu/MyCalender.java
new file mode 100644
index 0000000000000000000000000000000000000000..a10fc277f1e3843f44e4a0ab1e4a75f58fc441a6
--- /dev/null
+++ b/src/main/java/imu/MyCalender.java
@@ -0,0 +1,13 @@
+package imu;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class MyCalender {
+
+    public void func(){
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = new Date();
+        System.out.println(format.format(date));
+    }
+}
diff --git a/src/main/webapp/WEB-INF/a.html b/src/main/webapp/WEB-INF/a.html
new file mode 100644
index 0000000000000000000000000000000000000000..9ac506a49f219b1d00230995b6d9cf0a7dca6fc6
--- /dev/null
+++ b/src/main/webapp/WEB-INF/a.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+aaaaa
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9f88c1f9632445500e3b3688fe477b860f77d8f2
--- /dev/null
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,7 @@
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd" >
+
+<web-app>
+  <display-name>Archetype Created Web Application</display-name>
+</web-app>
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..c38169bb958579c635a5c09ee2f379cc5956c0c2
--- /dev/null
+++ b/src/main/webapp/index.jsp
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h2>Hello World!</h2>
+</body>
+</html>
diff --git a/src/test/java/imutest/MyCalenderTest.java b/src/test/java/imutest/MyCalenderTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..cfdb5a6cb9bf80d60a3bd9c4bf9e257a8a63997f
--- /dev/null
+++ b/src/test/java/imutest/MyCalenderTest.java
@@ -0,0 +1,13 @@
+package imutest;
+import org.junit.Test;
+
+
+import imu.MyCalender;
+
+public class MyCalenderTest {
+    @Test
+     public void test(){
+        MyCalender myCalender = new MyCalender();
+        myCalender.func();
+    }
+}