Merge remote-tracking branch 'origin/dev_v1' into dev_v1

platform-api/src/main/java/com/platform/api/ApiBrandController.java

@@ -111,7 +111,7 @@ public class ApiBrandController extends ApiBaseAction {
             case 11:
             case 12:
             case 13:
-                List<BrandVo> list = zhiHouseService.queryRecomendsByType(type,request.getHeader(AuthorizationInterceptor.LOGIN_TOKEN_KEY)).parallelStream().map(entity->{
+                List<BrandVo> list = zhiHouseService.queryRecomendsByType(type).parallelStream().map(entity->{
                     BrandVo vo = new BrandVo();
                     vo.setName(entity.getString("title"));
                     vo.setId(entity.getInteger("connectId"));

platform-common/src/main/java/com/platform/service/impl/ZhiHouseService.java

@@ -288,14 +288,11 @@ public class ZhiHouseService {
         return list;
     }
 
-    public Collection<JSONObject> queryRecomendsByType(Integer type,String token){
+    public Collection<JSONObject> queryRecomendsByType(Integer type){
         Map<String, Object> mp = new HashMap<>();
         mp.put("type", type);
-        String url = zhiHouseHost + "recommend/selectByType";
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("token", token);
-        HttpEntity<Object> formEntity = new HttpEntity<>(mp, headers);
-        ResponseEntity<ReturnDTO>  responseEntity = restTemplate.postForEntity(url, formEntity,ReturnDTO.class);
+        String url = zhiHouseHost + "recommend/selectWxByType";
+        ResponseEntity<ReturnDTO>  responseEntity = restTemplate.postForEntity(url, mp,ReturnDTO.class);
         if(responseEntity.getStatusCode()!= HttpStatus.OK){
             throw new CommonBaseException(ResultCodeEnum.D100);
         }