添加路由

src/com/w1hd/zzhnc/controller/pc/ActivityController.java

@@ -16,8 +16,6 @@ import com.w1hd.zzhnc.model.Activity;
 import com.w1hd.zzhnc.service.ActivityService;
 import com.w1hd.zzhnc.service.ActivityService;
 import com.w1hd.zzhnc.vo.Vo_msg;
 import com.w1hd.zzhnc.vo.Vo_msg;
 
 
-import jdk.nashorn.internal.ir.RuntimeNode.Request;
-
 @Controller
 @Controller
 @RequestMapping("/activity")
 @RequestMapping("/activity")
 public class ActivityController extends BaseController {
 public class ActivityController extends BaseController {
@@ -28,20 +26,20 @@ public class ActivityController extends BaseController {
 	@Autowired
 	@Autowired
 	LotteryLogDao lotteryLogDao;
 	LotteryLogDao lotteryLogDao;
 
 
-	@RequestMapping("/activityList")
+	@RequestMapping(value = "/activityList", method = RequestMethod.GET)
 	public ModelAndView activityList() {
 	public ModelAndView activityList() {
 		ModelAndView mv = new ModelAndView("/pc/activity/activityList");
 		ModelAndView mv = new ModelAndView("/pc/activity/activityList");
 		return mv;
 		return mv;
 	}
 	}
 
 
-	@RequestMapping("/activityindex")
+	@RequestMapping(value = "/activityEdit", method = RequestMethod.GET)
 	public ModelAndView activityindex() {
 	public ModelAndView activityindex() {
-		ModelAndView mv = new ModelAndView("/pc/activity/activityindex");
+		ModelAndView mv = new ModelAndView("/pc/activity/activityEdit");
 		return mv;
 		return mv;
 	}
 	}
 
 
 	// 修改活动配置
 	// 修改活动配置
-	@RequestMapping(value = "/editActivitySetting",method=RequestMethod.POST)
+	@RequestMapping(value = "/editActivitySetting", method = RequestMethod.POST)
 	@ResponseBody
 	@ResponseBody
 	public Object editActivitySetting(@RequestBody Activity activity) {
 	public Object editActivitySetting(@RequestBody Activity activity) {
 		try {
 		try {
@@ -51,12 +49,11 @@ public class ActivityController extends BaseController {
 			return new Vo_msg(-1, null, "error");
 			return new Vo_msg(-1, null, "error");
 		}
 		}
 		return new Vo_msg(0, null, "success");
 		return new Vo_msg(0, null, "success");
-	
-	
+
 	}
 	}
 
 
 	// 修改活动状态
 	// 修改活动状态
-	@RequestMapping(value = "/updateActivityStatus",method=RequestMethod.POST)
+	@RequestMapping(value = "/updateActivityStatus", method = RequestMethod.POST)
 	@ResponseBody
 	@ResponseBody
 	public Object updateActivityStatus(Integer status) {
 	public Object updateActivityStatus(Integer status) {
 		String result = activityService.updateActivityStatus(status);
 		String result = activityService.updateActivityStatus(status);
@@ -68,7 +65,7 @@ public class ActivityController extends BaseController {
 	}
 	}
 
 
 	// 获取
 	// 获取
-	@RequestMapping(value = "/getActivitySetting",method=RequestMethod.GET)
+	@RequestMapping(value = "/getActivitySetting", method = RequestMethod.GET)
 	@ResponseBody
 	@ResponseBody
 	public Object getActivitySetting() {
 	public Object getActivitySetting() {
 
 
@@ -76,7 +73,6 @@ public class ActivityController extends BaseController {
 		if (null == activity) {
 		if (null == activity) {
 			return new Vo_msg(-1, "获取失败，数据为空");
 			return new Vo_msg(-1, "获取失败，数据为空");
 		}
 		}
-			
 
 
 		BigDecimal currentMny = lotteryLogDao.getSumMny(activity.getTurn(), 1);
 		BigDecimal currentMny = lotteryLogDao.getSumMny(activity.getTurn(), 1);
 		activityService.updateCurrentMny(currentMny);
 		activityService.updateCurrentMny(currentMny);
@@ -87,7 +83,7 @@ public class ActivityController extends BaseController {
 	}
 	}
 
 
 	// 设置活动下一轮
 	// 设置活动下一轮
-	@RequestMapping(value = "/clearActivity")
+	@RequestMapping(value = "/clearActivity", method = RequestMethod.GET)
 	@ResponseBody
 	@ResponseBody
 	public Object clearActivity() {
 	public Object clearActivity() {
 		String result = activityService.clearActivity();
 		String result = activityService.clearActivity();

src/com/w1hd/zzhnc/controller/pc/ArticlesController.java

 package com.w1hd.zzhnc.controller.pc;
 package com.w1hd.zzhnc.controller.pc;
 
 
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.ModelAndView;
 
 
@@ -18,44 +18,43 @@ public class ArticlesController extends BaseController {
 	@Autowired
 	@Autowired
 	ArticleService articleService;
 	ArticleService articleService;
 
 
-	@RequestMapping("/articleIndex")
+	@RequestMapping(value = "/articleIndex", method = RequestMethod.GET)
 	public ModelAndView articleIndex() {
 	public ModelAndView articleIndex() {
 		ModelAndView mv = new ModelAndView("/pc/article/articleIndex");
 		ModelAndView mv = new ModelAndView("/pc/article/articleIndex");
 		return mv;
 		return mv;
 	}
 	}
-	
 
 
-    @RequestMapping("/articleEdit")
-    public ModelAndView articleEdit() {
-        ModelAndView mv = new ModelAndView("/pc/article/articleEdit");
-        return mv;
-    }
+	@RequestMapping(value = "/articleEdit", method = RequestMethod.GET)
+	public ModelAndView articleEdit() {
+		ModelAndView mv = new ModelAndView("/pc/article/articleEdit");
+		return mv;
+	}
 
 
-	//列表
-	@RequestMapping(value = "/getArticlesList")
+	// 列表
+	@RequestMapping(value = "/getArticlesList", method = RequestMethod.GET)
 	@ResponseBody
 	@ResponseBody
-	public Object getArticlesList(Integer page,Integer pagesize,String keyword) {
-	 
-		return new Vo_msg(0,articleService.getArticlesList(page, pagesize, keyword));
+	public Object getArticlesList(Integer page, Integer pagesize, String keyword) {
+
+		return new Vo_msg(0, articleService.getArticlesList(page, pagesize, keyword));
 	}
 	}
 
 
 	// 添加
 	// 添加
-	@RequestMapping(value = "/addArticle")
+	@RequestMapping(value = "/addArticle", method = RequestMethod.POST)
 	@ResponseBody
 	@ResponseBody
-	public Object addArticle(String title,String content,String imgurl) {
+	public Object addArticle(String title, String content, String imgurl) {
 		String result = articleService.addArticle(title, content, imgurl);
 		String result = articleService.addArticle(title, content, imgurl);
 		if (result.equals("ok")) {
 		if (result.equals("ok")) {
-			return new Vo_msg(0,null, "添加成功");
+			return new Vo_msg(0, null, "添加成功");
 		} else {
 		} else {
-			return new Vo_msg(-1,null, result);
+			return new Vo_msg(-1, null, result);
 		}
 		}
 	}
 	}
 
 
 	// 修改
 	// 修改
-	@RequestMapping(value = "/updateArticle")
+	@RequestMapping(value = "/updateArticle",method=RequestMethod.POST)
 	@ResponseBody
 	@ResponseBody
-	public Object updateArticle(Integer id,String title,String content,String imgurl) {
-		String result =articleService.updateArticle(id, title, content, imgurl);
+	public Object updateArticle(Integer id, String title, String content, String imgurl) {
+		String result = articleService.updateArticle(id, title, content, imgurl);
 		if (result.equals("ok")) {
 		if (result.equals("ok")) {
 			return new Vo_msg(0, "修改成功");
 			return new Vo_msg(0, "修改成功");
 		} else {
 		} else {
@@ -64,10 +63,10 @@ public class ArticlesController extends BaseController {
 	}
 	}
 
 
 	// 删除
 	// 删除
-	@RequestMapping(value = "/deleteArticle")
+	@RequestMapping(value = "/deleteArticle",method=RequestMethod.GET)
 	@ResponseBody
 	@ResponseBody
 	public Object deleteArticle(Integer id) {
 	public Object deleteArticle(Integer id) {
-		String result =articleService.deleteArticle(id);
+		String result = articleService.deleteArticle(id);
 		if (result.equals("ok")) {
 		if (result.equals("ok")) {
 			return new Vo_msg(0, "删除成功");
 			return new Vo_msg(0, "删除成功");
 		} else {
 		} else {
@@ -76,10 +75,10 @@ public class ArticlesController extends BaseController {
 	}
 	}
 
 
 	// 获取
 	// 获取
-	@RequestMapping(value = "/getArticle")
+	@RequestMapping(value = "/getArticle",method=RequestMethod.GET)
 	@ResponseBody
 	@ResponseBody
 	public Object getArticle(Integer id) {
 	public Object getArticle(Integer id) {
-	Articles article =articleService.getArticle(id);
+		Articles article = articleService.getArticle(id);
 		if (article != null) {
 		if (article != null) {
 			return new Vo_msg(0, article);
 			return new Vo_msg(0, article);
 		} else {
 		} else {

src/com/w1hd/zzhnc/controller/pc/AutoreplyController.java

@@ -3,6 +3,7 @@ package com.w1hd.zzhnc.controller.pc;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.ModelAndView;
 
 
@@ -17,7 +18,7 @@ public class AutoreplyController extends BaseController {
 	@Autowired
 	@Autowired
 	AutoreplyService replyService;
 	AutoreplyService replyService;
 
 
-	@RequestMapping("/autoresponse")
+	@RequestMapping(value="/autoresponse",method=RequestMethod.GET)
 	public ModelAndView autoreplyIndex() {
 	public ModelAndView autoreplyIndex() {
 		ModelAndView mv = new ModelAndView("/pc/autoresponse/autoresponse");
 		ModelAndView mv = new ModelAndView("/pc/autoresponse/autoresponse");
 		return mv;
 		return mv;

src/com/w1hd/zzhnc/controller/pc/BannerController.java

@@ -14,6 +14,8 @@ import org.springframework.web.servlet.ModelAndView;
 import com.w1hd.zzhnc.service.BannerService;
 import com.w1hd.zzhnc.service.BannerService;
 import com.w1hd.zzhnc.vo.Vo_msg;
 import com.w1hd.zzhnc.vo.Vo_msg;
 
 
+import jdk.nashorn.internal.ir.RuntimeNode.Request;
+
 @Controller
 @Controller
 @RequestMapping("/banner")
 @RequestMapping("/banner")
 public class BannerController {
 public class BannerController {
@@ -21,7 +23,7 @@ public class BannerController {
 	@Autowired
 	@Autowired
 	BannerService bannerService;
 	BannerService bannerService;
 
 
-	@RequestMapping("/bannerList")
+	@RequestMapping(value="/bannerList",method=RequestMethod.GET)
 	public ModelAndView autoreplyIndex(Map<String, Object> map) {
 	public ModelAndView autoreplyIndex(Map<String, Object> map) {
 		ModelAndView mv = new ModelAndView("/pc/banner/bannerList", map);
 		ModelAndView mv = new ModelAndView("/pc/banner/bannerList", map);
 		return mv;
 		return mv;

src/com/w1hd/zzhnc/controller/pc/CommonController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.ModelAndView;
 import org.testng.util.Strings;
 import org.testng.util.Strings;
 
 
+import com.mangofactory.swagger.annotations.ApiIgnore;
 import com.w1hd.zzhnc.config.PCLoginConfig;
 import com.w1hd.zzhnc.config.PCLoginConfig;
 import com.w1hd.zzhnc.dao.SysWxauthorizeDao;
 import com.w1hd.zzhnc.dao.SysWxauthorizeDao;
 import com.w1hd.zzhnc.model.SysWxauthorize;
 import com.w1hd.zzhnc.model.SysWxauthorize;
@@ -19,7 +20,9 @@ import com.w1hd.zzhnc.session.PCSessionHelper;
 import com.w1hd.zzhnc.session.PCSessionHelper.PCSessionName;
 import com.w1hd.zzhnc.session.PCSessionHelper.PCSessionName;
 import com.w1hd.zzhnc.util.RedisUtil;
 import com.w1hd.zzhnc.util.RedisUtil;
 import com.w1hd.zzhnc.vo.Vo_msg;
 import com.w1hd.zzhnc.vo.Vo_msg;
+import com.wordnik.swagger.annotations.Api;
 
 
+@ApiIgnore
 @Controller
 @Controller
 @RequestMapping("/")
 @RequestMapping("/")
 public class CommonController extends BaseController {
 public class CommonController extends BaseController {

src/com/w1hd/zzhnc/controller/pc/GoodsController.java

@@ -4,6 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.ModelAndView;
@@ -20,19 +21,26 @@ public class GoodsController {
 	@Autowired
 	@Autowired
 	GoodsService goodsService;
 	GoodsService goodsService;
 	
 	
-	@RequestMapping("/goodsList")
+	
+	
+	@RequestMapping(value="/goodsList",method=RequestMethod.GET)
 	public ModelAndView goodsList() {
 	public ModelAndView goodsList() {
 		return new ModelAndView("/pc/goods/goodsList");
 		return new ModelAndView("/pc/goods/goodsList");
 	}
 	}
 	
 	
+	@RequestMapping(value="/goodsEdit",method=RequestMethod.GET)
+	public ModelAndView goodsEdit() {
+		return new ModelAndView("/pc/goods/goodsEdit");
+	}
+	
 	@ResponseBody
 	@ResponseBody
-	@RequestMapping("/update")
+	@RequestMapping(value="/update",method=RequestMethod.POST)
 	public Object update(@RequestBody Goods goods) {
 	public Object update(@RequestBody Goods goods) {
 		return new Vo_msg(0,goodsService.update(goods));
 		return new Vo_msg(0,goodsService.update(goods));
 	}
 	}
 	
 	
 	@ResponseBody
 	@ResponseBody
-	@RequestMapping("/search")
+	@RequestMapping(value="/search",method=RequestMethod.GET)
 	public Object search(@RequestParam(value="key",required=false) String key,
 	public Object search(@RequestParam(value="key",required=false) String key,
 			@RequestParam(value="sellerId",required=false,defaultValue = "0")Integer sellerId,
 			@RequestParam(value="sellerId",required=false,defaultValue = "0")Integer sellerId,
 			@RequestParam(value="page",required=false,defaultValue = "1")Integer page,
 			@RequestParam(value="page",required=false,defaultValue = "1")Integer page,