店铺收藏和品牌收藏去除个性化

@@ -77,6 +77,6 @@ fi
 JAVA_OPTS=" $JAVA_OPTS $SERVER_BASE_DIR "
 
 #jmx
-export JMX_PORT=`expr 9600 + $SERVER_PORT`
+export JMX_PORT=`expr 9900 + $SERVER_PORT`
 export LOCAL_IP=`/sbin/ifconfig -a|grep inet|grep -v 127.0.0.1|grep -v inet6|awk '{print $2}'|tr -d "addr:"|awk 'NR==1 {print}'`
 export CATALINA_OPTS="$CATALINA_OPTS -Djava.rmi.server.hostname=$LOCAL_IP -Dcom.sun.management.jmxremote.port=$JMX_PORT -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"

@@ -55,7 +55,6 @@ public class BrandController {
 	 * @param request
 	 * @return
 	 */
-	@PersionalRateLimit(isOrderUseable = false)
 	@RequestMapping(method = RequestMethod.GET, value = "/group_brands")
 	@ResponseBody
 	public SearchApiResult groupBrands(HttpServletRequest request) {

@@ -36,7 +36,6 @@ public class ShopsController {
 	 * @param request
 	 * @return
 	 */
-	@PersionalRateLimit(isOrderUseable = false)
 	@RequestMapping(method = RequestMethod.GET, value = "/group_shops")
 	@ResponseBody
 	public SearchApiResult group_shops(HttpServletRequest request) {

@@ -55,8 +55,6 @@ public class ShopsServiceImpl extends BaseService implements IShopsService, Appl
     @Autowired
     private AggregationService aggregationService;
     @Autowired
-    private SearchCommonHelper searchCommonHelper;
-    @Autowired
     private AggregationFactoryService aggregationFactoryService;
     @Autowired
     private SearchParamHelper searchParamHelper;
@@ -76,14 +74,12 @@ public class ShopsServiceImpl extends BaseService implements IShopsService, Appl
             int topHitCount = StringUtils.isBlank(paramMap.get("viewNum")) ? 10 : Integer.parseInt(paramMap.get("viewNum"));
             // 2、获取聚合的排序规则
             String topHitOrder = "heatValue:desc";
-
             // 3、构建searchParam
-            SearchParam searchParam = searchParamHelper.buildWithPersional(paramMap, topHitCount > 0 ? true : false);
+            SearchParam searchParam = searchParamHelper.buildWithPersional(paramMap, false);
             IAggregation groupShopAgg = aggregationFactoryService.getGroupShopAggregation(topHitOrder, topHitCount);
             searchParam.setAggregationBuilders(Arrays.asList(groupShopAgg.getBuilder()));
             searchParam.setOffset(0);
             searchParam.setSize(0);
-
             // 4、从ES中获取
             JSONObject aggNameAndResponse = aggregationService.getAggNameAndResponseWithTotal(groupShopAgg, searchParam);
             if (aggNameAndResponse == null) {