3.x升级&老ES对接新服务,移除无用@FeignClient注解

pcloud-service-book/src/main/java/com/pcloud/book/adnews/facade/AdNewsFacade.java

 package com.pcloud.book.adnews.facade;
 
+import com.pcloud.book.adnews.dto.AdNewsListParam;
 import com.pcloud.book.adnews.entity.AdNewsClickRecord;
 import com.pcloud.book.adnews.entity.AdNewsSet;
-import com.pcloud.book.adnews.dto.AdNewsListParam;
 import com.pcloud.book.adnews.entity.AdNewsWechat;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.permission.PermissionException;
 import io.swagger.annotations.*;
-import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-@FeignClient(value = "pcloud-service-book", qualifier = "adNewsFacadeCloud", path = "adNews")
 @Api(description = "推送群消息外部接口")
 public interface AdNewsFacade {
 

pcloud-service-book/src/main/java/com/pcloud/book/advertising/facade/AdvertisingSpaceFacade.java

 package com.pcloud.book.advertising.facade;
 
 import com.pcloud.book.advertising.dto.*;
-import com.pcloud.book.advertising.entity.AdvertisingAdviserPermission;
-import com.pcloud.book.advertising.entity.AdvertisingAgentPermission;
-import com.pcloud.book.advertising.entity.AdvertisingBrand;
-import com.pcloud.book.advertising.entity.AdvertisingBrowseRecord;
-import com.pcloud.book.advertising.entity.AdvertisingClickRecord;
-import com.pcloud.book.advertising.entity.AdvertisingCpa;
-import com.pcloud.book.advertising.entity.AdvertisingDistributionBook;
-import com.pcloud.book.advertising.entity.AdvertisingExposureRecord;
-import com.pcloud.book.advertising.entity.AdvertisingMaster;
-import com.pcloud.book.advertising.entity.AdvertisingPilotRecord;
-import com.pcloud.book.advertising.entity.AdvertisingPlan;
-import com.pcloud.book.advertising.entity.AdvertisingSpace;
-import com.pcloud.book.advertising.entity.AdvertisingWechatMsg;
+import com.pcloud.book.advertising.entity.*;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBean;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.permission.PermissionException;
-
+import io.swagger.annotations.*;
 import org.codehaus.jackson.JsonParseException;
-import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CookieValue;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
 /**
  * Description 广告位接口层接口
  * @author PENG
  * @date 2019/2/28
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "advertisingSpaceFacadeCloud", path = "book/v1.0/advertising")
 @Api(description = "广告位接口层接口")
 public interface AdvertisingSpaceFacade {
 

pcloud-service-book/src/main/java/com/pcloud/book/advertising/facade/BmFacade.java

@@ -5,28 +5,15 @@ import com.pcloud.book.advertising.entity.AdvertisingBmRegister;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.permission.PermissionException;
-
+import io.swagger.annotations.*;
 import org.codehaus.jackson.JsonParseException;
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.web.bind.annotation.CookieValue;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
 /**
  * 报名
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bmFacadeCloud", path = "book/v1.0/bm")
 @Api("报名应用FACADE接口类")
 public interface BmFacade {
 

pcloud-service-book/src/main/java/com/pcloud/book/applet/facade/AppletThirdResourcesChooseFacade.java

@@ -12,14 +12,7 @@ import com.pcloud.common.utils.SessionUtil;
 import com.pcloud.wechatgroup.message.enums.IsSystem;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import sun.reflect.generics.tree.VoidDescriptor;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookAdviserFacade.java

@@ -4,14 +4,7 @@
 package com.pcloud.book.book.facade;
 
 import com.pcloud.book.base.dto.CountDto;
-import com.pcloud.book.book.dto.BookAdviserDto;
-import com.pcloud.book.book.dto.BookCountDto;
-import com.pcloud.book.book.dto.BookDataStatisticsDTO;
-import com.pcloud.book.book.dto.BookQrcodeStatisticsDTO;
-import com.pcloud.book.book.dto.BookRequestVO;
-import com.pcloud.book.book.dto.BookResourceStatisticsDTO;
-import com.pcloud.book.book.dto.BookStatisticsResultDto;
-import com.pcloud.book.book.dto.MapResourceTotalCountDTO;
+import com.pcloud.book.book.dto.*;
 import com.pcloud.book.book.entity.BookAdviser;
 import com.pcloud.book.book.vo.AgentBookStatsDetailVO;
 import com.pcloud.book.book.vo.PcloudAdviserBookVO;
@@ -19,23 +12,10 @@ import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.permission.PermissionException;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
 import org.codehaus.jackson.JsonParseException;
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -44,7 +24,6 @@ import java.util.Map;
  * @作者：songx
  * @创建时间：2016年12月30日,下午6:02:15 @版本：1.0
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookAdviserFacadeCloud", path = "book/v1.0/bookAdviser")
 @Api(description = "顾问书籍管理外部服务")
 public interface BookAdviserFacade {
 

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookAppFacade.java

@@ -14,7 +14,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.codehaus.jackson.JsonParseException;
-import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -25,7 +24,6 @@ import java.util.List;
  * @作者：songx
  * @创建时间：2016年12月23日,下午4:06:04 @版本：1.0
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookAppFacadeCloud", path = "book/v1.0/bookApp")
 @Api(description = "书籍应用关系管理外部服务")
 public interface BookAppFacade {
 

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookAssistTempletFacade.java

 package com.pcloud.book.book.facade;
 
-import java.util.List;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.codehaus.jackson.JsonParseException;
-
-import com.pcloud.book.book.entity.BookAssistTemplet;
-import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.permission.PermissionException;
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import org.codehaus.jackson.JsonParseException;
 
 /**
  * @描述：
@@ -21,7 +11,6 @@ import org.springframework.web.bind.annotation.*;
  * @作者：songx
  * @创建时间：2017年7月5日,下午5:38:14 @版本：1.0
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookAssistTempletFacadeCloud", path = "book/v1.0/bookAssistTempletFacade")
 @Api(description = "运营模板外部服务")
 public interface BookAssistTempletFacade {
 

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookFacade.java

@@ -3,38 +3,22 @@
  */
 package com.pcloud.book.book.facade;
 
-import com.pcloud.book.book.dto.AdviserBookInfoDTO;
-import com.pcloud.book.book.dto.BookAssocCount;
-import com.pcloud.book.book.dto.BookDetialDTO;
-import com.pcloud.book.book.dto.BookDto;
-import com.pcloud.book.book.dto.CreateBookVO;
-import com.pcloud.book.book.dto.MapResourceTotalCountDTO;
-import com.pcloud.book.book.dto.RelateAdviserVO;
+import com.pcloud.book.book.dto.*;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.book.book.vo.ListNoAuthBookParam;
 import com.pcloud.book.book.vo.ListNoAuthGroupBookParam;
 import com.pcloud.book.book.vo.request.BookQualifyInfoVO;
 import com.pcloud.book.book.vo.request.BookSearchParamVO;
-import com.pcloud.book.book.dto.BookUniqueNumberDTO;
 import com.pcloud.book.book.vo.request.UpdateBookRobotProcessDto;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBean;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.permission.PermissionException;
-
 import io.swagger.annotations.*;
 import org.codehaus.jackson.JsonParseException;
-import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.CookieValue;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -45,7 +29,6 @@ import java.util.Map;
  * @作者：songx
  * @创建时间：2016年12月23日,下午2:37:02 @版本：1.0
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookFacadeCloud", path = "book/v1.0/book")
 @Api(description = "书籍接口外部服务")
 public interface BookFacade {
 

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookFreezeFacade.java

 package com.pcloud.book.book.facade;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-
-import org.codehaus.jackson.JsonParseException;
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.web.bind.annotation.CookieValue;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
 import com.pcloud.book.book.dto.BookFreezeDto;
 import com.pcloud.book.book.entity.BookFreeze;
 import com.pcloud.book.book.entity.ThawEarning;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.permission.PermissionException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.codehaus.jackson.JsonParseException;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 图书冻结接口
@@ -27,7 +19,6 @@ import com.pcloud.common.permission.PermissionException;
  * @author lili
  * @date 2018/1/18 18:08
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookFreezeFacadeCloud", path = "book/v1.0/bookFreeze")
 @Api(description = "图书冻结外部服务")
 public interface BookFreezeFacade {
 

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookFundFacade.java

@@ -9,7 +9,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.codehaus.jackson.JsonParseException;
-import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -17,7 +16,6 @@ import org.springframework.web.bind.annotation.*;
  * @作者：lihao
  * @创建时间：2017年7月19日,下午3:13:21 @版本：1.0
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookFundFacadeCloud", path = "book/v1.0/bookFund")
 @Api(description = "书刊基金接口外部服务")
 public interface BookFundFacade {
 

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookProductFacade.java

@@ -14,7 +14,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.codehaus.jackson.JsonParseException;
-import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -24,7 +23,6 @@ import java.util.List;
  * @作者：songx
  * @创建时间：2016年12月23日,下午4:06:04 @版本：1.0
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookProductFacadeCloud", path = "book/v1.0/bookProduct")
 @Api(description = "书籍作品接口外部服务")
 public interface BookProductFacade {
 

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookResourceFacade.java

@@ -15,7 +15,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.codehaus.jackson.JsonParseException;
-import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -25,7 +24,6 @@ import java.util.List;
  * @作者：lili
  * @创建时间：2017年3月17日,下午4:06:04 @版本：1.0
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookResourceFacadeCloud", path = "book/v1.0/bookResource")
 @Api(description = "书籍资源关系管理外部服务")
 public interface BookResourceFacade {
 

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookTempletFeedbackFacade.java

@@ -8,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
  * @author lily
  * @date 2018/10/31 15:43
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookTempletFeedbackFacadeCloud", path = "book/v1.0/bookTempletFeedback")
 @Api(description = "图书类型反馈外部服务")
 public interface BookTempletFeedbackFacade {
     @ApiOperation(value = "新增图书类型反馈", httpMethod = "POST")

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookTypeFacade.java

@@ -12,7 +12,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.codehaus.jackson.JsonParseException;
-import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,7 +24,6 @@ import java.util.List;
  * @作者：songx
  * @创建时间：2017年1月3日,下午3:13:21 @版本：1.0
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookTypeFacadeCloud", path = "book/v1.0/bookType")
 @Api(description = "书籍类型管理外部服务")
 public interface BookTypeFacade {
 

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/SearchFacade.java

@@ -8,15 +8,8 @@ import com.pcloud.common.permission.PermissionException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.web.bind.annotation.CookieValue;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(value = "pcloud-service-book", qualifier = "searchFacadeCloud", path = "search")
+import org.springframework.web.bind.annotation.*;
+
 @Api("书籍搜索")
 public interface SearchFacade {
 

pcloud-service-book/src/main/java/com/pcloud/book/clock/facade/BookClockFacade.java

@@ -8,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -16,7 +15,6 @@ import org.springframework.web.bind.annotation.*;
  * @Date: 2019/5/24 14:46
  * @Version 1.0
  */
-@FeignClient(value = "pcloud-service-book",qualifier = "bookClockFacadeCloud",path = "bookClock")
 @Api(description = "微信群打卡设置")
 public interface BookClockFacade {
 

pcloud-service-book/src/main/java/com/pcloud/book/clock/facade/BookClockKeywordFacade.java

@@ -9,15 +9,16 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 /**
  * @Author: hzk
  * @Date: 2019/5/28 14:46
  * @Version 1.0
  */
-@FeignClient(value = "pcloud-service-book",qualifier = "bookClockKeywordFacadeCloud",path = "bookClockKeyword")
 @Api(description = "微信群打卡关键词设置")
 public interface BookClockKeywordFacade {
 

pcloud-service-book/src/main/java/com/pcloud/book/config/NacosPropertyLoadConfig.java

@@ -7,5 +7,6 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 @EnableNacosConfig
 @NacosPropertySource(dataId = "bookdb.yml")
+@NacosPropertySource(dataId = "public_system.properties")
 public class NacosPropertyLoadConfig {
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/facade/BookGroupFacade.java

 package com.pcloud.book.group.facade;
 
 import com.pcloud.book.book.dto.MapResourceTotalCountDTO;
-import com.pcloud.book.group.dto.BookAppletSceneDTO;
-import com.pcloud.book.group.dto.BookGroupCreateDTO;
-import com.pcloud.book.group.dto.BookGroupDTO;
-import com.pcloud.book.group.dto.ChangeQrCodeTypeDto;
-import com.pcloud.book.group.dto.HotAppDTO;
-import com.pcloud.book.group.dto.SelfBookGroupStParamDTO;
-import com.pcloud.book.group.dto.UserSelectParamDTO;
+import com.pcloud.book.group.dto.*;
 import com.pcloud.book.group.entity.BookGroup;
 import com.pcloud.book.group.entity.BookGroupClassify;
 import com.pcloud.book.group.entity.BookGroupServe;
 import com.pcloud.book.group.entity.WxWechatUserCorrelation;
-import com.pcloud.book.group.vo.BookGroupAnalysisParam;
-import com.pcloud.book.group.vo.BookGroupAnalysisVO;
-import com.pcloud.book.group.vo.FriendsVO;
-import com.pcloud.book.group.vo.GroupIncomeStaticParamVO;
-import com.pcloud.book.group.vo.GroupScanTrendParamVO;
-import com.pcloud.book.group.vo.GroupScanTrendVO;
-import com.pcloud.book.group.vo.ListBook4ChannelVO;
-import com.pcloud.book.group.vo.ListBookGroup4ChannelParamVO;
-import com.pcloud.book.group.vo.ResourcesStatisticVO;
-import com.pcloud.book.group.vo.UpdateRankTypeVO;
-import com.pcloud.book.group.vo.UserBookInfoVO;
+import com.pcloud.book.group.vo.*;
 import com.pcloud.book.keywords.vo.ListKeywordVO;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBean;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.permission.PermissionException;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
 import org.codehaus.jackson.JsonParseException;
-import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.CookieValue;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -54,7 +26,6 @@ import java.util.List;
  * Description 社群书群二维码接口
  * Created by PENG on 2019/4/17.
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookGroupFacadeCloud", path = "bookGroup")
 @Api(description = "社群书群二维码接口")
 public interface BookGroupFacade {
 

pcloud-service-book/src/main/java/com/pcloud/book/keywords/facade/BookGuideFacade.java

 package com.pcloud.book.keywords.facade;
 
 import com.pcloud.book.keywords.vo.GuideVO;
-import com.pcloud.book.keywords.vo.ReplyMessageVO;
 import com.pcloud.book.keywords.vo.SetGuideVO;
 import com.pcloud.book.keywords.vo.UpdateGuideVO;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.permission.PermissionException;
-
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-import java.util.Map;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
 
 /**
  * @author lily
  * @date 2019/4/23 15:24
  */
-@FeignClient(value = "pcloud-service-book",qualifier = "bookGuideFacadeCloud",path = "bookGuide")
 @Api(description = "欢迎语设置")
 public interface BookGuideFacade {
 

pcloud-service-book/src/main/java/com/pcloud/book/keywords/facade/BookKeywordFacade.java

@@ -5,29 +5,18 @@ import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.permission.PermissionException;
-
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.web.bind.annotation.CookieValue;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * @author lily
  * @date 2019/4/24 14:31
  */
-@FeignClient(value = "pcloud-service-book",qualifier = "bookKeywordFacadeCloud",path = "bookKeyword")
 @Api(description = "关键词设置")
 public interface BookKeywordFacade {
 

pcloud-service-book/src/main/java/com/pcloud/book/push/facade/PushFacade.java

@@ -11,7 +11,6 @@ import com.pcloud.common.permission.PermissionException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -21,7 +20,6 @@ import java.util.List;
  * @Author ruansiyuan
  * @Date 2019/4/17 17:49
  **/
-@FeignClient(value = "pcloud-service-book",qualifier = "pushFacadeCloud",path = "push")
 @Api(description = "推送群消息外部接口")
 public interface PushFacade {
 

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/facade/WeixinClockFacade.java

@@ -7,29 +7,16 @@ import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.permission.PermissionException;
-
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.web.bind.annotation.CookieValue;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import io.swagger.annotations.*;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
 /**
  * @author 杨涛
  * @description 接口层
  * @date 2019/8/14 19:15
  */
-@FeignClient(value = "pcloud-service-book",qualifier = "weixinClockFacadeCloud",path = "weixinClock")
 @Api(description = "微信群签到打卡")
 public interface WeixinClockFacade {
 

pcloud-service-book/src/main/resources/logback.xml

@@ -133,5 +133,6 @@
 	<logger name="druid.sql" level="INFO"/>
 	<logger name="org.springframework.cloud.openfeign.FeignClientFactoryBean" level="ERROR"/>
 	<logger name="com.netflix.discovery.shared.resolver.aws.ConfigClusterResolver" level="WARN"/>
+	<logger name="org.apache.ibatis.io.ResolverUtil" level="ERROR"/>
 
 </configuration>
\ No newline at end of file

pcloud-service-book/src/test/java/com.pcloud.book.test/ESBookAndAdviserBizTest.java

@@ -4,13 +4,13 @@ import com.alibaba.fastjson.JSON;
 import com.pcloud.book.BookApplication;
 import com.pcloud.book.es.biz.ESBookAndAdviserBiz;
 import com.pcloud.book.es.entity.ESBookAndAdviser;
+import com.pcloud.universe.commons.paging.Pagination;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.StopWatch;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.domain.Page;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 
@@ -29,13 +29,13 @@ public class ESBookAndAdviserBizTest {
         StopWatch sw = new StopWatch();
         sw.start();
         String keyword = "9787566602442";
-        Page<ESBookAndAdviser> p = esBookAndAdviserBiz.getESAdviserBooks4Applet(null,
+        Pagination<ESBookAndAdviser> p = esBookAndAdviserBiz.getESAdviserBooks4Applet(null,
                 keyword, null, null, null,
                 0, 100,
                 null, null, null, null);
 
-        log.info("key:{},count:{},cost:{}", keyword, p.getTotalElements(), sw.getTime());
-        p.forEach((baa) -> log.info(JSON.toJSONString(baa)));
+        log.info("key:{},count:{},cost:{}", keyword, p.getTotalCount(), sw.getTime());
+        p.getList().forEach((baa) -> log.info(JSON.toJSONString(baa)));
 
         sw.reset();
         sw.start();
@@ -45,8 +45,8 @@ public class ESBookAndAdviserBizTest {
                 0, 100,
                 null, null, null, null);
 
-        log.info("key:{},count:{},cost:{}", keyword, p.getTotalElements(), sw.getTime());
-        p.forEach((baa) -> log.info(JSON.toJSONString(baa)));
+        log.info("key:{},count:{},cost:{}", keyword, p.getTotalCount(), sw.getTime());
+        p.getList().forEach((baa) -> log.info(JSON.toJSONString(baa)));
 
         sw.reset();
         sw.start();
@@ -56,8 +56,8 @@ public class ESBookAndAdviserBizTest {
                 0, 100,
                 null, null, null, null);
 
-        log.info("key:{},count:{},cost:{}", keyword, p.getTotalElements(), sw.getTime());
-        p.forEach((baa) -> log.info(JSON.toJSONString(baa)));
+        log.info("key:{},count:{},cost:{}", keyword, p.getTotalCount(), sw.getTime());
+        p.getList().forEach((baa) -> log.info(JSON.toJSONString(baa)));
 
         sw.reset();
         sw.start();
@@ -67,8 +67,8 @@ public class ESBookAndAdviserBizTest {
                 0, 100,
                 null, null, null, null);
 
-        log.info("key:{},count:{},cost:{}", keyword, p.getTotalElements(), sw.getTime());
-        p.forEach((baa) -> log.info(JSON.toJSONString(baa)));
+        log.info("key:{},count:{},cost:{}", keyword, p.getTotalCount(), sw.getTime());
+        p.getList().forEach((baa) -> log.info(JSON.toJSONString(baa)));
 
         sw.stop();
     }
@@ -78,13 +78,13 @@ public class ESBookAndAdviserBizTest {
         StopWatch sw = new StopWatch();
         sw.start();
         String keyword = "语文";
-        Page<ESBookAndAdviser> p = esBookAndAdviserBiz.getESAdviserBooks4Applet(null,
+        Pagination<ESBookAndAdviser> p = esBookAndAdviserBiz.getESAdviserBooks4Applet(null,
                 keyword, null, null, null,
                 0, 100,
                 null, null, null, null);
 
-        log.info("key:{},count:{},cost:{}", keyword, p.getTotalElements(), sw.getTime());
-        p.forEach((baa) -> log.info(JSON.toJSONString(baa)));
+        log.info("key:{},count:{},cost:{}", keyword, p.getTotalCount(), sw.getTime());
+        p.getList().forEach((baa) -> log.info(JSON.toJSONString(baa)));
 
         sw.reset();
         sw.start();
@@ -94,8 +94,8 @@ public class ESBookAndAdviserBizTest {
                 0, 100,
                 null, null, null);
 
-        log.info("key:{},count:{},cost:{}", keyword, p.getTotalElements(), sw.getTime());
-        p.forEach((baa) -> log.info(JSON.toJSONString(baa)));
+        log.info("key:{},count:{},cost:{}", keyword, p.getTotalCount(), sw.getTime());
+        p.getList().forEach((baa) -> log.info(JSON.toJSONString(baa)));
 
         sw.stop();
     }