diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..73f69e0 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/artifacts/BookStore_war_exploded.xml b/.idea/artifacts/BookStore_war_exploded.xml new file mode 100644 index 0000000..2caac02 --- /dev/null +++ b/.idea/artifacts/BookStore_war_exploded.xml @@ -0,0 +1,19 @@ + + + $PROJECT_DIR$/out/artifacts/BookStore_war_exploded + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..6d8af17 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,14 @@ + + + + + mysql.8 + true + com.mysql.cj.jdbc.Driver + jdbc:mysql://localhost:3306/book + + + + + + \ No newline at end of file diff --git a/.idea/libraries/commons_beanutils_1_8_0.xml b/.idea/libraries/commons_beanutils_1_8_0.xml new file mode 100644 index 0000000..91059f5 --- /dev/null +++ b/.idea/libraries/commons_beanutils_1_8_0.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/commons_dbutils_1_3.xml b/.idea/libraries/commons_dbutils_1_3.xml new file mode 100644 index 0000000..bf0344d --- /dev/null +++ b/.idea/libraries/commons_dbutils_1_3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/jquery_3_1_1.xml b/.idea/libraries/jquery_3_1_1.xml new file mode 100644 index 0000000..d397c94 --- /dev/null +++ b/.idea/libraries/jquery_3_1_1.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/servlet_api.xml b/.idea/libraries/servlet_api.xml new file mode 100644 index 0000000..46cc7a0 --- /dev/null +++ b/.idea/libraries/servlet_api.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..0548357 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..480df03 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/BookStore.iml b/BookStore.iml index 08d40c3..e9f8594 100644 --- a/BookStore.iml +++ b/BookStore.iml @@ -19,10 +19,10 @@ - - - + - + + + \ No newline at end of file diff --git a/RentBook.iml b/RentBook.iml deleted file mode 100644 index 08d40c3..0000000 --- a/RentBook.iml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/bean/Book.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/bean/Book.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/bean/Book.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/bean/Book.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/bean/Cart.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/bean/Cart.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/bean/Cart.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/bean/Cart.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/bean/CartItem.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/bean/CartItem.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/bean/CartItem.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/bean/CartItem.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/bean/Order.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/bean/Order.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/bean/Order.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/bean/Order.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/bean/OrderItem.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/bean/OrderItem.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/bean/OrderItem.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/bean/OrderItem.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/bean/Page.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/bean/Page.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/bean/Page.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/bean/Page.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/bean/User.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/bean/User.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/bean/User.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/bean/User.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/dao/BookDao.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/dao/BookDao.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/dao/BookDao.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/dao/BookDao.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/dao/OrderDao.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/dao/OrderDao.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/dao/OrderDao.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/dao/OrderDao.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/dao/OrderItemDao.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/dao/OrderItemDao.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/dao/OrderItemDao.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/dao/OrderItemDao.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/dao/UserDao.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/dao/UserDao.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/dao/UserDao.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/dao/UserDao.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/dao/impl/BaseDao.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/dao/impl/BaseDao.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/dao/impl/BaseDao.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/dao/impl/BaseDao.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/dao/impl/BookDaoImpl.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/dao/impl/BookDaoImpl.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/dao/impl/BookDaoImpl.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/dao/impl/BookDaoImpl.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/dao/impl/OrderDaoImpl.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/dao/impl/OrderDaoImpl.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/dao/impl/OrderDaoImpl.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/dao/impl/OrderDaoImpl.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/dao/impl/OrderItemDaoImpl.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/dao/impl/OrderItemDaoImpl.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/dao/impl/OrderItemDaoImpl.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/dao/impl/OrderItemDaoImpl.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/dao/impl/UserDaoImpl.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/dao/impl/UserDaoImpl.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/dao/impl/UserDaoImpl.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/dao/impl/UserDaoImpl.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/filter/ManagerFilter.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/filter/ManagerFilter.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/filter/ManagerFilter.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/filter/ManagerFilter.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/filter/TransactionFilter.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/filter/TransactionFilter.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/filter/TransactionFilter.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/filter/TransactionFilter.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/service/BookService.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/service/BookService.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/service/BookService.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/service/BookService.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/service/OrderService.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/service/OrderService.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/service/OrderService.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/service/OrderService.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/service/UserService.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/service/UserService.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/service/UserService.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/service/UserService.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/service/impl/BookServiceImpl.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/service/impl/BookServiceImpl.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/service/impl/BookServiceImpl.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/service/impl/BookServiceImpl.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/service/impl/OrderServiceImpl.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/service/impl/OrderServiceImpl.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/service/impl/OrderServiceImpl.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/service/impl/OrderServiceImpl.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/service/impl/UserServiceImpl.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/service/impl/UserServiceImpl.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/service/impl/UserServiceImpl.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/service/impl/UserServiceImpl.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/BookDaoTest.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/BookDaoTest.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/BookDaoTest.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/BookDaoTest.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/BookServiceTest.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/BookServiceTest.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/BookServiceTest.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/BookServiceTest.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/CartTest.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/CartTest.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/CartTest.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/CartTest.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/JDBCUtilsTest.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/JDBCUtilsTest.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/JDBCUtilsTest.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/JDBCUtilsTest.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/OrderDaoTest.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/OrderDaoTest.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/OrderDaoTest.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/OrderDaoTest.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/OrderItemDaoTest.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/OrderItemDaoTest.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/OrderItemDaoTest.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/OrderItemDaoTest.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/OrderServiceTest.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/OrderServiceTest.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/OrderServiceTest.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/OrderServiceTest.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/UserDaoTest.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/UserDaoTest.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/UserDaoTest.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/UserDaoTest.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/UserServiceImplTest.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/UserServiceImplTest.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/UserServiceImplTest.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/UserServiceImplTest.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/UserServiceTest.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/UserServiceTest.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/test/UserServiceTest.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/test/UserServiceTest.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/utils/JDBCUtils.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/utils/JDBCUtils.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/utils/JDBCUtils.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/utils/JDBCUtils.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/utils/PaymentUtil.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/utils/PaymentUtil.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/utils/PaymentUtil.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/utils/PaymentUtil.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/utils/WebUtils.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/utils/WebUtils.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/utils/WebUtils.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/utils/WebUtils.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/web/BaseServlet.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/web/BaseServlet.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/web/BaseServlet.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/web/BaseServlet.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/web/BookServlet.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/web/BookServlet.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/web/BookServlet.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/web/BookServlet.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/web/CartServlet.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/web/CartServlet.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/web/CartServlet.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/web/CartServlet.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/web/ClientBookServlet.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/web/ClientBookServlet.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/web/ClientBookServlet.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/web/ClientBookServlet.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/web/ClientOrderServlet.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/web/ClientOrderServlet.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/web/ClientOrderServlet.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/web/ClientOrderServlet.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/web/ManagerOrderServlet.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/web/ManagerOrderServlet.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/web/ManagerOrderServlet.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/web/ManagerOrderServlet.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/web/ManagerUserServlet.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/web/ManagerUserServlet.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/web/ManagerUserServlet.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/web/ManagerUserServlet.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/web/PayServlet.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/web/PayServlet.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/web/PayServlet.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/web/PayServlet.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/web/UserServlet.class b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/web/UserServlet.class similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/com/yj/web/UserServlet.class rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/com/yj/web/UserServlet.class diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/classes/jdbc.properties b/out/artifacts/BookStore_war_exploded/WEB-INF/classes/jdbc.properties similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/classes/jdbc.properties rename to out/artifacts/BookStore_war_exploded/WEB-INF/classes/jdbc.properties diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/lib/commons-beanutils-1.8.0.jar b/out/artifacts/BookStore_war_exploded/WEB-INF/lib/commons-beanutils-1.8.0.jar similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/lib/commons-beanutils-1.8.0.jar rename to out/artifacts/BookStore_war_exploded/WEB-INF/lib/commons-beanutils-1.8.0.jar diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/lib/commons-dbutils-1.3.jar b/out/artifacts/BookStore_war_exploded/WEB-INF/lib/commons-dbutils-1.3.jar similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/lib/commons-dbutils-1.3.jar rename to out/artifacts/BookStore_war_exploded/WEB-INF/lib/commons-dbutils-1.3.jar diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/lib/commons-logging-1.1.1.jar b/out/artifacts/BookStore_war_exploded/WEB-INF/lib/commons-logging-1.1.1.jar similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/lib/commons-logging-1.1.1.jar rename to out/artifacts/BookStore_war_exploded/WEB-INF/lib/commons-logging-1.1.1.jar diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/lib/druid-1.1.9.jar b/out/artifacts/BookStore_war_exploded/WEB-INF/lib/druid-1.1.9.jar similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/lib/druid-1.1.9.jar rename to out/artifacts/BookStore_war_exploded/WEB-INF/lib/druid-1.1.9.jar diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/lib/gson-2.2.4.jar b/out/artifacts/BookStore_war_exploded/WEB-INF/lib/gson-2.2.4.jar similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/lib/gson-2.2.4.jar rename to out/artifacts/BookStore_war_exploded/WEB-INF/lib/gson-2.2.4.jar diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/lib/hamcrest-core-1.3.jar b/out/artifacts/BookStore_war_exploded/WEB-INF/lib/hamcrest-core-1.3.jar similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/lib/hamcrest-core-1.3.jar rename to out/artifacts/BookStore_war_exploded/WEB-INF/lib/hamcrest-core-1.3.jar diff --git a/out/artifacts/BookStore_war_exploded/WEB-INF/lib/jquery-3.1.1.jar b/out/artifacts/BookStore_war_exploded/WEB-INF/lib/jquery-3.1.1.jar new file mode 100644 index 0000000..bbdff45 Binary files /dev/null and b/out/artifacts/BookStore_war_exploded/WEB-INF/lib/jquery-3.1.1.jar differ diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/lib/junit-4.12.jar b/out/artifacts/BookStore_war_exploded/WEB-INF/lib/junit-4.12.jar similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/lib/junit-4.12.jar rename to out/artifacts/BookStore_war_exploded/WEB-INF/lib/junit-4.12.jar diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/lib/kaptcha-2.3.2.jar b/out/artifacts/BookStore_war_exploded/WEB-INF/lib/kaptcha-2.3.2.jar similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/lib/kaptcha-2.3.2.jar rename to out/artifacts/BookStore_war_exploded/WEB-INF/lib/kaptcha-2.3.2.jar diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/lib/mysql-connector-java-5.1.7-bin.jar b/out/artifacts/BookStore_war_exploded/WEB-INF/lib/mysql-connector-java-5.1.7-bin.jar similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/lib/mysql-connector-java-5.1.7-bin.jar rename to out/artifacts/BookStore_war_exploded/WEB-INF/lib/mysql-connector-java-5.1.7-bin.jar diff --git a/out/artifacts/BookStore_war_exploded/WEB-INF/lib/servlet-api.jar b/out/artifacts/BookStore_war_exploded/WEB-INF/lib/servlet-api.jar new file mode 100644 index 0000000..c0016bc Binary files /dev/null and b/out/artifacts/BookStore_war_exploded/WEB-INF/lib/servlet-api.jar differ diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/lib/taglibs-standard-impl-1.2.1.jar b/out/artifacts/BookStore_war_exploded/WEB-INF/lib/taglibs-standard-impl-1.2.1.jar similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/lib/taglibs-standard-impl-1.2.1.jar rename to out/artifacts/BookStore_war_exploded/WEB-INF/lib/taglibs-standard-impl-1.2.1.jar diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/lib/taglibs-standard-spec-1.2.1.jar b/out/artifacts/BookStore_war_exploded/WEB-INF/lib/taglibs-standard-spec-1.2.1.jar similarity index 100% rename from out/artifacts/RentBook_war_exploded/WEB-INF/lib/taglibs-standard-spec-1.2.1.jar rename to out/artifacts/BookStore_war_exploded/WEB-INF/lib/taglibs-standard-spec-1.2.1.jar diff --git a/out/artifacts/RentBook_war_exploded/WEB-INF/web.xml b/out/artifacts/BookStore_war_exploded/WEB-INF/web.xml similarity index 95% rename from out/artifacts/RentBook_war_exploded/WEB-INF/web.xml rename to out/artifacts/BookStore_war_exploded/WEB-INF/web.xml index 751c21e..2de2194 100644 --- a/out/artifacts/RentBook_war_exploded/WEB-INF/web.xml +++ b/out/artifacts/BookStore_war_exploded/WEB-INF/web.xml @@ -112,12 +112,12 @@ /pages/error/error404.jsp - - + + <!– location标签表示要跳转去的页面路径–> /pages/error/error500.jsp - + --> \ No newline at end of file diff --git a/out/artifacts/RentBook_war_exploded/index.jsp b/out/artifacts/BookStore_war_exploded/index.jsp similarity index 100% rename from out/artifacts/RentBook_war_exploded/index.jsp rename to out/artifacts/BookStore_war_exploded/index.jsp diff --git a/out/artifacts/RentBook_war_exploded/pages/cart/cart.jsp b/out/artifacts/BookStore_war_exploded/pages/cart/cart.jsp similarity index 100% rename from out/artifacts/RentBook_war_exploded/pages/cart/cart.jsp rename to out/artifacts/BookStore_war_exploded/pages/cart/cart.jsp diff --git a/out/artifacts/RentBook_war_exploded/pages/cart/checkout.jsp b/out/artifacts/BookStore_war_exploded/pages/cart/checkout.jsp similarity index 100% rename from out/artifacts/RentBook_war_exploded/pages/cart/checkout.jsp rename to out/artifacts/BookStore_war_exploded/pages/cart/checkout.jsp diff --git a/out/artifacts/RentBook_war_exploded/pages/cart/pay.jsp b/out/artifacts/BookStore_war_exploded/pages/cart/pay.jsp similarity index 100% rename from out/artifacts/RentBook_war_exploded/pages/cart/pay.jsp rename to out/artifacts/BookStore_war_exploded/pages/cart/pay.jsp diff --git a/out/artifacts/RentBook_war_exploded/pages/client/index.jsp b/out/artifacts/BookStore_war_exploded/pages/client/index.jsp similarity index 100% rename from out/artifacts/RentBook_war_exploded/pages/client/index.jsp rename to out/artifacts/BookStore_war_exploded/pages/client/index.jsp diff --git a/out/artifacts/RentBook_war_exploded/pages/client/top.jsp b/out/artifacts/BookStore_war_exploded/pages/client/top.jsp similarity index 100% rename from out/artifacts/RentBook_war_exploded/pages/client/top.jsp rename to out/artifacts/BookStore_war_exploded/pages/client/top.jsp diff --git a/out/artifacts/RentBook_war_exploded/pages/common/footer.jsp b/out/artifacts/BookStore_war_exploded/pages/common/footer.jsp similarity index 100% rename from out/artifacts/RentBook_war_exploded/pages/common/footer.jsp rename to out/artifacts/BookStore_war_exploded/pages/common/footer.jsp diff --git a/out/artifacts/RentBook_war_exploded/pages/common/header.jsp b/out/artifacts/BookStore_war_exploded/pages/common/header.jsp similarity index 100% rename from out/artifacts/RentBook_war_exploded/pages/common/header.jsp rename to out/artifacts/BookStore_war_exploded/pages/common/header.jsp diff --git a/out/artifacts/RentBook_war_exploded/pages/common/login_success_menu.jsp b/out/artifacts/BookStore_war_exploded/pages/common/login_success_menu.jsp similarity index 100% rename from out/artifacts/RentBook_war_exploded/pages/common/login_success_menu.jsp rename to out/artifacts/BookStore_war_exploded/pages/common/login_success_menu.jsp diff --git a/out/artifacts/RentBook_war_exploded/pages/common/manager_menu.jsp b/out/artifacts/BookStore_war_exploded/pages/common/manager_menu.jsp similarity index 90% rename from out/artifacts/RentBook_war_exploded/pages/common/manager_menu.jsp rename to out/artifacts/BookStore_war_exploded/pages/common/manager_menu.jsp index 7836be6..9a709e6 100644 --- a/out/artifacts/RentBook_war_exploded/pages/common/manager_menu.jsp +++ b/out/artifacts/BookStore_war_exploded/pages/common/manager_menu.jsp @@ -11,6 +11,5 @@ 订单管理 用户管理 总账单 - 返回书店 - + 返回书店 \ No newline at end of file diff --git a/out/artifacts/RentBook_war_exploded/pages/common/page_nav.jsp b/out/artifacts/BookStore_war_exploded/pages/common/page_nav.jsp similarity index 99% rename from out/artifacts/RentBook_war_exploded/pages/common/page_nav.jsp rename to out/artifacts/BookStore_war_exploded/pages/common/page_nav.jsp index 7442dd8..b719bb4 100644 --- a/out/artifacts/RentBook_war_exploded/pages/common/page_nav.jsp +++ b/out/artifacts/BookStore_war_exploded/pages/common/page_nav.jsp @@ -7,9 +7,7 @@ --%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> - \ No newline at end of file diff --git a/web/pages/common/page_nav.jsp b/web/pages/common/page_nav.jsp index 7442dd8..b719bb4 100644 --- a/web/pages/common/page_nav.jsp +++ b/web/pages/common/page_nav.jsp @@ -7,9 +7,7 @@ --%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> -