diff --git a/WebContent/admin/booklist.jsp b/WebContent/admin/booklist.jsp
index f702219..a6f26a9 100644
--- a/WebContent/admin/booklist.jsp
+++ b/WebContent/admin/booklist.jsp
@@ -79,7 +79,7 @@
     </table>
     
 	<!-- 行操作  -->
-	<script type="text/html" id="barDemo">
+	<script type="text/html" id="operateBar">
 		<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="bookBorrowList">查看借阅</a>
   		<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
   		<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
@@ -108,12 +108,10 @@
 		  var tableIns =  table.render({
 		     elem: '#demo'
 		    ,height: 600
-		    //,url: './data.json' 
 		    ,url: './bookList'
 		    ,title: '数据表单'
 		    ,toolbar: '#search'
 		    ,page: true 
-		    //,size: 'lg'
 		    ,cols: [[
 		   	  {type: 'numbers', width:50, fixed:'left'}
 		      ,{field: 'id', title: 'ID', width:80, sort: true, fixed: 'left'}
@@ -130,10 +128,8 @@
 		      ,{field: 'position', title: '位置', width: 110, sort: true}
 		      ,{field: 'status', title: '状态', width: 60, templet:'#statusTpl'}
 		      ,{field: 'description', title: '描述', width: 340}
-		      //,{field: 'operate', title: '操作', width: 200, templet: 'titleTpl'}
-		      ,{fixed: 'right', title:'操作', width: 200, align:'center', toolbar: '#barDemo'} //这里的toolbar值是模板元素的选择器
+		      ,{fixed: 'right', title:'操作', width: 200, align:'center', toolbar: '#operateBar'} //这里的toolbar值是模板元素的选择器
 		    ]]
-		  	,id: 'idTest'
 		  });
 		  
 		  // 直接编辑
diff --git a/WebContent/admin/cardborrow.jsp b/WebContent/admin/cardborrow.jsp
index 3255d2e..03aafa7 100644
--- a/WebContent/admin/cardborrow.jsp
+++ b/WebContent/admin/cardborrow.jsp
@@ -67,7 +67,7 @@
       <tr>
       <%} %>
         <td><%=resultSet.getString("card_id") %></td>
-        <td><%=resultSet.getString("id") %></td>
+        <td><%=resultSet.getString("book_id") %></td>
         <td><%=resultSet.getString("books.name") %></td>
         <td><%=Util.getFormatDateTime(resultSet.getString("borrow_date")) %></td>
         <td><%=Util.getFormatDateTime(resultSet.getString("end_date"))%></td>
diff --git a/WebContent/adminLogin.html b/WebContent/adminLogin.html
index a3aa11d..57c001f 100644
--- a/WebContent/adminLogin.html
+++ b/WebContent/adminLogin.html
@@ -32,36 +32,36 @@
 	</div>
 	<script src="./public/js/layer/layer.js"></script>
 	<script>
-	$(function(){
-		//登录	
-		$("input[type=submit]").click(function(){
-			
-			$.ajax({
-				url: "./adminLogin",
-				type: "post",
-				data: $("form").serialize(),
-				dataType: "json",
-				success: function( data ){
-					if(data.code == 0){
-						layer.msg("登录成功", {
-							icon: 6,
-							time: 1000
-						}, function(){
-							location.href = data.url;
-						})
-					}else{
-						layer.open({
-							title: "登录失败",
-							content: data.msg,
-							icon: 5,
-							anim: 6
-						})
+		$(function(){
+			//登录	
+			$("input[type=submit]").click(function(){
+				
+				$.ajax({
+					url: "./adminLogin",
+					type: "post",
+					data: $("form").serialize(),
+					dataType: "json",
+					success: function( data ){
+						if(data.code == 0){
+							layer.msg("登录成功", {
+								icon: 6,
+								time: 1000
+							}, function(){
+								location.href = data.url;
+							})
+						}else{
+							layer.open({
+								title: "登录失败",
+								content: data.msg,
+								icon: 5,
+								anim: 6
+							})
+						}
 					}
-				}
+				})
+				return false;
 			})
-			return false;
 		})
-	})
 	</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/build/classes/filter/AdminFilter.class b/build/classes/filter/AdminFilter.class
index ed2913a..d630d97 100644
Binary files a/build/classes/filter/AdminFilter.class and b/build/classes/filter/AdminFilter.class differ
diff --git a/build/classes/filter/CharacterEncodingFilter.class b/build/classes/filter/CharacterEncodingFilter.class
index 34a7450..5da783c 100644
Binary files a/build/classes/filter/CharacterEncodingFilter.class and b/build/classes/filter/CharacterEncodingFilter.class differ
diff --git a/build/classes/filter/ManagerFilter.class b/build/classes/filter/ManagerFilter.class
index 34d3e6d..74af0af 100644
Binary files a/build/classes/filter/ManagerFilter.class and b/build/classes/filter/ManagerFilter.class differ
diff --git a/build/classes/javabean/Admin.class b/build/classes/javabean/Admin.class
index 13f2d17..fb8693a 100644
Binary files a/build/classes/javabean/Admin.class and b/build/classes/javabean/Admin.class differ
diff --git a/build/classes/javabean/Base.class b/build/classes/javabean/Base.class
index 82f1a14..a4f21b5 100644
Binary files a/build/classes/javabean/Base.class and b/build/classes/javabean/Base.class differ
diff --git a/build/classes/javabean/Manager.class b/build/classes/javabean/Manager.class
index 0cfc7e6..4b1ff7d 100644
Binary files a/build/classes/javabean/Manager.class and b/build/classes/javabean/Manager.class differ
diff --git a/build/classes/servlet/admin/AdminLogin.class b/build/classes/servlet/admin/AdminLogin.class
index f100366..b841b90 100644
Binary files a/build/classes/servlet/admin/AdminLogin.class and b/build/classes/servlet/admin/AdminLogin.class differ
diff --git a/build/classes/servlet/manager/ManagerLogin.class b/build/classes/servlet/manager/ManagerLogin.class
index 4adae0e..1576ab3 100644
Binary files a/build/classes/servlet/manager/ManagerLogin.class and b/build/classes/servlet/manager/ManagerLogin.class differ
diff --git a/src/filter/AdminFilter.java b/src/filter/AdminFilter.java
index 584b67a..de26330 100644
--- a/src/filter/AdminFilter.java
+++ b/src/filter/AdminFilter.java
@@ -31,9 +31,4 @@ public class AdminFilter implements Filter {
 		}
 		chain.doFilter(request, response);
 	}
-
-	public void init(FilterConfig fConfig) throws ServletException {
-		
-	}
-
 }
diff --git a/src/javabean/Admin.java b/src/javabean/Admin.java
index a3f4ee8..7acff63 100644
--- a/src/javabean/Admin.java
+++ b/src/javabean/Admin.java
@@ -45,7 +45,7 @@ public class Admin {
 			return "发生未知错误";
 		}finally {
 			if(Base.closeResource(connection, pstmt, resultSet) == false) {
-				System.out.println("关闭失败");
+				return "关闭失败";
 			}
 		}