From 8fce4d61217f49437dbd877779c689879cf34e66 Mon Sep 17 00:00:00 2001
From: megagao <megagao@126.com>
Date: Wed, 28 Sep 2016 13:08:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../production_ms/controller/CustomController.java    | 11 ++++++++++-
 src/main/webapp/WEB-INF/js/common.js                  |  2 +-
 src/main/webapp/WEB-INF/jsp/home.jsp                  |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/hqu/production_ms/controller/CustomController.java b/src/main/java/org/hqu/production_ms/controller/CustomController.java
index c074629..6f6aa9c 100644
--- a/src/main/java/org/hqu/production_ms/controller/CustomController.java
+++ b/src/main/java/org/hqu/production_ms/controller/CustomController.java
@@ -1,5 +1,7 @@
 package org.hqu.production_ms.controller;
 
+import java.util.List;
+
 import org.hqu.production_ms.domain.Custom;
 import org.hqu.production_ms.domain.CustomResult;
 import org.hqu.production_ms.domain.EUDataGridResult;
@@ -18,7 +20,7 @@ public class CustomController {
 	@Autowired
 	private CustomService customService;
 	
-	@RequestMapping("/{customId}")
+	@RequestMapping("/get/{customId}")
 	@ResponseBody
 	public Custom getItemById(@PathVariable String customId) {
 		Custom custom = customService.get(customId);
@@ -31,6 +33,13 @@ public class CustomController {
 		return "custom_list";
 	}
 	
+	@RequestMapping("/get_data")
+	@ResponseBody
+	public List<Custom> getData() {
+		 List<Custom> list = customService.find();
+		return list;
+	}
+	
 	@RequestMapping("/list")
 	@ResponseBody
 	public EUDataGridResult getItemList(Integer page, Integer rows, Custom custom) {
diff --git a/src/main/webapp/WEB-INF/js/common.js b/src/main/webapp/WEB-INF/js/common.js
index 9fbb0da..01d7c95 100644
--- a/src/main/webapp/WEB-INF/js/common.js
+++ b/src/main/webapp/WEB-INF/js/common.js
@@ -25,7 +25,7 @@ var TT = TAOTAO = {
 		//指定上传文件参数名称
 		filePostName  : "uploadFile",
 		//指定上传文件请求的url。
-		uploadJson : '/pic/upload',
+		uploadJson : 'pic/upload',
 		//上传类型，分别为image、flash、media、file
 		dir : "image"
 	},
diff --git a/src/main/webapp/WEB-INF/jsp/home.jsp b/src/main/webapp/WEB-INF/jsp/home.jsp
index fa49bba..00763c0 100644
--- a/src/main/webapp/WEB-INF/jsp/home.jsp
+++ b/src/main/webapp/WEB-INF/jsp/home.jsp
@@ -22,7 +22,7 @@
 	         		<li>
 	         			<span>订单管理</span>
 	         			<ul>
-			         		<li data-options="attributes:{'url':'content-category'}">新增订单</li>
+			         		<li data-options="attributes:{'url':'order/add'}">新增订单</li>
 			         		<li data-options="attributes:{'url':'order/find'}">订单查询</li>
 	         			</ul>
 	         		</li>
-- 
GitLab