diff --git a/src/com/w1hd/zzhnc/controller/wx/WxMiniController.java b/src/com/w1hd/zzhnc/controller/wx/WxMiniController.java index 15a3ec3..e0c6e5f 100644 --- a/src/com/w1hd/zzhnc/controller/wx/WxMiniController.java +++ b/src/com/w1hd/zzhnc/controller/wx/WxMiniController.java @@ -28,6 +28,7 @@ import com.w1hd.zzhnc.dao.FansDao; import com.w1hd.zzhnc.model.Articles; import com.w1hd.zzhnc.model.Banner; import com.w1hd.zzhnc.model.Fans; +import com.w1hd.zzhnc.model.Goods; import com.w1hd.zzhnc.service.ActivityService; import com.w1hd.zzhnc.service.ArticleService; import com.w1hd.zzhnc.service.BannerService; @@ -55,7 +56,7 @@ public class WxMiniController extends BaseController { @Autowired FansDao fansDao; - @RequestMapping("/wxmsg") + @RequestMapping(value="/wxmsg",method=RequestMethod.GET) public void WxMsg(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String signature = request.getParameter("signature"); String timestamp = request.getParameter("timestamp"); @@ -93,7 +94,7 @@ public class WxMiniController extends BaseController { } - @RequestMapping("/login") // 购房助手登录 double lng,double lat + @RequestMapping(value="/login",method=RequestMethod.GET) // 购房助手登录 double lng,double lat public @ResponseBody Vo_msg login(@RequestParam(value = "code") String code, @RequestParam(value = "shareId") Integer shareId, @RequestParam(value = "nickname") String nickname, @RequestParam(value = "logo") String logo, @RequestParam(value = "lng") double lng, @@ -140,7 +141,7 @@ public class WxMiniController extends BaseController { } // 强制刷新Token - @RequestMapping(value = "/refresh_token") + @RequestMapping(value = "/refresh_token",method = RequestMethod.POST) public @ResponseBody String refreshToken(String pwd) { if (!pwd.equals("nmdzpsmhs")) return "error pwd"; @@ -148,7 +149,7 @@ public class WxMiniController extends BaseController { } // 文章列表 - @RequestMapping(value = "/getArticlesList") + @RequestMapping(value = "/getArticlesList",method = RequestMethod.GET) @ResponseBody public Object getArticlesList(Integer page, Integer pagesize) { @@ -156,7 +157,7 @@ public class WxMiniController extends BaseController { } // 增加文章浏览数 - @RequestMapping(value = "/addArticleViewCount") + @RequestMapping(value = "/addArticleViewCount",method = RequestMethod.GET) @ResponseBody public Object addArticleViewCount(Integer id) { articleService.addArticleViewCount(id); @@ -164,7 +165,7 @@ public class WxMiniController extends BaseController { } // 获取 - @RequestMapping(value = "/getArticle") + @RequestMapping(value = "/getArticle",method=RequestMethod.GET) @ResponseBody public Object getArticle(Integer id) { Articles article = articleService.getArticle(id); @@ -236,7 +237,7 @@ public class WxMiniController extends BaseController { // } // // 清除小程序卡片的media_id的方法 - @RequestMapping(value = "/cleanProgramMedia") + @RequestMapping(value = "/cleanProgramMedia",method=RequestMethod.GET) @ResponseBody public String cleanProgramMedia(@RequestParam(value = "code") String code) { if (!code.equals("nmdzpsmhs")) @@ -252,17 +253,17 @@ public class WxMiniController extends BaseController { @Autowired GoodsService goodsService; - @RequestMapping(value = "/index") + @RequestMapping(value = "/index",method=RequestMethod.GET) @ResponseBody public Object index(@RequestParam String openId) { try { Map result = Maps.newHashMap(); List bannerList = bannerService.getAll(); List homeData = articleService.getHomeData(); - goodsService.getHomeData(); + List homeData2 = goodsService.getHomeData(); result.put("banner", bannerList); - MiniHomeVO.getData(homeData, goodsService.getHomeData()); - result.put("data", bannerList); + List data = MiniHomeVO.getData(homeData, homeData2); + result.put("data", data); return new Vo_msg(0, result); } catch (Exception e) { return new Vo_msg(-1, "系统繁忙");