3.x升级&老ES对接新服务

pcloud-facade-book/deploy-all-env.bat

-call mvn -Ptest clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U
-
-call mvn -Puat clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U -Dreversion=3.1.0-RELEASE
-
-call mvn -Pperf clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U -Dreversion=3.1.1-SNAPSHOT
-
-call mvn -Pprod clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U -Dreversion=3.1.1-RELEASE
-
-call mvn -Ptsrpd clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U -Dreversion=3.1.2-RELEASE
-
-@pause
\ No newline at end of file

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/pom.xml

@@ -191,11 +191,6 @@
 			<artifactId>pcloud-facade-wechat</artifactId>
 			<version>${pcloud-facade3.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.pcloud.facade</groupId>
-			<artifactId>pcloud-facade-feedback</artifactId>
-			<version>${pcloud-facade3.version}</version>
-		</dependency>
 
 		<dependency>
 			<groupId>com.pcloud.facade</groupId>

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

@@ -4,6 +4,7 @@ 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;
@@ -24,6 +25,7 @@ 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;
@@ -42,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) {
@@ -78,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/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/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/BookBizImpl.java

@@ -38,11 +38,7 @@ import com.pcloud.book.book.entity.*;
 import com.pcloud.book.book.set.BookSet;
 import com.pcloud.book.book.tools.BookTools;
 import com.pcloud.book.book.vo.*;
-import com.pcloud.book.book.vo.request.BookInfo4ScanCountRequestVO;
-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.book.vo.request.*;
 import com.pcloud.book.consumer.analysisengine.SceneRecordConsr;
 import com.pcloud.book.consumer.app.AppConsr;
 import com.pcloud.book.consumer.app.AssistTempletConsr;
@@ -109,23 +105,21 @@ import com.pcloud.common.utils.NumberUtil;
 import com.pcloud.common.utils.ResponseHandleUtil;
 import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.string.StringUtil;
-import com.pcloud.commoncenter.export.service.ExportService;
 import com.pcloud.labelcenter.label.service.LabelService;
 import com.pcloud.message.common.enums.YesNoEnums;
 import com.pcloud.resourcecenter.product.dto.ProductDto;
 import com.pcloud.resourcecenter.product.dto.SpecificationDto;
+import com.pcloud.universe.commons.paging.Pagination;
 import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
 import com.pcloud.usercenter.party.agent.dto.SaleAgentDTO;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.lucene.queryparser.classic.QueryParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DuplicateKeyException;
-import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -2334,16 +2328,16 @@ public class BookBizImpl implements BookBiz {
     @Override
     public PageBeanNew<BookDto> getAdviserBooks4H5(String grayStatus, String keyword, Long templetId, Long secondTempletId,
                                                    Long thirdTempletId, Integer currentPage, Integer numPerPage) {
-        Page<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getAdviserBooks4ES(StringUtils.isEmpty(grayStatus) ? "0" : grayStatus,keyword
+        Pagination<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getAdviserBooks4ES(StringUtils.isEmpty(grayStatus) ? "0" : grayStatus,keyword
                 , templetId, secondTempletId, thirdTempletId, currentPage, numPerPage);
-        List<ESBookAndAdviser> esBookAndAdvisers=esPage.getContent();
+        List<ESBookAndAdviser> esBookAndAdvisers=esPage.getList();
         if (ListUtils.isEmpty(esBookAndAdvisers)){
             return new PageBeanNew<>();
         }
         List<BookDto> bookDtos=changeToBookDto(esBookAndAdvisers);
         fillOtherBookInfo(bookDtos);
         fillBookInfo(bookDtos);
-        PageBeanNew<BookDto> page=new PageBeanNew<>(currentPage,numPerPage,(int)esPage.getTotalElements(),bookDtos);
+        PageBeanNew<BookDto> page=new PageBeanNew<>(currentPage,numPerPage,(int)esPage.getTotalCount(),bookDtos);
         return page;
     }
 
@@ -2741,15 +2735,13 @@ public class BookBizImpl implements BookBiz {
         if (null != agentId) {
            adviserIds = adviserConsr.getByAgentId(agentId);
         }
-        if (!StringUtil.isEmpty(keyword)) {
-            keyword = QueryParser.escape(keyword);
-        }
-        Page<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getESAdviserBooks4AppletV2(grayStatus, keyword, templetIds, graLabelIds, subLabelIds,
+
+        Pagination<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getESAdviserBooks4AppletV2(grayStatus, keyword, templetIds, graLabelIds, subLabelIds,
                 currentPage, numPerPage,scecondTempletIds, adviserIds, agentId);
 
-        List<ESBookAndAdviser> esBookAndAdvisers = esPage.getContent();
+        List<ESBookAndAdviser> esBookAndAdvisers = esPage.getList();
         if (ListUtils.isEmpty(esBookAndAdvisers)) {
-            return new PageBeanNew<>(currentPage,numPerPage, (int)esPage.getTotalElements(),new ArrayList<>());
+            return new PageBeanNew<>(currentPage,numPerPage, (int)esPage.getTotalCount(),new ArrayList<>());
         }
         List<BookDto> bookDtos = changeToBookDto(esBookAndAdvisers);
         fillOtherBookInfo(bookDtos);
@@ -2760,7 +2752,7 @@ public class BookBizImpl implements BookBiz {
         if (null != isAdviserBook) {
             fillAgentSale(bookDtos);
         }
-        PageBeanNew<BookDto> page = new PageBeanNew<>(currentPage, numPerPage, (int) esPage.getTotalElements(), bookDtos);
+        PageBeanNew<BookDto> page = new PageBeanNew<>(currentPage, numPerPage, (int) esPage.getTotalCount(), bookDtos);
         return page;
     }
 
@@ -3683,10 +3675,10 @@ public class BookBizImpl implements BookBiz {
     public PageBeanNew<BookDto> getESAdviserBooks4Answer(Long wechatUserId, BookSearchParamVO bookSearchParamVO) {
         Integer currentPage = bookSearchParamVO.getCurrentPage() == null?0:bookSearchParamVO.getCurrentPage();
         Integer numPerPage = bookSearchParamVO.getNumPerPage() == null?10:bookSearchParamVO.getNumPerPage();
-        Page<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getESAdviserBooks4Answer(bookSearchParamVO);
-        List<ESBookAndAdviser> esBookAndAdvisers = esPage.getContent();
+        Pagination<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getESAdviserBooks4Answer(bookSearchParamVO);
+        List<ESBookAndAdviser> esBookAndAdvisers = esPage.getList();
         if (ListUtils.isEmpty(esBookAndAdvisers)) {
-            return new PageBeanNew<>(currentPage, numPerPage, (int) esPage.getTotalElements(),new ArrayList<>());
+            return new PageBeanNew<>(currentPage, numPerPage, (int) esPage.getTotalCount(),new ArrayList<>());
         }
         List<BookDto> bookDtos = changeToBookDto(esBookAndAdvisers);
         fillOtherBookInfo(bookDtos);
@@ -3716,7 +3708,7 @@ public class BookBizImpl implements BookBiz {
             }
             bookDto.setSubscribeState(subscribeState);
         }
-        PageBeanNew<BookDto> page = new PageBeanNew<>(currentPage, numPerPage, (int) esPage.getTotalElements(), bookDtos);
+        PageBeanNew<BookDto> page = new PageBeanNew<>(currentPage, numPerPage, (int) esPage.getTotalCount(), bookDtos);
         return page;
     }
 
@@ -3734,8 +3726,8 @@ public class BookBizImpl implements BookBiz {
         List<Long> adviserIds = adviserConsr.getByAgentId(seriesBook.getAgentId());
         Integer currentPage = 0;
         Integer numPerPage = 50;
-        Page<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getAdviserBooks4SeriesBook(seriesBook.getSeriesBookKeyword(), currentPage, numPerPage, adviserIds, seriesBook.getAgentId(), null, graLabelId, seriesBook.getSerialNumber(), null, null);
-        List<ESBookAndAdviser> esBookAndAdvisers = esPage.getContent();
+        Pagination<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getAdviserBooks4SeriesBook(seriesBook.getSeriesBookKeyword(), currentPage, numPerPage, adviserIds, seriesBook.getAgentId(), null, graLabelId, seriesBook.getSerialNumber(), null, null);
+        List<ESBookAndAdviser> esBookAndAdvisers = esPage.getList();
         if (ListUtils.isEmpty(esBookAndAdvisers)) {
             return new ArrayList<>();
         }
@@ -3800,8 +3792,8 @@ public class BookBizImpl implements BookBiz {
         }
         if (isSeriesBook){
             List<Long> adviserIds = adviserConsr.getByAgentId(agentId);
-            Page<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getAdviserBooks4SeriesBook(StringUtils.join(keywordList, ' '), 0, 50, adviserIds, agentId, null, bookAdviserDto.getGraLabelId(), serialNumber, null, null);
-            List<ESBookAndAdviser> esBookAndAdvisers = esPage.getContent();
+            Pagination<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getAdviserBooks4SeriesBook(StringUtils.join(keywordList, ' '), 0, 50, adviserIds, agentId, null, bookAdviserDto.getGraLabelId(), serialNumber, null, null);
+            List<ESBookAndAdviser> esBookAndAdvisers = esPage.getList();
             List<Long> subjectLabels = new ArrayList<>();
             if (!ListUtils.isEmpty(esBookAndAdvisers)) {
                 subjectLabels = esBookAndAdvisers.stream().filter(s->s.getSubLabelId()>0).map(ESBookAndAdviser::getSubLabelId).distinct().collect(Collectors.toList());
@@ -3837,9 +3829,9 @@ public class BookBizImpl implements BookBiz {
             currentPage = 0;
             numPerPage = 50;
         }
-        Page<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getAdviserBooks4SeriesBook(seriesBook.getSeriesBookKeyword(), currentPage, numPerPage, adviserIds,
+        Pagination<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getAdviserBooks4SeriesBook(seriesBook.getSeriesBookKeyword(), currentPage, numPerPage, adviserIds,
                 seriesBook.getAgentId(), subLabelId, graLabelId, seriesBook.getSerialNumber(), verLabelId, volLabelId);
-        List<ESBookAndAdviser> esBookAndAdvisers = esPage.getContent();
+        List<ESBookAndAdviser> esBookAndAdvisers = esPage.getList();
         if (ListUtils.isEmpty(esBookAndAdvisers)) {
             return new PageBeanNew<>();
         }
@@ -3853,7 +3845,7 @@ public class BookBizImpl implements BookBiz {
         fillOtherBookInfo(bookDtos);
         fillBookInfo(bookDtos);
         fillLabelNames(bookDtos);
-        PageBeanNew<BookDto> page = new PageBeanNew<>(currentPage,numPerPage,(int)esPage.getTotalElements(),bookDtos);
+        PageBeanNew<BookDto> page = new PageBeanNew<>(currentPage,numPerPage,(int)esPage.getTotalCount(),bookDtos);
         return page;
     }
 
@@ -4337,14 +4329,14 @@ public class BookBizImpl implements BookBiz {
         Integer currentPage = bookSearchParamVO.getCurrentPage();
         Integer numPerPage = bookSearchParamVO.getNumPerPage();
         List<Long> choseBookIdList = bookSearchParamVO.getChoseBookIdList();
-        Page<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getESBooksOrderByChose(keyword, choseBookIdList, currentPage, numPerPage);
-        List<ESBookAndAdviser> esBookAndAdvisers = esPage.getContent();
+        Pagination<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getESBooksOrderByChose(keyword, choseBookIdList, currentPage, numPerPage);
+        List<ESBookAndAdviser> esBookAndAdvisers = esPage.getList();
         if (ListUtils.isEmpty(esBookAndAdvisers)) {
             return new PageBeanNew<>(currentPage,numPerPage,0,new ArrayList<>());
         }
         List<BookDto> bookDtos = changeToBookDto(esBookAndAdvisers);
         fillOtherBookInfo(bookDtos);
-        PageBeanNew<BookDto> page = new PageBeanNew<>(currentPage, numPerPage, (int) esPage.getTotalElements(), bookDtos);
+        PageBeanNew<BookDto> page = new PageBeanNew<>(currentPage, numPerPage, (int) esPage.getTotalCount(), bookDtos);
         return page;
     }
 

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")
+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/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,11 +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);
+    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);
 
     /**
      * 答案，搜索全平台书刊
@@ -29,14 +29,14 @@ 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(String keyword, 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;
 
@@ -48,6 +48,6 @@ public interface ESBookAndAdviserBiz {
      * @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);
 
 }

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

@@ -24,7 +24,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -80,7 +79,7 @@ public class ESBookAndAdviserBizImpl implements ESBookAndAdviserBiz {
     }
 
     @Override
-    public Page<ESBookAndAdviser> getAdviserBooks4ES(String grayStatus, String keyword, Long templetId, Long secondTempletId, Long thirdTempletId, Integer currentPage, Integer numPerPage) {
+    public Pagination<ESBookAndAdviser> getAdviserBooks4ES(String grayStatus, String keyword, Long templetId, Long secondTempletId, Long thirdTempletId, Integer currentPage, Integer numPerPage) {
 
         BookSearchDto dto = BookSearchDto.builder()
                 .grayStatus(grayStatus).keyword(keyword).templetIds(Lists.newArrayList(templetId))
@@ -94,7 +93,7 @@ public class ESBookAndAdviserBizImpl implements ESBookAndAdviserBiz {
     }
 
     @Override
-    public Page<ESBookAndAdviser> getESAdviserBooks4Applet(String grayStatus, String keyword, List<Long> templetIds, List<Long> graLabelIds,
+    public 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) {
 
         BookSearchDto dto = BookSearchDto.builder()
@@ -110,7 +109,7 @@ public class ESBookAndAdviserBizImpl implements ESBookAndAdviserBiz {
     }
 
     @Override
-    public Page<ESBookAndAdviser> getESAdviserBooks4AppletV2(String grayStatus, String keyword, List<Long> templetIds, List<Long> graLabelIds,
+    public 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) {
         BookSearchDto dto = BookSearchDto.builder()
                 .grayStatus(grayStatus).keyword(keyword).templetIds(templetIds).graLabelIds(graLabelIds)
@@ -134,7 +133,7 @@ public class ESBookAndAdviserBizImpl implements ESBookAndAdviserBiz {
     }
 
     @Override
-    public Page<ESBookAndAdviser> getESAdviserBooks4Answer(BookSearchParamVO vo) {
+    public Pagination<ESBookAndAdviser> getESAdviserBooks4Answer(BookSearchParamVO vo) {
         BookSearchDto dto = BookSearchDto.builder()
                 .grayStatus(vo.getGrayStatus()).keyword(vo.getKeyword()).isAdviserBook(true)
                 .label1(vo.getLabel1()).label2(vo.getLabel2()).label3(vo.getLabel3())
@@ -146,7 +145,7 @@ public class ESBookAndAdviserBizImpl implements ESBookAndAdviserBiz {
     }
 
     @Override
-    public Page<ESBookAndAdviser> getAdviserBooks4SeriesBook(String keyword, Integer currentPage, Integer numPerPage, List<Long> adviserIds,
+    public Pagination<ESBookAndAdviser> getAdviserBooks4SeriesBook(String keyword, Integer currentPage, Integer numPerPage, List<Long> adviserIds,
                                                              Long agentId, Long subLabelId, Long graLabelId, String serialNumber, Long verLabelId, Long volLabelId) {
         //k12教育分类校验
         List<Long> templetIds = Arrays.asList(RightsSettingConstant.K12_TEMPLET_ID_NEW);
@@ -242,7 +241,7 @@ public class ESBookAndAdviserBizImpl implements ESBookAndAdviserBiz {
     }
 
     @Override
-    public Page<ESBookAndAdviser> getESBooksOrderByChose(String keyword, List<Long> choseBookIdList, Integer currentPage, Integer numPerPage) {
+    public Pagination<ESBookAndAdviser> getESBooksOrderByChose(String keyword, List<Long> choseBookIdList, Integer currentPage, Integer numPerPage) {
 
         BookSearchDto dto = BookSearchDto.builder().keyword(keyword).build();
         dto.setCurrentPage(Optional.ofNullable(currentPage).orElse(0) + 1);

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/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,7 +44,7 @@ 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中删除部分测试图书")

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

@@ -5,7 +5,6 @@ import com.pcloud.book.es.dto.ESBookGroupQrcodeDTO;
 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.*;
 
 import java.util.List;
@@ -15,8 +14,6 @@ import java.util.List;
 public class ESBookGroupQrcodeServiceImpl implements ESBookGroupQrcodeService {
 
     @Autowired
-    private ElasticsearchTemplate elasticsearchTemplate;
-    @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
@@ -1449,13 +1396,15 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePageVO.setBookId(qrcodeSceneDto.getAdviserBookId());
             resourcePageVO.setAdviserId(qrcodeSceneDto.getCreatedByUserLogin());
             resourcePageVO.setChannelId(qrcodeSceneDto.getChannelPartyId());
-            resourcePageVO.setBookImg(qrcodeSceneDto.getBook().getCoverImg());
+            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/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/util/common/Converter.java

@@ -9,9 +9,6 @@ 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 org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -45,7 +42,10 @@ public class Converter {
         return dto;
     }
 
-    public static Page<ESBookAndAdviser> convert(Pagination<Es7Book> data) {
+    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();
@@ -88,7 +88,8 @@ public class Converter {
 
             list.add(ba);
         });
-        return new PageImpl<>(list, new PageRequest(data.getCurrentPageIndex(), data.getPageSize()), data.getTotalCount());
+        result.setList(list);
+        return result;
     }
 
     private static String long2String(Long l) {

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
+
+

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

+##Perf Environment
+
+

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

+##Prod Environment

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

+##Test Environment
+
+

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

+##Prod Environment

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

+##Uat Environment
+
+

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

+##
+## Common configs, none business with Environment
+##
+spring:
+  application:
+    name: pcloud-service-book
+  profiles:
+    active: dev
+  main:
+    allow-bean-definition-overriding: true
+
+nacos:
+  config:
+    server-addr: http://192.168.92.37:8848
+    namespace: ${spring.profiles.active}
+    username: rays_app
+    password: app@read
+
+server:
+  port: 8202
+  servlet:
+    context-path: /book/v1.0/
+
+eureka:
+  instance:
+    status-page-url-path: /book/v1.0/swagger-ui.html
+  client:
+    register-with-eureka: true
+
+mybatis:
+  mapper-locations: classpath*:mapper/*/*.xml
+  type-aliases-package: com.pcloud.book
+  check-config-location: true
+  config-location: classpath:mybatis/mybatis-config.xml
+
+management:
+  security:
+    enabled: false
+  endpoints:
+    web:
+      base-path: /
+      exposure:
+        include: "*"
+  endpoint:
+    shutdown:
+      enabled: true
+      sensitive: false
+ribbon:
+  ServerListRefreshInterval: 5
+  OkToRetryOnAllOperations: true
+  MaxAutoRetriesNextServer: 1
+  MaxAutoRetries: 0
+  ReadTimeout: 60000
+  ConnectTimeout: 60000
+feign:
+  hystrix:
+    enabled: true
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000
+  threadpool:
+    default:
+      coreSize: 300
\ No newline at end of file

pcloud-service-book/src/main/resources/ext.dic

-2020春
-2020秋
-2021春
-2021秋
-20春
-20秋
-2020秋百年学典
-百年学典
-同步导学
-优化训练
-同步导学与优化训练
-基础训练
-黄冈名师
-20秋新编
-一年级
-二年级
-三年级
-四年级
-五年级
-六年级
-七年级
-八年级
-九年级
-人教版
-配人教版
-江苏版
-北师大版
-2020秋南方新课堂
-南方新课堂
-新课堂
-快乐5+2
-长江作业本
-同步练习册
-长江全能学案
-优质课堂
-状元桥
-席卷金榜
-名校真题集锦
-真题集锦
-云教金榜
-云顶课堂
-卓越培优
-智慧花朵
-寒假作业
-追梦之旅
-铺路卷
-大先生
-大课堂
-中考新时代
-中考一本通
-夺冠金卷
-状元郎
-超级考卷
-RJ版
-BS版
-夺冠计划
-快乐寒假
-创维新课堂
-中考总复习优化设计
-中考总动员
-中考题库
-湘岳假期
-湘少版
-苏教版
-华东师大版
-湘教版
-鲁教版
-苏科版
-高考版生物
-高考版物理
-高考版化学
-高考版
-同步
-实践
-评价
-重点中学与你有约
-重点中学
-与你有约
-总复习
-寒假生活
-寒假作业本天天练
-天天练
-作业本
-黄金假期
-书香寒假
-假期复习计划
-复习计划
-假日知新
-寒假学习与生活
-寒假学习
-趣味寒假
-北京专版
-2021简
-金点名卷
-2021年
-2021年山西省中考训练卷
-训练卷
-中考训练卷
-2021山西新中考
-新中考
-中考总动员
-中考拐点
-学本课堂
-架构中考
-创新教程
-高考仿真卷
-中考总复习
-高考总复习
-高考总复习优化设计
-优化设计
-2021版教材完全解读
-2021版教材
-完全解读
-同步学习导与练
-同步学习
-高中全程学习导与练
-全程学习导与练
-全程学习
-导与练
-序号2021
-序号202101

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

 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="3 seconds">
+
+	<property name="application" value="book" />
+	<property name="pattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS}[TraceId:%X{X-B3-TraceId:-} SpanId:%X{X-B3-SpanId:-} ParentSpanId:%X{X-B3-ParentSpanId:-}] [%thread] %-5level %logger{50}:%L - %msg%n" />
+
 	<!-- 控制台调试输出 -->
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
-            <pattern>invoker-info-%d{yyyy-MM-dd HH:mm:ss.SSS} [TraceId:%X{X-B3-TraceId:-} SpanId:%X{X-B3-SpanId:-} ParentSpanId:%X{X-B3-ParentSpanId:-}] [%thread] %-5level %logger{50} - %msg%n</pattern>
+			<pattern>${pattern}</pattern>
 		</encoder>
 		<!--日志级别过滤-->
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
@@ -16,19 +20,19 @@
 	<appender name="info_apd" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<!--日志文件输出的文件名 -->
-            <FileNamePattern>logs/info/book-info-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+			<FileNamePattern>logs/info/${application}-info-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
 			<!--日志文件保留天数 -->
-            <MaxHistory>15</MaxHistory>
+			<MaxHistory>10</MaxHistory>
 			<!--日志文件最大的大小 -->
 			<timeBasedFileNamingAndTriggeringPolicy
 					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
 				<!-- or whenever the file size reaches 50MB -->
-                <maxFileSize>20MB</maxFileSize>
+				<maxFileSize>70MB</maxFileSize>
 			</timeBasedFileNamingAndTriggeringPolicy>
 
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [TraceId:%X{X-B3-TraceId:-} SpanId:%X{X-B3-SpanId:-} ParentSpanId:%X{X-B3-ParentSpanId:-}] [%thread] %-5level %logger{50} - %msg%n</pattern>
+			<pattern>${pattern}</pattern>
 		</encoder>
 		<!--日志级别过滤-->
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
@@ -41,7 +45,7 @@
 	<appender name="warn_apd" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<!--日志文件输出的文件名 -->
-            <FileNamePattern>logs/warn/book-warn-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+			<FileNamePattern>logs/warn/${application}-warn-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
 			<!--日志文件保留天数 -->
 			<MaxHistory>20</MaxHistory>
 			<!--日志文件最大的大小 -->
@@ -53,7 +57,7 @@
 
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [TraceId:%X{X-B3-TraceId:-} SpanId:%X{X-B3-SpanId:-} ParentSpanId:%X{X-B3-ParentSpanId:-}] [%thread] %-5level %logger{50} - %msg%n</pattern>
+			<pattern>${pattern}</pattern>
 		</encoder>
 		<!--日志级别过滤-->
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
@@ -66,7 +70,7 @@
 	<appender name="error_apd" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<!--日志文件输出的文件名 -->
-            <FileNamePattern>logs/error/book-error-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+			<FileNamePattern>logs/error/${application}-error-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
 			<!--日志文件保留天数 -->
 			<MaxHistory>30</MaxHistory>
 			<!--日志文件最大的大小 -->
@@ -78,33 +82,56 @@
 
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [TraceId:%X{X-B3-TraceId:-} SpanId:%X{X-B3-SpanId:-} ParentSpanId:%X{X-B3-ParentSpanId:-}] [%thread] %-5level %logger{50} - %msg%n</pattern>
+			<pattern>${pattern}</pattern>
 		</encoder>
 		<!--日志级别过滤-->
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 			<level>ERROR</level>
 		</filter>
+	</appender>
 
+	<!-- 监控日志 -->
+	<appender name="monitorLogFileAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<!--日志文件输出的文件名 -->
+			<FileNamePattern>logs/monitor/${application}-monitor-%d{yyyy-MM-dd_HH}.%i.log</FileNamePattern>
+			<!--日志文件保留天数 -->
+			<MaxHistory>10</MaxHistory>
+			<!--日志文件最大的大小 -->
+			<timeBasedFileNamingAndTriggeringPolicy
+					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<!-- or whenever the file size reaches 50MB -->
+				<maxFileSize>3GB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+
+		</rollingPolicy>
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<pattern>%msg%n</pattern>
+		</encoder>
+		<!--日志级别过滤-->
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>INFO</level>
+		</filter>
+	</appender>
+	<appender name="asyncMonitorLogAppender" class="ch.qos.logback.classic.AsyncAppender">
+		<appender-ref ref="monitorLogFileAppender" />
 	</appender>
+	<logger name="com.pcloud.universe.monitorlog.MonitorUtilImpl" level="INFO" additivity="false">
+		<appender-ref ref="asyncMonitorLogAppender" />
+	</logger>
 
-    <!-- sentry -->
-<!--    <appender name="Sentry" class="io.sentry.logback.SentryAppender">-->
-<!--        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">-->
-<!--            <level>ERROR</level>-->
-<!--        </filter>-->
-<!--    </appender>-->
 	<!-- INFO级别以上的日志全部都输出，不同的级别输出在不同的文件里面 -->
 	<root>
 		<level value="INFO"/>
-        <appender-ref ref="STDOUT"/>
-        <appender-ref ref="info_apd"/>
-        <appender-ref ref="warn_apd"/>
-        <appender-ref ref="error_apd"/>
-<!--        <appender-ref ref="Sentry"/>-->
+		<appender-ref ref="STDOUT" />
+		<appender-ref ref="info_apd" />
+		<appender-ref ref="warn_apd" />
+		<appender-ref ref="error_apd" />
 	</root>
 
-    <logger name="net.sf.ehcache" level="DEBUG"/>
-    <logger name="druid.sql" level="DEBUG"/>
-    <logger name="io.micrometer.influx.InfluxRegistry" level="ERROR"/>
+	<logger name="net.sf.ehcache" level="INFO"/>
+	<logger name="druid.sql" level="INFO"/>
+	<logger name="org.springframework.cloud.openfeign.FeignClientFactoryBean" level="ERROR"/>
+	<logger name="com.netflix.discovery.shared.resolver.aws.ConfigClusterResolver" level="WARN"/>
 
 </configuration>
\ No newline at end of file