From e8f3ca02918dd7eb4660ef918f53126820c35762 Mon Sep 17 00:00:00 2001 From: zxt@theyeasy.com Date: Wed, 27 Dec 2017 14:32:23 +0800 Subject: [PATCH] 添加路由 --- build/classes/com/w1hd/zzhnc/controller/pc/ArticlesController.class | Bin 3498 -> 0 bytes build/classes/com/w1hd/zzhnc/controller/pc/AutoreplyController.class | Bin 4562 -> 0 bytes build/classes/com/w1hd/zzhnc/controller/pc/CommonController.class | Bin 4278 -> 0 bytes build/classes/com/w1hd/zzhnc/util/QQFaceUtil.class | Bin 5785 -> 0 bytes build/classes/org/theyeasy/weixin/util/SHA1.class | Bin 6989 -> 0 bytes src/com/w1hd/zzhnc/controller/pc/ActivityController.java | 20 ++++++++------------ src/com/w1hd/zzhnc/controller/pc/ArticlesController.java | 47 +++++++++++++++++++++++------------------------ src/com/w1hd/zzhnc/controller/pc/AutoreplyController.java | 3 ++- src/com/w1hd/zzhnc/controller/pc/BannerController.java | 4 +++- src/com/w1hd/zzhnc/controller/pc/CommonController.java | 3 +++ src/com/w1hd/zzhnc/controller/pc/GoodsController.java | 14 +++++++++++--- 11 files changed, 50 insertions(+), 41 deletions(-) delete mode 100644 build/classes/com/w1hd/zzhnc/controller/pc/ArticlesController.class delete mode 100644 build/classes/com/w1hd/zzhnc/controller/pc/AutoreplyController.class delete mode 100644 build/classes/com/w1hd/zzhnc/controller/pc/CommonController.class delete mode 100644 build/classes/com/w1hd/zzhnc/util/QQFaceUtil.class delete mode 100644 build/classes/org/theyeasy/weixin/util/SHA1.class diff --git a/build/classes/com/w1hd/zzhnc/controller/pc/ArticlesController.class b/build/classes/com/w1hd/zzhnc/controller/pc/ArticlesController.class deleted file mode 100644 index 0690817..0000000 Binary files a/build/classes/com/w1hd/zzhnc/controller/pc/ArticlesController.class and /dev/null differ diff --git a/build/classes/com/w1hd/zzhnc/controller/pc/AutoreplyController.class b/build/classes/com/w1hd/zzhnc/controller/pc/AutoreplyController.class deleted file mode 100644 index fc158b8..0000000 Binary files a/build/classes/com/w1hd/zzhnc/controller/pc/AutoreplyController.class and /dev/null differ diff --git a/build/classes/com/w1hd/zzhnc/controller/pc/CommonController.class b/build/classes/com/w1hd/zzhnc/controller/pc/CommonController.class deleted file mode 100644 index bfc4671..0000000 Binary files a/build/classes/com/w1hd/zzhnc/controller/pc/CommonController.class and /dev/null differ diff --git a/build/classes/com/w1hd/zzhnc/util/QQFaceUtil.class b/build/classes/com/w1hd/zzhnc/util/QQFaceUtil.class deleted file mode 100644 index 2e68bc2..0000000 Binary files a/build/classes/com/w1hd/zzhnc/util/QQFaceUtil.class and /dev/null differ diff --git a/build/classes/org/theyeasy/weixin/util/SHA1.class b/build/classes/org/theyeasy/weixin/util/SHA1.class deleted file mode 100644 index 3531ce6..0000000 Binary files a/build/classes/org/theyeasy/weixin/util/SHA1.class and /dev/null differ diff --git a/src/com/w1hd/zzhnc/controller/pc/ActivityController.java b/src/com/w1hd/zzhnc/controller/pc/ActivityController.java index cb204da..8451b3c 100644 --- a/src/com/w1hd/zzhnc/controller/pc/ActivityController.java +++ b/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.vo.Vo_msg; -import jdk.nashorn.internal.ir.RuntimeNode.Request; - @Controller @RequestMapping("/activity") public class ActivityController extends BaseController { @@ -28,20 +26,20 @@ public class ActivityController extends BaseController { @Autowired LotteryLogDao lotteryLogDao; - @RequestMapping("/activityList") + @RequestMapping(value = "/activityList", method = RequestMethod.GET) public ModelAndView activityList() { ModelAndView mv = new ModelAndView("/pc/activity/activityList"); return mv; } - @RequestMapping("/activityindex") + @RequestMapping(value = "/activityEdit", method = RequestMethod.GET) public ModelAndView activityindex() { - ModelAndView mv = new ModelAndView("/pc/activity/activityindex"); + ModelAndView mv = new ModelAndView("/pc/activity/activityEdit"); return mv; } // 修改活动配置 - @RequestMapping(value = "/editActivitySetting",method=RequestMethod.POST) + @RequestMapping(value = "/editActivitySetting", method = RequestMethod.POST) @ResponseBody public Object editActivitySetting(@RequestBody Activity activity) { try { @@ -51,12 +49,11 @@ public class ActivityController extends BaseController { return new Vo_msg(-1, null, "error"); } return new Vo_msg(0, null, "success"); - - + } // 修改活动状态 - @RequestMapping(value = "/updateActivityStatus",method=RequestMethod.POST) + @RequestMapping(value = "/updateActivityStatus", method = RequestMethod.POST) @ResponseBody public Object updateActivityStatus(Integer 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 public Object getActivitySetting() { @@ -76,7 +73,6 @@ public class ActivityController extends BaseController { if (null == activity) { return new Vo_msg(-1, "获取失败，数据为空"); } - BigDecimal currentMny = lotteryLogDao.getSumMny(activity.getTurn(), 1); activityService.updateCurrentMny(currentMny); @@ -87,7 +83,7 @@ public class ActivityController extends BaseController { } // 设置活动下一轮 - @RequestMapping(value = "/clearActivity") + @RequestMapping(value = "/clearActivity", method = RequestMethod.GET) @ResponseBody public Object clearActivity() { String result = activityService.clearActivity(); diff --git a/src/com/w1hd/zzhnc/controller/pc/ArticlesController.java b/src/com/w1hd/zzhnc/controller/pc/ArticlesController.java index 5cc194d..bd40b0d 100644 --- a/src/com/w1hd/zzhnc/controller/pc/ArticlesController.java +++ b/src/com/w1hd/zzhnc/controller/pc/ArticlesController.java @@ -1,9 +1,9 @@ package com.w1hd.zzhnc.controller.pc; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; 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.servlet.ModelAndView; @@ -18,44 +18,43 @@ public class ArticlesController extends BaseController { @Autowired ArticleService articleService; - @RequestMapping("/articleIndex") + @RequestMapping(value = "/articleIndex", method = RequestMethod.GET) public ModelAndView articleIndex() { ModelAndView mv = new ModelAndView("/pc/article/articleIndex"); 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 - 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 - 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); if (result.equals("ok")) { - return new Vo_msg(0,null, "添加成功"); + return new Vo_msg(0, null, "添加成功"); } 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 - 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")) { return new Vo_msg(0, "修改成功"); } else { @@ -64,10 +63,10 @@ public class ArticlesController extends BaseController { } // 删除 - @RequestMapping(value = "/deleteArticle") + @RequestMapping(value = "/deleteArticle",method=RequestMethod.GET) @ResponseBody public Object deleteArticle(Integer id) { - String result =articleService.deleteArticle(id); + String result = articleService.deleteArticle(id); if (result.equals("ok")) { return new Vo_msg(0, "删除成功"); } else { @@ -76,10 +75,10 @@ public class ArticlesController extends BaseController { } // 获取 - @RequestMapping(value = "/getArticle") + @RequestMapping(value = "/getArticle",method=RequestMethod.GET) @ResponseBody public Object getArticle(Integer id) { - Articles article =articleService.getArticle(id); + Articles article = articleService.getArticle(id); if (article != null) { return new Vo_msg(0, article); } else { diff --git a/src/com/w1hd/zzhnc/controller/pc/AutoreplyController.java b/src/com/w1hd/zzhnc/controller/pc/AutoreplyController.java index 98043eb..bbb0ad7 100644 --- a/src/com/w1hd/zzhnc/controller/pc/AutoreplyController.java +++ b/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.stereotype.Controller; 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.servlet.ModelAndView; @@ -17,7 +18,7 @@ public class AutoreplyController extends BaseController { @Autowired AutoreplyService replyService; - @RequestMapping("/autoresponse") + @RequestMapping(value="/autoresponse",method=RequestMethod.GET) public ModelAndView autoreplyIndex() { ModelAndView mv = new ModelAndView("/pc/autoresponse/autoresponse"); return mv; diff --git a/src/com/w1hd/zzhnc/controller/pc/BannerController.java b/src/com/w1hd/zzhnc/controller/pc/BannerController.java index 0274a75..d510520 100644 --- a/src/com/w1hd/zzhnc/controller/pc/BannerController.java +++ b/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.vo.Vo_msg; +import jdk.nashorn.internal.ir.RuntimeNode.Request; + @Controller @RequestMapping("/banner") public class BannerController { @@ -21,7 +23,7 @@ public class BannerController { @Autowired BannerService bannerService; - @RequestMapping("/bannerList") + @RequestMapping(value="/bannerList",method=RequestMethod.GET) public ModelAndView autoreplyIndex(Map map) { ModelAndView mv = new ModelAndView("/pc/banner/bannerList", map); return mv; diff --git a/src/com/w1hd/zzhnc/controller/pc/CommonController.java b/src/com/w1hd/zzhnc/controller/pc/CommonController.java index 7d766d6..b124549 100644 --- a/src/com/w1hd/zzhnc/controller/pc/CommonController.java +++ b/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.testng.util.Strings; +import com.mangofactory.swagger.annotations.ApiIgnore; import com.w1hd.zzhnc.config.PCLoginConfig; import com.w1hd.zzhnc.dao.SysWxauthorizeDao; 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.util.RedisUtil; import com.w1hd.zzhnc.vo.Vo_msg; +import com.wordnik.swagger.annotations.Api; +@ApiIgnore @Controller @RequestMapping("/") public class CommonController extends BaseController { diff --git a/src/com/w1hd/zzhnc/controller/pc/GoodsController.java b/src/com/w1hd/zzhnc/controller/pc/GoodsController.java index aeede86..2dbd3dd 100644 --- a/src/com/w1hd/zzhnc/controller/pc/GoodsController.java +++ b/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.web.bind.annotation.RequestBody; 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.ResponseBody; import org.springframework.web.servlet.ModelAndView; @@ -20,19 +21,26 @@ public class GoodsController { @Autowired GoodsService goodsService; - @RequestMapping("/goodsList") + + + @RequestMapping(value="/goodsList",method=RequestMethod.GET) public ModelAndView goodsList() { return new ModelAndView("/pc/goods/goodsList"); } + @RequestMapping(value="/goodsEdit",method=RequestMethod.GET) + public ModelAndView goodsEdit() { + return new ModelAndView("/pc/goods/goodsEdit"); + } + @ResponseBody - @RequestMapping("/update") + @RequestMapping(value="/update",method=RequestMethod.POST) public Object update(@RequestBody Goods goods) { return new Vo_msg(0,goodsService.update(goods)); } @ResponseBody - @RequestMapping("/search") + @RequestMapping(value="/search",method=RequestMethod.GET) public Object search(@RequestParam(value="key",required=false) String key, @RequestParam(value="sellerId",required=false,defaultValue = "0")Integer sellerId, @RequestParam(value="page",required=false,defaultValue = "1")Integer page, -- libgit2 0.24.0