Merge branch 'dev-csm-split-1126' of http://git.yoho.cn/platform/platform-cms in…

…to dev-csm-split-1126

Merge branch 'dev-csm-split-1126' of http://git.yoho.cn/platform/platform-cms in…
…to dev-csm-split-1126
mlge
Commit 6f8918b69d9ad932d2880058d9d2204b9f6e76cf 2 parents d31eda21 9482ec92
Showing 4 changed files with 18 additions and 18 deletions
cms/src/main/java/com/yohobuy/platform/cms/restapi/GateController.java
cms/src/main/java/com/yohobuy/platform/cms/restapi/HtmlContentController.java
cms/src/main/java/com/yohobuy/platform/cms/restapi/MakePromotionController.java
cms/src/main/java/com/yohobuy/platform/cms/restapi/SpecialController.java
--- a/cms/src/main/java/com/yohobuy/platform/cms/restapi/GateController.java
View file @6f8918b
+++ b/cms/src/main/java/com/yohobuy/platform/cms/restapi/GateController.java
View file @6f8918b
@@ -25,7 +25,7 @@ public class GateController {
      * 列表
      */
     @RequestMapping("gate_list")
-    public ApiResponse GateList(@RequestBody GateRequest request) {
+    public ApiResponse gateList(@RequestBody GateRequest request) {
         PageResponseBO<GateBO> page = gateService.list(request);
         return new ApiResponse.ApiResponseBuilder().data(page).build();
     }
--- a/cms/src/main/java/com/yohobuy/platform/cms/restapi/HtmlContentController.java
View file @6f8918b
+++ b/cms/src/main/java/com/yohobuy/platform/cms/restapi/HtmlContentController.java
View file @6f8918b
@@ -32,7 +32,7 @@ public class HtmlContentController {
     /**
      * 获取静态内容列表
      */
-    @RequestMapping("/getStaticList.do")
+    @RequestMapping("/getStaticList")
     @ResponseBody
     public ApiResponse getStaticList(HtmlContentReq req) {
         logger.info("getSpecialActivity with param is {}", req);
@@ -46,10 +46,10 @@ public class HtmlContentController {
      * @param
      * @return
      */
-    @RequestMapping(params = "method=getCategoryListSel")
+    @RequestMapping("/getCategoryListSel")
     @ResponseBody
-    public JSONArray getStyleListSel(EnumTypeRequestBean enumTypeRequestBean) {
-        logger.info("begin getStyleListSel");
+    public JSONArray getStyleListSelFromHtmlContent(EnumTypeRequestBean enumTypeRequestBean) {
+        logger.info("begin getStyleListSelFromHtmlContent");
         JSONArray arr = new JSONArray();
         JSONObject obj;
         List<HtmlContentSort> htmlContentSorts = htmlContentService.selectHtmlContentSort();
@@ -65,7 +65,7 @@ public class HtmlContentController {
     /**
      * 新增静态模板
      */
-    @RequestMapping("/addStatic.do")
+    @RequestMapping("/addStatic")
     @ResponseBody
     public ApiResponse addStatic(HtmlContent req) {
         logger.info("addStatic with param is {}", req);
--- a/cms/src/main/java/com/yohobuy/platform/cms/restapi/MakePromotionController.java
View file @6f8918b
+++ b/cms/src/main/java/com/yohobuy/platform/cms/restapi/MakePromotionController.java
View file @6f8918b
@@ -49,7 +49,7 @@ public class MakePromotionController {
     /**
      * 获取专区活动列表
      */
-    @RequestMapping("/getMakePromotionList.do")
+    @RequestMapping("/getMakePromotionList")
     @ResponseBody
     public ApiResponse getMakePromotionList(MakePromotionReq req) {
         logger.info("getMakePromotionList with param is {}", req);
@@ -64,7 +64,7 @@ public class MakePromotionController {
      * @param
      * @return
      */
-    @RequestMapping(params = "method=getAllMakePromotion")
+    @RequestMapping( "/getAllMakePromotion")
     @ResponseBody
     public JSONArray getAllMakePromotion(EnumTypeRequestBean enumTypeRequestBean) {
         logger.info("begin getAllMakePromotion");
@@ -89,7 +89,7 @@ public class MakePromotionController {
      * @param
      * @return
      */
-    @RequestMapping(params = "method=getAllNotEffectMakePromotion")
+    @RequestMapping("/getAllNotEffectMakePromotion")
     @ResponseBody
     public JSONArray getNotEffectMakePromotion(EnumTypeRequestBean enumTypeRequestBean) {
         logger.info("begin getAllMakePromotion");
@@ -111,7 +111,7 @@ public class MakePromotionController {
     /**
      * 删除专区活动
      */
-    @RequestMapping("/delMakePromotion.do")
+    @RequestMapping("/delMakePromotion")
     @ResponseBody
     public ApiResponse delMakePromotion(MakePromotionReq req) {
         logger.info("getMakePromotionList with param is {}", req);
@@ -195,7 +195,7 @@ public class MakePromotionController {
     /**
      * 获取专区活动相关商品列表
      */
-    @RequestMapping("/getMakePromotionListProductDetail.do")
+    @RequestMapping("/getMakePromotionListProductDetail")
     @ResponseBody
     public ApiResponse getMakePromotionListProductDetail(MakePromotionListReq req) {
         logger.info("getMakePromotionList with param is {}", req);
@@ -206,7 +206,7 @@ public class MakePromotionController {
     /**
      * 生效
      */
-    @RequestMapping("/effectMakePromotion.do")
+    @RequestMapping("/effectMakePromotion")
     @ResponseBody
     public ApiResponse effectMakePromotion(MakePromotionReq req) {
         logger.info("getMakePromotionList with param is {}", req);
--- a/cms/src/main/java/com/yohobuy/platform/cms/restapi/SpecialController.java
View file @6f8918b
+++ b/cms/src/main/java/com/yohobuy/platform/cms/restapi/SpecialController.java
View file @6f8918b
@@ -37,7 +37,7 @@ public class SpecialController {
     /**
      * 获取专区列表
      */
-    @RequestMapping("/getSpecialList.do")
+    @RequestMapping("/getSpecialList")
     @ResponseBody
     public ApiResponse getSpecialList(SpecialReq req) {
         logger.info("getSpecialActivity with param is {}", req);
@@ -48,7 +48,7 @@ public class SpecialController {
     /**
      * 专区模板列表
      */
-    @RequestMapping("/getStyleList.do")
+    @RequestMapping("/getStyleList")
     @ResponseBody
     public ApiResponse getStyleList(SpecialReq req) {
         logger.info("getSpecialActivity with param is {}", req);
@@ -83,7 +83,7 @@ public class SpecialController {
     /**
      * 新增模板
      */
-    @RequestMapping(value = "/addStyle.do")
+    @RequestMapping(value = "/addStyle")
     @ResponseBody
     public ApiResponse addStyle(SpecialStyleReq req) {
         logger.info("getSpecialActivity with param is {}", req);
@@ -99,7 +99,7 @@ public class SpecialController {
     /**
      * 编辑模板
      */
-    @RequestMapping(value = "/updateStyle.do")
+    @RequestMapping(value = "/updateStyle")
     @ResponseBody
     public ApiResponse updateStyle(SpecialStyleReq req) {
         logger.info("getSpecialActivity with param is {}", req);
@@ -115,7 +115,7 @@ public class SpecialController {
     /**
      * 新增专区
      */
-    @RequestMapping(value = "/addSpecial.do")
+    @RequestMapping(value = "/addSpecial")
     @ResponseBody
     public ApiResponse addSpecial(SpecialReq req) {
         logger.info("addSpecial with param is {}", req);
@@ -131,7 +131,7 @@ public class SpecialController {
     /**
      * 编辑专区
      */
-    @RequestMapping(value = "/updateSpecial.do")
+    @RequestMapping(value = "/updateSpecial")
     @ResponseBody
     public ApiResponse updateSpecial(SpecialReq req) {
         logger.info("updateSpecial with param is {}", req);