From 92493895b393159a79b42226405353b94b0b1372 Mon Sep 17 00:00:00 2001
From: you <284908631@qq.com>
Date: Fri, 12 Jun 2020 22:10:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E6=8A=A5=E5=91=8A=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/admin/booklist.jsp                 |   8 +--
 WebContent/admin/cardborrow.jsp               |   2 +-
 WebContent/adminLogin.html                    |  54 +++++++++---------
 build/classes/filter/AdminFilter.class        | Bin 1993 -> 1834 bytes
 .../filter/CharacterEncodingFilter.class      | Bin 1277 -> 1277 bytes
 build/classes/filter/ManagerFilter.class      | Bin 1947 -> 1947 bytes
 build/classes/javabean/Admin.class            | Bin 6147 -> 6125 bytes
 build/classes/javabean/Base.class             | Bin 2790 -> 2790 bytes
 build/classes/javabean/Manager.class          | Bin 1514 -> 1514 bytes
 build/classes/servlet/admin/AdminLogin.class  | Bin 3147 -> 3147 bytes
 .../servlet/manager/ManagerLogin.class        | Bin 3187 -> 3187 bytes
 src/filter/AdminFilter.java                   |   5 --
 src/javabean/Admin.java                       |   2 +-
 13 files changed, 31 insertions(+), 40 deletions(-)

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 ed2913a4f9ce78719c9149d1839f5ae98c03c719..d630d979c9d41107d023c6a211850cfc3cebc216 100644
GIT binary patch
delta 36
scmX@fzlx9R)W2Q(7#JAL7-BYZ&10SXi&dMEX|ozzAR{XS0~13u0O=wM9smFU

delta 160
zcmZ3*caop$)W2Q(7#J8#7!o#e&12<c$;`_vVPufkn0%f^Of)|)Ei>I(GmMdeJ<S=+
zVPud2$*@6WCNE>vWn|ubg*A{dD4KzZK?rCP3j-sAC<7;uWeUVhK+L!i%-{i%Y(Pl{
i22}=LASnisWZ+}q2l9Z*7-AS=fg~eC9FWJv5Dx&z>l*g}

diff --git a/build/classes/filter/CharacterEncodingFilter.class b/build/classes/filter/CharacterEncodingFilter.class
index 34a7450a15c11d0ed3f0360605b3ae12abfdc771..5da783cc5d395dfb298640f2d607e4e67dc33f02 100644
GIT binary patch
delta 17
Zcmey%`InR9)W2Q(7#JALHgbGr0RTx;2R#4)

delta 17
Zcmey%`InR9)W2Q(7#J8#HgbGr0RTx!2Ri@&

diff --git a/build/classes/filter/ManagerFilter.class b/build/classes/filter/ManagerFilter.class
index 34d3e6dedc8c34c60b0c380830f04ae27b29a1c7..74af0afae708928da47d1b19233a958c004a7c7a 100644
GIT binary patch
delta 17
ZcmbQuKbxQ9)W2Q(7#JALHgZg62LL?=1||Ri

delta 17
ZcmbQuKbxQ9)W2Q(7#J8#HgZg62LL?$1|$Fg

diff --git a/build/classes/javabean/Admin.class b/build/classes/javabean/Admin.class
index 13f2d1771c504571bc4c100480e3ec7e279090d6..fb8693a9dc8d622b99a8a0e39906528c89c54031 100644
GIT binary patch
delta 2544
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

delta 2568
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
RtKP?yK2|_1`M#1F{{`-|k|zKF

diff --git a/build/classes/javabean/Base.class b/build/classes/javabean/Base.class
index 82f1a14152b4589a5cb1c69f188d5284aec07370..a4f21b5a2169eba75b5a5e8614256f2e3c09946e 100644
GIT binary patch
delta 17
ZcmaDR`b?DL)W2Q(7#JALHgeqK0su#|2NnPT

delta 17
ZcmaDR`b?DL)W2Q(7#J8#HgeqK0su#;2NVDR

diff --git a/build/classes/javabean/Manager.class b/build/classes/javabean/Manager.class
index 0cfc7e6c229c71749c8838aa1e4f97a732a902ad..4b1ff7deef9d528fca6e93710267434b031af658 100644
GIT binary patch
delta 17
ZcmaFG{fe98)W2Q(7#JALHgY^-1pr412MGWG

delta 17
ZcmaFG{fe98)W2Q(7#J8#HgY^-1pr3?2L}KE

diff --git a/build/classes/servlet/admin/AdminLogin.class b/build/classes/servlet/admin/AdminLogin.class
index f100366b68c18a55ecef2c3dc0263af7413e8fad..b841b90bfbb0cf52c24d08e21dd99eef583e9c54 100644
GIT binary patch
delta 17
ZcmX>taaw}o)W2Q(7#JALHgY)g002XI22B6}

delta 17
ZcmX>taaw}o)W2Q(7#J8#HgY)g002X821@_{

diff --git a/build/classes/servlet/manager/ManagerLogin.class b/build/classes/servlet/manager/ManagerLogin.class
index 4adae0ec003b119420f3b5a7dd0ef4067792e01e..1576ab333425029e4aa05e0aefaf308a7ff57288 100644
GIT binary patch
delta 17
Zcmew?@mYf7)W2Q(7#JALHgaV1002nI2E_mX

delta 17
Zcmew?@mYf7)W2Q(7#J8#HgaV1002n82EzaV

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 "关闭失败";
 			}
 		}