diff --git a/WebContent/admin/index.jsp b/WebContent/admin/index.jsp index 5f3f2e1..e6499e6 100644 --- a/WebContent/admin/index.jsp +++ b/WebContent/admin/index.jsp @@ -34,7 +34,7 @@
修改密码
-
  • 注销
  • +
  • 退出
  • diff --git a/WebContent/manager/05returnSus.jsp b/WebContent/manager/05returnSus.jsp index c87a7f0..a336d80 100644 --- a/WebContent/manager/05returnSus.jsp +++ b/WebContent/manager/05returnSus.jsp @@ -27,15 +27,15 @@ //String id = session.getAttribute("manager").toString(); int status=Integer.parseInt(rs2.getString("STATUS")); if(status==0){ - String sql = "update borrow_books set RETURN_DATE='" + date1 + "',ILLEGAL='" + ill + "',MANAGER_ID='" + managerid + "' where BOOK_ID="+ book; + String sql = "update borrow_books set RETURN_DATE='" + date1 + "',ILLEGAL='" + ill + "',MANAGER_ID='" + managerid + "' where manager_id is null and BOOK_ID="+ book; //out.println(sql); try { int i = ret.executeUpdate(sql); - String sql1 = "update borrow_books set RETURN_DATE='" + date1 + "',ILLEGAL='" + ill + "',MANAGER_ID='" + managerid + "' order by BORROW_DATE desc limit 1 "; - int k = ret.executeUpdate(sql1); + //String sql1 = "update borrow_books set RETURN_DATE='" + date1 + "',ILLEGAL='" + ill + "',MANAGER_ID='" + managerid + "' order by BORROW_DATE desc limit 1 "; + //int k = ret.executeUpdate(sql1); String sql3="update books set STATUS=1 where ID="+book; ret.executeUpdate(sql3); diff --git a/WebContent/WEB-INF/web.xml b/WebContent/web.xml similarity index 100% rename from WebContent/WEB-INF/web.xml rename to WebContent/web.xml diff --git a/build/classes/javabean/Base.class b/build/classes/javabean/Base.class index 53ec998..82f1a14 100644 Binary files a/build/classes/javabean/Base.class and b/build/classes/javabean/Base.class differ diff --git a/src/javabean/Base.java b/src/javabean/Base.java index d815e50..ca85126 100644 --- a/src/javabean/Base.java +++ b/src/javabean/Base.java @@ -7,7 +7,7 @@ import java.sql.ResultSet; import java.sql.SQLException; public class Base { - private static String driver = "com.mysql.jdbc.Driver"; + private static String driver = "com.mysql.cj.jdbc.Driver"; private static String url = "jdbc:mysql://localhost:3306/library?&useSSL=false&serverTimezone=UTC&userUnicode=true&characterEncoding=UTF-8"; private static String username = "root"; private static String password = "root"; diff --git a/src/javabean/JDBCBean.java b/src/javabean/JDBCBean.java index c8147e3..bb20bb4 100644 --- a/src/javabean/JDBCBean.java +++ b/src/javabean/JDBCBean.java @@ -6,7 +6,7 @@ import java.sql.ResultSet; import java.sql.Statement; public class JDBCBean { - private static String driver = "com.mysql.jdbc.Driver"; + private static String driver = "com.mysql.cj.jdbc.Driver"; private static String url = "jdbc:mysql://localhost:3306/library?&useSSL=false&serverTimezone=UTC&userUnicode=true&characterEncoding=UTF-8"; private static String username = "root"; private static String password = "root";