3.x，API规范处理

deploy.bat

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

install.bat

+call mvn -Ptest -Denforcer.skip=true -Dmaven.test.skip=true -U clean install
+
+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 -Denforcer.skip=true -Dmaven.test.skip=true -U clean install
+
+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>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
 		<groupId>com.pcloud.common</groupId>
 		<artifactId>pcloud-book-parent</artifactId>
-		<version>2.1.0-RELEASE</version>
+       <version>3.1.0-SNAPSHOT</version>
+       <relativePath>../pom.xml</relativePath>
 	</parent>
-    <modelVersion>4.0.0</modelVersion>
 
 	<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

@@ -16,7 +16,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;
@@ -33,7 +33,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

@@ -8,7 +8,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.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,7 +25,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

@@ -28,7 +28,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;
@@ -50,7 +50,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 {
 

pom.xml

@@ -2,188 +2,33 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.pcloud.universe</groupId>
+        <artifactId>universe-commons-parent</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+    </parent>
 
     <groupId>com.pcloud.common</groupId>
 	<artifactId>pcloud-book-parent</artifactId>
-	<version>2.1.0-RELEASE</version>
-    <modules>
-        <module>pcloud-facade-book</module>
-        <module>pcloud-service-book</module>
-    </modules>
+    <version>3.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>pcloud-book-parent</name>
     <description>invoker project for Spring Boot</description>
 
-    <parent>
-        <groupId>com.pcloud.universe</groupId>
-        <artifactId>universe-commons-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <!-- 全局属性配置 -->
-    <profiles>
-
-        <!-- 开发环境 -->
-        <profile>
-            <id>dev</id>
-            <properties>
-                <!-- 部署环境(对应配置文件版本) -->
-                <env>dev</env>
-                <wxgroup-sdk.version>1.1.0-SNAPSHOT</wxgroup-sdk.version>
-                <coolq-sdk.version>1.0-SNAPSHOT</coolq-sdk.version>
-            </properties>
-        </profile>
-
-        <!-- 测试环境 -->
-        <profile>
-            <id>test</id>
-            <properties>
-                <!-- 部署环境(对应配置文件版本) -->
-                <env>test</env>
-                 <maven.test.skip>false</maven.test.skip>
-                <wxgroup-sdk.version>1.0.0-SNAPSHOT</wxgroup-sdk.version>
-                <coolq-sdk.version>1.0-SNAPSHOT</coolq-sdk.version>
-            </properties>
-        </profile>
-
-        <!-- UAT -->
-        <profile>
-            <id>uat</id>
-            <properties>
-                <!-- 部署环境(对应配置文件版本) -->
-                <env>uat</env>
-                <wxgroup-sdk.version>1.0.0-RELEASE</wxgroup-sdk.version>
-                <coolq-sdk.version>1.0-RELEASE</coolq-sdk.version>
-            </properties>
-               <!-- 设置默认环境 -->
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-        </profile>
-
-        <!-- 压测环境 -->
-        <profile>
-            <id>perf</id>
-            <properties>
-                <!-- 部署环境(对应配置文件版本) -->
-                <env>perf</env>
-                <wxgroup-sdk.version>1.0.0-SNAPSHOT</wxgroup-sdk.version>
-                <coolq-sdk.version>1.0-SNAPSHOT</coolq-sdk.version>
-            </properties>
-        </profile>
-
-        <!-- 生产环境 -->
-        <profile>
-            <id>prod</id>
-            <properties>
-                <!-- 部署环境(对应配置文件版本) -->
-                <env>prod</env>
-                <wxgroup-sdk.version>1.1.0-SNAPSHOT</wxgroup-sdk.version>
-                <coolq-sdk.version>1.1.0-RELEASE</coolq-sdk.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>tsrpd</id>
-            <properties>
-                <!-- 部署环境(对应配置文件版本) -->
-                <env>tsrpd</env>
-                <wxgroup-sdk.version>1.1.0-SNAPSHOT</wxgroup-sdk.version>
-                <coolq-sdk.version>1.1.0-RELEASE</coolq-sdk.version>
-            </properties>
-        </profile>
-
-    </profiles>
+    <modules>
+        <module>pcloud-facade-book</module>
+        <module>pcloud-service-book</module>
+    </modules>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-        <spring-cloud.version>Dalston.SR1</spring-cloud.version>
+        <reversion>3.1.0-SNAPSHOT</reversion>
       </properties>
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.mybatis.spring.boot</groupId>
-                <artifactId>mybatis-spring-boot-starter</artifactId>
-                <version>1.3.0</version>
-            </dependency>
-            <!-- swagger2 -->
-            <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-swagger2</artifactId>
-                <version>2.7.0</version>
-            </dependency>
-            <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-swagger-ui</artifactId>
-                <version>2.7.0</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>public</id>
-            <name>public repositories</name>
-            <url>http://192.168.83.20:8081/nexus/content/repositories/snapshots/</url>
-        </repository>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>jboss</id>
-            <name>public jboss</name>
-            <url>http://192.168.83.20:8081/nexus/content/repositories/snapshots/</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>public</id>
-            <name>public repositories</name>
-            <url>http://192.168.83.20:8081/nexus/content/repositories/snapshots/</url>
-        </pluginRepository>
-        <pluginRepository>
-            <releases>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <id>central</id>
-            <name>Central Repository</name>
-            <url>http://repo.maven.apache.org/maven2</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>Codehaus repository</id>
-            <url>http://repository.codehaus.org/</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <distributionManagement>
-        <repository>
-            <id>nexus-releases</id>
-            <name>Nexus Release Repository</name>
-            <url>http://192.168.83.20:8081/nexus/content/repositories/releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>nexus-snapshots</id>
-            <name>Nexus Snapshot Repository</name>
-            <url>http://192.168.83.20:8081/nexus/content/repositories/snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
 
 </project>