Merge branch '3.x' into 'master'

3.x 升级

See merge request rays/pcloud-book!1402

deploy.bat

+call mvn -Ptest clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U -N
+@pause
\ No newline at end of file

install.bat

+call mvn -Ptest clean install -Denforcer.skip=true -Dmaven.test.skip=true -U
+
+call pause
\ No newline at end of file

pcloud-facade-book/deploy.bat

+call mvn -Ptest clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U
+@pause
\ No newline at end of file

pcloud-facade-book/install.bat

+call mvn -Ptest clean install -Denforcer.skip=true -Dmaven.test.skip=true -U
+
+call pause
\ No newline at end of file

pcloud-facade-book/pom.xml

 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-   <parent>
-		<groupId>com.pcloud.common</groupId>
-		<artifactId>pcloud-book-parent</artifactId>
-		<version>2.1.0-RELEASE</version>
-	</parent>
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.pcloud.common</groupId>
+        <artifactId>pcloud-book-parent</artifactId>
+        <version>3.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+	</parent>
 
 	<groupId>com.pcloud.facade</groupId>
 	<artifactId>pcloud-facade-book</artifactId>
-    <version>${pcloud-facade.version}</version>
+    <version>${reversion}</version>
 	<packaging>jar</packaging>
 
     <name>pcloud-facade-book</name>
-    <url>http://maven.apache.org</url>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
     </properties>
 
     <dependencies>
@@ -25,28 +25,7 @@
 			<artifactId>pcloud-common</artifactId>
 			<version>${pcloud-common.version}</version>
 		</dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-netflix-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-         <!-- swagger2 -->
-         <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-swagger2</artifactId>
-         </dependency>
-         <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-swagger-ui</artifactId>
-         </dependency>
+
 
     </dependencies>
 </project>

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

@@ -3,13 +3,13 @@ package com.pcloud.book.adnews.service;
 import com.pcloud.common.exceptions.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Map;
 
-@FeignClient(value = "pcloud-service-book", qualifier = "adNewsServiceCloud", path = "book/v1.0/adNewsService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "adNewsServiceCloud", path = "book/v1.0/adNewsService")
 @Api(description = "编辑端早晚报内部接口")
 public interface AdNewsService {
 

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

@@ -5,7 +5,7 @@ import com.pcloud.book.advertising.dto.BrandDataDTO4Channel;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,7 +22,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
-@FeignClient(value = "pcloud-service-book", qualifier = "advertisingSpaceServiceCloud", path = "book/v1.0/advertisingSpaceService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "advertisingSpaceServiceCloud", path = "book/v1.0/advertisingSpaceService")
 @Api(description = "广告位内部接口")
 public interface AdvertisingSpaceService {
 

pcloud-facade-book/src/main/java/com/pcloud/book/appeal/facade/BookAppealFacade.java

 package com.pcloud.book.appeal.facade;
 
 import org.codehaus.jackson.JsonParseException;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,7 +29,7 @@ import io.swagger.annotations.ApiOperation;
  * @version 1.0
  * @return
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookAppealFacadeCloud", path = "book/v1.0/bookAppeal")
+@FeignClient(value = "pcloud-service-book", qualifiers = "bookAppealFacadeCloud", path = "book/v1.0/bookAppeal")
 @Api(description = "期刊申诉外部服务")
 public interface BookAppealFacade {
 

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

@@ -14,7 +14,7 @@ import com.pcloud.book.applet.dto.ServeCollectDTO;
 import com.pcloud.book.book.dto.BookDto;
 import com.pcloud.common.dto.ResponseDto;
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,7 +29,7 @@ import io.swagger.annotations.ApiParam;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(value = "pcloud-service-book", qualifier = "appletServiceCloud", path = "book/v1.0/appletService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "appletServiceCloud", path = "book/v1.0/appletService")
 @Api(description = "小程序内部接口")
 public interface AppletService {
 

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

@@ -25,7 +25,7 @@ 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.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -42,7 +42,7 @@ import java.util.Map;
  * @作者：songx
  * @创建时间：2017年1月4日,下午7:57:04 @版本：1.0
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookAdviserServiceCloud", path = "book/v1.0/bookAdviserService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "bookAdviserServiceCloud", path = "book/v1.0/bookAdviserService")
 @Api(description = "编辑推广书籍内部服务")
 public interface BookAdviserService {
 

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

@@ -7,7 +7,7 @@ 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.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,7 +25,7 @@ import java.util.Map;
  * @date 创建时间：2017年3月21日 上午11:34:18
  * @return
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookAppServiceCloud", path = "book/v1.0/bookAppService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "bookAppServiceCloud", path = "book/v1.0/bookAppService")
 @Api(description = "图书应用内部服务")
 public interface BookAppService {
 

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

@@ -7,7 +7,7 @@ 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.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam;
  * @author lili
  * @date 2018/1/18 19:15
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookFreezeServiceCloud", path = "book/v1.0/bookFreezeService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "bookFreezeServiceCloud", path = "book/v1.0/bookFreezeService")
 @Api(description = "图书冻结内部服务")
 public interface BookFreezeService {
 

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

@@ -8,7 +8,7 @@ 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.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,7 +24,7 @@ import java.util.Map;
  * @作者：lihao
  * @创建时间：2017年7月21日,下午5:27:09 @版本：1.0
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookFundServiceCloud", path = "book/v1.0/bookFundService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "bookFundServiceCloud", path = "book/v1.0/bookFundService")
 @Api(description = "编辑推广书籍内部服务")
 public interface BookFundService {
 

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

@@ -10,7 +10,7 @@ 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.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -23,7 +23,7 @@ import java.util.Map;
  * @作者：songx
  * @创建时间：2016年12月23日,下午4:35:23 @版本：1.0
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookProductServiceCloud", path = "book/v1.0/bookProductService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "bookProductServiceCloud", path = "book/v1.0/bookProductService")
 @Api(description = "书籍作品内部服务")
 public interface BookProductService {
 

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

@@ -7,7 +7,7 @@ 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.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -25,7 +25,7 @@ import java.util.List;
  * @date 创建时间：2017年3月21日 上午11:34:18
  * @return
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookResourceServiceCloud", path = "book/v1.0/bookResourceService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "bookResourceServiceCloud", path = "book/v1.0/bookResourceService")
 @Api(description = "图书资源内部服务")
 public interface BookResourceService {
 

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

@@ -19,7 +19,7 @@ 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.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -36,7 +36,7 @@ import java.util.Map;
  * @作者：songx
  * @创建时间：2016年12月23日,下午5:27:09 @版本：1.0
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookServiceCloud", path = "book/v1.0/bookService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "bookServiceCloud", path = "book/v1.0/bookService")
 @Api(description = "书籍内部服务")
 public interface BookService {
 

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

@@ -2,7 +2,7 @@ package com.pcloud.book.book.service;
 
 import com.pcloud.common.dto.ResponseDto;
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -11,7 +11,7 @@ import java.util.List;
 
 import io.swagger.annotations.Api;
 
-@FeignClient(value = "pcloud-service-book", qualifier = "bookServiceCloud", path = "book/v1.0/keywordService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "bookServiceCloud", path = "book/v1.0/keywordService")
 @Api(description = "书籍关键词内部服务")
 public interface KeywordService {
 

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

@@ -5,13 +5,13 @@ import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
-@FeignClient(value = "pcloud-service-book", qualifier = "bookClockInfoServiceCloud", path = "book/v1.0/bookClockInfoService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "bookClockInfoServiceCloud", path = "book/v1.0/bookClockInfoService")
 @Api(description = "微信群打卡内部服务")
 public interface BookClockInfoService {
 

pcloud-facade-book/src/main/java/com/pcloud/book/copyright/service/BookAuthInfoService.java

@@ -7,7 +7,7 @@ import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,7 +21,7 @@ import java.util.List;
  * @author lily
  * @date 2018/12/4 16:23
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookAuthInfoServiceCloud", path = "book/v1.0/bookAuthInfoService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "bookAuthInfoServiceCloud", path = "book/v1.0/bookAuthInfoService")
 @Api(description = "图书版权开启信息")
 public interface BookAuthInfoService {
 

pcloud-facade-book/src/main/java/com/pcloud/book/copyright/service/BookAuthServeService.java

@@ -7,7 +7,7 @@ import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,7 +20,7 @@ import java.util.Map;
  * @author lily
  * @date 2018/12/4 11:01
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookAuthServeServiceCloud", path = "book/v1.0/bookAuthServeService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "bookAuthServeServiceCloud", path = "book/v1.0/bookAuthServeService")
 @Api(description = "图书开启版权服务")
 public interface BookAuthServeService {
 

pcloud-facade-book/src/main/java/com/pcloud/book/cultivate/service/CultivateNotifyService.java

@@ -9,7 +9,7 @@ import com.pcloud.book.cultivate.entity.CultivateNotifySend;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -27,7 +27,7 @@ import io.swagger.annotations.ApiOperation;
  * @author lily
  * @date 2018/12/4 16:23
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "cultivateNotifyServiceCloud", path = "book/v1.0/cultivateNotifyService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "cultivateNotifyServiceCloud", path = "book/v1.0/cultivateNotifyService")
 @Api(description = "小程序站内信")
 public interface CultivateNotifyService {
 

pcloud-facade-book/src/main/java/com/pcloud/book/es/service/ESBookGroupQrcodeService.java

@@ -3,7 +3,7 @@ package com.pcloud.book.es.service;
 import com.pcloud.book.es.dto.ESBookGroupQrcodeDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
-@FeignClient(value = "pcloud-service-book", qualifier = "esBookGroupQrcodeServiceCloud", path = "book/v1.0/esBookGroupQrcode")
+@FeignClient(value = "pcloud-service-book", qualifiers = "esBookGroupQrcodeServiceCloud", path = "book/v1.0/esBookGroupQrcode")
 @Api(description = "ES内部接口")
 public interface ESBookGroupQrcodeService {
 

pcloud-facade-book/src/main/java/com/pcloud/book/giftcoupon/service/GiftCouponService.java

@@ -4,7 +4,7 @@ import com.pcloud.book.giftcoupon.vo.GiftCouponVo;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
-@FeignClient(value = "pcloud-service-book", qualifier = "giftCouponServiceCloud", path = "book/v1.0/giftCouponService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "giftCouponServiceCloud", path = "book/v1.0/giftCouponService")
 @Api(description = "小程序劵包")
 public interface GiftCouponService {
 

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

@@ -10,7 +10,7 @@ import com.pcloud.book.group.dto.ProAssocGroupAndUserNumberDTO;
 import com.pcloud.common.dto.ResponseDto;
 
 import org.omg.CORBA.INTERNAL;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,7 +28,7 @@ import io.swagger.annotations.ApiOperation;
  * @author lily
  * @date 2019/4/28 20:20
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookGroupClassifyCloud", path = "book/v1.0/bookGroupClassifyService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "bookGroupClassifyCloud", path = "book/v1.0/bookGroupClassifyService")
 @Api(description = "微信群分类接口")
 public interface BookGroupClassifyService {
 

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

@@ -6,7 +6,7 @@ import com.pcloud.book.group.dto.BookGroupDTO;
 import com.pcloud.book.group.dto.BookGroupServiceDTO;
 import com.pcloud.book.group.dto.CreateGroupDTO;
 import com.pcloud.common.dto.ResponseDto;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -15,7 +15,7 @@ import java.util.Map;
 
 import io.swagger.annotations.ApiOperation;
 
-@FeignClient(value = "pcloud-service-book", qualifier = "BookGroupDataCloud", path = "book/v1.0/bookGroupDataService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "BookGroupDataCloud", path = "book/v1.0/bookGroupDataService")
 public interface BookGroupDataService {
 
     @RequestMapping(value = "/getBookGroupService", method = RequestMethod.POST)

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

@@ -29,7 +29,7 @@ import com.pcloud.common.dto.StoreFlowInfoDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBeanNew;
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -51,7 +51,7 @@ import io.swagger.annotations.ApiParam;
  * Description 社群书内部接口
  * Created by PENG on 2019/5/14.
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "bookGroupServiceCloud", path = "book/v1.0/bookGroupService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "bookGroupServiceCloud", path = "book/v1.0/bookGroupService")
 @Api(description = "社群书内部接口")
 public interface BookGroupService {
 

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

@@ -12,7 +12,7 @@ import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,7 +28,7 @@ import java.util.Map;
  * @author lily
  * @date 2019/4/19 15:57
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "weixinQrcodeServiceCloud", path = "book/v1.0/weixinQrcodeService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "weixinQrcodeServiceCloud", path = "book/v1.0/weixinQrcodeService")
 @Api(description = "微信群二维码码接口")
 public interface WeixinQrcodeService {
 

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

@@ -4,14 +4,14 @@ import com.pcloud.book.group.dto.ReplyMsgDTO;
 import com.pcloud.common.dto.ResponseDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
-@FeignClient(value = "pcloud-service-book", qualifier = "wxWorkKeyWordServiceCloud", path = "book/v1.0/wxWorkKeyWordService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "wxWorkKeyWordServiceCloud", path = "book/v1.0/wxWorkKeyWordService")
 @Api(description = "关键词内部接口")
 public interface WxWorkKeyWordService {
 

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

@@ -5,7 +5,7 @@ import com.pcloud.book.group.dto.WxWorkTeacherDTO;
 import com.pcloud.common.dto.ResponseDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(value = "pcloud-service-book", qualifier = "wxWorkTeacherServiceCloud", path = "book/v1.0/wxWorkTeacherService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "wxWorkTeacherServiceCloud", path = "book/v1.0/wxWorkTeacherService")
 @Api(description = "企业微信客服")
 public interface WxWorkTeacherService {
 

pcloud-facade-book/src/main/java/com/pcloud/book/guide/service/PcloudRobotWakeUpService.java

@@ -3,13 +3,13 @@ package com.pcloud.book.guide.service;
 import com.pcloud.common.exceptions.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Map;
 
-@FeignClient(value = "pcloud-service-book", qualifier = "pcloudRobotWakeUpServiceCloud", path = "book/v1.0/pcloudRobotWakeUpService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "pcloudRobotWakeUpServiceCloud", path = "book/v1.0/pcloudRobotWakeUpService")
 @Api(description = "机器人自动唤醒内部服务")
 public interface PcloudRobotWakeUpService {
 

pcloud-facade-book/src/main/java/com/pcloud/book/pcloudKeyword/service/PcloudRobotService.java

@@ -5,7 +5,7 @@ import com.pcloud.book.pcloudKeyword.dto.RobotClassifyDTO;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.utils.ResponseHandleUtil;
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,7 +19,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
-@FeignClient(value = "pcloud-service-book", qualifier = "robotServiceCloud", path = "book/v1.0/pcloudRobotService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "robotServiceCloud", path = "book/v1.0/pcloudRobotService")
 @Api(description = "平台个人号内部接口")
 public interface PcloudRobotService {
 

pcloud-facade-book/src/main/java/com/pcloud/book/personlstage/service/PersonalStageService.java

@@ -5,7 +5,7 @@ import com.pcloud.common.dto.ResponseDto;
 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.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Map;
 
-@FeignClient(value = "pcloud-service-book", qualifier = "personalStageServiceCloud", path = "book/v1.0/personalStageService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "personalStageServiceCloud", path = "book/v1.0/personalStageService")
 @Api("阶段内部接口")
 public interface PersonalStageService {
 

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

@@ -3,13 +3,13 @@ package com.pcloud.book.push.service;
 import com.pcloud.common.exceptions.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Map;
 
-@FeignClient(value = "pcloud-service-book", qualifier = "pushServiceCloud", path = "book/v1.0/pushService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "pushServiceCloud", path = "book/v1.0/pushService")
 @Api(description = "群发消息内部服务")
 public interface PushService {
 

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

 package com.pcloud.book.push.service;
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -16,7 +16,7 @@ import io.swagger.annotations.ApiOperation;
  * @创建时间：10:44 2019/12/10
  * @版本：1.0
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "selfPushServiceCloud", path = "book/v1.0/selfPushService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "selfPushServiceCloud", path = "book/v1.0/selfPushService")
 @Api(description = "个人号群发消息内部服务")
 public interface SelfPushService {
 

pcloud-facade-book/src/main/java/com/pcloud/book/reading/service/ReadingActivityService.java

 package com.pcloud.book.reading.service;
 
 import io.swagger.annotations.ApiParam;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -17,7 +17,7 @@ import io.swagger.annotations.ApiOperation;
  * @版本：1.0
  */
 
-@FeignClient(value = "pcloud-service-book", qualifier = "readingActivityServiceCloud", path = "book/v1.0/readingActivityService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "readingActivityServiceCloud", path = "book/v1.0/readingActivityService")
 @Api(description = "共读活动内部服务")
 public interface ReadingActivityService {
 

pcloud-facade-book/src/main/java/com/pcloud/book/record/service/BookBrowseRecordService.java

@@ -3,7 +3,7 @@ package com.pcloud.book.record.service;
 import com.pcloud.book.record.entity.BookBrowseRecord;
 import com.pcloud.common.dto.ResponseDto;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(value = "pcloud-service-book", qualifier = "bookBrowseRecordPcloud", path = "book/v1.0/bookBrowseRecordService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "bookBrowseRecordPcloud", path = "book/v1.0/bookBrowseRecordService")
 public interface BookBrowseRecordService {
 
     @RequestMapping(value = "addBookRecord", method = RequestMethod.POST)

pcloud-facade-book/src/main/java/com/pcloud/book/riddle/RiddleService.java

 package com.pcloud.book.riddle;
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -16,7 +16,7 @@ import io.swagger.annotations.ApiOperation;
  * @创建时间：16:24 2019/8/5
  * @版本：1.0
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "riddleServiceCloud", path = "book/v1.0/riddleService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "riddleServiceCloud", path = "book/v1.0/riddleService")
 @Api(description = "猜谜语接口")
 public interface RiddleService {
 

pcloud-facade-book/src/main/java/com/pcloud/book/skill/service/SkillService.java

@@ -5,7 +5,7 @@ import com.pcloud.book.applet.dto.GroupActivity4AppletDTO;
 import com.pcloud.common.dto.ResponseDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -21,7 +21,7 @@ import java.util.Map;
  * @Date：2020-02-13
  * @Version：1.0
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "skillServiceCloud", path = "/book/v1.0/skillService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "skillServiceCloud", path = "/book/v1.0/skillService")
 @Api(description = "技能内部接口")
 public interface SkillService {
 

pcloud-facade-book/src/main/java/com/pcloud/book/timecontrol/service/TimeControlTaskService.java

@@ -6,7 +6,7 @@ import com.pcloud.book.timecontrol.dto.TaskDto;
 import com.pcloud.common.dto.ResponseDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,7 +22,7 @@ import java.util.Map;
  * @Date：2020-01-30
  * @Version：1.0
  */
-@FeignClient(value = "pcloud-service-book", qualifier = "timeControlTaskServiceCloud", path = "/book/v1.0/timeControlTaskService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "timeControlTaskServiceCloud", path = "/book/v1.0/timeControlTaskService")
 @Api(description = "时间管理内部接口")
 public interface TimeControlTaskService {
 

pcloud-facade-book/src/main/java/com/pcloud/book/timesscreen/service/TimesBookService.java

@@ -5,7 +5,7 @@ import com.pcloud.book.book.dto.BookTypeDto;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.page.PageBeanNew;
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -18,7 +18,7 @@ import java.util.Map;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
-@FeignClient(value = "pcloud-service-book", qualifier = "timesBookServiceCloud", path = "book/v1.0/timesBookService")
+@FeignClient(value = "pcloud-service-book", qualifiers = "timesBookServiceCloud", path = "book/v1.0/timesBookService")
 @Api(description = "时代大屏内部服务")
 public interface TimesBookService {
 

pcloud-service-book/package.bat

+call mvn -Ptest clean package -Denforcer.skip=true -Dmaven.test.skip=true -U
+
+call pause
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/BookApplication.java

@@ -4,9 +4,11 @@ import com.alibaba.druid.pool.DruidDataSource;
 import com.pcloud.book.mq.config.MQTopicConumer;
 import com.pcloud.common.core.constant.MQQueueConstant;
 import com.pcloud.common.core.constant.MQTopicProducer;
+import com.pcloud.common.core.datasource.DataSourceConfig;
 import com.pcloud.common.core.mq.MQExchangeConstants;
 import com.pcloud.common.core.mq.MQQueueConstants;
 import com.pcloud.common.core.mq.RabbitMQFactory;
+import org.apache.commons.lang3.BooleanUtils;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.BindingBuilder;
@@ -17,12 +19,13 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.MultipartConfigFactory;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.util.unit.DataSize;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
@@ -41,11 +44,11 @@ import java.util.Map;
 @ComponentScan("com.pcloud")
 @EnableEurekaClient
 @EnableFeignClients("com.pcloud")
-@PropertySource({"classpath:properties/book.properties", "classpath:public_system.properties"})
+@PropertySource({"classpath:properties/book.properties"})
 @Configuration
 @EnableSwagger2
 @EnableScheduling
-@MapperScan(basePackages = {"com.pcloud.book.*.mapper"}, sqlSessionFactoryRef = "sqlSessionFactory")
+@MapperScan(basePackages = {"com.pcloud.book.*.mapper"}, sqlSessionFactoryRef = DataSourceConfig.SESSION_FACTORY_NAME)
 public class BookApplication {
 
     public static void main(String[] args) {
@@ -55,6 +58,7 @@ public class BookApplication {
     @Bean
     public Docket createRestApi() {// 创建API基本信息
         return new Docket(DocumentationType.SWAGGER_2)
+                .enable(BooleanUtils.toBoolean(System.getProperty("swagger.enable", "false")))
                 .apiInfo(apiInfo())
                 .select()
                 .apis(RequestHandlerSelectors.basePackage("com.pcloud"))// 扫描该包下的所有需要在Swagger中展示的API，@ApiIgnore注解标注的除外
@@ -76,9 +80,9 @@ public class BookApplication {
     public MultipartConfigElement multipartConfigElement() {
         MultipartConfigFactory factory = new MultipartConfigFactory();
         //允许上传的文件最大值
-        factory.setMaxFileSize("50MB"); //KB,MB
+        factory.setMaxFileSize(DataSize.ofMegabytes(50)); //KB,MB
         /// 设置总上传数据总大小
-        factory.setMaxRequestSize("50MB");
+        factory.setMaxRequestSize(DataSize.ofMegabytes(50));
         return factory.createMultipartConfig();
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/adnews/enums/AdContentFromEnum.java

 package com.pcloud.book.adnews.enums;
 
-import com.pcloud.book.advertising.enums.AdDetailModeEnum;
-import org.springframework.amqp.rabbit.support.PublisherCallbackChannelImpl;
-
 /**
  * 早晚报内容来源
  *

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/biz/impl/AppletBooklistBizImpl.java

@@ -47,13 +47,13 @@ import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.httpclient.UrlUtils;
 import com.pcloud.common.utils.string.StringUtil;
+import com.pcloud.universe.commons.paging.Pagination;
 import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
 
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -770,8 +770,8 @@ public class AppletBooklistBizImpl implements AppletBooklistBiz {
 
     private void autoCreateBooklist(List<Long>templetIds, List<Long> secondTempletIds, List<Long> graLabelIds, List<Long> subLabelIds){
         for (int i = 0; i < 3; i++) {
-            Page<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getESAdviserBooks4Applet("1", null, templetIds, graLabelIds, subLabelIds, i, 20,secondTempletIds, null, null, null);
-            if (ListUtils.isEmpty(esPage.getContent())){
+            Pagination<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getESAdviserBooks4Applet("1", null, templetIds, graLabelIds, subLabelIds, i, 20,secondTempletIds, null, null, null);
+            if (ListUtils.isEmpty(esPage.getList())){
                 return;
             }
             AssistTempletDTO assistTempletDTO = assistTempletConsr.getTempletById(templetIds.get(0));
@@ -783,14 +783,14 @@ public class AppletBooklistBizImpl implements AppletBooklistBiz {
             appletBooklist.setThirdClassify(null);
             appletBooklist.setGradeLabelId(ListUtils.isEmpty(graLabelIds)?null:graLabelIds.get(0));
             appletBooklist.setSubjectLabelId(ListUtils.isEmpty(subLabelIds)?null:subLabelIds.get(0));
-            appletBooklist.setDigest(esPage.getContent().size()+"本"+assistTempletDTO.getTempletName()+"书单推荐");
+            appletBooklist.setDigest(esPage.getList().size()+"本"+assistTempletDTO.getTempletName()+"书单推荐");
             appletBooklist.setDisplayPic("https://oss.5rs.me/oss/uploadfe/png/39e36255426a66454037fcde86e19bf2.png");
             appletBooklist.setClassifyId(1L);
             appletBooklist.setIntroduceType(1);
-            appletBooklist.setIntroduceContent("<p>"+(int) esPage.getTotalElements()+"本"+assistTempletDTO.getTempletName()+"书单推荐</p>");
+            appletBooklist.setIntroduceContent("<p>"+(int) esPage.getTotalCount()+"本"+assistTempletDTO.getTempletName()+"书单推荐</p>");
             Long booklistId = addBooklist(appletBooklist);
             List<BookDTO4Booklist> addList = new ArrayList<>();
-            for (ESBookAndAdviser esBookAndAdviser :esPage.getContent()){
+            for (ESBookAndAdviser esBookAndAdviser :esPage.getList()){
                 BookDTO4Booklist booklist = new BookDTO4Booklist();
                 booklist.setBookId(Long.valueOf(esBookAndAdviser.getBookId()));
                 booklist.setAdviserId(Long.valueOf(esBookAndAdviser.getAdviserId()));

pcloud-service-book/src/main/java/com/pcloud/book/applet/dao/impl/BuyBookRequestDaoImpl.java

 package com.pcloud.book.applet.dao.impl;
 
 import com.pcloud.book.applet.dao.BuyBookRequestDao;
-import com.pcloud.book.applet.dto.BuyBookRequestDTO;
 import com.pcloud.book.applet.entity.BuyBookRequest;
 import com.pcloud.common.core.dao.BaseDaoImpl;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

pcloud-service-book/src/main/java/com/pcloud/book/applet/dto/AppletThirdResourceDataDTO.java

 package com.pcloud.book.applet.dto;
 
 import lombok.Data;
-import org.springframework.data.domain.Page;
 
 import java.util.List;
 

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/biz/BookAdviserBiz.java

@@ -4,38 +4,16 @@
 package com.pcloud.book.book.biz;
 
 import com.pcloud.book.base.dto.CountDto;
-import com.pcloud.book.book.dto.AdviserBookInfoDTO;
-import com.pcloud.book.book.dto.AdviserManageDto;
-import com.pcloud.book.book.dto.AviserBookInfoParam;
-import com.pcloud.book.book.dto.BookAdviserDto;
-import com.pcloud.book.book.dto.BookCountAndAdviserIdDTO;
-import com.pcloud.book.book.dto.BookCountByAdvisersDto;
-import com.pcloud.book.book.dto.BookCountDto;
-import com.pcloud.book.book.dto.BookDataStatisticsDTO;
-import com.pcloud.book.book.dto.BookDto;
-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.BookRightsSettingDTO;
-import com.pcloud.book.book.dto.BookStatisticsResultDto;
-import com.pcloud.book.book.dto.BookVarietyStatsDto;
-import com.pcloud.book.book.dto.BookVarietyStatsRequestDto;
-import com.pcloud.book.book.dto.QrcodeStatisticsDTO;
+import com.pcloud.book.book.dto.*;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.book.book.entity.BookAdviser;
-import com.pcloud.book.book.vo.AgentBookStatsDetailVO;
-import com.pcloud.book.book.vo.BookServeInfo;
-import com.pcloud.book.book.vo.BookServesListDTO;
-import com.pcloud.book.book.vo.ErpAdviserBookVO;
-import com.pcloud.book.book.vo.PcloudAdviserBookVO;
-import com.pcloud.book.book.vo.QrCodeVO;
+import com.pcloud.book.book.vo.*;
 import com.pcloud.book.book.vo.request.RelateRaysBookApprovalVO;
 import com.pcloud.book.group.dto.BookAppletSceneDTO;
 import com.pcloud.book.group.dto.BookServeDTO;
 import com.pcloud.channelcenter.qrcode.vo.BookQrcodeVO;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBeanNew;
-import org.springframework.data.domain.Page;
 
 import java.util.Date;
 import java.util.List;

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookAdviserBizImpl.java

@@ -13,43 +13,15 @@ import com.pcloud.analysisengine.browse.dto.BrowseCacheRecordDto;
 import com.pcloud.appcenter.app.dto.AppDto;
 import com.pcloud.book.base.dto.CountDto;
 import com.pcloud.book.base.exception.BookBizException;
-import com.pcloud.book.book.biz.BookAdviserBiz;
-import com.pcloud.book.book.biz.BookBiz;
-import com.pcloud.book.book.biz.BookFundBiz;
-import com.pcloud.book.book.biz.BookLabelBiz;
-import com.pcloud.book.book.biz.BookQrcodeWxworkBiz;
+import com.pcloud.book.book.biz.*;
 import com.pcloud.book.book.constant.BookConstant;
 import com.pcloud.book.book.dao.BookAdviserDao;
-import com.pcloud.book.book.dto.AdviserBookInfoDTO;
-import com.pcloud.book.book.dto.AdviserManageDto;
-import com.pcloud.book.book.dto.AviserBookInfoParam;
-import com.pcloud.book.book.dto.BookAdviserDto;
-import com.pcloud.book.book.dto.BookCountAndAdviserIdDTO;
-import com.pcloud.book.book.dto.BookCountByAdvisersDto;
-import com.pcloud.book.book.dto.BookCountDto;
-import com.pcloud.book.book.dto.BookDataStatisticsDTO;
-import com.pcloud.book.book.dto.BookDto;
-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.BookRightsSettingDTO;
-import com.pcloud.book.book.dto.BookStatisticsResultDto;
-import com.pcloud.book.book.dto.BookVarietyStatsDto;
-import com.pcloud.book.book.dto.BookVarietyStatsRequestDto;
-import com.pcloud.book.book.dto.ERPPublishNumDTO;
-import com.pcloud.book.book.dto.ErpBookInfoDTO;
-import com.pcloud.book.book.dto.QrcodeStatisticsDTO;
+import com.pcloud.book.book.dto.*;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.book.book.entity.BookAdviser;
 import com.pcloud.book.book.enums.BookQrcodeType;
 import com.pcloud.book.book.set.BookSet;
-import com.pcloud.book.book.vo.AgentBookStatsDetailVO;
-import com.pcloud.book.book.vo.BookServeInfo;
-import com.pcloud.book.book.vo.BookServesListDTO;
-import com.pcloud.book.book.vo.ErpAdviserBookVO;
-import com.pcloud.book.book.vo.PcloudAdviserBookVO;
-import com.pcloud.book.book.vo.QrCodeVO;
-import com.pcloud.book.book.vo.QrcodeInfoDto;
+import com.pcloud.book.book.vo.*;
 import com.pcloud.book.book.vo.request.RelateRaysBookApprovalVO;
 import com.pcloud.book.book.vo.request.UpdateBookRobotProcessDto;
 import com.pcloud.book.consumer.analysisengine.BrowseRecordConsr;
@@ -77,11 +49,7 @@ import com.pcloud.book.group.dao.BookAppletSceneDao;
 import com.pcloud.book.group.dao.BookGroupDao;
 import com.pcloud.book.group.dao.BookGroupServeDao;
 import com.pcloud.book.group.dao.ResourcePageItemDao;
-import com.pcloud.book.group.dto.BookAppletSceneDTO;
-import com.pcloud.book.group.dto.BookGroupDTO;
-import com.pcloud.book.group.dto.BookGroupServeCountDTO;
-import com.pcloud.book.group.dto.BookServeDTO;
-import com.pcloud.book.group.dto.BookServeLabelDTO;
+import com.pcloud.book.group.dto.*;
 import com.pcloud.book.group.entity.BookGroupServe;
 import com.pcloud.book.group.enums.AppAndProductTypeEnum;
 import com.pcloud.book.group.enums.JoinGroupTypeEnum;
@@ -130,7 +98,6 @@ import com.pcloud.resourcecenter.product.dto.ProductLabelDto;
 import com.pcloud.resourcecenter.product.dto.ProductTypeDto;
 import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
 import com.pcloud.usercenter.user.entity.UserLogin;
-import com.pcloud.wechatgroup.group.dto.BookGroupScanStatisticsDTO;
 import com.pcloud.wechatgroup.group.dto.GroupScanUserStatsDTO;
 import com.pcloud.wechatgroup.group.dto.GroupUserCountDTO;
 import org.apache.commons.collections.MapUtils;
@@ -141,32 +108,14 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.w3c.dom.NameList;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookElasticSearchBizImpl.java

@@ -8,9 +8,9 @@ import com.pcloud.book.book.dto.BookFundDto;
 import com.pcloud.book.book.dto.BookTypeDto;
 import com.pcloud.book.consumer.book.elasticsearch.BookElasticSearchConsr;
 import com.pcloud.book.consumer.user.PartyConsr;
-import com.pcloud.book.elasticsearch7.entity.Es7Book;
-import com.pcloud.book.elasticsearch7.entity.Es7BookFreeze;
-import com.pcloud.book.elasticsearch7.search.domain.dto.param.PlatformSearchDto;
+import com.pcloud.book.elasticsearch7.domain.dto.param.PlatformSearchDto;
+import com.pcloud.book.elasticsearch7.domain.entity.Es7Book;
+import com.pcloud.book.elasticsearch7.domain.entity.Es7BookFreeze;
 import com.pcloud.book.util.common.Converter;
 import com.pcloud.common.core.constant.SystemCode;
 import com.pcloud.common.exceptions.BizException;

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/book/facade/impl/BookFacadeImpl.java

@@ -19,7 +19,7 @@ import com.pcloud.book.book.vo.request.BookQualifyInfoVO;
 import com.pcloud.book.book.vo.request.BookSearchParamVO;
 import com.pcloud.book.book.vo.request.SyncRelateDataToRaysVO;
 import com.pcloud.book.book.vo.request.UpdateBookRobotProcessDto;
-import com.pcloud.book.elasticsearch7.search.domain.dto.param.PlatformSearchDto;
+import com.pcloud.book.elasticsearch7.domain.dto.param.PlatformSearchDto;
 import com.pcloud.common.core.constant.SystemCode;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;

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

+package com.pcloud.book.config;
+
+import com.alibaba.nacos.spring.context.annotation.config.EnableNacosConfig;
+import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource;
+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/config/datasource/CHDataSource.java

@@ -23,7 +23,7 @@ import javax.sql.DataSource;
 public class CHDataSource {
 
     @Bean(name = "clickHouseDataSource")
-    @ConfigurationProperties(prefix = "spring.datasourceCh")
+    @ConfigurationProperties(prefix = "spring.datasource-ch")
     public DataSource druidDataSource() {
         log.info("[初始化clickhouse数据源 - druidDataSource]");
         return new DruidDataSource();

pcloud-service-book/src/main/java/com/pcloud/book/consumer/book/elasticsearch/BookElasticSearchConsr.java

 package com.pcloud.book.consumer.book.elasticsearch;
 
-import com.pcloud.book.elasticsearch7.entity.Es7Book;
-import com.pcloud.book.elasticsearch7.search.domain.dto.param.PlatformSearchDto;
-import com.pcloud.book.elasticsearch7.search.facade.PlatformBookSearchFacade;
+import com.pcloud.book.elasticsearch7.domain.dto.param.PlatformSearchDto;
+import com.pcloud.book.elasticsearch7.domain.entity.Es7Book;
+import com.pcloud.book.elasticsearch7.service.PlatformBookSearchService;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.universe.commons.paging.Pagination;
 import org.slf4j.Logger;
@@ -22,11 +22,11 @@ public class BookElasticSearchConsr {
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
     @Autowired
-    private PlatformBookSearchFacade platformBookSearchFacade;
+    private PlatformBookSearchService platformBookSearchService;
 
     public Pagination<Es7Book> search(PlatformSearchDto dto) {
         try {
-            ResponseDto<Pagination<Es7Book>> r = platformBookSearchFacade.search(dto);
+            ResponseDto<Pagination<Es7Book>> r = platformBookSearchService.search(dto);
             return r.getData();
         } catch (Exception e) {
             logger.error("platform book es search exception.", e);

pcloud-service-book/src/main/java/com/pcloud/book/custom/biz/impl/CustomTimeControlBizImpl.java

 package com.pcloud.book.custom.biz.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Lists;
 import com.pcloud.appcenter.app.dto.AppDto;
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.consumer.app.AppConsr;
@@ -25,44 +24,29 @@ import com.pcloud.book.group.enums.AppAndProductTypeEnum;
 import com.pcloud.book.keywords.enums.ReplyTypeEnum;
 import com.pcloud.book.pcloudkeyword.set.PcloudRobotSet;
 import com.pcloud.book.skill.dto.AppOrProductReplyDTO;
-import com.pcloud.book.skill.entity.PcloudSubReply;
 import com.pcloud.book.timecontrol.biz.TaskSubscribeBiz;
 import com.pcloud.book.util.common.ThreadPoolUtils;
 import com.pcloud.common.core.aspect.ParamLog;
+import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
 import com.pcloud.common.utils.ListUtils;
-import com.pcloud.common.utils.ResponseHandleUtil;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.common.utils.string.StringUtilParent;
 import com.pcloud.contentcenter.resource.dto.ResourceDTO;
-import com.pcloud.erp.project.dto.ProjectInfoDTO;
-import com.pcloud.erp.project.service.ProjectService;
-
 import com.pcloud.wechatgroup.group.dto.GroupRobotDTO;
-import com.sdk.wxgroup.RobotProcessTypeEnum;
-import com.sdk.wxgroup.SendFileVO;
-import com.sdk.wxgroup.SendMessageTypeEnum;
-import com.sdk.wxgroup.SendPicMessageVO;
-import com.sdk.wxgroup.SendTextMessageVO;
+import com.sdk.wxgroup.*;
 import com.sdk.wxgroup.im.mimc.BusinessConstant;
 import com.sdk.wxgroup.im.mimc.dto.SendMomentsDTO;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 
-import lombok.extern.slf4j.Slf4j;
-
 @Component
 @Slf4j
 public class CustomTimeControlBizImpl implements CustomTimeControlBiz {
@@ -74,8 +58,7 @@ public class CustomTimeControlBizImpl implements CustomTimeControlBiz {
     private CustomTimeControlReplyMapper customTimeControlReplyMapper;
     @Autowired
     private CustomCheck customCheck;
-    @Autowired
-    private ProjectService projectService;
+
     @Autowired
     private AppConsr appConsr;
     @Autowired
@@ -175,28 +158,7 @@ public class CustomTimeControlBizImpl implements CustomTimeControlBiz {
     @Override
     @ParamLog(value = "通过id获取定制服务读书推送计划",isAfterReturn = false)
     public CustomTimeControlDTO getCustomTimeControlById(Integer id) {
-        CustomTimeControlDTO customTimeControlDTO = customTimeControlMapper.getCustomTimeControlById(id);
-        if (null == customTimeControlDTO){
-            throw new BookBizException(BookBizException.PARAM_IS_EXIST,"通过id获取定制服务读书推送计划为null");
-        }
-        List<CustomTimeControlBook> customTimeControlBooks = customTimeControlDTO.getRelatedBooks();
-        fillRelies(customTimeControlDTO.getReplyList4Subscribe(),customTimeControlDTO.getReplyList4Unsubscribe());
-        if (!ListUtils.isEmpty(customTimeControlBooks)){
-            List<String> bookIds = customTimeControlBooks.stream().map(e -> e.getBookId()).collect(Collectors.toList());
-            Map<String, ProjectInfoDTO>  projectMap = null;
-            try {
-                projectMap = ResponseHandleUtil.parseMap(projectService.getProjectInfoBySerialNumbers(bookIds),String.class, ProjectInfoDTO.class);
-            } catch (Exception e) {
-                log.error("获取erp书籍信息失败");
-            }
-            if (MapUtils.isNotEmpty(projectMap)){
-                for (CustomTimeControlBook e : customTimeControlBooks) {
-                    e.setBookName(null == projectMap.get(e.getBookId()) ? "" : projectMap.get(e.getBookId()).getBookName());
-                    e.setErpBookId(null == projectMap.get(e.getBookId()) ? null : Integer.valueOf(projectMap.get(e.getBookId()).getProjectId().toString()));
-                }
-            }
-        }
-        return customTimeControlDTO;
+        throw new BizException("接口已下线");
     }
 
     private void fillRelies(List<CustomTimeControlReply> replyList4Subscribe, List<CustomTimeControlReply> replyList4Unsubscribe) {

pcloud-service-book/src/main/java/com/pcloud/book/es/biz/ESBookAndAdviserBiz.java

@@ -2,7 +2,7 @@ package com.pcloud.book.es.biz;
 
 import com.pcloud.book.book.vo.request.BookSearchParamVO;
 import com.pcloud.book.es.entity.ESBookAndAdviser;
-import org.springframework.data.domain.Page;
+import com.pcloud.universe.commons.paging.Pagination;
 
 import java.util.List;
 import java.util.Map;
@@ -17,15 +17,11 @@ public interface ESBookAndAdviserBiz {
 
     void updateBookAndAdviserToES(List<Long> bookIds);
 
-    Page<ESBookAndAdviser> getAdviserBooks4ES(String grayStatus, String keyword, Long templetId, Long secondTempletId, Long thirdTempletId, Integer currentPage, Integer numPerPage);
+    Pagination<ESBookAndAdviser> getAdviserBooks4ES(String grayStatus, String keyword, Long templetId, Long secondTempletId, Long thirdTempletId, Integer currentPage, Integer numPerPage);
 
-    Page<ESBookAndAdviser> getESAdviserBooks4Applet(String grayStatus, String keyword, List<Long> templetIds, List<Long> graLabelIds, List<Long> subLabelIds, Integer currentPage, Integer numPerPage, List<Long> scecondTempletIds, Integer isAdviserBook, List<Long> adviserIds, Long agentId);
+    Pagination<ESBookAndAdviser> getESAdviserBooks4Applet(String grayStatus, String keyword, List<Long> templetIds, List<Long> graLabelIds, List<Long> subLabelIds, Integer currentPage, Integer numPerPage, List<Long> scecondTempletIds, Integer isAdviserBook, List<Long> adviserIds, Long agentId);
 
-    Page<ESBookAndAdviser> getESAdviserBooks4AppletV2(String grayStatus, String keyword, List<Long> templetIds, List<Long> graLabelIds, List<Long> subLabelIds, Integer currentPage, Integer numPerPage, List<Long> scecondTempletIds, List<Long> adviserIds, Long agentId);
-
-    void deleteAdviserBooks4ES();
-
-    void deleteChoosedAdviserBooks4ES(String keyword);
+    Pagination<ESBookAndAdviser> getESAdviserBooks4AppletV2(String grayStatus, String keyword, List<Long> templetIds, List<Long> graLabelIds, List<Long> subLabelIds, Integer currentPage, Integer numPerPage, List<Long> scecondTempletIds, List<Long> adviserIds, Long agentId);
 
     /**
      * 答案，搜索全平台书刊
@@ -33,31 +29,25 @@ public interface ESBookAndAdviserBiz {
      * @date：2020/11/4 13:52
      *  * @param null
      */
-    Page<ESBookAndAdviser> getESAdviserBooks4Answer(BookSearchParamVO bookSearchParamVO);
+    Pagination<ESBookAndAdviser> getESAdviserBooks4Answer(BookSearchParamVO bookSearchParamVO);
     /**
      * 系列书搜索
      * @author：zhuyajie
      * @date：2020/11/23 17:26
      *  * @param null
      */
-    Page<ESBookAndAdviser> getAdviserBooks4SeriesBook(List<String> keywords, Integer currentPage, Integer numPerPage, List<Long> adviserIds, Long agentId, Long subLabelId, Long graLabelId, String serialNumber, Long verLabelId, Long volLabelId);
+    Pagination<ESBookAndAdviser> getAdviserBooks4SeriesBook(String keyword, Integer currentPage, Integer numPerPage, List<Long> adviserIds, Long agentId, Long subLabelId, Long graLabelId, String serialNumber, Long verLabelId, Long volLabelId);
 
     Map<String, Object> getNotFoundBookId(String lastBookId)throws Exception;
 
     void stopNotFoundBookId();
 
-    void updateTempletId();
-
     /**
      * 查所有书刊，选中的在前
      * @author：zhuyajie
      * @date：2021/4/16 14:34
      *  * @param null
      */
-    Page<ESBookAndAdviser> getESBooksOrderByChose(String keyword, List<Long> choseBookIdList, Integer currentPage, Integer numPerPage);
+    Pagination<ESBookAndAdviser> getESBooksOrderByChose(String keyword, List<Long> choseBookIdList, Integer currentPage, Integer numPerPage);
 
-    /**
-     * 获取编辑书刊列表(ERP项目用)
-     */
-    Page<ESBookAndAdviser> getESBooks4Erp(String isbn, String uniqueNumber, List<String> listName, List<Long> adviserIdList, Integer currentPage, Integer numPerPage);
 }

pcloud-service-book/src/main/java/com/pcloud/book/es/biz/ESBookGroupQrcodeBiz.java

@@ -9,12 +9,6 @@ import java.util.List;
 public interface ESBookGroupQrcodeBiz {
 
     /**
-     * 初始化数据-将数据从 MySQL 导入到 Elasticsearch 中
-     */
-    void initData();
-
-
-    /**
      * 通过微信群ID(xxx@chatroom)获取ES中的群信息
      *
      * @param wxGroupIds 微信群ID

pcloud-service-book/src/main/java/com/pcloud/book/es/biz/impl/ESNewsBizImpl.java

@@ -2,22 +2,15 @@ package com.pcloud.book.es.biz.impl;
 
 import com.pcloud.book.es.biz.ESNewsBiz;
 import com.pcloud.book.es.entity.ESNews;
-import com.pcloud.book.es.repository.NewsRepository;
 import com.pcloud.book.push.dao.NewsDao;
 import com.pcloud.book.push.entity.News;
 import com.pcloud.common.core.aspect.ParamLog;
-import com.pcloud.common.utils.BeanUtils;
-import com.pcloud.common.utils.ListUtils;
-import com.pcloud.common.utils.string.StringUtil;
-import org.elasticsearch.index.query.*;
+import com.pcloud.common.exceptions.BizException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -30,71 +23,25 @@ public class ESNewsBizImpl implements ESNewsBiz {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ESNewsBizImpl.class);
 
-
-    @Autowired
-    private NewsRepository newsRepository;
-
     @Autowired
     private NewsDao newsDao;
 
 
     @ParamLog("导入全部")
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public void addAllNewsToES() {
-        Integer count = newsDao.count();
-        LOGGER.info("总数:" + count);
-        if (null == count || count <= 0) {
-            return;
-        }
-        Long maxId = 0L;
-        Integer index = 0;
-        Integer offset = 10000;
-        while (index * offset < count) {
-            List<ESNews> list = newsDao.findAll(maxId, offset);
-            if (ListUtils.isEmpty(list)) {
-                break;
-            }
-            newsRepository.save(list);
-            maxId = Long.valueOf(list.get(list.size() - 1).getId());
-            index += 1;
-        }
+        throw new BizException("已下线");
     }
 
     @ParamLog("新增新闻")
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public void addNews(News news) {
-        if (news == null) {
-            return;
-        }
-        //查询之前有没有相同的
-        News newsHas=newsDao.getByUrl(news.getUrl());
-        if (newsHas!=null){
-            LOGGER.info("该news已存在"+news.toString());
-            return;
-        }
-        newsDao.insert(news);
-        ESNews esNews = new ESNews();
-        BeanUtils.copyProperties(news, esNews);
-        esNews.setId(news.getId().toString());
-        esNews.setCreateTime(new Date());
-        newsRepository.save(esNews);
+        throw new BizException("已下线");
     }
 
     @ParamLog("查询新闻")
     @Override
     public List<ESNews> getNews(String title, List<Long> notInIds, Integer top) {
-        BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
-        if (!StringUtil.isEmpty(title)) {
-            MatchQueryBuilder matchQuery = QueryBuilders.matchQuery("title", title);
-            boolQueryBuilder.must(matchQuery);
-        }
-        if (!ListUtils.isEmpty(notInIds)){
-            TermsQueryBuilder termsQuery = QueryBuilders.termsQuery("id", notInIds);
-            boolQueryBuilder.mustNot(termsQuery);
-        }
-        PageRequest pageRequest = new PageRequest(0, top);
-        return newsRepository.search(boolQueryBuilder, pageRequest).getContent();
+        throw new BizException("已下线");
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/es/biz/impl/IKAnalyzerUtil.java

-package com.pcloud.book.es.biz.impl;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.wltea.analyzer.lucene.IKAnalyzer;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 分词工具
- */
-public class IKAnalyzerUtil {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(IKAnalyzerUtil.class);
-
-    /**
-     * 通配符
-     */
-    public static final char WILDCARD_CHAR = '*';
-
-    /**
-     * 前后加通配符
-     * @param text  内容
-     * @return
-     */
-    public static String aroundWildcard(String text) {
-        return WILDCARD_CHAR + text + WILDCARD_CHAR;
-    }
-
-    /**
-     * 解析成分词后通配字符串
-     * @param text  内容
-     * @return  String，*通配
-     */
-    public static String parseWildcardString(String text) {
-        if (StringUtils.isBlank(text)) {
-            return text;
-        }
-        return StringUtils.join(analyzerText(text), WILDCARD_CHAR);
-    }
-
-    /**
-     * 分词
-     * @param text   内容
-     * @return  List<分词>
-     */
-    public static List<String> analyzerText(String text) {
-        List<String> result = new ArrayList<>();
-
-        TokenStream ts = null;
-        try (IKAnalyzer analyzer = new IKAnalyzer(true)) {
-            ts = analyzer.tokenStream("text", new StringReader(text));
-            CharTermAttribute term = ts.addAttribute(CharTermAttribute.class);
-            ts.reset();
-
-            while (ts.incrementToken()) {
-                result.add(term.toString());
-            }
-
-            ts.end();
-        } catch (IOException ioe) {
-            result.add(text);
-            LOGGER.warn("analyzer text exception,text={}", text, ioe);
-        } finally {
-            closeTokenStream(text, ts);
-        }
-        return result;
-    }
-
-    private static void closeTokenStream(String text, TokenStream ts) {
-        if (ts != null) {
-            try {
-                ts.close();
-            } catch (IOException ioe) {
-                LOGGER.warn("analyzer text, close stream exception,text={}", text, ioe);
-            }
-        }
-    }
-}

pcloud-service-book/src/main/java/com/pcloud/book/es/entity/ESBookAndAdviser.java

 package com.pcloud.book.es.entity;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import lombok.Data;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldIndex;
-import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -18,14 +11,12 @@ import java.util.Date;
  * @Date 2020/4/13 14:29
  **/
 @Data
-@Document(indexName = "book", type = "book_and_adviser")
 public class ESBookAndAdviser  {
 
 
     /**
      * 书籍标识
      */
-    @Id
     private String bookId;
 
     /**
@@ -71,19 +62,16 @@ public class ESBookAndAdviser  {
     /**
      * 书籍ISBN码
      */
-    @Field(type = FieldType.String, index = FieldIndex.not_analyzed)
     private String isbn;
 
     /**
      * 书籍名称
      */
-    @Field(type = FieldType.String, index = FieldIndex.not_analyzed)
     private String bookName;
 
     /**
      * 书籍名称，同上面bookName，ES按分词存储，主要用于分词搜索
      */
-    @Field(type = FieldType.String, index = FieldIndex.analyzed, analyzer = "ik_max_word", searchAnalyzer = "ik_max_word")
     private String ikBookName;
 
     /**
@@ -99,13 +87,11 @@ public class ESBookAndAdviser  {
     /**
      * 最后更新时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date lastModifiedDate;
 
     /**
      * 编辑书创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createdDate;
 
     /**

pcloud-service-book/src/main/java/com/pcloud/book/es/entity/ESBookGroupQrcode.java

@@ -2,13 +2,7 @@ package com.pcloud.book.es.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldIndex;
-import org.springframework.data.elasticsearch.annotations.FieldType;
 
-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -20,12 +14,9 @@ import java.util.List;
  * @since 2020年7月10日
  */
 @Data
-@Document(indexName = "book", type = "book_group_qrcode")
 public class ESBookGroupQrcode {
-    @Field(type = FieldType.Long, index = FieldIndex.no)
     private static final long serialVersionUID = 353789664671201879L;
 
-    @Id
     private Long id;
     /**
      * 分类标识
@@ -34,7 +25,6 @@ public class ESBookGroupQrcode {
     /**
      * 群名称
      */
-    @Field(type = FieldType.String, index = FieldIndex.analyzed, analyzer = "ik_smart", searchAnalyzer = "ik_smart")
     private String groupName;
     /**
      * 序号
@@ -51,7 +41,6 @@ public class ESBookGroupQrcode {
     /**
      * 微信群id
      */
-    @Field(type = FieldType.String, index = FieldIndex.not_analyzed)
     private String weixinGroupId;
     /**
      * 微信群头像
@@ -99,25 +88,21 @@ public class ESBookGroupQrcode {
     /**
      * 城市标签
      */
-    @Field(type = FieldType.String, index = FieldIndex.analyzed,analyzer = "ik_smart",searchAnalyzer = "ik_smart")
     private List<String> cityTags;
 
     /**
      * 群名标签
      */
-    @Field(type = FieldType.String,index = FieldIndex.analyzed,analyzer = "ik_smart",searchAnalyzer = "ik_smart")
     private List<String> groupNameTags;
 
     /**
      * 书名标签
      */
-    @Field(type = FieldType.String,index = FieldIndex.analyzed,analyzer = "ik_smart",searchAnalyzer = "ik_smart")
     private List<String> bookNameTags;
 
     /**
      * 出版社地区标签
      */
-    @Field(type = FieldType.String,index = FieldIndex.analyzed,analyzer = "ik_smart",searchAnalyzer = "ik_smart")
     private List<String> pressTags;
 
     /**
@@ -138,13 +123,11 @@ public class ESBookGroupQrcode {
     /**
      * 书名
      */
-    @Field(type = FieldType.String,index = FieldIndex.analyzed,analyzer = "ik_smart",searchAnalyzer = "ik_smart")
     private String qrcodeBookName;
 
     /**
      * 群内实付总额 - ES 不支持 BigDecimal 类型
      */
-    @Field(type = FieldType.String,index = FieldIndex.not_analyzed)
     private String purchaseAmount;
 
     /**
@@ -160,19 +143,16 @@ public class ESBookGroupQrcode {
     /**
      * 编辑名称
      */
-    @Field(type = FieldType.String,index = FieldIndex.not_analyzed)
     private String adviserName;
 
     /**
      * 出版社名称
      */
-    @Field(type = FieldType.String,index = FieldIndex.analyzed,analyzer = "ik_smart",searchAnalyzer = "ik_smart")
     private String agentName;
 
     /**
      * 图书ISBN
      */
-    @Field(type = FieldType.String,index = FieldIndex.not_analyzed)
     private String isbn;
 
     /**

pcloud-service-book/src/main/java/com/pcloud/book/es/entity/ESNews.java

 package com.pcloud.book.es.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.elasticsearch.annotations.Document;
 
 import java.util.Date;
 
@@ -11,10 +9,8 @@ import java.util.Date;
  * @Author ruansiyuan
  * @Date 2019/6/13 16:03
  **/
-@Document(indexName = "book", type = "news")
 public class ESNews {
 
-    @Id
     private String id;
 
     /**

pcloud-service-book/src/main/java/com/pcloud/book/es/facade/ESBookAndAdviserFacade.java

 package com.pcloud.book.es.facade;
 
-import cn.hutool.core.util.StrUtil;
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.es.biz.ESBookAndAdviserBiz;
 import com.pcloud.book.es.entity.ESBookAndAdviser;
@@ -8,13 +7,7 @@ import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -51,21 +44,19 @@ public class ESBookAndAdviserFacade {
         if (currentPage == null || numPerPage == null || currentPage < 0 || numPerPage < 0) {
             throw BookBizException.PAGE_PARAM_DELETION;
         }
-        return esBookAndAdviserBiz.getAdviserBooks4ES("0", keyword,templetId,secondTempletId,thirdTempletId,currentPage,numPerPage).getContent();
+        return esBookAndAdviserBiz.getAdviserBooks4ES("0", keyword,templetId,secondTempletId,thirdTempletId,currentPage,numPerPage).getList();
     }
 
     @ApiOperation("es中删除部分测试图书")
     @GetMapping("deleteAdviserBooks4ES")
     public ResponseDto<?> deleteAdviserBooks4ES() throws BizException {
-        esBookAndAdviserBiz.deleteAdviserBooks4ES();
-        return new ResponseDto<>();
+        throw new BizException("接口已下线 - deleteAdviserBooks4ES");
     }
 
     @ApiOperation("es中删除选中图书")
     @GetMapping("deleteChoosedAdviserBooks4ES")
     public ResponseDto<?> deleteChoosedAdviserBooks4ES(@RequestParam(value = "keyword") String keyword) throws BizException {
-        esBookAndAdviserBiz.deleteChoosedAdviserBooks4ES(keyword);
-        return new ResponseDto<>();
+        throw new BizException("接口已下线 - deleteChoosedAdviserBooks4ES");
     }
 
     @ApiOperation("查询ES有而BOOK表没有的书")
@@ -84,10 +75,7 @@ public class ESBookAndAdviserFacade {
     @ApiOperation("ES同步图书分类信息 - 慎点 参数为接口名")
     @GetMapping("/syncBookAdviserTemplet4ES")
     public ResponseDto<Void> syncBookAdviserTemplet4ES(@RequestParam("conten") String content){
-        if (StrUtil.equals(content,"syncBookAdviserTemplet4ES")){
-            esBookAndAdviserBiz.updateTempletId();
-        }
-        return new ResponseDto<>();
+        throw new BizException("接口已下线 - syncBookAdviserTemplet4ES");
     }
 
     @ApiOperation("更新es书刊")

pcloud-service-book/src/main/java/com/pcloud/book/es/facade/impl/ESBookGroupQrcodeFacadeImpl.java

@@ -24,7 +24,6 @@ public class ESBookGroupQrcodeFacadeImpl {
     @ApiOperation("初始化数据")
     @RequestMapping(value = "init",method = RequestMethod.GET)
     public ResponseDto<?> initData(){
-        esBookGroupQrcodeBiz.initData();
         return new ResponseDto<>();
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/es/repository/BookAndAdviserRepository.java

-package com.pcloud.book.es.repository;
-
-import com.pcloud.book.es.entity.ESBookAndAdviser;
-import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
-
-public interface BookAndAdviserRepository extends ElasticsearchRepository<ESBookAndAdviser, String> {
-}

pcloud-service-book/src/main/java/com/pcloud/book/es/repository/BookGroupQrcodeRepository.java

-package com.pcloud.book.es.repository;
-
-import com.pcloud.book.es.entity.ESBookGroupQrcode;
-import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
-
-/**
- * @author guiq
- */
-public interface BookGroupQrcodeRepository extends ElasticsearchRepository<ESBookGroupQrcode,Long> {
-}

pcloud-service-book/src/main/java/com/pcloud/book/es/repository/NewsRepository.java

-package com.pcloud.book.es.repository;
-
-import com.pcloud.book.es.entity.ESNews;
-import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
-
-public interface NewsRepository extends ElasticsearchRepository<ESNews, String> {
-}

pcloud-service-book/src/main/java/com/pcloud/book/es/service/impl/ESBookGroupQrcodeServiceImpl.java

@@ -2,16 +2,10 @@ package com.pcloud.book.es.service.impl;
 
 import com.pcloud.book.es.biz.ESBookGroupQrcodeBiz;
 import com.pcloud.book.es.dto.ESBookGroupQrcodeDTO;
-import com.pcloud.book.es.repository.BookGroupQrcodeRepository;
 import com.pcloud.book.es.service.ESBookGroupQrcodeService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
-import org.springframework.web.bind.annotation.RequestBody;
-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.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -20,10 +14,6 @@ import java.util.List;
 public class ESBookGroupQrcodeServiceImpl implements ESBookGroupQrcodeService {
 
     @Autowired
-    private ElasticsearchTemplate elasticsearchTemplate;
-    @Autowired
-    private BookGroupQrcodeRepository bookGroupQrcodeRepository;
-    @Autowired
     private ESBookGroupQrcodeBiz esBookGroupQrcodeBiz;
 
 

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/ResourcePageBizImpl.java

 package com.pcloud.book.group.biz.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.qrcode.QrCodeException;
+import cn.hutool.extra.qrcode.QrCodeUtil;
+import cn.hutool.http.HttpUtil;
 import com.pcloud.advertising.advertising.dto.AdvertisingSpaceDTO;
 import com.pcloud.advertising.advertising.dto.AdvertisingSpaceItemDTO;
 import com.pcloud.analysisengine.browse.dto.BrowseRecordStatisticDTO;
@@ -37,47 +44,11 @@ import com.pcloud.book.group.biz.BookGroupBiz;
 import com.pcloud.book.group.biz.ResourcePageBiz;
 import com.pcloud.book.group.biz.ResourcePageBookstoreBiz;
 import com.pcloud.book.group.constant.ResourcePageConstants;
-import com.pcloud.book.group.dao.BookAppletSceneDao;
-import com.pcloud.book.group.dao.BookGroupDao;
-import com.pcloud.book.group.dao.ResourcePageCollectDao;
-import com.pcloud.book.group.dao.ResourcePageColumnDao;
-import com.pcloud.book.group.dao.ResourcePageCourseDao;
-import com.pcloud.book.group.dao.ResourcePageDao;
-import com.pcloud.book.group.dao.ResourcePageItemDao;
-import com.pcloud.book.group.dao.ResourcePageNavigationDao;
-import com.pcloud.book.group.dao.ResourcePagePicDao;
-import com.pcloud.book.group.dao.ResourcePageToolDao;
-import com.pcloud.book.group.dao.ResourceRecomManageDao;
-import com.pcloud.book.group.dto.AddBookGroupServeDTO;
-import com.pcloud.book.group.dto.BookGroupDTO;
-import com.pcloud.book.group.dto.BookGroupServeCountDTO;
-import com.pcloud.book.group.dto.BookGroupServeDTO;
-import com.pcloud.book.group.dto.BookServeDTO;
-import com.pcloud.book.group.dto.NavigationParamDTO;
-import com.pcloud.book.group.dto.ResourcePageCourseDTO;
-import com.pcloud.book.group.dto.ResourcePageDTO;
-import com.pcloud.book.group.dto.ResourcePageUrlDTO;
-import com.pcloud.book.group.entity.BookAppletScene;
-import com.pcloud.book.group.entity.BookGroup;
-import com.pcloud.book.group.entity.BookGroupServe;
-import com.pcloud.book.group.entity.ResourcePage;
-import com.pcloud.book.group.entity.ResourcePageBookstore;
-import com.pcloud.book.group.entity.ResourcePageCollect;
-import com.pcloud.book.group.entity.ResourcePageColumn;
-import com.pcloud.book.group.entity.ResourcePageCourse;
-import com.pcloud.book.group.entity.ResourcePageItem;
-import com.pcloud.book.group.entity.ResourcePageNavigation;
-import com.pcloud.book.group.entity.ResourcePagePic;
-import com.pcloud.book.group.entity.ResourcePageTool;
-import com.pcloud.book.group.entity.ResourceRecomManage;
+import com.pcloud.book.group.dao.*;
+import com.pcloud.book.group.dto.*;
+import com.pcloud.book.group.entity.*;
 import com.pcloud.book.group.tools.SendWeixinRequestTools;
-import com.pcloud.book.group.vo.ResourceColumnAndServeVO;
-import com.pcloud.book.group.vo.ResourcePageBookstoreVO;
-import com.pcloud.book.group.vo.ResourcePageItemVO;
-import com.pcloud.book.group.vo.ResourcePageOneServe;
-import com.pcloud.book.group.vo.ResourcePageVO;
-import com.pcloud.book.group.vo.UpdateResourceColumnVO;
-import com.pcloud.book.group.vo.UpdateResourcePageVO;
+import com.pcloud.book.group.vo.*;
 import com.pcloud.book.rightsSetting.biz.RightsSettingBiz;
 import com.pcloud.book.skill.biz.PcloudGroupActivityBiz;
 import com.pcloud.book.util.common.ThreadPoolUtils;
@@ -97,13 +68,7 @@ import com.pcloud.common.core.constant.ProductTypeConstant;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
-import com.pcloud.common.utils.BeanUtils;
-import com.pcloud.common.utils.DateUtils;
-import com.pcloud.common.utils.ListUtils;
-import com.pcloud.common.utils.NumberUtil;
-import com.pcloud.common.utils.QrcodeUtils;
-import com.pcloud.common.utils.ServeLinkUtils;
-import com.pcloud.common.utils.UUIDUitl;
+import com.pcloud.common.utils.*;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.message.common.enums.YesNoEnums;
 import com.pcloud.readercenter.userlabel.dto.UserGradeLabelIdDTO;
@@ -111,7 +76,7 @@ import com.pcloud.resourcecenter.product.dto.ProductDto;
 import com.pcloud.resourcecenter.product.dto.ProductLabelDto;
 import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
 import com.pcloud.wechatgroup.wxwork.dto.WxworkGroupQrcodeBaseDTO;
-
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -119,27 +84,9 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.qrcode.QrCodeException;
-import cn.hutool.extra.qrcode.QrCodeUtil;
-import cn.hutool.http.HttpUtil;
-import lombok.extern.slf4j.Slf4j;
-
 /**
  * @ClassName com.pcloud.book.group.biz.impl.ResourcePageBizImpl
  * @Author zhuyajie
@@ -1463,13 +1410,15 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePageVO.setBookId(qrcodeSceneDto.getAdviserBookId());
             resourcePageVO.setAdviserId(qrcodeSceneDto.getCreatedByUserLogin());
             resourcePageVO.setChannelId(qrcodeSceneDto.getChannelPartyId());
-            resourcePageVO.setBookImg(qrcodeSceneDto.getBook().getCoverImg());
-            resourcePageVO.setBookName(qrcodeSceneDto.getBook().getBookName());
+            if (qrcodeSceneDto.getBook() != null) {
+                resourcePageVO.setBookName(qrcodeSceneDto.getBook().getBookName());
+                resourcePageVO.setBookImg(qrcodeSceneDto.getBook().getCoverImg());
+            }
             resourcePageVO.setQrcodeName(qrcodeSceneDto.getSceneName());
             Long adviserId = qrcodeSceneDto.getCreatedByUserLogin();
             Map<Long, AdviserBaseInfoDto> agentMap = adviserConsr.getAdviserId2AdviserInfoDtoMap(Arrays.asList(adviserId));
             if (!MapUtils.isEmpty(agentMap)) {
-                resourcePageVO.setAgentName(agentMap.get(adviserId).getAgentName());
+                resourcePageVO.setAgentName(Optional.ofNullable(agentMap.get(adviserId)).orElseGet(AdviserBaseInfoDto::new).getAgentName());
             }
             AccountSettingDto accountSettingDto = qrcodeSceneConsr.getWechatInfo(qrcodeSceneDto.getChannelPartyId());
             if(accountSettingDto != null){

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/personal/facade/PersonalFacade.java

@@ -4,19 +4,14 @@ import com.pcloud.book.keywords.entity.RobotSkillDetail;
 import com.pcloud.book.personal.biz.PersonalBiz;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.page.PageBeanNew;
-
+import io.swagger.annotations.Api;
 import org.apache.ibatis.annotations.Param;
-import org.elasticsearch.common.recycler.Recycler.V;
 import org.springframework.beans.factory.annotation.Autowired;
 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.RestController;
 
-import javax.xml.ws.soap.Addressing;
-
-import io.swagger.annotations.Api;
-
 @Api("个人中心")
 @RestController("personalFacade")
 @RequestMapping("personal")

pcloud-service-book/src/main/java/com/pcloud/book/personalstage/biz/impl/PersonalStageBizImpl.java

@@ -12,10 +12,8 @@ import com.pcloud.book.consumer.content.ResourceConsr;
 import com.pcloud.book.consumer.erp.ErpConsr;
 import com.pcloud.book.consumer.wechatgroup.WechatGroupConsr;
 import com.pcloud.book.custom.entity.CustomPlan;
-import com.pcloud.book.custom.enums.PlanReadTypeEnum;
 import com.pcloud.book.custom.mapper.CustomPlanMapper;
 import com.pcloud.book.custom.mapper.CustomPlanModuleSuggestionMapper;
-import com.pcloud.book.custom.vo.AddBookNameVO;
 import com.pcloud.book.custom.vo.UserBookServiceVO;
 import com.pcloud.book.group.dao.BookGroupDao;
 import com.pcloud.book.group.enums.JoinGroupTypeEnum;
@@ -29,26 +27,9 @@ import com.pcloud.book.personalstage.biz.PersonalStageBiz;
 import com.pcloud.book.personalstage.biz.PersonalStageJumpBiz;
 import com.pcloud.book.personalstage.check.PersonalStageCheck;
 import com.pcloud.book.personalstage.constant.PersonalStageConstant;
-import com.pcloud.book.personalstage.dao.PersonalStageDao;
-import com.pcloud.book.personalstage.dao.PersonalStageJumpDao;
-import com.pcloud.book.personalstage.dao.PersonalStageJumpKeywordDao;
-import com.pcloud.book.personalstage.dao.PersonalStageJumpLinkupDao;
-import com.pcloud.book.personalstage.dao.PersonalStageProgressMessageDao;
-import com.pcloud.book.personalstage.dao.PersonalStageReplyDao;
-import com.pcloud.book.personalstage.dao.PersonalStageReplyItemDao;
-import com.pcloud.book.personalstage.dao.PersonalStageUserDao;
-import com.pcloud.book.personalstage.dao.PersonalStageWakeupDao;
-import com.pcloud.book.personalstage.dao.ReplaceCodeDao;
-import com.pcloud.book.personalstage.dao.UserReplaceCodeDao;
+import com.pcloud.book.personalstage.dao.*;
 import com.pcloud.book.personalstage.dto.*;
-import com.pcloud.book.personalstage.entity.PersonalStage;
-import com.pcloud.book.personalstage.entity.PersonalStageProgressMessage;
-import com.pcloud.book.personalstage.entity.PersonalStageReply;
-import com.pcloud.book.personalstage.entity.PersonalStageReplyItem;
-import com.pcloud.book.personalstage.entity.PersonalStageUser;
-import com.pcloud.book.personalstage.entity.PersonalStageWakeup;
-import com.pcloud.book.personalstage.entity.ReplaceCode;
-import com.pcloud.book.personalstage.entity.UserReplaceCode;
+import com.pcloud.book.personalstage.entity.*;
 import com.pcloud.book.personalstage.enums.JumpTypeEnum;
 import com.pcloud.book.personalstage.enums.PersonalStageUserStateEnum;
 import com.pcloud.book.personalstage.enums.SendModeEnum;
@@ -74,18 +55,11 @@ import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.httpclient.UrlUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.contentcenter.resource.dto.ResourceDTO;
-import com.pcloud.erp.project.enums.ServiceLevelEnum;
 import com.pcloud.wechatgroup.group.dto.GroupRobotDTO;
 import com.pcloud.wechatgroup.group.dto.GroupUserDTO;
-import com.sdk.wxgroup.RobotProcessTypeEnum;
-import com.sdk.wxgroup.SendFileVO;
-import com.sdk.wxgroup.SendMessageTypeEnum;
-import com.sdk.wxgroup.SendPicMessageVO;
-import com.sdk.wxgroup.SendTextMessageVO;
-import com.sdk.wxgroup.WxGroupSDK;
+import com.sdk.wxgroup.*;
 import com.sdk.wxgroup.im.mimc.BusinessConstant;
 import com.sdk.wxgroup.im.mimc.dto.SendMomentsDTO;
-
 import org.apache.commons.collections.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -94,14 +68,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Component("personalStageBiz")

pcloud-service-book/src/main/java/com/pcloud/book/personalstage/biz/impl/ServiceLevelEnum.java

+package com.pcloud.book.personalstage.biz.impl;
+
+/**
+ * 从原ERP包中复制
+ */
+enum ServiceLevelEnum {
+
+    OT_FOUND(1),
+    ZERO_BOOK(2),
+    NOT_ZERO_BOOK(3);
+
+    final Integer value;
+
+    ServiceLevelEnum(Integer value) {
+        this.value = value;
+    }
+}

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/util/common/Converter.java

@@ -2,9 +2,12 @@ package com.pcloud.book.util.common;
 
 import com.pcloud.book.book.dto.BookDto;
 import com.pcloud.book.book.dto.BookFundDto;
-import com.pcloud.book.elasticsearch7.entity.Es7Book;
-import com.pcloud.book.elasticsearch7.entity.Es7BookFund;
+import com.pcloud.book.elasticsearch7.domain.entity.Es7Book;
+import com.pcloud.book.elasticsearch7.domain.entity.Es7BookFund;
+import com.pcloud.book.es.entity.ESBookAndAdviser;
+import com.pcloud.universe.commons.paging.Pagination;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.cglib.beans.BeanCopier;
 
 import java.util.ArrayList;
@@ -38,4 +41,62 @@ public class Converter {
 
         return dto;
     }
+
+    public static Pagination<ESBookAndAdviser> convert(Pagination<Es7Book> data) {
+        Pagination<ESBookAndAdviser> result = new Pagination<>(data.getCurrentPage(), data.getPageSize());
+        result.setTotalCount(data.getTotalCount());
+
+        List<ESBookAndAdviser> list = new ArrayList<>();
+        data.getList().forEach(b -> {
+            ESBookAndAdviser ba = new ESBookAndAdviser();
+            ba.setFundBookValue(b.getFundBookValue());
+            ba.setIsMainEditor(b.getIsMainEditor());
+            ba.setCreatedDate(b.getCreatedDate());
+            ba.setLastModifiedDate(b.getLastModifiedDate());
+//            ba.setBookUserCount(b.getBookUserCount());
+//            ba.setHasAnswer(b.getHasAnswer());
+            ba.setIsApproval(BooleanUtils.toInteger(b.getIsApproval()));
+            ba.setIsFundSupport(BooleanUtils.toInteger(b.getIsFundSupport()));
+            ba.setJoinGroupType(b.getJoinGroupType());
+            ba.setResourceCount(b.getResourceCount());
+//            ba.setAreaLabelId(b.getAreaLabelId());
+            ba.setBookGroupId(b.getBookGroupId());
+            ba.setGraLabelId(int2Long(b.getAdviserGraLabelId()));
+//            ba.setRightsSettingId(b.getRightsSettingId());
+            ba.setSubLabelId(int2Long(b.getAdviserSubLabelId()));
+            ba.setVerLabelId(int2Long(b.getAdviserVerLabelId()));
+            ba.setVolLabelId(int2Long(b.getAdviserVolLabelId()));
+            ba.setAdviserId(long2String(b.getAdviserId()));
+            ba.setBookAdviserId(long2String(b.getBookAdviserId()));
+            ba.setBookId(long2String(b.getBookId()));
+            ba.setBookName(b.getBookName());
+            ba.setChannelId(long2String(b.getAdviserChannelId()));
+            ba.setIkBookName(b.getIkBookName());
+            ba.setIsAdviserBook(BooleanUtils.toString(b.getIsAdviserBook(), "1", "0"));
+            ba.setIsbn(b.getIsbn());
+            ba.setIsBookAdviserDelete(BooleanUtils.toString(b.getIsBookAdviserDelete(), "1", "0"));
+            ba.setIsBookDelete(BooleanUtils.toString(b.getIsDelete(), "1", "0"));
+            ba.setLabel1(b.getLabel1());
+            ba.setLabel2(b.getLabel2());
+            ba.setLabel3(b.getLabel3());
+            ba.setLabel4(b.getLabel4());
+            ba.setSecondTempletId(long2String(b.getAdviserSecondTempletId()));
+            ba.setSerialNumber(b.getSerialNumber());
+            ba.setTempletId(long2String(b.getAdviserTempletId()));
+            ba.setThirdTempletId(long2String(b.getAdviserThirdTempletId()));
+            ba.setTypeCode(b.getTypeCode());
+
+            list.add(ba);
+        });
+        result.setList(list);
+        return result;
+    }
+
+    private static String long2String(Long l) {
+        return l == null ? null : l.toString();
+    }
+
+    private static Long int2Long(Integer l) {
+        return l == null ? null : l.longValue();
+    }
 }

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/application.yml

-server:
-  port: 8202
-  context-path: /book/v1.0/
-
-eureka:
-  instance:
-    status-page-url-path: /book/v1.0/swagger-ui.html
-  client:
-   register-with-eureka: true #禁止自己当做服务注册
-
-spring:
-  application:
-    name: pcloud-service-book
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: com.mysql.jdbc.Driver
-    initialSize: 5
-    minIdle: 5
-    maxActive: 100
-    maxWait: 60000
-    removeAbandoned: true
-    removeAbandonedTimeout: 180
-    logAbandoned: true
-    timeBetweenEvictionRunsMillis: 3000
-    minEvictableIdleTimeMillis: 3600000
-    validationQuery: SELECT 'x' FROM DUAL
-    testWhileIdle: true
-    testOnBorrow: false
-    testOnReturn: false
-
-
-    poolPreparedStatements: true
-    maxPoolPreparedStatementPerConnectionSize: 20
-    connectionProperties: config.decrypt=true
-
-    filters: 
-
-
-mybatis:
-  mapper-locations: classpath*:mapper/*/*.xml
-  type-aliases-package: com.pcloud.book
-  check-config-location: true
-  config-location: classpath:mybatis/mybatis-config.xml
-
-
-
-hystrix:  
-  command:  
-    default:  
-      execution:  
-        isolation:  
-          thread:  
-            timeoutInMilliseconds: 60000 

pcloud-service-book/src/main/resources/config/application-dev.yml

+##DEV Environment
+
+# Overwrite, Local Dev Env do not register service to eureka
+eureka:
+  client:
+    register-with-eureka: false
+
+# Overwrite, Local Dev Env get the Test Configurations
+nacos:
+  config:
+    namespace: test
+
+