添加过滤器前的结构修改

ffdy · ffdy · commit dd512c369332 · 2021-12-07T17:22:07.000+08:00
diff --git a/.idea/artifacts/JavaWeb_war_exploded.xml b/.idea/artifacts/JavaWeb_war_exploded.xml
diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml
diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_6.xml b/.idea/libraries/Maven__commons_io_commons_io_2_6.xml
diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_46.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_46.xml
diff --git a/JavaWeb.iml b/JavaWeb.iml
@@ -35,5 +35,8 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.7.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.46" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
   </component>
 </module>
diff --git a/src/main/java/cn/edu/swu/ffdy/JavaWeb/AddBookServlet.java b/src/main/java/cn/edu/swu/ffdy/JavaWeb/AddBookServlet.java
@@ -7,7 +7,7 @@
 import java.io.IOException;
 import java.sql.SQLException;
 
-@WebServlet("/addBook")
+@WebServlet("/admin/addBook")
 public class AddBookServlet extends HttpServlet {
 
 	private static final long serialVersionUID = 1139723442711986380L;
@@ -32,7 +32,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 		System.out.println(sql);
 		
 		try {
-			cn.edu.swu.ffdy.JavaWeb.DBUtils.insert(sql);
+			DBUtils.insert(sql);
 			response.sendRedirect("./listBook");
 		} catch (SQLException e) {
 			e.printStackTrace();
diff --git a/src/main/java/cn/edu/swu/ffdy/JavaWeb/DBUtils.java b/src/main/java/cn/edu/swu/ffdy/JavaWeb/DBUtils.java
@@ -11,18 +11,18 @@ public class DBUtils {
 	private static final String DB_PASS   = "123456";
 	
 	public static void insert(String sql) throws SQLException {
-		excute(sql);
+		execute(sql);
 	}
 	
 	public static void delete(String sql) throws SQLException {
-		excute(sql);
+		execute(sql);
 	}
 	
 	public static void update(String sql) throws SQLException {
-		excute(sql);
+		execute(sql);
 	}
 		
-	private static void excute(String sql) throws SQLException {
+	private static void execute(String sql) throws SQLException {
 		try {
 			Class.forName(DB_DRIVER);
 		} catch (ClassNotFoundException e) {
@@ -36,20 +36,20 @@ private static void excute(String sql) throws SQLException {
 		}
 	}
 	
-	public static List<cn.edu.swu.ffdy.JavaWeb.Book> getBooks(String sql) throws SQLException {
+	public static List<Book> getBooks(String sql) throws SQLException {
 		try {
 			Class.forName(DB_DRIVER);
 		} catch (ClassNotFoundException e) {
 			e.printStackTrace();
 		}
 		
-		List<cn.edu.swu.ffdy.JavaWeb.Book> books = new ArrayList<>();
+		List<Book> books = new ArrayList<>();
 		
 		try (Connection connection = DriverManager.getConnection(DB_URL, DB_USER, DB_PASS)) {
 			try (Statement statement = connection.createStatement()) {
 				ResultSet rs = statement.executeQuery(sql);				
 				while (rs.next()) {
-					cn.edu.swu.ffdy.JavaWeb.Book book = new cn.edu.swu.ffdy.JavaWeb.Book();
+					Book book = new cn.edu.swu.ffdy.JavaWeb.Book();
 					book.setId(rs.getInt("id"));
 					book.setName(rs.getString("name"));
 					book.setAuthor(rs.getString("author"));
diff --git a/src/main/java/cn/edu/swu/ffdy/JavaWeb/DeleteBookServlet.java b/src/main/java/cn/edu/swu/ffdy/JavaWeb/DeleteBookServlet.java
@@ -7,7 +7,7 @@
 import java.io.IOException;
 import java.sql.SQLException;
 
-@WebServlet("/deleteBook")
+@WebServlet("/admin/deleteBook")
 public class DeleteBookServlet extends HttpServlet {
 
 	private static final long serialVersionUID = 1198763442666686380L;
diff --git a/src/main/java/cn/edu/swu/ffdy/JavaWeb/EditBookServlet.java b/src/main/java/cn/edu/swu/ffdy/JavaWeb/EditBookServlet.java
@@ -9,7 +9,7 @@
 import java.sql.SQLException;
 import java.util.List;
 
-@WebServlet("/editBook")
+@WebServlet("/admin/editBook")
 public class EditBookServlet extends HttpServlet {
 
     private static final long serialVersionUID = 119876388866686380L;
diff --git a/src/main/java/cn/edu/swu/ffdy/JavaWeb/ListBookServlet.java b/src/main/java/cn/edu/swu/ffdy/JavaWeb/ListBookServlet.java
@@ -10,7 +10,7 @@
 import java.sql.SQLException;
 import java.util.List;
 
-@WebServlet("/listBook")
+@WebServlet("/admin/listBook")
 public class ListBookServlet extends HttpServlet {
 
 	private static final long serialVersionUID = 1198763442711986380L;
@@ -56,10 +56,10 @@ private String toHtmlTable(List<Book> books) {
 			sb.append("<td>").append(book.getPrice()).append("</td>");
 			sb.append("<td>").append(book.getDescribe()).append("</td>");
 			sb.append("<td>").append(
-					String.format("<a href='./editBook?id=%s'>修改</a>", book.getId())
+					String.format("<a href='./admin/editBook?id=%s'>修改</a>", book.getId())
 			).append("</td>");
 			sb.append("<td>").append(
-					String.format("<a href='./deleteBook?id=%s'>删除</a>", book.getId())
+					String.format("<a href='./admin/deleteBook?id=%s'>删除</a>", book.getId())
 			).append("</td>");			
 			sb.append("</tr>");
 		}		
diff --git a/src/main/java/cn/edu/swu/ffdy/JavaWeb/LoginServlet.java b/src/main/java/cn/edu/swu/ffdy/JavaWeb/LoginServlet.java
@@ -22,7 +22,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 
         if (user != null && pass != null) {
             if (user.equals("admin") && pass.equals("123456")) {
-                response.sendRedirect("./listBook");
+                response.sendRedirect("./admin/listBook");
             } else {
                 response.sendRedirect("./login.html");
             }
diff --git a/src/main/java/cn/edu/swu/ffdy/JavaWeb/PageUtils.java b/src/main/java/cn/edu/swu/ffdy/JavaWeb/PageUtils.java
@@ -30,9 +30,9 @@ public static String getAdminHeader() {
 			"<div style='text-align:center;padding:0.7em'><h1>西南大学网上书店</h1></div>" +
 			"<div style='text-align:center;padding:0.7em'>" +
 			"	<span class='menu'><a href='./index.html'>首 页</a></span>" +
-			"	<span class='menu'><a href='./add.html'>添 加</a></span>" +
-			"	<span class='menu'><a href='./listBook'>管理</a></span>" +
-			"	<span class='menu'><a href='./login'>登录</a></span>" +
+			"	<span class='menu'><a href='./admin/add.html'>添 加</a></span>" +
+			"	<span class='menu'><a href='./admin/listBook'>管理</a></span>" +
+			"	<span class='menu'><a href='./login.html'>登录</a></span>" +
 			"</div>";
 	}
 	
diff --git a/src/main/java/cn/edu/swu/ffdy/JavaWeb/SearchBookServlet.java b/src/main/java/cn/edu/swu/ffdy/JavaWeb/SearchBookServlet.java
@@ -9,7 +9,7 @@
 import java.sql.SQLException;
 import java.util.List;
 
-@WebServlet("/")
+@WebServlet("/index.html")
 public class SearchBookServlet extends HttpServlet {
 
     private static final long serialVersionUID = 1198763442711986380L;
diff --git a/src/main/java/cn/edu/swu/ffdy/JavaWeb/UpdateBookServlet.java b/src/main/java/cn/edu/swu/ffdy/JavaWeb/UpdateBookServlet.java
@@ -7,7 +7,7 @@
 import java.io.IOException;
 import java.sql.SQLException;
 
-@WebServlet("/updateBook")
+@WebServlet("/admin/updateBook")
 public class UpdateBookServlet extends HttpServlet {
 
     private static final long serialVersionUID = 119833388866686380L;
@@ -34,7 +34,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
         System.out.println(sql);
 
         try {
-            cn.edu.swu.ffdy.JavaWeb.DBUtils.update(sql);
+            DBUtils.update(sql);
             response.sendRedirect("./listBook");
         } catch (SQLException e) {
             e.printStackTrace();
diff --git a/src/main/webapp/__index.html b/src/main/webapp/__index.html
diff --git a/src/main/webapp/admin/add.html b/src/main/webapp/admin/add.html
@@ -10,9 +10,9 @@
 <div style='text-align:center;padding:0.7em'><h1>西南大学网上书店</h1></div>
 <div style='text-align:center;padding:0.7em'>
 	<span class='menu'><a href='./index.html'>首 页</a></span>
-	<span class='menu'><a href='./add.html'>添 加</a></span>
+	<span class='menu'><a href='./admin/add.html'>添 加</a></span>
 	<span class='menu'><a href='./listBook'>管理</a></span>
-	<span class='menu'><a href='./login'>登录</a></span>
+	<span class='menu'><a href='./login.html'>登录</a></span>
 </div>
 <center>
 <br>
