diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/controller/SystemController.class b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/controller/SystemController.class
index 1975873..c80506b 100644
Binary files a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/controller/SystemController.class and b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/controller/SystemController.class differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/controller/UserController.class b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/controller/UserController.class
index 4418380..3d7af7d 100644
Binary files a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/controller/UserController.class and b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/controller/UserController.class differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/mapper/UserMapper.class b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/mapper/UserMapper.class
index 9269104..9d5c42e 100644
Binary files a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/mapper/UserMapper.class and b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/mapper/UserMapper.class differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/pojo/User.class b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/pojo/User.class
index a938941..01c74f1 100644
Binary files a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/pojo/User.class and b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/pojo/User.class differ
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/mapper/UserMapper.xml b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/mapper/UserMapper.xml
index a6100bf..2b029e0 100644
--- a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/mapper/UserMapper.xml
+++ b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/mapper/UserMapper.xml
@@ -12,4 +12,9 @@
INSERT INTO user (username, password)
VALUES (#{username}, #{password})
+
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/views/settings.jsp b/project2/out/artifacts/project2_war_exploded/WEB-INF/views/settings.jsp
index 1355910..6ca4c3e 100644
--- a/project2/out/artifacts/project2_war_exploded/WEB-INF/views/settings.jsp
+++ b/project2/out/artifacts/project2_war_exploded/WEB-INF/views/settings.jsp
@@ -136,12 +136,12 @@
-
+
-
+
diff --git a/project2/out/artifacts/project2_war_exploded/resources/setting.html b/project2/out/artifacts/project2_war_exploded/WEB-INF/views/usermanage.jsp
similarity index 66%
rename from project2/out/artifacts/project2_war_exploded/resources/setting.html
rename to project2/out/artifacts/project2_war_exploded/WEB-INF/views/usermanage.jsp
index 577cf8c..136fb76 100644
--- a/project2/out/artifacts/project2_war_exploded/resources/setting.html
+++ b/project2/out/artifacts/project2_war_exploded/WEB-INF/views/usermanage.jsp
@@ -1,3 +1,5 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
@@ -5,14 +7,14 @@
-
成绩信息修改v2
-
+
用户管理
+
-
+
@@ -132,45 +130,162 @@
+ style="background-image: url('${pageContext.request.contextPath}/resources/img/jason-blackeye-nyL-rzwP-Mk-unsplash.jpg'); margin-top: -58.59px;">
+
+
+
+
+ 用户ID |
+ 用户名(登录用) |
+ 身份 |
+ 身份ID |
+ 禁用状态 |
+ 操作 |
+
+
+
+
+
+ ${user.id} |
+ ${user.username} |
+ ${user.roles} |
+ ${user.detail} |
+ ${user.disabled} |
+
+
+
+
+
+
+ |
+
+
+
+
+
-
高级设置
+ role="tab" aria-controls="ex1-tabs-1" aria-selected="true">成绩查询
-
还没想好1
+ role="tab" aria-controls="ex1-tabs-2" aria-selected="true">成绩修改
-
还没想好2
+ role="tab" aria-controls="ex1-tabs-3" aria-selected="false">成绩删除
-
还没想好3
+ role="tab" aria-controls="ex1-tabs-4" aria-selected="false">成绩添加
+ <%-- 查询--%>
+ <%-- 修改--%>
+ <%-- 删除--%>
+ <%-- 添加--%>
@@ -334,18 +451,19 @@
-
+
+