Authored by hugufei

移包

Showing 16 changed files with 16 additions and 18 deletions
@@ -7,7 +7,7 @@ import com.yoho.search.core.es.model.SearchParam; @@ -7,7 +7,7 @@ import com.yoho.search.core.es.model.SearchParam;
7 import com.yoho.search.core.es.model.SearchResult; 7 import com.yoho.search.core.es.model.SearchResult;
8 import com.yoho.search.core.personalized.models.SortBrand; 8 import com.yoho.search.core.personalized.models.SortBrand;
9 import com.yoho.search.recall.scene.beans.helper.ExtendFilterHelper; 9 import com.yoho.search.recall.scene.beans.helper.ExtendFilterHelper;
10 -import com.yoho.search.recall.scene.constants.CacheTimeConstants; 10 +import com.yoho.search.recall.scene.config.CacheTimeConstants;
11 import com.yoho.search.recall.scene.models.common.ParamQueryFilter; 11 import com.yoho.search.recall.scene.models.common.ParamQueryFilter;
12 import com.yoho.search.recall.scene.models.personal.PagePersonalFactor; 12 import com.yoho.search.recall.scene.models.personal.PagePersonalFactor;
13 import com.yoho.search.service.base.SearchCommonService; 13 import com.yoho.search.service.base.SearchCommonService;
@@ -5,8 +5,7 @@ import com.yoho.search.base.utils.ISearchConstants; @@ -5,8 +5,7 @@ import com.yoho.search.base.utils.ISearchConstants;
5 import com.yoho.search.base.utils.ProductIndexEsField; 5 import com.yoho.search.base.utils.ProductIndexEsField;
6 import com.yoho.search.core.es.model.SearchParam; 6 import com.yoho.search.core.es.model.SearchParam;
7 import com.yoho.search.core.es.model.SearchResult; 7 import com.yoho.search.core.es.model.SearchResult;
8 -import com.yoho.search.recall.scene.beans.helper.ExtendFilterHelper;  
9 -import com.yoho.search.recall.scene.constants.CacheTimeConstants; 8 +import com.yoho.search.recall.scene.config.CacheTimeConstants;
10 import com.yoho.search.recall.scene.models.common.ParamQueryFilter; 9 import com.yoho.search.recall.scene.models.common.ParamQueryFilter;
11 import com.yoho.search.recall.scene.models.personal.PageProductIdBitSet; 10 import com.yoho.search.recall.scene.models.personal.PageProductIdBitSet;
12 import com.yoho.search.service.base.SearchCommonService; 11 import com.yoho.search.service.base.SearchCommonService;
1 package com.yoho.search.recall.scene.beans.strategy.impls; 1 package com.yoho.search.recall.scene.beans.strategy.impls;
2 2
3 -import com.yoho.search.recall.scene.constants.CacheTimeConstants; 3 +import com.yoho.search.recall.scene.config.CacheTimeConstants;
4 import com.yoho.search.recall.scene.beans.helper.ExtendFilterHelper; 4 import com.yoho.search.recall.scene.beans.helper.ExtendFilterHelper;
5 import com.yoho.search.recall.scene.beans.helper.SortBuilderHelper; 5 import com.yoho.search.recall.scene.beans.helper.SortBuilderHelper;
6 import com.yoho.search.recall.scene.beans.strategy.IStrategy; 6 import com.yoho.search.recall.scene.beans.strategy.IStrategy;
@@ -3,7 +3,7 @@ package com.yoho.search.recall.scene.beans.strategy.impls; @@ -3,7 +3,7 @@ package com.yoho.search.recall.scene.beans.strategy.impls;
3 import com.yoho.search.recall.scene.beans.helper.SortBuilderHelper; 3 import com.yoho.search.recall.scene.beans.helper.SortBuilderHelper;
4 import com.yoho.search.recall.scene.beans.strategy.IStrategy; 4 import com.yoho.search.recall.scene.beans.strategy.IStrategy;
5 import com.yoho.search.recall.scene.beans.strategy.StrategyEnum; 5 import com.yoho.search.recall.scene.beans.strategy.StrategyEnum;
6 -import com.yoho.search.recall.scene.constants.CacheTimeConstants; 6 +import com.yoho.search.recall.scene.config.CacheTimeConstants;
7 import org.elasticsearch.index.query.QueryBuilder; 7 import org.elasticsearch.index.query.QueryBuilder;
8 import org.elasticsearch.search.sort.SortBuilder; 8 import org.elasticsearch.search.sort.SortBuilder;
9 9
1 package com.yoho.search.recall.scene.beans.strategy.impls; 1 package com.yoho.search.recall.scene.beans.strategy.impls;
2 2
3 -import com.yoho.search.recall.scene.constants.CacheTimeConstants; 3 +import com.yoho.search.recall.scene.config.CacheTimeConstants;
4 import com.yoho.search.recall.scene.beans.helper.ExtendFilterHelper; 4 import com.yoho.search.recall.scene.beans.helper.ExtendFilterHelper;
5 import com.yoho.search.recall.scene.beans.helper.SortBuilderHelper; 5 import com.yoho.search.recall.scene.beans.helper.SortBuilderHelper;
6 import com.yoho.search.recall.scene.beans.strategy.IStrategy; 6 import com.yoho.search.recall.scene.beans.strategy.IStrategy;
1 package com.yoho.search.recall.scene.beans.strategy.impls; 1 package com.yoho.search.recall.scene.beans.strategy.impls;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 -import com.yoho.search.recall.scene.constants.CacheTimeConstants; 4 +import com.yoho.search.recall.scene.config.CacheTimeConstants;
5 import com.yoho.search.recall.scene.beans.helper.ExtendFilterHelper; 5 import com.yoho.search.recall.scene.beans.helper.ExtendFilterHelper;
6 import com.yoho.search.recall.scene.beans.helper.SortBuilderHelper; 6 import com.yoho.search.recall.scene.beans.helper.SortBuilderHelper;
7 import com.yoho.search.recall.scene.beans.strategy.IStrategy; 7 import com.yoho.search.recall.scene.beans.strategy.IStrategy;
@@ -3,7 +3,7 @@ package com.yoho.search.recall.scene.beans.strategy.impls; @@ -3,7 +3,7 @@ package com.yoho.search.recall.scene.beans.strategy.impls;
3 import com.yoho.search.recall.scene.beans.helper.SortBuilderHelper; 3 import com.yoho.search.recall.scene.beans.helper.SortBuilderHelper;
4 import com.yoho.search.recall.scene.beans.strategy.IStrategy; 4 import com.yoho.search.recall.scene.beans.strategy.IStrategy;
5 import com.yoho.search.recall.scene.beans.strategy.StrategyEnum; 5 import com.yoho.search.recall.scene.beans.strategy.StrategyEnum;
6 -import com.yoho.search.recall.scene.constants.CacheTimeConstants; 6 +import com.yoho.search.recall.scene.config.CacheTimeConstants;
7 import org.elasticsearch.index.query.QueryBuilder; 7 import org.elasticsearch.index.query.QueryBuilder;
8 import org.elasticsearch.search.sort.SortBuilder; 8 import org.elasticsearch.search.sort.SortBuilder;
9 9
1 package com.yoho.search.recall.scene.beans.strategy.impls; 1 package com.yoho.search.recall.scene.beans.strategy.impls;
2 2
3 -import com.yoho.search.recall.scene.constants.CacheTimeConstants; 3 +import com.yoho.search.recall.scene.config.CacheTimeConstants;
4 import com.yoho.search.recall.scene.beans.helper.ExtendFilterHelper; 4 import com.yoho.search.recall.scene.beans.helper.ExtendFilterHelper;
5 import com.yoho.search.recall.scene.beans.helper.SortBuilderHelper; 5 import com.yoho.search.recall.scene.beans.helper.SortBuilderHelper;
6 import com.yoho.search.recall.scene.beans.strategy.IStrategy; 6 import com.yoho.search.recall.scene.beans.strategy.IStrategy;
@@ -4,7 +4,7 @@ import com.yoho.search.recall.scene.beans.helper.ExtendFilterHelper; @@ -4,7 +4,7 @@ import com.yoho.search.recall.scene.beans.helper.ExtendFilterHelper;
4 import com.yoho.search.recall.scene.beans.helper.SortBuilderHelper; 4 import com.yoho.search.recall.scene.beans.helper.SortBuilderHelper;
5 import com.yoho.search.recall.scene.beans.strategy.IStrategy; 5 import com.yoho.search.recall.scene.beans.strategy.IStrategy;
6 import com.yoho.search.recall.scene.beans.strategy.StrategyEnum; 6 import com.yoho.search.recall.scene.beans.strategy.StrategyEnum;
7 -import com.yoho.search.recall.scene.constants.CacheTimeConstants; 7 +import com.yoho.search.recall.scene.config.CacheTimeConstants;
8 import org.elasticsearch.index.query.QueryBuilder; 8 import org.elasticsearch.index.query.QueryBuilder;
9 import org.elasticsearch.search.sort.SortBuilder; 9 import org.elasticsearch.search.sort.SortBuilder;
10 10
@@ -5,7 +5,7 @@ import com.yoho.search.core.personalized.models.SortBrand; @@ -5,7 +5,7 @@ import com.yoho.search.core.personalized.models.SortBrand;
5 import com.yoho.search.recall.scene.beans.strategy.IStrategy; 5 import com.yoho.search.recall.scene.beans.strategy.IStrategy;
6 import com.yoho.search.recall.scene.beans.strategy.SortBrandType; 6 import com.yoho.search.recall.scene.beans.strategy.SortBrandType;
7 import com.yoho.search.recall.scene.beans.strategy.StrategyEnum; 7 import com.yoho.search.recall.scene.beans.strategy.StrategyEnum;
8 -import com.yoho.search.recall.scene.constants.CacheTimeConstants; 8 +import com.yoho.search.recall.scene.config.CacheTimeConstants;
9 9
10 public abstract class SortBrandAbstractStrategy implements IStrategy { 10 public abstract class SortBrandAbstractStrategy implements IStrategy {
11 11
@@ -4,7 +4,7 @@ import com.yoho.core.redis.cluster.operations.serializer.RedisKeyBuilder; @@ -4,7 +4,7 @@ import com.yoho.core.redis.cluster.operations.serializer.RedisKeyBuilder;
4 import com.yoho.search.base.utils.MD5Util; 4 import com.yoho.search.base.utils.MD5Util;
5 import com.yoho.search.base.utils.ProductIndexEsField; 5 import com.yoho.search.base.utils.ProductIndexEsField;
6 import com.yoho.search.core.es.model.SearchParam; 6 import com.yoho.search.core.es.model.SearchParam;
7 -import com.yoho.search.recall.scene.constants.CacheTimeConstants; 7 +import com.yoho.search.recall.scene.config.CacheTimeConstants;
8 import com.yoho.search.recall.scene.models.common.ICacheRequest; 8 import com.yoho.search.recall.scene.models.common.ICacheRequest;
9 import com.yoho.search.recall.scene.models.common.ParamQueryFilter; 9 import com.yoho.search.recall.scene.models.common.ParamQueryFilter;
10 import org.elasticsearch.index.query.BoolQueryBuilder; 10 import org.elasticsearch.index.query.BoolQueryBuilder;
@@ -2,10 +2,9 @@ package com.yoho.search.recall.scene.models.req; @@ -2,10 +2,9 @@ package com.yoho.search.recall.scene.models.req;
2 2
3 import com.yoho.core.redis.cluster.operations.serializer.RedisKeyBuilder; 3 import com.yoho.core.redis.cluster.operations.serializer.RedisKeyBuilder;
4 import com.yoho.search.base.utils.ProductIndexEsField; 4 import com.yoho.search.base.utils.ProductIndexEsField;
5 -import com.yoho.search.recall.scene.constants.CacheTimeConstants; 5 +import com.yoho.search.recall.scene.config.CacheTimeConstants;
6 import com.yoho.search.recall.scene.models.common.ICacheRequest; 6 import com.yoho.search.recall.scene.models.common.ICacheRequest;
7 7
8 -import java.util.ArrayList;  
9 import java.util.Arrays; 8 import java.util.Arrays;
10 import java.util.List; 9 import java.util.List;
11 10
@@ -2,7 +2,7 @@ package com.yoho.search.recall.scene.models.req; @@ -2,7 +2,7 @@ package com.yoho.search.recall.scene.models.req;
2 2
3 import com.yoho.core.redis.cluster.operations.serializer.RedisKeyBuilder; 3 import com.yoho.core.redis.cluster.operations.serializer.RedisKeyBuilder;
4 import com.yoho.search.base.utils.ProductIndexEsField; 4 import com.yoho.search.base.utils.ProductIndexEsField;
5 -import com.yoho.search.recall.scene.constants.CacheTimeConstants; 5 +import com.yoho.search.recall.scene.config.CacheTimeConstants;
6 import com.yoho.search.recall.scene.models.common.ICacheRequest; 6 import com.yoho.search.recall.scene.models.common.ICacheRequest;
7 7
8 import java.util.Arrays; 8 import java.util.Arrays;
1 package com.yoho.search.recall.scene.models.req; 1 package com.yoho.search.recall.scene.models.req;
2 2
3 import com.yoho.core.redis.cluster.operations.serializer.RedisKeyBuilder; 3 import com.yoho.core.redis.cluster.operations.serializer.RedisKeyBuilder;
4 -import com.yoho.search.recall.scene.constants.CacheTimeConstants; 4 +import com.yoho.search.recall.scene.config.CacheTimeConstants;
5 import com.yoho.search.recall.scene.models.common.ICacheRequest; 5 import com.yoho.search.recall.scene.models.common.ICacheRequest;
6 6
7 public class SknReturnInfoResquest implements ICacheRequest { 7 public class SknReturnInfoResquest implements ICacheRequest {
@@ -3,7 +3,7 @@ package com.yoho.search.recall.scene.models.req; @@ -3,7 +3,7 @@ package com.yoho.search.recall.scene.models.req;
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.yoho.core.redis.cluster.operations.serializer.RedisKeyBuilder; 4 import com.yoho.core.redis.cluster.operations.serializer.RedisKeyBuilder;
5 import com.yoho.search.base.utils.MD5Util; 5 import com.yoho.search.base.utils.MD5Util;
6 -import com.yoho.search.recall.scene.constants.CacheTimeConstants; 6 +import com.yoho.search.recall.scene.config.CacheTimeConstants;
7 import com.yoho.search.recall.scene.models.common.ParamQueryFilter; 7 import com.yoho.search.recall.scene.models.common.ParamQueryFilter;
8 import com.yoho.search.recall.scene.models.common.ICacheRequest; 8 import com.yoho.search.recall.scene.models.common.ICacheRequest;
9 import org.apache.commons.lang.StringUtils; 9 import org.apache.commons.lang.StringUtils;