Authored by hugufei

拆包

Showing 15 changed files with 6 additions and 18 deletions
@@ -3,7 +3,7 @@ package com.yoho.search.restapi.scene; @@ -3,7 +3,7 @@ package com.yoho.search.restapi.scene;
3 import com.yoho.search.aop.downgrade.PersionalRateLimit; 3 import com.yoho.search.aop.downgrade.PersionalRateLimit;
4 import com.yoho.search.common.utils.HttpServletRequestUtils; 4 import com.yoho.search.common.utils.HttpServletRequestUtils;
5 import com.yoho.search.models.SearchApiResult; 5 import com.yoho.search.models.SearchApiResult;
6 -import com.yoho.search.service.scene.productlist.FreeShippingOrderPageSceneService; 6 +import com.yoho.search.service.scene.others.FreeShippingSceneService;
7 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.stereotype.Controller; 8 import org.springframework.stereotype.Controller;
9 import org.springframework.web.bind.annotation.RequestMapping; 9 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,7 +21,7 @@ import java.util.Map; @@ -21,7 +21,7 @@ import java.util.Map;
21 public class FreeShippingOrderSceneController { 21 public class FreeShippingOrderSceneController {
22 22
23 @Autowired 23 @Autowired
24 - private FreeShippingOrderPageSceneService freeShippingOrderSceneService; 24 + private FreeShippingSceneService freeShippingOrderSceneService;
25 25
26 /** 26 /**
27 * 免运费凑单商品列表 27 * 免运费凑单商品列表
1 -package com.yoho.search.service.scene.productlist; 1 +package com.yoho.search.service.scene.others;
2 2
3 import com.yoho.search.common.BaseSceneService; 3 import com.yoho.search.common.BaseSceneService;
4 import com.yoho.search.common.utils.SearchApiResultUtils; 4 import com.yoho.search.common.utils.SearchApiResultUtils;
@@ -15,7 +15,7 @@ import java.util.Map; @@ -15,7 +15,7 @@ import java.util.Map;
15 * Created by wangnan on 2017/11/21. 15 * Created by wangnan on 2017/11/21.
16 */ 16 */
17 @Service 17 @Service
18 -public class FreeShippingOrderPageSceneService extends BaseSceneService { 18 +public class FreeShippingSceneService extends BaseSceneService {
19 19
20 private final Logger logger = LoggerFactory.getLogger(this.getClass()); 20 private final Logger logger = LoggerFactory.getLogger(this.getClass());
21 21
1 -package com.yoho.search.service.scene.productlist.core; 1 +package com.yoho.search.service.scene.productlist;
2 2
3 import com.yoho.search.common.BaseSceneService; 3 import com.yoho.search.common.BaseSceneService;
4 import com.yoho.search.common.SearchRequestParams; 4 import com.yoho.search.common.SearchRequestParams;
@@ -6,7 +6,7 @@ import com.yoho.search.models.SearchApiResult; @@ -6,7 +6,7 @@ import com.yoho.search.models.SearchApiResult;
6 6
7 import java.util.Map; 7 import java.util.Map;
8 8
9 -public abstract class AbstractPageSceneService extends BaseSceneService { 9 +abstract class AbstractPageSceneService extends BaseSceneService {
10 10
11 protected static final String RECOMMEND_PROMOTION_LIST = "recommend_promotion_list"; 11 protected static final String RECOMMEND_PROMOTION_LIST = "recommend_promotion_list";
12 protected static final String CUSTOMIZE_TAG_LIST = "customize_tag"; 12 protected static final String CUSTOMIZE_TAG_LIST = "customize_tag";
@@ -4,7 +4,6 @@ import com.yoho.search.base.utils.SearchPageIdDefine; @@ -4,7 +4,6 @@ import com.yoho.search.base.utils.SearchPageIdDefine;
4 import com.yoho.search.common.utils.SearchApiResultUtils; 4 import com.yoho.search.common.utils.SearchApiResultUtils;
5 import com.yoho.search.models.SearchApiResult; 5 import com.yoho.search.models.SearchApiResult;
6 import com.yoho.search.common.SearchRequestParams; 6 import com.yoho.search.common.SearchRequestParams;
7 -import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;  
8 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService; 7 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService;
9 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService; 8 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;
10 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService; 9 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService;
@@ -16,7 +16,6 @@ import com.yoho.search.common.SearchCommonService; @@ -16,7 +16,6 @@ import com.yoho.search.common.SearchCommonService;
16 import com.yoho.search.common.SearchRequestParams; 16 import com.yoho.search.common.SearchRequestParams;
17 import com.yoho.search.service.index.SizeIndexBaseService; 17 import com.yoho.search.service.index.SizeIndexBaseService;
18 import com.yoho.search.service.helper.SearchParamHelper; 18 import com.yoho.search.service.helper.SearchParamHelper;
19 -import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;  
20 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService; 19 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService;
21 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService; 20 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;
22 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService; 21 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService;
@@ -4,7 +4,6 @@ import com.google.common.base.Splitter; @@ -4,7 +4,6 @@ import com.google.common.base.Splitter;
4 import com.yoho.search.base.utils.SearchPageIdDefine; 4 import com.yoho.search.base.utils.SearchPageIdDefine;
5 import com.yoho.search.common.utils.SearchApiResultUtils; 5 import com.yoho.search.common.utils.SearchApiResultUtils;
6 import com.yoho.search.models.SearchApiResult; 6 import com.yoho.search.models.SearchApiResult;
7 -import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;  
8 import com.yoho.search.service.scene.sknimg.SknImgsResponse; 7 import com.yoho.search.service.scene.sknimg.SknImgsResponse;
9 import com.yoho.search.common.SearchRequestParams; 8 import com.yoho.search.common.SearchRequestParams;
10 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService; 9 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService;
@@ -3,7 +3,6 @@ package com.yoho.search.service.scene.productlist; @@ -3,7 +3,6 @@ package com.yoho.search.service.scene.productlist;
3 import com.yoho.search.base.utils.SearchPageIdDefine; 3 import com.yoho.search.base.utils.SearchPageIdDefine;
4 import com.yoho.search.common.utils.SearchApiResultUtils; 4 import com.yoho.search.common.utils.SearchApiResultUtils;
5 import com.yoho.search.models.SearchApiResult; 5 import com.yoho.search.models.SearchApiResult;
6 -import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;  
7 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService; 6 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService;
8 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService; 7 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;
9 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService; 8 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService;
@@ -8,7 +8,6 @@ import com.yoho.search.common.SearchDynamicConfigService; @@ -8,7 +8,6 @@ import com.yoho.search.common.SearchDynamicConfigService;
8 import com.yoho.search.common.SearchRequestParams; 8 import com.yoho.search.common.SearchRequestParams;
9 import com.yoho.search.service.helper.SearchCommonHelper; 9 import com.yoho.search.service.helper.SearchCommonHelper;
10 import com.yoho.search.service.helper.SearchKeyWordHelper; 10 import com.yoho.search.service.helper.SearchKeyWordHelper;
11 -import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;  
12 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService; 11 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService;
13 import com.yoho.search.service.scene.productlist.selections.SceneAggregationsHelper; 12 import com.yoho.search.service.scene.productlist.selections.SceneAggregationsHelper;
14 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService; 13 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;
@@ -7,7 +7,6 @@ import com.yoho.search.models.SearchApiResult; @@ -7,7 +7,6 @@ import com.yoho.search.models.SearchApiResult;
7 import com.yoho.search.common.SearchRequestParams; 7 import com.yoho.search.common.SearchRequestParams;
8 import com.yoho.search.service.helper.SearchCommonHelper; 8 import com.yoho.search.service.helper.SearchCommonHelper;
9 import com.yoho.search.service.helper.SearchKeyWordHelper; 9 import com.yoho.search.service.helper.SearchKeyWordHelper;
10 -import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;  
11 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService; 10 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService;
12 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService; 11 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;
13 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService; 12 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService;
@@ -4,7 +4,6 @@ import java.util.Date; @@ -4,7 +4,6 @@ import java.util.Date;
4 import java.util.List; 4 import java.util.List;
5 import java.util.Map; 5 import java.util.Map;
6 6
7 -import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;  
8 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService; 7 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;
9 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService; 8 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService;
10 import org.slf4j.Logger; 9 import org.slf4j.Logger;
@@ -2,7 +2,6 @@ package com.yoho.search.service.scene.productlist; @@ -2,7 +2,6 @@ package com.yoho.search.service.scene.productlist;
2 2
3 import java.util.Map; 3 import java.util.Map;
4 4
5 -import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;  
6 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService; 5 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;
7 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService; 6 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService;
8 import org.apache.commons.lang.StringUtils; 7 import org.apache.commons.lang.StringUtils;
@@ -4,7 +4,6 @@ import java.util.Date; @@ -4,7 +4,6 @@ import java.util.Date;
4 import java.util.List; 4 import java.util.List;
5 import java.util.Map; 5 import java.util.Map;
6 6
7 -import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;  
8 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService; 7 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService;
9 import org.slf4j.Logger; 8 import org.slf4j.Logger;
10 import org.slf4j.LoggerFactory; 9 import org.slf4j.LoggerFactory;
@@ -3,7 +3,6 @@ package com.yoho.search.service.scene.productlist; @@ -3,7 +3,6 @@ package com.yoho.search.service.scene.productlist;
3 import java.util.List; 3 import java.util.List;
4 import java.util.Map; 4 import java.util.Map;
5 5
6 -import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;  
7 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService; 6 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;
8 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService; 7 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService;
9 import org.apache.commons.lang3.StringUtils; 8 import org.apache.commons.lang3.StringUtils;
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject; @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
4 import com.yoho.search.base.utils.SearchPageIdDefine; 4 import com.yoho.search.base.utils.SearchPageIdDefine;
5 import com.yoho.search.models.SearchApiResult; 5 import com.yoho.search.models.SearchApiResult;
6 import com.yoho.search.common.SearchRequestParams; 6 import com.yoho.search.common.SearchRequestParams;
7 -import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;  
8 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService; 7 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService;
9 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService; 8 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;
10 import com.yoho.search.service.scene.productlist.selections.SceneAggregationsHelper; 9 import com.yoho.search.service.scene.productlist.selections.SceneAggregationsHelper;
@@ -2,7 +2,6 @@ package com.yoho.search.service.scene.productlist; @@ -2,7 +2,6 @@ package com.yoho.search.service.scene.productlist;
2 2
3 import java.util.Map; 3 import java.util.Map;
4 4
5 -import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;  
6 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService; 5 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;
7 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService; 6 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService;
8 import org.apache.commons.lang.StringUtils; 7 import org.apache.commons.lang.StringUtils;