From 15c31a48d35c64d00ad345db5bda1565aabee0c7 Mon Sep 17 00:00:00 2001
From: you <284908631@qq.com>
Date: Wed, 10 Jun 2020 09:54:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/admin/cardborrow.jsp  |  2 +-
 src/javabean/TestConnection.java | 48 --------------------------------
 src/servlet/admin/CardList.java  |  2 +-
 src/servlet/admin/SortList.java  |  2 +-
 4 files changed, 3 insertions(+), 51 deletions(-)
 delete mode 100644 src/javabean/TestConnection.java

diff --git a/WebContent/admin/cardborrow.jsp b/WebContent/admin/cardborrow.jsp
index ca00f39..3255d2e 100644
--- a/WebContent/admin/cardborrow.jsp
+++ b/WebContent/admin/cardborrow.jsp
@@ -1,6 +1,6 @@
 <%@page import="javabean.Util"%>
 <%@page import="java.sql.PreparedStatement"%>
-<%@page import="com.mysql.jdbc.Connection"%>
+<%@page import="java.sql.Connection"%>
 <%@page import="javabean.Base"%>
 <%@page import="java.sql.ResultSet"%>
 <%@page import="javabean.JDBCBean"%>
diff --git a/src/javabean/TestConnection.java b/src/javabean/TestConnection.java
deleted file mode 100644
index 5aaba76..0000000
--- a/src/javabean/TestConnection.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package javabean;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import java.sql.Connection;
-
-public class TestConnection {
-	public static void main(String[] args) throws ClassNotFoundException, SQLException {
-		// 获取rule
-		Connection connection = null;
-		PreparedStatement  pstmt = null;
-		ResultSet resultSet = null;
-		int result = 0;
-		String password = "1234";
-		String reader = "1234";
-		String rule_id = "1";
-		String status = "1";
-		connection = (Connection) Base.getConnection();
-		String sql = "insert into borrow_card(password, reader, rule_id, status) values(?,?,?,?)";
-		pstmt = connection.prepareStatement(sql);
-		pstmt.setString(1, password);
-		pstmt.setString(2, reader);
-		pstmt.setString(3, rule_id);
-		pstmt.setString(4, status);
-		result = pstmt.executeUpdate();
-		System.out.println(result);
-		//获取id
-		//connection1= (Connection) Base.getConnection();
-		String findIdSql = "select id from borrow_card where password=? and reader=? and rule_id=? and status=? limit 1";
-		pstmt = connection.prepareStatement(findIdSql);
-		pstmt.setString(1, password);
-		pstmt.setString(2, reader);
-		pstmt.setString(3, rule_id);
-		pstmt.setString(4, status);
-//		pstmt1 = connection.prepareStatement(findIdSql);
-//		pstmt1.setString(1, password);
-//		pstmt1.setString(2, reader);
-//		pstmt1.setString(3, rule_id);
-//		pstmt1.setString(4, status);
-		resultSet = pstmt.executeQuery();
-		while(resultSet.next()) {
-			System.out.println(resultSet.getString("id"));
-		}
-		
-	}
-}
diff --git a/src/servlet/admin/CardList.java b/src/servlet/admin/CardList.java
index 592094f..ad11013 100644
--- a/src/servlet/admin/CardList.java
+++ b/src/servlet/admin/CardList.java
@@ -25,7 +25,7 @@ import net.sf.json.JSONObject;
 public class CardList extends HttpServlet {
 	@Override
 	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-		resp.setContentType("application/json; charset:utf8");
+		resp.setContentType("application/json; charset=utf8");
 		// 接收参数
 		String limit = req.getParameter("limit");
 		String page = req.getParameter("page");
diff --git a/src/servlet/admin/SortList.java b/src/servlet/admin/SortList.java
index e0e014e..584930b 100644
--- a/src/servlet/admin/SortList.java
+++ b/src/servlet/admin/SortList.java
@@ -23,7 +23,7 @@ import net.sf.json.JSONObject;
 public class SortList extends HttpServlet {
 	@Override
 	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-		resp.setContentType("application/json; charset:utf8");
+		resp.setContentType("application/json; charset=utf8");
 		// 接受参数
 		
 		// 准备参数