fix bug

mabecyy · May 30, 2018 · 7751973 · 7751973
1 parent 93a93db
commit 7751973
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 33 deletions.
diff --git a/src/main/java/com/lesson/controller/OrderEntryControllor.java b/src/main/java/com/lesson/controller/OrderEntryControllor.java
@@ -16,10 +16,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 
 @Controller
-@RequestMapping("/order")
 public class OrderEntryControllor {
     @Autowired
     MenuManager menuManager;
@@ -185,13 +185,14 @@ public String saveMenu(Model model,
     @RequestMapping(value = "/delete/{mid}", method = RequestMethod.GET) //按照ID展示
     public String deleteMenu(Model model,
                              @PathVariable int mid,
-                             HttpServletRequest request) {
+                             HttpServletRequest request,
+                             HttpServletResponse response) {
         menuManager.deleteMenuByMid(mid); //删除对应menu
 
         HttpSession session = request.getSession();
         model.addAttribute("menus", menuManager.getAllMenus());
         session.setAttribute("categoryManager", categoryManager);
-//        return "jsp/menuList.jsp";
+
         return "/showMenus";
     }
 

diff --git a/src/main/sql/order.sql b/src/main/sql/order.sql
@@ -1,4 +1,4 @@
-CREATE DATABASE  IF NOT EXISTS `order` /*!40100 DEFAULT CHARACTER SET utf8 */;
+CREATE DATABASE  IF NOT EXISTS `order`
 USE `order`;
 
 DROP TABLE IF EXISTS `categories`;

diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
@@ -1,4 +1,4 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="UTF-8"%>
 <html>
-<jsp:forward page="order/showMenus"></jsp:forward>
+<jsp:forward page="/showMenus"></jsp:forward>
 </html>
diff --git a/src/main/webapp/jsp/categoryAdd.jsp b/src/main/webapp/jsp/categoryAdd.jsp
@@ -12,7 +12,7 @@
 
 <body>
 	<h2>添加菜品分类</h2>
-	<form action="/order/saveCategory" method = "post">
+	<form action="/saveCategory" method = "post">
 		<table border="1" cellspacing="0" cellpadding="5">
 			<tr>
 				<th>菜品分类名称</th>
@@ -27,7 +27,7 @@
 		<br>
 		<input type = "submit" value = "添加"/>
 		&nbsp;
-		<input type = "button" value = "取消" onclick="window.location.href='/order/showCategories'"/>
+		<input type = "button" value = "取消" onclick="window.location.href='/showCategories'"/>
 	</form>
 
 </body>

diff --git a/src/main/webapp/jsp/categoryEdit.jsp b/src/main/webapp/jsp/categoryEdit.jsp
@@ -13,7 +13,7 @@
 <body>
 	<h2>编辑菜品分类</h2>
 
-	<form action="/order/saveCategory" method = "post">
+	<form action="/saveCategory" method = "post">
 		<table border="1" cellspacing="0" cellpadding="5">
 			<tr>
 				<th>菜品分类ID</th>
@@ -27,7 +27,7 @@
 		<br>
 		<input type = "submit" value = "提交修改"/>
 		&nbsp;
-		<input type = "button" value = "取消" onclick="window.location.href='/order/showCategories'"/>
+		<input type = "button" value = "取消" onclick="window.location.href='/showCategories'"/>
 	</form>
 
 </body>

diff --git a/src/main/webapp/jsp/categoryList_blank.jsp b/src/main/webapp/jsp/categoryList_blank.jsp
@@ -49,9 +49,9 @@
 		onload=initAd;
 	</script>
 	<h2>菜品分类</h2>
-	<input type = "button" value = "添加菜品分类" onclick="window.location.href='/order/addCategory'">
+	<input type = "button" value = "添加菜品分类" onclick="window.location.href='/addCategory'">
 	&nbsp;|&nbsp;
-	<input type = "button" value = "返回主菜单" onclick="window.location.href='/order/showMenus'">
+	<input type = "button" value = "返回主菜单" onclick="window.location.href='/showMenus'">
 	<%
 		if(errMsg != null && !errMsg.equalsIgnoreCase("")){
 			out.println("<div id='sponsorAdDiv'><br><font color=red>" + errMsg + "</font></div>");
@@ -71,8 +71,8 @@
 				<td align="center">${category.cid}</td>
 				<td>${category.cname}</td>
 				<td>
-					<input type = "button" value = "删除" onclick="javascript:if(confirm('确认删除${category.cname}?'))window.location.href='/order/deleteCategory/${category.cid}'">
-					<input type = "button" value = "更新" onclick="window.location.href='/order/editCategory/${category.cid}'">
+					<input type = "button" value = "删除" onclick="javascript:if(confirm('确认删除${category.cname}?'))window.location.href='/deleteCategory/${category.cid}'">
+					<input type = "button" value = "更新" onclick="window.location.href='/editCategory/${category.cid}'">
 				</td>
 			</tr>
 		</c:forEach>

diff --git a/src/main/webapp/jsp/common/leftTree.jsp b/src/main/webapp/jsp/common/leftTree.jsp
@@ -11,19 +11,19 @@
 
 <div class="sidebar-shortcuts" id="sidebar-shortcuts">
     <div class="sidebar-shortcuts-large" id="sidebar-shortcuts-large">
-        <button class="btn btn-success" onclick="window.location.href='/order/showMenus'">
+        <button class="btn btn-success" onclick="window.location.href='/showMenus'">
             <i class="icon-signal"></i>
         </button>
 
-        <button class="btn btn-info" onclick="window.location.href='/order/addMenu'">
+        <button class="btn btn-info" onclick="window.location.href='/addMenu'">
             <i class="icon-pencil"></i>
         </button>
 
-        <button class="btn btn-warning" onclick="window.location.href='/order/showCategories'">
+        <button class="btn btn-warning" onclick="window.location.href='/showCategories'">
             <i class="icon-group"></i>
         </button>
 
-        <button class="btn btn-danger" onclick="window.location.href='/order/showMenus'">
+        <button class="btn btn-danger" onclick="window.location.href='/showMenus'">
             <i class="icon-cogs"></i>
         </button>
     </div>
@@ -41,7 +41,7 @@
 <!-- #sidebar-shortcuts -->
 <ul class="nav nav-list">
     <li <%if ("menuList".equalsIgnoreCase(_currentMenu)) {%> class='active'  <%}%>>
-        <a href="/order/showMenus">
+        <a href="/showMenus">
             <i class="icon-dashboard"></i>
             <span class="menu-text"> 主菜单</span>
         </a>
@@ -55,17 +55,17 @@
 
         <ul class="submenu">
             <li <%if ("addMenu".equalsIgnoreCase(_currentMenu)) {%> class='active'  <%}%>>
-                <a href="/order/addMenu">
+                <a href="/addMenu">
                     <i class="icon-double-angle-right"></i>添加菜品
                 </a>
             </li>
             <li <%if ("cateList".equalsIgnoreCase(_currentMenu)) {%> class='active'  <%}%>>
-                <a href="/order/showCategories">
+                <a href="/showCategories">
                     <i class="icon-double-angle-right"></i>查看菜品分类
                 </a>
             </li>
             <li>
-                <a href="">
+                <a href="/addCategory">
                     <i class="icon-double-angle-right"></i>添加菜品分类
                 </a>
             </li>

diff --git a/src/main/webapp/jsp/menuAdd.jsp b/src/main/webapp/jsp/menuAdd.jsp
@@ -69,7 +69,7 @@
 					<div class="page-header">
 					</div>
 						<div class="col-xs-12">
-							<form class="form-horizontal" role="form" action="/order/saveMenu" method = "post">
+							<form class="form-horizontal" role="form" action="/saveMenu" method = "post">
 								<div class="form-group">
 									<label class="col-sm-3 control-label no-padding-right" for="form-field-2"> 菜品名称 </label>
 

diff --git a/src/main/webapp/jsp/menuAdd_blank.jsp b/src/main/webapp/jsp/menuAdd_blank.jsp
@@ -18,7 +18,7 @@
 
 <body>
 	<h2>添加菜品</h2>
-	<form action="/order/saveMenu" method = "post">
+	<form action="/saveMenu" method = "post">
 		<table border="1" cellspacing="0" cellpadding="5">
 			<tr>
 				<th>菜品名称</th>
@@ -50,7 +50,7 @@
 		<br>
 		<input type = "submit" value = "添加"/>
 		&nbsp;
-		<input type = "button" value = "取消" onclick="window.location.href='/order/showMenus'"/>
+		<input type = "button" value = "取消" onclick="window.location.href='/showMenus'"/>
 	</form>
 
 </body>

diff --git a/src/main/webapp/jsp/menuEdit.jsp b/src/main/webapp/jsp/menuEdit.jsp
@@ -19,7 +19,7 @@
 <body>
 	<h2>编辑菜品详情</h2>
 
-	<form action="/order/saveMenu" method = "post">
+	<form action="/saveMenu" method = "post">
 		<table border="1" cellspacing="0" cellpadding="5">
 			<tr>
 				<th>菜品ID</th>
@@ -58,7 +58,7 @@
 		<br>
 		<input type = "submit" value = "提交修改"/>
 		&nbsp;
-		<input type = "button" value = "取消" onclick="window.location.href='/order/showMenus'"/>
+		<input type = "button" value = "取消" onclick="window.location.href='/showMenus'"/>
 	</form>
 
 </body>

diff --git a/src/main/webapp/jsp/menuList.jsp b/src/main/webapp/jsp/menuList.jsp
@@ -156,7 +156,7 @@
 								<td align="center">${menu.price}</td>
 								<td>
 									<input type = "button" value = "删除" onclick="javascript:if(confirm('确认删除${menu.mname}'))window.location.href='/delete/${menu.mid}'">
-									<input type = "button" value = "更新" onclick="window.location.href='/order/editMenu/${menu.mid}'">
+									<input type = "button" value = "更新" onclick="window.location.href='/editMenu/${menu.mid}'">
 								</td>
 							</tr>
 						</c:forEach>

diff --git a/src/main/webapp/jsp/menuList_blank.jsp b/src/main/webapp/jsp/menuList_blank.jsp
@@ -26,7 +26,7 @@
 	//如果ckUseCookie = on 并且当前的 currentCid 为空 则尝试提交相应的请求
 	if(ckUseCookie != null && ckUseCookie.getValue().equalsIgnoreCase("on") && currentCid == null){
 %>
-		<jsp:forward page="/order/showMenus">
+		<jsp:forward page="/showMenus">
 			<jsp:param name="useCookie" value="<%=ckUseCookie.getValue()%>"></jsp:param>
 			<jsp:param name="cid" value="<%=ckCid.getValue()%>"></jsp:param>
 		</jsp:forward>
@@ -41,7 +41,7 @@
 
 <body>
 	<h2>当前菜单</h2>
-	<form action = "/order/showMenus" method = "post">
+	<form action = "/showMenus" method = "post">
 		<b>查询：</b>
 		<select name="cid">
 			<option value="all"
@@ -66,9 +66,9 @@
 		</select>
 		<input type = "submit", value = "提交查询"/>
 		&nbsp;|&nbsp;
-		<input type = "button" value = "添加菜品" onclick="window.location.href='/order/addMenu'">
+		<input type = "button" value = "添加菜品" onclick="window.location.href='/addMenu'">
 		&nbsp;|&nbsp;
-		<input type = "button" value = "管理分类" onclick="window.location.href='/order/showCategories'">
+		<input type = "button" value = "管理分类" onclick="window.location.href='/showCategories'">
 		&nbsp;|&nbsp;
 		<input type = "checkbox" name = "useCookie"
 		<%
@@ -101,8 +101,8 @@
 				</td>
 				<td align="center">${menu.price}</td>
 				<td>
-					<input type = "button" value = "删除" onclick="javascript:if(confirm('确认删除${menu.mname}'))window.location.href='/order/delete/${menu.mid}'">
-					<input type = "button" value = "更新" onclick="window.location.href='/order/editMenu/${menu.mid}'">
+					<input type = "button" value = "删除" onclick="javascript:if(confirm('确认删除${menu.mname}'))window.location.href='/delete/${menu.mid}'">
+					<input type = "button" value = "更新" onclick="window.location.href='/editMenu/${menu.mid}'">
 				</td>
 			</tr>
 		</c:forEach>