diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/views/usermanage.jsp b/project2/out/artifacts/project2_war_exploded/WEB-INF/views/usermanage.jsp
index 7116772..8b05247 100644
--- a/project2/out/artifacts/project2_war_exploded/WEB-INF/views/usermanage.jsp
+++ b/project2/out/artifacts/project2_war_exploded/WEB-INF/views/usermanage.jsp
@@ -159,7 +159,8 @@
                                     <div class="btn-group" role="group" aria-label="Basic example">
                                         <c:choose>
                                             <c:when test="${user.disabled_str == false}">
-                                                <button type="button" class="btn btn-danger"><i class="fas fa-ban me-1"></i>禁用账户
+                                                <button type="button" class="btn btn-danger"><i
+                                                        class="fas fa-ban me-1"></i>禁用账户
                                                 </button>
                                             </c:when>
                                             <c:when test="${user.disabled_str == true}">
@@ -168,7 +169,7 @@
                                                 </button>
                                             </c:when>
                                         </c:choose>
-                                        <button type="button" class="btn btn-primary"><i
+                                        <button type="button" class="btn btn-primary" onclick="resetPWD(${user.id})"><i
                                                 class="fas fa-arrow-rotate-right me-1"></i>重设密码
                                         </button>
                                     </div>
@@ -184,7 +185,11 @@
                         <ul class="nav nav-tabs" id="ex1" role="tablist">
                             <li class="nav-item" role="presentation">
                                 <a class="nav-link active fs-6" id="ex1-tab-1" data-mdb-toggle="tab" href="#ex1-tabs-1"
-                                   role="tab" aria-controls="ex1-tabs-1" aria-selected="true">成绩查询</a>
+                                   role="tab" aria-controls="ex1-tabs-1" aria-selected="true">创建账户</a>
+                            </li>
+                            <li class="nav-item" role="presentation">
+                                <a class="nav-link fs-6" id="ex1-tab-2" data-mdb-toggle="tab" href="#ex1-tabs-2"
+                                   role="tab" aria-controls="ex1-tabs-2" aria-selected="true">密码重置</a>
                             </li>
                         </ul>
                         <!-- Tabs navs -->
@@ -194,86 +199,56 @@
                             <div class="tab-pane fade show active" id="ex1-tabs-1" role="tabpanel"
                                  aria-labelledby="ex1-tab-1">
                                 <div class="card-body" style="min-width: 175px">
-                                    <form action="query" method="post">
+                                    <form action="" method="post">
                                         <div class="row mb-2">
                                             <div class="col-12">
                                                 <div class="form-outline">
-                                                    <input type="number" id="typeText1" class="form-control"
-                                                           name="scoreid"/>
-                                                    <label class="form-label" for="typeText1">成绩ID</label>
+                                                    <input type="text" id="typeText1" class="form-control"
+                                                           name="username" required/>
+                                                    <label class="form-label" for="typeText1">用户名</label>
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="row mb-2">
+                                        <div class="row mb-2 mt-2">
                                             <div class="col-12">
                                                 <div class="form-outline">
-                                                    <input type="number" id="typeText2" class="form-control"
-                                                           name="studentid"/>
-                                                    <label class="form-label" for="typeText2">学号</label>
+                                                    <input type="password" id="typeText2" class="form-control"
+                                                           name="password" required/>
+                                                    <label class="form-label" for="typeText2">密码</label>
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="row mb-2">
+                                        <div class="row mb-2 mt-2">
                                             <div class="col-12">
                                                 <div class="form-outline">
-                                                    <input type="text" id="typeText3" class="form-control"
-                                                           name="name"/>
-                                                    <label class="form-label" for="typeText3">学生姓名</label>
+                                                    <input type="password" id="typeText3" class="form-control"
+                                                           name="re_password" required/>
+                                                    <label class="form-label" for="typeText3">重复密码</label>
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="row mb-2">
+                                        <div class="row mb-2 mt-2">
                                             <div class="col-12">
                                                 <div class="form-outline">
                                                     <input type="number" id="typeText4" class="form-control"
-                                                           name="courseid"/>
-                                                    <label class="form-label" for="typeText4">课程ID</label>
+                                                           name="roleid"/>
+                                                    <label class="form-label" for="typeText4">身份ID</label>
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="row mb-2">
+                                        <div class="row mb-2 mt-2">
                                             <div class="col-12">
-                                                <div class="form-outline">
-                                                    <input type="text" id="typeText5" class="form-control"
-                                                           name="coursename"/>
-                                                    <label class="form-label" for="typeText5">课程名(支持部分)</label>
-                                                </div>
+                                                <label class="form-label" for="role-select">权限组:</label>
+                                                <select name="role" id="role-select" required>
+                                                    <option value="admin">管理员</option>
+                                                    <option value="teacher">教师</option>
+                                                    <option value="student">学生</option>
+                                                </select>
                                             </div>
                                         </div>
-                                        <div class="row mb-2">
-                                            <div class="col-12">
-                                                <label class="form-label" for="customRange1">成绩最小值:
-                                                    <output id="score_min_value"></output>
-                                                </label>
-                                                <div class="range">
-                                                    <input type="range" class="form-range" id="customRange1" name="min"
-                                                           value="0" min="0" max="100" disabled/>
-                                                </div>
-                                            </div>
-                                            <div class="col-12">
-                                                <label class="form-label" for="customRange2">成绩最大值:
-                                                    <output id="score_max_value"></output>
-                                                </label>
-                                                <div class="range">
-                                                    <input type="range" class="form-range" id="customRange2" name="max"
-                                                           value="100" min="0" max="100" disabled/>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="row mb-2">
-                                            <div class="col-12">
-                                                <div class="form-check">
-                                                    <input class="form-check-input" type="checkbox" value="true"
-                                                           id="range_enabler" name="range_enabler"/>
-                                                    <label class="form-check-label"
-                                                           for="range_enabler">设定成绩范围</label>
-                                                </div>
-                                            </div>
-                                        </div>
-
                                         <div class="row mb-2 mt-4">
                                             <div class="col-lg-6 text-center">
-                                                <button type="submit" class="btn btn-primary">查询
+                                                <button type="submit" class="btn btn-primary">创建
                                                 </button>
                                             </div>
                                             <div class="col-lg-6 text-center">
@@ -283,6 +258,49 @@
                                     </form>
                                 </div>
                             </div>
+                            <div class="tab-pane fade" id="ex1-tabs-2" role="tabpanel"
+                                 aria-labelledby="ex1-tab-2">
+                                <div class="card-body" style="min-width: 175px">
+                                    <form action="" method="post">
+                                        <div class="row mb-2">
+                                            <div class="col-12">
+                                                <div class="form-outline">
+                                                    <input type="number" id="typeText5" class="form-control"
+                                                           name="id" readonly required/>
+                                                    <label class="form-label" for="typeText5">用户ID</label>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row mb-2 mt-2">
+                                            <div class="col-12">
+                                                <div class="form-outline">
+                                                    <input type="password" id="typeText6" class="form-control"
+                                                           name="password" required/>
+                                                    <label class="form-label" for="typeText6">新的密码</label>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row mb-2 mt-2">
+                                            <div class="col-12">
+                                                <div class="form-outline">
+                                                    <input type="password" id="typeText7" class="form-control"
+                                                           name="re_password" required/>
+                                                    <label class="form-label" for="typeText7">重复密码</label>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row mb-2 mt-4">
+                                            <div class="col-lg-6 text-center">
+                                                <button type="submit" class="btn btn-primary">重置
+                                                </button>
+                                            </div>
+                                            <div class="col-lg-6 text-center">
+                                                <button type="reset" class="btn btn-secondary">清除</button>
+                                            </div>
+                                        </div>
+                                    </form>
+                                </div>
+                            </div>
                         </div>
                         <!-- Tabs content -->
 
@@ -355,8 +373,13 @@
         $('#exampleModal2').modal('show');
         </c:if>
     });
+
+    function resetPWD(id) {
+        $('#typeText5').val(id);
+        const triggerEl = document.querySelector('#ex1 a[href="#密码重置"]');
+        mdb.Tab.getInstance(triggerEl).show(); // Select tab by name
+    }
 </script>
-<script type="text/javascript" src="${pageContext.request.contextPath}/resources/js/multi_function_v1.js"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/project2/web/WEB-INF/views/usermanage.jsp b/project2/web/WEB-INF/views/usermanage.jsp
index 7116772..8b0145b 100644
--- a/project2/web/WEB-INF/views/usermanage.jsp
+++ b/project2/web/WEB-INF/views/usermanage.jsp
@@ -159,7 +159,8 @@
                                     <div class="btn-group" role="group" aria-label="Basic example">
                                         <c:choose>
                                             <c:when test="${user.disabled_str == false}">
-                                                <button type="button" class="btn btn-danger"><i class="fas fa-ban me-1"></i>禁用账户
+                                                <button type="button" class="btn btn-danger"><i
+                                                        class="fas fa-ban me-1"></i>禁用账户
                                                 </button>
                                             </c:when>
                                             <c:when test="${user.disabled_str == true}">
@@ -168,7 +169,7 @@
                                                 </button>
                                             </c:when>
                                         </c:choose>
-                                        <button type="button" class="btn btn-primary"><i
+                                        <button type="button" class="btn btn-primary" onclick="resetPWD(${user.id})"><i
                                                 class="fas fa-arrow-rotate-right me-1"></i>重设密码
                                         </button>
                                     </div>
@@ -184,7 +185,11 @@
                         <ul class="nav nav-tabs" id="ex1" role="tablist">
                             <li class="nav-item" role="presentation">
                                 <a class="nav-link active fs-6" id="ex1-tab-1" data-mdb-toggle="tab" href="#ex1-tabs-1"
-                                   role="tab" aria-controls="ex1-tabs-1" aria-selected="true">成绩查询</a>
+                                   role="tab" aria-controls="ex1-tabs-1" aria-selected="true">创建账户</a>
+                            </li>
+                            <li class="nav-item" role="presentation">
+                                <a class="nav-link fs-6" id="ex1-tab-2" data-mdb-toggle="tab" href="#ex1-tabs-2"
+                                   role="tab" aria-controls="ex1-tabs-2" aria-selected="true">密码重置</a>
                             </li>
                         </ul>
                         <!-- Tabs navs -->
@@ -194,86 +199,56 @@
                             <div class="tab-pane fade show active" id="ex1-tabs-1" role="tabpanel"
                                  aria-labelledby="ex1-tab-1">
                                 <div class="card-body" style="min-width: 175px">
-                                    <form action="query" method="post">
+                                    <form action="" method="post">
                                         <div class="row mb-2">
                                             <div class="col-12">
                                                 <div class="form-outline">
-                                                    <input type="number" id="typeText1" class="form-control"
-                                                           name="scoreid"/>
-                                                    <label class="form-label" for="typeText1">成绩ID</label>
+                                                    <input type="text" id="typeText1" class="form-control"
+                                                           name="username" required/>
+                                                    <label class="form-label" for="typeText1">用户名</label>
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="row mb-2">
+                                        <div class="row mb-2 mt-2">
                                             <div class="col-12">
                                                 <div class="form-outline">
-                                                    <input type="number" id="typeText2" class="form-control"
-                                                           name="studentid"/>
-                                                    <label class="form-label" for="typeText2">学号</label>
+                                                    <input type="password" id="typeText2" class="form-control"
+                                                           name="password" required/>
+                                                    <label class="form-label" for="typeText2">密码</label>
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="row mb-2">
+                                        <div class="row mb-2 mt-2">
                                             <div class="col-12">
                                                 <div class="form-outline">
-                                                    <input type="text" id="typeText3" class="form-control"
-                                                           name="name"/>
-                                                    <label class="form-label" for="typeText3">学生姓名</label>
+                                                    <input type="password" id="typeText3" class="form-control"
+                                                           name="re_password" required/>
+                                                    <label class="form-label" for="typeText3">重复密码</label>
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="row mb-2">
+                                        <div class="row mb-2 mt-2">
                                             <div class="col-12">
                                                 <div class="form-outline">
                                                     <input type="number" id="typeText4" class="form-control"
-                                                           name="courseid"/>
-                                                    <label class="form-label" for="typeText4">课程ID</label>
+                                                           name="roleid"/>
+                                                    <label class="form-label" for="typeText4">身份ID</label>
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="row mb-2">
+                                        <div class="row mb-2 mt-2">
                                             <div class="col-12">
-                                                <div class="form-outline">
-                                                    <input type="text" id="typeText5" class="form-control"
-                                                           name="coursename"/>
-                                                    <label class="form-label" for="typeText5">课程名(支持部分)</label>
-                                                </div>
+                                                <label class="form-label" for="role-select">权限组:</label>
+                                                <select name="role" id="role-select" required>
+                                                    <option value="admin">管理员</option>
+                                                    <option value="teacher">教师</option>
+                                                    <option value="student">学生</option>
+                                                </select>
                                             </div>
                                         </div>
-                                        <div class="row mb-2">
-                                            <div class="col-12">
-                                                <label class="form-label" for="customRange1">成绩最小值:
-                                                    <output id="score_min_value"></output>
-                                                </label>
-                                                <div class="range">
-                                                    <input type="range" class="form-range" id="customRange1" name="min"
-                                                           value="0" min="0" max="100" disabled/>
-                                                </div>
-                                            </div>
-                                            <div class="col-12">
-                                                <label class="form-label" for="customRange2">成绩最大值:
-                                                    <output id="score_max_value"></output>
-                                                </label>
-                                                <div class="range">
-                                                    <input type="range" class="form-range" id="customRange2" name="max"
-                                                           value="100" min="0" max="100" disabled/>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="row mb-2">
-                                            <div class="col-12">
-                                                <div class="form-check">
-                                                    <input class="form-check-input" type="checkbox" value="true"
-                                                           id="range_enabler" name="range_enabler"/>
-                                                    <label class="form-check-label"
-                                                           for="range_enabler">设定成绩范围</label>
-                                                </div>
-                                            </div>
-                                        </div>
-
                                         <div class="row mb-2 mt-4">
                                             <div class="col-lg-6 text-center">
-                                                <button type="submit" class="btn btn-primary">查询
+                                                <button type="submit" class="btn btn-primary">创建
                                                 </button>
                                             </div>
                                             <div class="col-lg-6 text-center">
@@ -283,6 +258,49 @@
                                     </form>
                                 </div>
                             </div>
+                            <div class="tab-pane fade" id="ex1-tabs-2" role="tabpanel"
+                                 aria-labelledby="ex1-tab-2">
+                                <div class="card-body" style="min-width: 175px">
+                                    <form action="" method="post">
+                                        <div class="row mb-2">
+                                            <div class="col-12">
+                                                <div class="form-outline">
+                                                    <input type="number" id="typeText5" class="form-control"
+                                                           name="id" readonly required/>
+                                                    <label class="form-label" for="typeText5">用户ID</label>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row mb-2 mt-2">
+                                            <div class="col-12">
+                                                <div class="form-outline">
+                                                    <input type="password" id="typeText6" class="form-control"
+                                                           name="password" required/>
+                                                    <label class="form-label" for="typeText6">新的密码</label>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row mb-2 mt-2">
+                                            <div class="col-12">
+                                                <div class="form-outline">
+                                                    <input type="password" id="typeText7" class="form-control"
+                                                           name="re_password" required/>
+                                                    <label class="form-label" for="typeText7">重复密码</label>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row mb-2 mt-4">
+                                            <div class="col-lg-6 text-center">
+                                                <button type="submit" class="btn btn-primary">重置
+                                                </button>
+                                            </div>
+                                            <div class="col-lg-6 text-center">
+                                                <button type="reset" class="btn btn-secondary">清除</button>
+                                            </div>
+                                        </div>
+                                    </form>
+                                </div>
+                            </div>
                         </div>
                         <!-- Tabs content -->
 
@@ -355,8 +373,13 @@
         $('#exampleModal2').modal('show');
         </c:if>
     });
+
+    function resetPWD(id) {
+        $('#typeText5').val(id);
+        // const triggerEl = document.querySelector('#ex1-tab-2'); Pending
+        mdb.Tab.getInstance(triggerEl).show(); // Select tab by name
+    }
 </script>
-<script type="text/javascript" src="${pageContext.request.contextPath}/resources/js/multi_function_v1.js"></script>
 </body>
 
 </html>
\ No newline at end of file