wangyunpeng 2 weeks ago
parent
commit
5315b8aa71
90 changed files with 441 additions and 454 deletions
  1. 0 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/GhTypeEnum.java
  2. 1 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/MinigramEnum.java
  3. 0 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/SecretEnum.java
  4. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/recommend/AccountBusinessTypeEnum.java
  5. 3 0
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/response/CommonResponse.java
  6. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/response/ErrcodeNamespace.java
  7. 144 144
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/response/ExceptionCodeEnum.java
  8. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/config/db/LongArticleDBConfig.java
  9. 4 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/aigc/AigcBaseMapper.java
  10. 2 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/crawler/ArticleContentLinkMapper.java
  11. 2 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/crawler/ArticleGzhDeveloperMapper.java
  12. 1 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/crawler/PushMessageCallbackMapper.java
  13. 4 3
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/growth/AlgGhAutoreplyVideoRankDataMapper.java
  14. 3 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/growth/CgiReplyBucketDataMapper.java
  15. 2 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/growth/GhDetailMapper.java
  16. 2 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/growth/ReplyStaffMapper.java
  17. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/longArticle/LongArticleBaseMapper.java
  18. 0 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/bo/CardData.java
  19. 5 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/adplatform/ChangwenArticle.java
  20. 4 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/adplatform/ChangwenArticleDatastat.java
  21. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/CrawlerPlan.java
  22. 1 6
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/CrawlerPlanResultRel.java
  23. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/ProducePlan.java
  24. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/ProducePlanExeRecord.java
  25. 1 6
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/ProducePlanInputSource.java
  26. 1 0
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/PublishContent.java
  27. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/PublishContentLayout.java
  28. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/PublishPlan.java
  29. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/PublishPlanMiniprogramTask.java
  30. 1 5
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/crawler/AccountCorrelation.java
  31. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/crawler/GetOffVideoCrawler.java
  32. 4 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/longArticle/ArticlePoolPromotionSource.java
  33. 4 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/longArticle/DatastatSortStrategy.java
  34. 0 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/longArticle/LongArticlesPublishMiniprogram.java
  35. 4 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/longArticle/PublishContentGzhWaiting.java
  36. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/longArticle/VideoEndScreenTransformationTask.java
  37. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/vo/FeishuTableDTO.java
  38. 0 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/vo/GhDetailVo.java
  39. 1 0
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/vo/IntermediateIndicatorsExport.java
  40. 7 7
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/vo/NewSortStrategyExport.java
  41. 4 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/vo/WxUserGetResponse.java
  42. 0 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mq/MessageCallbackProducer.java
  43. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/remote/ArticleSensitiveRemoteService.java
  44. 0 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/remote/ODPSManager.java
  45. 3 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/remote/aigc/AIGCProduceContentListService.java
  46. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/adplatform/ChangwenArticleDatastatRepository.java
  47. 1 0
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/longArticle/DatastatSortStrategyRepository.java
  48. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/model/GhDetailExample.java
  49. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/ServiceBeanFactory.java
  50. 2 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/XxlJobService.java
  51. 4 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/cgi/TouLiuHttpClientService.java
  52. 0 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/cgi/impl/CgiReplyServiceImpl.java
  53. 0 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/exterior/GhDetailService.java
  54. 0 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/exterior/ThirdPartyService.java
  55. 1 3
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/exterior/impl/AccessTokenServiceImpl.java
  56. 1 3
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/exterior/impl/ThirdPartyServiceImpl.java
  57. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/ArticleAuditService.java
  58. 3 4
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/ArticlePromotionService.java
  59. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/DataDashboardService.java
  60. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/RecommendService.java
  61. 5 5
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/config/AccountIndexAvgViewCountService.java
  62. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/filter/strategy/HistoryTitleForFwhColdStartStrategy.java
  63. 6 6
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/RankStrategy.java
  64. 4 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/strategy/RankV2Strategy.java
  65. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/score/strategy/AccountPreDistributeStrategy.java
  66. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/score/strategy/FlowCtlDecreaseStrategy.java
  67. 2 3
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/score/strategy/PublishTimesStrategy.java
  68. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/score/strategy/ViewCountRateStrategy.java
  69. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/score/strategy/ViewCountRateV2Strategy.java
  70. 3 3
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/score/strategy/ViewMultiplierStrategy.java
  71. 5 4
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/strategy/reply/impl/BuckStrategyV1.java
  72. 0 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/strategy/reply/impl/PushMessageStrategyV1.java
  73. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/strategy/reply/impl/WeComPushMessageStrategyV1.java
  74. 0 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/video/CardGeneratorService.java
  75. 0 3
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/video/MatchVideoService.java
  76. 4 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/video/impl/CardGeneratorServiceImpl.java
  77. 0 3
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/video/impl/MatchVideoServiceImpl.java
  78. 1 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/util/HttpClientFactory.java
  79. 0 10
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/util/LarkRobotUtil.java
  80. 10 9
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/util/MapBuilder.java
  81. 53 53
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/util/Md5Util.java
  82. 1 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/util/http/HttpClientUtils.java
  83. 84 86
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/util/http/HttpResponseContent.java
  84. 1 0
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/util/page/Page.java
  85. 2 10
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/WeComController.java
  86. 4 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/recommend/ArticleCategoryController.java
  87. 4 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/recommend/ArticleController.java
  88. 1 0
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/recommend/ArticleVideoPoolController.java
  89. 5 0
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/recommend/DataFlushController.java
  90. 0 3
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/video/MatchVideoController.java

+ 0 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/GhTypeEnum.java

@@ -31,6 +31,4 @@ public enum GhTypeEnum {
     }
 
 
-
-
 }

+ 1 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/MinigramEnum.java

@@ -6,8 +6,7 @@ import lombok.Getter;
 public enum MinigramEnum {
     PQSP4("https://rescdn.yishihui.com/0temp/pqsp.png", "wxbdd2a2e93d9a6e25", "票圈视频"),
     VLOG0("https://rescdn.yishihui.com/0temp/logo.png", "wx89e7eb06478361d7", "票圈 l 3亿人喜欢的视频平台"),
-    XYMHFQDD_27("https://rescdn.yishihui.com/0temp/xymhfqdd.png","wx7187c217efef24a7","幸运美好福气多多")
-    ;
+    XYMHFQDD_27("https://rescdn.yishihui.com/0temp/xymhfqdd.png", "wx7187c217efef24a7", "幸运美好福气多多");
 
     MinigramEnum(String avatar, String id, String name) {
         this.avatar = avatar;

+ 0 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/SecretEnum.java

@@ -2,7 +2,6 @@ package com.tzld.longarticle.recommend.server.common.enums;
 
 
 import java.util.Objects;
-import java.util.UUID;
 
 public enum SecretEnum {
 

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/recommend/AccountBusinessTypeEnum.java

@@ -9,7 +9,7 @@ public enum AccountBusinessTypeEnum {
     CHANGWEN(1, "长文"),
     TOULIU(2, "投流"),
     QIWEI(3, "企微"),
-    
+
     OTHER(999, "其他"),
 
     ;

+ 3 - 0
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/response/CommonResponse.java

@@ -48,12 +48,15 @@ public class CommonResponse<T> {
     public static <T> CommonResponse<T> create(T data) {
         return create(SUCCESS_CODE, SUCCESS_MSG, data);
     }
+
     public static <T> CommonResponse<T> create(ExceptionCodeEnum exceptionCodeEnum) {
         return create(exceptionCodeEnum.getCode(), exceptionCodeEnum.getMsg(), null);
     }
+
     public static <T> CommonResponse<T> create(ExceptionCodeEnum exceptionCodeEnum, String msg) {
         return create(exceptionCodeEnum.getCode(), msg, null);
     }
+
     public static <T> CommonResponse<T> create(int code, String msg) {
         return create(code, msg, null);
     }

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/response/ErrcodeNamespace.java

@@ -2,5 +2,5 @@ package com.tzld.longarticle.recommend.server.common.response;
 
 public interface ErrcodeNamespace {
 
-  public final static String NS_GENERAL = "manager";
+    public final static String NS_GENERAL = "manager";
 }

+ 144 - 144
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/response/ExceptionCodeEnum.java

@@ -5,149 +5,149 @@ import static com.tzld.longarticle.recommend.server.common.response.ErrcodeNames
 
 public enum ExceptionCodeEnum {
 
-  LOGIN_ERROR(NS_GENERAL, -999, "用户未登录"),
-  ACCOUNT_FREEZE(NS_GENERAL, -888, "账户被锁定"),
-  SYS_ERROR(NS_GENERAL, -111, "系统异常"),
-  PARAM_ERROR(NS_GENERAL, -990, "参数错误"),
-  WX_GET_ACCESS_TOKEN(NS_GENERAL, -995, "获取线上的微信accessToken失败"),
-  WX_GET_OPENID_ERROR(NS_GENERAL,-992,"微信用户获取OPENID出错"),
-
-  VIDEO_NOTEXIST(NS_GENERAL, 1, "视频不存在"),
-  DATA_ERROR(NS_GENERAL, 2, "数据不匹配"),
-  USER_NOTEXIST(NS_GENERAL, 3, "用户不存在"),
-  PAPAM_ERROR(NS_GENERAL, 4, "参数不对"),
-  ACCOUNT_EXIST(NS_GENERAL, 5, "账号已被占用"),
-  PASSWORD_ERROR(NS_GENERAL, 6, "密码不准确"),
-  DATA_NOTEXIST(NS_GENERAL, 7, "数据不匹配"),
-  MENU_EXIST(NS_GENERAL, 8, "菜单标示已存在"),
-  MENU_NOTEXIST(NS_GENERAL, 9, "菜单不存在"),
-  NOT_lOGIN(NS_GENERAL, 10, "未登录"),
-  KAIYAN_VIDEO_SEND(NS_GENERAL, 11, "开眼视频已经发过"),
-
-  MONITORING_ALARM_CONFIG_NOT_EXIST(NS_GENERAL, 12, "数据库容量告警手机号码未配置"),
-
-  OPERAATION_FAIL(NS_GENERAL, 13, "操作失败"),
-
-  PUSH_MSG_CANNT_UPDATE(NS_GENERAL,14,"立即推送的信息不能修改"),
-  PUSH_MSG_CANNT_DELETE(NS_GENERAL,15,"立即推送的信息不能撤销"),
-  SEND_PUSH_MSG_CANNT_UPDATE(NS_GENERAL,16,"已推送的信息不能修改"),
-  PUSH_TARGET_NOTEXIST(NS_GENERAL,17,"没有找到推送目标的绑定设备"),
-  PUSH_PLATFORM_ERROR(NS_GENERAL,18,"推送平台错误"),
-  PUSH_SCHEDULE_ERROR(NS_GENERAL,19,"定时推送时间必须大于当前时间"),
-
-  DATA_REPORT_TYPE_NOT_EXISTS(NS_GENERAL,20,"对应的报表不存在"),
-  DATA_REPORT_PARAM_NOT_EXISTS(NS_GENERAL,21,"报表扩展参数有缺失"),
-  NOTEXAMINEVIDEO_CONFIG_NOT_EXIST(NS_GENERAL, 23, "未审核的视频数手机号码未配置"),
-  SENSITIVE_WORD_EXISTS(NS_GENERAL,22,"该词已存在"),
-  USERPROHIBITION_NOTEXIST(NS_GENERAL, 24, "封禁类型或者标示不存在"),
-
-  VERSION_CONTROLLER_DEFAULT_CONFIG(NS_GENERAL, 25, "没有默认配置,请联系管理员直接添加。"),
-  CONFIG_EXIST(NS_GENERAL, 26, "该版本配置已存在,不能重复添加。"),
-
-  BARRAGE_UP_VSIBILITY(NS_GENERAL, 27, "不能操作弹幕UP主删除"),
-  BARRAGE_TIME_ERROR(NS_GENERAL, 28, "视频时间不能为0"),
-  VIDEO_AUDITTRANSCATIONID_NOT_NEW(NS_GENERAL, 29, "视频审核ID不是最新"),
-  VIDEO_IS_DELETE(NS_GENERAL, 30, "视频已被用户删除"),
-  VIDEO_NOT_NOAML(NS_GENERAL, 29, "视频不是正常可见的"),
-  VIDEO_SHOULD_UNFREEZE(NS_GENERAL, 31, "请先解冻视频"),
-
-  AD_ALGO_THRESHOLD_PUSH_UPDATE_ERROR(NS_GENERAL, 32, "更新远程广告算法阈值失败"),
-
-
-  VIDEO_CONTENT_SENSITIVE_MATCH(NS_GENERAL,1015,"输入内容包含违禁词汇,请修改"),
-  VIDEO_TITLE_SENSITIVE_MATCH(NS_GENERAL,1016,"输入标题包含违禁词汇,请修改"),
-  VIDEO_RECOMMEND_TITLE_SENSITIVE_MATCH(NS_GENERAL,1017,"输入分发标题包含违禁词汇,请修改"),
-
-  CANNOT_GET_LOCK(NS_GENERAL, 3001,"已有相同操作在进行"),
-  COMMENT_NOT_EXIST(NS_GENERAL, 3002,"评论不存在"),
-  COMMENT_IS_DELETE(NS_GENERAL, 3003,"评论已经删除存在"),
-
-  VIDEO_MEASURE_PROCEEDING(NS_GENERAL, 4000,"此视频正在曝光池中"),
-  VIDEO_NOT_TAG(NS_GENERAL, 4001, "视频没有标签"),
-  RECOMMENT_PARAM_INDEX_ERROR(NS_GENERAL, 4002, "推荐配置的限制个数和位置个数对应不上"),
-  RECOMMENT_PARAM_SCORE_ERROR(NS_GENERAL, 4003, "分数设置不对"),
-  VIDEO_UNRECOMMEND(NS_GENERAL, 4002, "待推荐视频不能加入曝光池"),
-
-  TAG_NAME_IS_UNUSED(NS_GENERAL, 5001,"同名视频标签%s不存在"),
-  MAJIAHAO_IS_ALL_USED(NS_GENERAL, 5001,"马甲号已全部用完"),
-
-  SECOND_CATEGORY_IS_NULL(NS_GENERAL, 6002,"二级分类不能为空"),
-  PARENT_CATEGORY_IS_NULL(NS_GENERAL, 6001,"一级分类不能为空"),
-
-  CANNOT_REVOCER_UNDELETED_VIDEO(NS_GENERAL, 7001, "不能恢复未删除的视频"),
-  CANNOT_REVOCER_DELETED_FILENOTFIND_VIDEO(NS_GENERAL, 7002, "视频文件已经被迁移,请先恢复文件后再恢复视频"),
-
-  VIDEO_AUDIT_PERMISSION_DENIED(NS_GENERAL, 8001, "你没有修改视频审核状态的权限"),
-  CAN_NOT_FETCHTASK_FOR_NOT_ONDUTY(NS_GENERAL, 8002, "你已经下班了,无法分配审核任务"),
-
-  DELOGO_VIDEO_NOT_EXISTS(NS_GENERAL, 8003, "去视频视频不存在"),
-  DELOGO_VIDEO_AUDIT_ERROR(NS_GENERAL, 8004, "已转码成功的视频不能改成审核不通过"),
-  DELOGO_VIDEO_AUDIT_WRONG(NS_GENERAL, 8004, "已审核通过且已发起转码的视频不能改成审核不通过"),
-  VIDEO_NOT_SLICE(NS_GENERAL, 8005, "不可搜视频不能分剪"),
-  VIDEO_SLICE_EXISTS(NS_GENERAL, 8006, "视频分剪已存在"),
-  MUSIC_NOT_EXISTS(NS_GENERAL, 8007, "音乐素材不存在"),
-  MUSIC_CATE_EXISTS(NS_GENERAL, 8008, "音乐素材分类已存在"),
-  MUSIC_CRAWER_NOT_EDIT(NS_GENERAL, 8009, "音乐爬取素材不能编辑"),
-  MUSIC_HOT_NOT_DELETE(NS_GENERAL, 8010, "热门音乐不能被删除"),
-
-  VIDEO_CROP_PROCESSING(NS_GENERAL, 9001, "该视频有正在处理中的剪切任务"),
-
-
-  AD_POSITION_FLOW_CONTROL_OVERFLOW(NS_GENERAL, 1001, "该广告位下流量控制不能大于 100%"),
-  INVOKE_VIDEO_API_WEAPP_URLLINK_ERROR(NS_GENERAL, 1002, "调用 video api 获取小程序 URL Link 失败"),
-  INVOKE_INCENTIVE_API_ERROR(NS_GENERAL, 1003, "调用激励服务失败"),
-  ADCAMPAIGN_REPEAT_ERROR(NS_GENERAL, -1, "名称重复,请修改"),
-  ADCAMPAIGN_RUNNING_DELETE_ERROR(NS_GENERAL, -1, "计划启用中,不能删除"),
-  ADAD_RUNNING_DELETE_ERROR(NS_GENERAL, -1, "广告启用中,不能删除"),
-  ADAD_HAS_CREATIVE_DELETE_ERROR(NS_GENERAL, -1, "广告下存在绑定创意,请删除对应创意后操作删除广告"),
-  ADCREATIVE_RUNNING_DELETE_ERROR(NS_GENERAL, -1, "创意启用中,不能删除"),
-  GET_AGENT_ERROR(NS_GENERAL, -1, "获取agent错误"),
-  DELETE_ADVERTISER_ERROR(NS_GENERAL, -1, "该广告主下绑定有计划,不能删除"),
-  OPERATE_ADVERTISER_ERROR(NS_GENERAL, -1, "该代理商下没有该广告主,不能操作"),
-  DELETE_CAMPAIGN_ERROR(NS_GENERAL, -1, "该计划下绑定广告投放中,不能删除"),
-  ADCAMPAIGN_HAS_AD_DELETE_ERROR(NS_GENERAL, -1, "该计划下存在绑定广告,请删除对应广告后操作删除计划"),
-  PHONE_EXIST(NS_GENERAL, 10001, "手机号已存在"),
-
-  NO_AD(NS_GENERAL, 11001, "无分发激励广告")
-  ;
-
-
-  ExceptionCodeEnum(String namespace, int code, String msg) {
-    this.code = code;
-    this.msg = msg;
-    this.namespace = namespace;
-  }
-  private int code;
-  private String msg;
-  private String namespace;
-
-  public int getCode() {
-    return code;
-  }
-
-  public void setCode(int code) {
-    this.code = code;
-  }
-
-  public String getMsg() {
-    return msg;
-  }
-
-  public void setMsg(String msg) {
-    this.msg = msg;
-  }
-
-  public String getNamespace() {
-    return namespace;
-  }
-
-  public void setNamespace(String namespace) {
-    this.namespace = namespace;
-  }
-
-  @Override
-  public String toString() {
-    return String.format("[code=%s, msg=%s]", this.code, this.msg);
-  }
+    LOGIN_ERROR(NS_GENERAL, -999, "用户未登录"),
+    ACCOUNT_FREEZE(NS_GENERAL, -888, "账户被锁定"),
+    SYS_ERROR(NS_GENERAL, -111, "系统异常"),
+    PARAM_ERROR(NS_GENERAL, -990, "参数错误"),
+    WX_GET_ACCESS_TOKEN(NS_GENERAL, -995, "获取线上的微信accessToken失败"),
+    WX_GET_OPENID_ERROR(NS_GENERAL, -992, "微信用户获取OPENID出错"),
+
+    VIDEO_NOTEXIST(NS_GENERAL, 1, "视频不存在"),
+    DATA_ERROR(NS_GENERAL, 2, "数据不匹配"),
+    USER_NOTEXIST(NS_GENERAL, 3, "用户不存在"),
+    PAPAM_ERROR(NS_GENERAL, 4, "参数不对"),
+    ACCOUNT_EXIST(NS_GENERAL, 5, "账号已被占用"),
+    PASSWORD_ERROR(NS_GENERAL, 6, "密码不准确"),
+    DATA_NOTEXIST(NS_GENERAL, 7, "数据不匹配"),
+    MENU_EXIST(NS_GENERAL, 8, "菜单标示已存在"),
+    MENU_NOTEXIST(NS_GENERAL, 9, "菜单不存在"),
+    NOT_lOGIN(NS_GENERAL, 10, "未登录"),
+    KAIYAN_VIDEO_SEND(NS_GENERAL, 11, "开眼视频已经发过"),
+
+    MONITORING_ALARM_CONFIG_NOT_EXIST(NS_GENERAL, 12, "数据库容量告警手机号码未配置"),
+
+    OPERAATION_FAIL(NS_GENERAL, 13, "操作失败"),
+
+    PUSH_MSG_CANNT_UPDATE(NS_GENERAL, 14, "立即推送的信息不能修改"),
+    PUSH_MSG_CANNT_DELETE(NS_GENERAL, 15, "立即推送的信息不能撤销"),
+    SEND_PUSH_MSG_CANNT_UPDATE(NS_GENERAL, 16, "已推送的信息不能修改"),
+    PUSH_TARGET_NOTEXIST(NS_GENERAL, 17, "没有找到推送目标的绑定设备"),
+    PUSH_PLATFORM_ERROR(NS_GENERAL, 18, "推送平台错误"),
+    PUSH_SCHEDULE_ERROR(NS_GENERAL, 19, "定时推送时间必须大于当前时间"),
+
+    DATA_REPORT_TYPE_NOT_EXISTS(NS_GENERAL, 20, "对应的报表不存在"),
+    DATA_REPORT_PARAM_NOT_EXISTS(NS_GENERAL, 21, "报表扩展参数有缺失"),
+    NOTEXAMINEVIDEO_CONFIG_NOT_EXIST(NS_GENERAL, 23, "未审核的视频数手机号码未配置"),
+    SENSITIVE_WORD_EXISTS(NS_GENERAL, 22, "该词已存在"),
+    USERPROHIBITION_NOTEXIST(NS_GENERAL, 24, "封禁类型或者标示不存在"),
+
+    VERSION_CONTROLLER_DEFAULT_CONFIG(NS_GENERAL, 25, "没有默认配置,请联系管理员直接添加。"),
+    CONFIG_EXIST(NS_GENERAL, 26, "该版本配置已存在,不能重复添加。"),
+
+    BARRAGE_UP_VSIBILITY(NS_GENERAL, 27, "不能操作弹幕UP主删除"),
+    BARRAGE_TIME_ERROR(NS_GENERAL, 28, "视频时间不能为0"),
+    VIDEO_AUDITTRANSCATIONID_NOT_NEW(NS_GENERAL, 29, "视频审核ID不是最新"),
+    VIDEO_IS_DELETE(NS_GENERAL, 30, "视频已被用户删除"),
+    VIDEO_NOT_NOAML(NS_GENERAL, 29, "视频不是正常可见的"),
+    VIDEO_SHOULD_UNFREEZE(NS_GENERAL, 31, "请先解冻视频"),
+
+    AD_ALGO_THRESHOLD_PUSH_UPDATE_ERROR(NS_GENERAL, 32, "更新远程广告算法阈值失败"),
+
+
+    VIDEO_CONTENT_SENSITIVE_MATCH(NS_GENERAL, 1015, "输入内容包含违禁词汇,请修改"),
+    VIDEO_TITLE_SENSITIVE_MATCH(NS_GENERAL, 1016, "输入标题包含违禁词汇,请修改"),
+    VIDEO_RECOMMEND_TITLE_SENSITIVE_MATCH(NS_GENERAL, 1017, "输入分发标题包含违禁词汇,请修改"),
+
+    CANNOT_GET_LOCK(NS_GENERAL, 3001, "已有相同操作在进行"),
+    COMMENT_NOT_EXIST(NS_GENERAL, 3002, "评论不存在"),
+    COMMENT_IS_DELETE(NS_GENERAL, 3003, "评论已经删除存在"),
+
+    VIDEO_MEASURE_PROCEEDING(NS_GENERAL, 4000, "此视频正在曝光池中"),
+    VIDEO_NOT_TAG(NS_GENERAL, 4001, "视频没有标签"),
+    RECOMMENT_PARAM_INDEX_ERROR(NS_GENERAL, 4002, "推荐配置的限制个数和位置个数对应不上"),
+    RECOMMENT_PARAM_SCORE_ERROR(NS_GENERAL, 4003, "分数设置不对"),
+    VIDEO_UNRECOMMEND(NS_GENERAL, 4002, "待推荐视频不能加入曝光池"),
+
+    TAG_NAME_IS_UNUSED(NS_GENERAL, 5001, "同名视频标签%s不存在"),
+    MAJIAHAO_IS_ALL_USED(NS_GENERAL, 5001, "马甲号已全部用完"),
+
+    SECOND_CATEGORY_IS_NULL(NS_GENERAL, 6002, "二级分类不能为空"),
+    PARENT_CATEGORY_IS_NULL(NS_GENERAL, 6001, "一级分类不能为空"),
+
+    CANNOT_REVOCER_UNDELETED_VIDEO(NS_GENERAL, 7001, "不能恢复未删除的视频"),
+    CANNOT_REVOCER_DELETED_FILENOTFIND_VIDEO(NS_GENERAL, 7002, "视频文件已经被迁移,请先恢复文件后再恢复视频"),
+
+    VIDEO_AUDIT_PERMISSION_DENIED(NS_GENERAL, 8001, "你没有修改视频审核状态的权限"),
+    CAN_NOT_FETCHTASK_FOR_NOT_ONDUTY(NS_GENERAL, 8002, "你已经下班了,无法分配审核任务"),
+
+    DELOGO_VIDEO_NOT_EXISTS(NS_GENERAL, 8003, "去视频视频不存在"),
+    DELOGO_VIDEO_AUDIT_ERROR(NS_GENERAL, 8004, "已转码成功的视频不能改成审核不通过"),
+    DELOGO_VIDEO_AUDIT_WRONG(NS_GENERAL, 8004, "已审核通过且已发起转码的视频不能改成审核不通过"),
+    VIDEO_NOT_SLICE(NS_GENERAL, 8005, "不可搜视频不能分剪"),
+    VIDEO_SLICE_EXISTS(NS_GENERAL, 8006, "视频分剪已存在"),
+    MUSIC_NOT_EXISTS(NS_GENERAL, 8007, "音乐素材不存在"),
+    MUSIC_CATE_EXISTS(NS_GENERAL, 8008, "音乐素材分类已存在"),
+    MUSIC_CRAWER_NOT_EDIT(NS_GENERAL, 8009, "音乐爬取素材不能编辑"),
+    MUSIC_HOT_NOT_DELETE(NS_GENERAL, 8010, "热门音乐不能被删除"),
+
+    VIDEO_CROP_PROCESSING(NS_GENERAL, 9001, "该视频有正在处理中的剪切任务"),
+
+
+    AD_POSITION_FLOW_CONTROL_OVERFLOW(NS_GENERAL, 1001, "该广告位下流量控制不能大于 100%"),
+    INVOKE_VIDEO_API_WEAPP_URLLINK_ERROR(NS_GENERAL, 1002, "调用 video api 获取小程序 URL Link 失败"),
+    INVOKE_INCENTIVE_API_ERROR(NS_GENERAL, 1003, "调用激励服务失败"),
+    ADCAMPAIGN_REPEAT_ERROR(NS_GENERAL, -1, "名称重复,请修改"),
+    ADCAMPAIGN_RUNNING_DELETE_ERROR(NS_GENERAL, -1, "计划启用中,不能删除"),
+    ADAD_RUNNING_DELETE_ERROR(NS_GENERAL, -1, "广告启用中,不能删除"),
+    ADAD_HAS_CREATIVE_DELETE_ERROR(NS_GENERAL, -1, "广告下存在绑定创意,请删除对应创意后操作删除广告"),
+    ADCREATIVE_RUNNING_DELETE_ERROR(NS_GENERAL, -1, "创意启用中,不能删除"),
+    GET_AGENT_ERROR(NS_GENERAL, -1, "获取agent错误"),
+    DELETE_ADVERTISER_ERROR(NS_GENERAL, -1, "该广告主下绑定有计划,不能删除"),
+    OPERATE_ADVERTISER_ERROR(NS_GENERAL, -1, "该代理商下没有该广告主,不能操作"),
+    DELETE_CAMPAIGN_ERROR(NS_GENERAL, -1, "该计划下绑定广告投放中,不能删除"),
+    ADCAMPAIGN_HAS_AD_DELETE_ERROR(NS_GENERAL, -1, "该计划下存在绑定广告,请删除对应广告后操作删除计划"),
+    PHONE_EXIST(NS_GENERAL, 10001, "手机号已存在"),
+
+    NO_AD(NS_GENERAL, 11001, "无分发激励广告");
+
+
+    ExceptionCodeEnum(String namespace, int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+        this.namespace = namespace;
+    }
+
+    private int code;
+    private String msg;
+    private String namespace;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public String getNamespace() {
+        return namespace;
+    }
+
+    public void setNamespace(String namespace) {
+        this.namespace = namespace;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("[code=%s, msg=%s]", this.code, this.msg);
+    }
 
 }

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/config/db/LongArticleDBConfig.java

@@ -47,7 +47,7 @@ public class LongArticleDBConfig {
 
     @Bean(name = "longArticleEntityManagerFactory")
     public LocalContainerEntityManagerFactoryBean longArticleEntityManagerFactory(EntityManagerFactoryBuilder builder,
-                                                                           @Qualifier("longArticleDataSource") DataSource dataSource) {
+                                                                                  @Qualifier("longArticleDataSource") DataSource dataSource) {
         return builder
                 .dataSource(dataSource)
                 .packages("com.tzld.longarticle.recommend.server.model.entity.longArticle") // 实体类包路径

+ 4 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/aigc/AigcBaseMapper.java

@@ -1,6 +1,9 @@
 package com.tzld.longarticle.recommend.server.mapper.aigc;
 
-import com.tzld.longarticle.recommend.server.model.dto.*;
+import com.tzld.longarticle.recommend.server.model.dto.ContentPoolTypeDTO;
+import com.tzld.longarticle.recommend.server.model.dto.CrawlerContent;
+import com.tzld.longarticle.recommend.server.model.dto.ProduceContentDTO;
+import com.tzld.longarticle.recommend.server.model.dto.ProducePlanAuditCheckDTO;
 import com.tzld.longarticle.recommend.server.model.dto.aigc.BadCrawlerAccountDTO;
 import com.tzld.longarticle.recommend.server.model.dto.aigc.IdChannelDTO;
 import com.tzld.longarticle.recommend.server.model.dto.aigc.IdPlatformDTO;

+ 2 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/crawler/ArticleContentLinkMapper.java

@@ -2,11 +2,11 @@ package com.tzld.longarticle.recommend.server.mapper.crawler;
 
 import com.tzld.longarticle.recommend.server.repository.model.ArticleContentLink;
 import com.tzld.longarticle.recommend.server.repository.model.ArticleContentLinkExample;
-import java.util.List;
-
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface ArticleContentLinkMapper {
     long countByExample(ArticleContentLinkExample example);

+ 2 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/crawler/ArticleGzhDeveloperMapper.java

@@ -2,11 +2,11 @@ package com.tzld.longarticle.recommend.server.mapper.crawler;
 
 import com.tzld.longarticle.recommend.server.repository.model.ArticleGzhDeveloper;
 import com.tzld.longarticle.recommend.server.repository.model.ArticleGzhDeveloperExample;
-import java.util.List;
-
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface ArticleGzhDeveloperMapper {
     long countByExample(ArticleGzhDeveloperExample example);

+ 1 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/crawler/PushMessageCallbackMapper.java

@@ -2,11 +2,10 @@ package com.tzld.longarticle.recommend.server.mapper.crawler;
 
 import com.tzld.longarticle.recommend.server.repository.model.PushMessageCallback;
 import com.tzld.longarticle.recommend.server.repository.model.PushMessageCallbackExample;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.Param;
-
 public interface PushMessageCallbackMapper {
     long countByExample(PushMessageCallbackExample example);
 

+ 4 - 3
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/growth/AlgGhAutoreplyVideoRankDataMapper.java

@@ -2,10 +2,11 @@ package com.tzld.longarticle.recommend.server.mapper.growth;
 
 import com.tzld.longarticle.recommend.server.repository.model.AlgGhAutoreplyVideoRankData;
 import com.tzld.longarticle.recommend.server.repository.model.AlgGhAutoreplyVideoRankDataExample;
-import java.util.List;
-
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 @Mapper
 public interface AlgGhAutoreplyVideoRankDataMapper {
     long countByExample(AlgGhAutoreplyVideoRankDataExample example);
@@ -32,5 +33,5 @@ public interface AlgGhAutoreplyVideoRankDataMapper {
 
     String selectLatestDtVersionByStrategyKey(String strategyKey);
 
-    String selectLatestDtVersionByStrategyKeyAndGhId(@Param("strategyKey")String strategyKey, @Param("ghId")String ghId);
+    String selectLatestDtVersionByStrategyKeyAndGhId(@Param("strategyKey") String strategyKey, @Param("ghId") String ghId);
 }

+ 3 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/growth/CgiReplyBucketDataMapper.java

@@ -2,10 +2,11 @@ package com.tzld.longarticle.recommend.server.mapper.growth;
 
 import com.tzld.longarticle.recommend.server.repository.model.CgiReplyBucketData;
 import com.tzld.longarticle.recommend.server.repository.model.CgiReplyBucketDataExample;
-import java.util.List;
-
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 @Mapper
 public interface CgiReplyBucketDataMapper {
     long countByExample(CgiReplyBucketDataExample example);

+ 2 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/growth/GhDetailMapper.java

@@ -2,11 +2,11 @@ package com.tzld.longarticle.recommend.server.mapper.growth;
 
 import com.tzld.longarticle.recommend.server.repository.model.GhDetail;
 import com.tzld.longarticle.recommend.server.repository.model.GhDetailExample;
-import java.util.List;
-
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface GhDetailMapper {
     long countByExample(GhDetailExample example);

+ 2 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/growth/ReplyStaffMapper.java

@@ -2,11 +2,11 @@ package com.tzld.longarticle.recommend.server.mapper.growth;
 
 import com.tzld.longarticle.recommend.server.repository.model.ReplyStaff;
 import com.tzld.longarticle.recommend.server.repository.model.ReplyStaffExample;
-import java.util.List;
-
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface ReplyStaffMapper {
     long countByExample(ReplyStaffExample example);

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/longArticle/LongArticleBaseMapper.java

@@ -88,7 +88,7 @@ public interface LongArticleBaseMapper {
 
     Long countMatchCount(Date start, Date end);
 
-    List<String>  getMatchContentId(Date start, Date end);
+    List<String> getMatchContentId(Date start, Date end);
 
     void batchInsertLongArticleAuditDelete(List<LongArticleAuditDelete> deleteList);
 

+ 0 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/bo/CardData.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Data

+ 5 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/adplatform/ChangwenArticle.java

@@ -2,7 +2,10 @@ package com.tzld.longarticle.recommend.server.model.entity.adplatform;
 
 import lombok.Data;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.io.Serializable;
 
 @Data
@@ -33,6 +36,6 @@ public class ChangwenArticle implements Serializable {
 
     @Column(name = "create_timestamp")
     private Long createTimestamp;
-    
+
 
 }

+ 4 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/adplatform/ChangwenArticleDatastat.java

@@ -2,7 +2,10 @@ package com.tzld.longarticle.recommend.server.model.entity.adplatform;
 
 import lombok.Data;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.math.BigDecimal;
 

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/CrawlerPlan.java

@@ -4,10 +4,10 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.persistence.Column;
 
 @Data
 @AllArgsConstructor

+ 1 - 6
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/CrawlerPlanResultRel.java

@@ -4,12 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Column;
+import javax.persistence.*;
 
 @Data
 @AllArgsConstructor

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/ProducePlan.java

@@ -4,10 +4,10 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.persistence.Column;
 
 @Data
 @AllArgsConstructor

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/ProducePlanExeRecord.java

@@ -4,10 +4,10 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.persistence.Column;
 
 @Data
 @AllArgsConstructor

+ 1 - 6
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/ProducePlanInputSource.java

@@ -4,12 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Table;
-import javax.persistence.Column;
+import javax.persistence.*;
 
 @Data
 @AllArgsConstructor

+ 1 - 0
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/PublishContent.java

@@ -1,4 +1,5 @@
 package com.tzld.longarticle.recommend.server.model.entity.aigc;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/PublishContentLayout.java

@@ -4,10 +4,10 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.persistence.Column;
 
 @Data
 @AllArgsConstructor

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/PublishPlan.java

@@ -4,10 +4,10 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.persistence.Column;
 
 @Data
 @AllArgsConstructor

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/PublishPlanMiniprogramTask.java

@@ -4,10 +4,10 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.persistence.Column;
 
 @Data
 @AllArgsConstructor

+ 1 - 5
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/crawler/AccountCorrelation.java

@@ -4,11 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.Table;
-import javax.persistence.Column;
+import javax.persistence.*;
 import java.io.Serializable;
 
 @Data

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/crawler/GetOffVideoCrawler.java

@@ -4,9 +4,9 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Id;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Id;
 import javax.persistence.Table;
 
 @Data

+ 4 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/longArticle/ArticlePoolPromotionSource.java

@@ -4,7 +4,10 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.io.Serializable;
 
 @Data

+ 4 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/longArticle/DatastatSortStrategy.java

@@ -4,7 +4,10 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.io.Serializable;
 
 @Data

+ 0 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/longArticle/LongArticlesPublishMiniprogram.java

@@ -30,5 +30,4 @@ public class LongArticlesPublishMiniprogram {
     private Long newVideoCoverId;
 
 
-
 }

+ 4 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/longArticle/PublishContentGzhWaiting.java

@@ -5,7 +5,10 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Data
 @AllArgsConstructor

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/longArticle/VideoEndScreenTransformationTask.java

@@ -20,7 +20,7 @@ public class VideoEndScreenTransformationTask {
     private Long TaskId;
 
     @Column(name = "video_origin_type")
-    private String videoOriginType ;
+    private String videoOriginType;
 
     @Column(name = "video_origin_id")
     private Long videoOriginId;

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/vo/FeishuTableDTO.java

@@ -90,7 +90,7 @@ public class FeishuTableDTO {
                 "        }\n" +
                 "    ]\n" +
                 "}";
-        FeishuTableDTO result =  JSONObject.parseObject(tableStr, FeishuTableDTO.class);
+        FeishuTableDTO result = JSONObject.parseObject(tableStr, FeishuTableDTO.class);
         if (atAll) {
             FeishuTableDTO.Element atAllElement = new FeishuTableDTO.Element();
             atAllElement.setTag("div");

+ 0 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/vo/GhDetailVo.java

@@ -2,7 +2,6 @@ package com.tzld.longarticle.recommend.server.model.vo;
 
 import lombok.Data;
 
-import java.util.Date;
 import java.util.List;
 
 @Data

+ 1 - 0
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/vo/IntermediateIndicatorsExport.java

@@ -1,4 +1,5 @@
 package com.tzld.longarticle.recommend.server.model.vo;
+
 import lombok.Data;
 
 @Data

+ 7 - 7
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/vo/NewSortStrategyExport.java

@@ -13,17 +13,17 @@ public class NewSortStrategyExport {
 
     private String dateStr;
     private String publishTime;
-//    private String accountMode;
+    //    private String accountMode;
     private String accountSource;
-//    private String accountType;
+    //    private String accountType;
     private String accountStatus;
     private String businessType;
     private String accountName;
     private String strategy;
     private Integer fans;
-//    private Integer viewCount;
+    //    private Integer viewCount;
     private Double avgViewCount;
-//    private Integer firstViewCount;
+    //    private Integer firstViewCount;
 //    private Double firstAvgViewCount;
 //    // 首日
 //    private Integer firstLevel;
@@ -64,15 +64,15 @@ public class NewSortStrategyExport {
 
     // 抓取计划名称
     private String crawlerPlanName;
-//    // 抓取计划策略
+    //    // 抓取计划策略
 //    private String crawlerPlanTag;
     // 生成计划名称
     private String producePlanName;
-//    // 生成计划策略
+    //    // 生成计划策略
 //    private String producePlanTag;
     // 发布计划名称
     private String publishPlanName;
-//    // 发布匹配小程序策略
+    //    // 发布匹配小程序策略
 //    private String publishMiniProgramInsertStrategy;
 //    // 发布匹配小程序小程序用途
 //    private String publishMiniProgramInsertUseType;

+ 4 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/vo/WxUserGetResponse.java

@@ -1,6 +1,9 @@
 package com.tzld.longarticle.recommend.server.model.vo;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import java.util.List;
 

+ 0 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mq/MessageCallbackProducer.java

@@ -2,8 +2,6 @@ package com.tzld.longarticle.recommend.server.mq;
 
 import com.alibaba.fastjson.JSON;
 import com.aliyun.openservices.ons.api.Message;
-import com.aliyun.openservices.ons.api.SendResult;
-import com.aliyun.openservices.ons.api.bean.ProducerBean;
 import com.tzld.longarticle.recommend.server.common.response.CommonResponse;
 import com.tzld.longarticle.recommend.server.common.response.ExceptionCodeEnum;
 import com.tzld.longarticle.recommend.server.model.param.CallbackParam;

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/remote/ArticleSensitiveRemoteService.java

@@ -7,8 +7,8 @@ import com.tencentcloudapi.common.profile.HttpProfile;
 import com.tencentcloudapi.tms.v20201229.TmsClient;
 import com.tencentcloudapi.tms.v20201229.models.TextModerationRequest;
 import com.tencentcloudapi.tms.v20201229.models.TextModerationResponse;
-import com.tzld.longarticle.recommend.server.repository.crawler.ArticleSensitiveRepository;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.ArticleSensitive;
+import com.tzld.longarticle.recommend.server.repository.crawler.ArticleSensitiveRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

+ 0 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/remote/ODPSManager.java

@@ -11,8 +11,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**

+ 3 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/remote/aigc/AIGCProduceContentListService.java

@@ -18,7 +18,9 @@ import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 @Service
 @Slf4j

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/adplatform/ChangwenArticleDatastatRepository.java

@@ -5,6 +5,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface ChangwenArticleDatastatRepository  extends JpaRepository<ChangwenArticleDatastat, String> {
+public interface ChangwenArticleDatastatRepository extends JpaRepository<ChangwenArticleDatastat, String> {
 
 }

+ 1 - 0
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/longArticle/DatastatSortStrategyRepository.java

@@ -12,6 +12,7 @@ public interface DatastatSortStrategyRepository extends JpaRepository<DatastatSo
     List<DatastatSortStrategy> getByViewCountGreaterThanEqualAndReadRateGreaterThanEqualAndPositionIn(Integer viewCount,
                                                                                                       Double readRate,
                                                                                                       List<Integer> positionList);
+
     List<DatastatSortStrategy> getByWxSnIn(List<String> wxSnList);
 
     List<DatastatSortStrategy> getByDateStr(String dateStr);

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/model/GhDetailExample.java

@@ -68,7 +68,7 @@ public class GhDetailExample {
     }
 
     public void setPage(Page page) {
-        this.page=page;
+        this.page = page;
     }
 
     public Page getPage() {

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/ServiceBeanFactory.java

@@ -21,7 +21,7 @@ public class ServiceBeanFactory implements ApplicationContextAware {
         return applicationContext.getBean(clazz);
     }
 
-    public static Object getBeanByName(String name){
+    public static Object getBeanByName(String name) {
         return applicationContext.getBean(name);
     }
 }

+ 2 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/XxlJobService.java

@@ -1279,8 +1279,9 @@ public class XxlJobService {
 
     /**
      * 计算长字符串数字余数
+     *
      * @param numberStr 长字符串数字
-     * @param divisor 除数
+     * @param divisor   除数
      * @return 余数
      */
     public int calculateRemainder(String numberStr, int divisor) {

+ 4 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/cgi/TouLiuHttpClientService.java

@@ -11,7 +11,10 @@ import org.springframework.web.reactive.function.BodyInserters;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 @Service
 public class TouLiuHttpClientService {

+ 0 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/cgi/impl/CgiReplyServiceImpl.java

@@ -1,13 +1,11 @@
 package com.tzld.longarticle.recommend.server.service.cgi.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.tzld.longarticle.recommend.server.common.enums.GhTypeEnum;
 import com.tzld.longarticle.recommend.server.common.enums.cgi.ReplyStrategyServiceEnum;
 import com.tzld.longarticle.recommend.server.mapper.growth.GhDetailMapper;
 import com.tzld.longarticle.recommend.server.model.cgi.BucketDataParam;
 import com.tzld.longarticle.recommend.server.model.cgi.ReplyBucketData;
-import com.tzld.longarticle.recommend.server.model.param.PushMessageParam;
 import com.tzld.longarticle.recommend.server.repository.model.GhDetail;
 import com.tzld.longarticle.recommend.server.repository.model.GhDetailExample;
 import com.tzld.longarticle.recommend.server.service.cgi.CgiReplyService;

+ 0 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/exterior/GhDetailService.java

@@ -2,7 +2,6 @@ package com.tzld.longarticle.recommend.server.service.exterior;
 
 import com.tzld.longarticle.recommend.server.common.response.CommonResponse;
 import com.tzld.longarticle.recommend.server.model.vo.GhDetailVo;
-import com.tzld.longarticle.recommend.server.repository.model.GhDetail;
 import com.tzld.longarticle.recommend.server.util.page.Page;
 
 public interface GhDetailService {

+ 0 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/exterior/ThirdPartyService.java

@@ -1,7 +1,6 @@
 package com.tzld.longarticle.recommend.server.service.exterior;
 
 import com.tzld.longarticle.recommend.server.common.response.CommonResponse;
-import com.tzld.longarticle.recommend.server.model.param.CallbackParam;
 import com.tzld.longarticle.recommend.server.model.param.PushMessageParam;
 import com.tzld.longarticle.recommend.server.model.vo.PushMessageVo;
 import com.tzld.longarticle.recommend.server.model.vo.ReportUvVo;

+ 1 - 3
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/exterior/impl/AccessTokenServiceImpl.java

@@ -15,8 +15,6 @@ import org.springframework.stereotype.Service;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import static com.tzld.longarticle.recommend.server.common.response.ErrcodeNamespace.NS_GENERAL;
-
 @Service
 public class AccessTokenServiceImpl implements AccessTokenService {
 
@@ -78,7 +76,7 @@ public class AccessTokenServiceImpl implements AccessTokenService {
     @Override
     public SecretEnum getSecretEnum(String accessToken) {
         String secret = redisTemplate.opsForValue().get(accessToken);
-        if(StringUtils.isEmpty(secret)){
+        if (StringUtils.isEmpty(secret)) {
             return null;
         }
         return SecretEnum.get(secret);

+ 1 - 3
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/exterior/impl/ThirdPartyServiceImpl.java

@@ -6,7 +6,6 @@ import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.tzld.longarticle.recommend.server.common.constant.TimeConstant;
 import com.tzld.longarticle.recommend.server.common.enums.GhTypeEnum;
 import com.tzld.longarticle.recommend.server.common.enums.SecretEnum;
-import com.tzld.longarticle.recommend.server.common.enums.StatusEnum;
 import com.tzld.longarticle.recommend.server.common.enums.cgi.ReplyStrategyServiceEnum;
 import com.tzld.longarticle.recommend.server.common.response.CommonResponse;
 import com.tzld.longarticle.recommend.server.common.response.ExceptionCodeEnum;
@@ -19,6 +18,7 @@ import com.tzld.longarticle.recommend.server.model.cgi.ReplyBucketData;
 import com.tzld.longarticle.recommend.server.model.param.PushMessageParam;
 import com.tzld.longarticle.recommend.server.model.vo.PushMessageVo;
 import com.tzld.longarticle.recommend.server.model.vo.ReportUvVo;
+import com.tzld.longarticle.recommend.server.remote.ODPSManager;
 import com.tzld.longarticle.recommend.server.repository.model.GhDetail;
 import com.tzld.longarticle.recommend.server.repository.model.GhDetailExample;
 import com.tzld.longarticle.recommend.server.service.exterior.AccessTokenService;
@@ -26,7 +26,6 @@ import com.tzld.longarticle.recommend.server.service.exterior.ThirdPartyService;
 import com.tzld.longarticle.recommend.server.service.strategy.reply.ReplyStrategyService;
 import com.tzld.longarticle.recommend.server.util.DateUtils;
 import com.tzld.longarticle.recommend.server.util.LarkRobotUtil;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -34,7 +33,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import com.tzld.longarticle.recommend.server.remote.ODPSManager;
 
 import javax.annotation.PostConstruct;
 import java.util.ArrayList;

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/ArticleAuditService.java

@@ -817,7 +817,7 @@ public class ArticleAuditService {
                 .collect(Collectors.toMap(PublishAccount::getId, Function.identity()));
         List<PublishAccountRemarkDTO> publishAccountRemarkDTOList = publishContentMapper.getPublishAccountRemarkList(publishAccountIds);
         Map<String, List<PublishAccountRemarkDTO>> publishAccountRemarkMap = publishAccountRemarkDTOList.stream()
-               .collect(Collectors.groupingBy(PublishAccountRemarkDTO::getPublishAccountId));
+                .collect(Collectors.groupingBy(PublishAccountRemarkDTO::getPublishAccountId));
         List<PublishGzhPushContentRelDTO> groupPushRelList = publishContentMapper.getGroupPushRelByPushIdIn(pushIds);
         List<String> publishContentIds = groupPushRelList.stream().map(PublishGzhPushContentRelDTO::getPublishContentId)
                 .collect(Collectors.toList());

+ 3 - 4
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/ArticlePromotionService.java

@@ -99,12 +99,11 @@ public class ArticlePromotionService {
     private final List<String> contentPoolType = Arrays.asList("autoArticlePoolLevel1", "autoArticlePoolLevel3", "autoArticlePoolLevel4");
 
     /**
-     *
      * @param readAvg:对照组分子
      * @param fansA:对照组分母
-     * @param viewCount: 实验组分子
-     * @param fansB: 实验组分母
-     * @param confidence: 置信度
+     * @param viewCount:    实验组分子
+     * @param fansB:        实验组分母
+     * @param confidence:   置信度
      * @return boolean: true / false
      */
     public static boolean isExperimentGroupStatisticallySuperior(double readAvg, int fansA, double viewCount, int fansB, double confidence) {

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/DataDashboardService.java

@@ -1141,7 +1141,7 @@ public class DataDashboardService {
             if (!"L4".equals(data.getType())) {
                 continue;
             }
-            if (data.getViewCount() < 100000){
+            if (data.getViewCount() < 100000) {
                 FeishuMessageSender.sendWebHookMessage(FeishuRobotIdEnum.RECOMMEND.getRobotId(),
                         "【中间指标】 " + data.getDateStr() + "-" + data.getType() + " 阅读量异常");
             }

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/RecommendService.java

@@ -107,7 +107,7 @@ public class RecommendService {
         saveSortLog(param, rankResult);
 
         RecommendResponse response = buildRecommendResponse(recallResult, rankResult, param.getPublishNum());
-        long t4  = System.currentTimeMillis();
+        long t4 = System.currentTimeMillis();
         log.info("recommendCost param:{} total cost:{} recall:{} rank:{} response: {}", JSONObject.toJSONString(request),
                 t4 - start, t2 - start, t3 - t2, JSONObject.toJSONString(response));
         CostMonitor.logCost("Recommend", "Total", t4 - start);

+ 5 - 5
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/config/AccountIndexAvgViewCountService.java

@@ -2,8 +2,8 @@ package com.tzld.longarticle.recommend.server.service.recommend.config;
 
 import cn.hutool.core.io.resource.ResourceUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.tzld.longarticle.recommend.server.repository.crawler.AccountAvgInfoRepository;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.AccountAvgInfo;
+import com.tzld.longarticle.recommend.server.repository.crawler.AccountAvgInfoRepository;
 import com.tzld.longarticle.recommend.server.service.recommend.score.AvgReadDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -56,9 +56,9 @@ public class AccountIndexAvgViewCountService {
         Map<String, AccountAvgInfo> accountAvgInfoMap = accountAvgInfoList.stream().collect(Collectors.toMap(AccountAvgInfo::getPosition, Function.identity()));
         AccountAvgInfo info = accountAvgInfoMap.get(index + "");
         if (Objects.isNull(info)) {
-            info =  accountAvgInfoMap.get("4");
+            info = accountAvgInfoMap.get("4");
             if (Objects.isNull(info)) {
-                info =  accountAvgInfoMap.get("1");
+                info = accountAvgInfoMap.get("1");
             }
         }
         return info == null ? 1.0 : info.getReadAvg();
@@ -76,9 +76,9 @@ public class AccountIndexAvgViewCountService {
         Map<String, AccountAvgInfo> accountAvgInfoMap = accountAvgInfoList.stream().collect(Collectors.toMap(AccountAvgInfo::getPosition, Function.identity()));
         AccountAvgInfo info = accountAvgInfoMap.get(index + "");
         if (Objects.isNull(info)) {
-            info =  accountAvgInfoMap.get("4");
+            info = accountAvgInfoMap.get("4");
             if (Objects.isNull(info)) {
-                info =  accountAvgInfoMap.get("1");
+                info = accountAvgInfoMap.get("1");
             }
         }
         return info == null ? 1.0 : info.getReadAvg();

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/filter/strategy/HistoryTitleForFwhColdStartStrategy.java

@@ -2,8 +2,8 @@ package com.tzld.longarticle.recommend.server.service.recommend.filter.strategy;
 
 import com.tzld.longarticle.recommend.server.common.enums.recommend.ArticleTypeEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-import com.tzld.longarticle.recommend.server.remote.ArticleListRemoteService;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
+import com.tzld.longarticle.recommend.server.remote.ArticleListRemoteService;
 import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterParam;
 import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterResult;
 import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterStrategy;

+ 6 - 6
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/RankStrategy.java

@@ -93,12 +93,12 @@ public interface RankStrategy {
         if (CollectionUtils.isNotEmpty(items)
                 && items.get(0).getScoreMap().containsKey(ScoreStrategyEnum.SIMILARITY.value())
                 && items.get(0).getScoreMap().get(ScoreStrategyEnum.SIMILARITY.value()) == 0) {
-                FeishuMessageSender.sendWebHookMessage(FeishuRobotIdEnum.RECOMMEND.getRobotId(),
-                        "内容评分为0\n"
-                                + "ghId: " + param.getGhId() + "\n"
-                                + "账号名称: " + param.getAccountName() + "\n"
-                                + "策略: " + param.getStrategy());
-                return true;
+            FeishuMessageSender.sendWebHookMessage(FeishuRobotIdEnum.RECOMMEND.getRobotId(),
+                    "内容评分为0\n"
+                            + "ghId: " + param.getGhId() + "\n"
+                            + "账号名称: " + param.getAccountName() + "\n"
+                            + "策略: " + param.getStrategy());
+            return true;
         }
         return false;
     }

+ 4 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/strategy/RankV2Strategy.java

@@ -3,7 +3,10 @@ package com.tzld.longarticle.recommend.server.service.recommend.rank.strategy;
 
 import com.tzld.longarticle.recommend.server.common.enums.recommend.ScoreStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-import com.tzld.longarticle.recommend.server.service.recommend.rank.*;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankItem;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankParam;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankResult;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankStrategy;
 import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreResult;
 import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreService;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/score/strategy/AccountPreDistributeStrategy.java

@@ -3,8 +3,8 @@ package com.tzld.longarticle.recommend.server.service.recommend.score.strategy;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.google.common.reflect.TypeToken;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-import com.tzld.longarticle.recommend.server.repository.crawler.ArticlePreDistributeAccountRepository;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.ArticlePreDistributeAccount;
+import com.tzld.longarticle.recommend.server.repository.crawler.ArticlePreDistributeAccountRepository;
 import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
 import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
 import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/score/strategy/FlowCtlDecreaseStrategy.java

@@ -4,8 +4,8 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.dto.ContentHisPublishArticle;
-import com.tzld.longarticle.recommend.server.repository.crawler.PublishSortLogRepository;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.PublishSortLog;
+import com.tzld.longarticle.recommend.server.repository.crawler.PublishSortLogRepository;
 import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
 import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
 import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;

+ 2 - 3
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/score/strategy/PublishTimesStrategy.java

@@ -3,9 +3,9 @@ package com.tzld.longarticle.recommend.server.service.recommend.score.strategy;
 import cn.hutool.core.collection.CollectionUtil;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.PublishSortLog;
 import com.tzld.longarticle.recommend.server.repository.aigc.CrawlerMetaArticleRepository;
 import com.tzld.longarticle.recommend.server.repository.crawler.PublishSortLogRepository;
-import com.tzld.longarticle.recommend.server.model.entity.crawler.PublishSortLog;
 import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
 import com.tzld.longarticle.recommend.server.service.recommend.score.AccountPublishTimesConfig;
 import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
@@ -16,10 +16,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
-import java.util.function.Function;
-
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Component

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/score/strategy/ViewCountRateStrategy.java

@@ -84,7 +84,7 @@ public class ViewCountRateStrategy implements ScoreStrategy {
                             showViewCountSumFirst += hisItem.getViewCount();
                             avgViewCountSumFirst += hisItem.getAvgViewCount();
                         } else if (hisItem.getItemIndex() == 2) {
-                            if (Objects.nonNull(hisItem.getFirstViewCount()) &&  hisItem.getFirstViewCount() > 0 &&
+                            if (Objects.nonNull(hisItem.getFirstViewCount()) && hisItem.getFirstViewCount() > 0 &&
                                     Objects.nonNull(hisItem.getFirstViewCountRate()) && hisItem.getFirstViewCountRate() > 0) {
                                 showViewCountSumSecond += hisItem.getViewCount();
                                 if (hisItem.getFirstViewCountRate() > 1) {

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/score/strategy/ViewCountRateV2Strategy.java

@@ -91,7 +91,7 @@ public class ViewCountRateV2Strategy implements ScoreStrategy {
                             showViewCountSumFirst += hisItem.getViewCount();
                             readAvgCiUpperSumFirst += hisItem.getReadAvgCiUpper();
                         } else if (hisItem.getItemIndex() == 2) {
-                            if (Objects.nonNull(hisItem.getFirstViewCount()) &&  hisItem.getFirstViewCount() > 0 &&
+                            if (Objects.nonNull(hisItem.getFirstViewCount()) && hisItem.getFirstViewCount() > 0 &&
                                     Objects.nonNull(hisItem.getFirstViewCountRate()) && hisItem.getFirstViewCountRate() > 0) {
                                 showViewCountSumSecond += hisItem.getViewCount();
                                 if (hisItem.getFirstViewCountRate() > 1) {

+ 3 - 3
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/score/strategy/ViewMultiplierStrategy.java

@@ -1,12 +1,12 @@
 package com.tzld.longarticle.recommend.server.service.recommend.score.strategy;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-import com.tzld.longarticle.recommend.server.repository.adplatform.ChangwenArticleDatastatRepository;
-import com.tzld.longarticle.recommend.server.repository.adplatform.ChangwenArticleRepository;
-import com.tzld.longarticle.recommend.server.repository.crawler.AccountAvgInfoRepository;
 import com.tzld.longarticle.recommend.server.model.entity.adplatform.ChangwenArticle;
 import com.tzld.longarticle.recommend.server.model.entity.adplatform.ChangwenArticleDatastat;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.AccountAvgInfo;
+import com.tzld.longarticle.recommend.server.repository.adplatform.ChangwenArticleDatastatRepository;
+import com.tzld.longarticle.recommend.server.repository.adplatform.ChangwenArticleRepository;
+import com.tzld.longarticle.recommend.server.repository.crawler.AccountAvgInfoRepository;
 import com.tzld.longarticle.recommend.server.service.recommend.config.AccountIndexAvgViewCountService;
 import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
 import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;

+ 5 - 4
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/strategy/reply/impl/BuckStrategyV1.java

@@ -2,17 +2,18 @@ package com.tzld.longarticle.recommend.server.service.strategy.reply.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.tzld.longarticle.recommend.server.common.enums.GhTypeEnum;
 import com.tzld.longarticle.recommend.server.common.enums.cgi.ReplyStrategyServiceEnum;
 import com.tzld.longarticle.recommend.server.mapper.growth.AlgGhAutoreplyVideoRankDataMapper;
 import com.tzld.longarticle.recommend.server.mapper.growth.CgiReplyBucketDataMapper;
 import com.tzld.longarticle.recommend.server.mapper.growth.GhDetailMapper;
 import com.tzld.longarticle.recommend.server.model.bo.VideoDetail;
 import com.tzld.longarticle.recommend.server.model.cgi.*;
-import com.tzld.longarticle.recommend.server.repository.model.*;
+import com.tzld.longarticle.recommend.server.repository.model.AlgGhAutoreplyVideoRankData;
+import com.tzld.longarticle.recommend.server.repository.model.AlgGhAutoreplyVideoRankDataExample;
+import com.tzld.longarticle.recommend.server.repository.model.CgiReplyBucketData;
+import com.tzld.longarticle.recommend.server.repository.model.CgiReplyBucketDataExample;
 import com.tzld.longarticle.recommend.server.service.cgi.TouLiuHttpClientService;
 import com.tzld.longarticle.recommend.server.service.strategy.reply.ReplyStrategyService;
-import com.tzld.longarticle.recommend.server.util.LarkRobotUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -281,7 +282,7 @@ public class BuckStrategyV1 implements ReplyStrategyService {
                 cgiReplyBucketData.setMsgType(1);
                 cgiReplyBucketData.setTitle(x.getTitle());
                 VideoDetail videoDetail = videoDetailMap.get(x.getVideoId());
-                if (videoDetail !=null && StringUtils.isNotEmpty(videoDetail.getCover())) {
+                if (videoDetail != null && StringUtils.isNotEmpty(videoDetail.getCover())) {
                     cgiReplyBucketData.setCoverUrl(videoDetail.getCover());
                 } else {
                     cgiReplyBucketData.setCoverUrl(CDN_URL + x.getCoverUrl());

+ 0 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/strategy/reply/impl/PushMessageStrategyV1.java

@@ -14,7 +14,6 @@ import com.tzld.longarticle.recommend.server.repository.model.CgiReplyBucketData
 import com.tzld.longarticle.recommend.server.repository.model.CgiReplyBucketDataExample;
 import com.tzld.longarticle.recommend.server.service.cgi.TouLiuHttpClientService;
 import com.tzld.longarticle.recommend.server.service.strategy.reply.ReplyStrategyService;
-import com.tzld.longarticle.recommend.server.util.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/strategy/reply/impl/WeComPushMessageStrategyV1.java

@@ -14,12 +14,12 @@ import com.tzld.longarticle.recommend.server.repository.model.CgiReplyBucketData
 import com.tzld.longarticle.recommend.server.service.cgi.TouLiuHttpClientService;
 import com.tzld.longarticle.recommend.server.service.strategy.reply.ReplyStrategyService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;

+ 0 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/video/CardGeneratorService.java

@@ -2,8 +2,6 @@ package com.tzld.longarticle.recommend.server.service.video;
 
 import com.tzld.longarticle.recommend.server.model.bo.CardData;
 
-import java.io.UnsupportedEncodingException;
-
 public interface CardGeneratorService {
 
     CardData generateCards(String ghId, String response, Integer miniprogramUseType);

+ 0 - 3
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/video/MatchVideoService.java

@@ -1,14 +1,11 @@
 package com.tzld.longarticle.recommend.server.service.video;
 
 import com.alibaba.fastjson.JSONObject;
-import com.tzld.longarticle.recommend.server.common.response.CommonResponse;
 import com.tzld.longarticle.recommend.server.model.param.ChooseMinigramParam;
 import com.tzld.longarticle.recommend.server.model.param.GetOffVideosParam;
 import com.tzld.longarticle.recommend.server.model.param.RecallVideosParam;
 import com.tzld.longarticle.recommend.server.model.param.SearchVideoParam;
 
-import java.io.UnsupportedEncodingException;
-
 public interface MatchVideoService {
     JSONObject searchVideo(SearchVideoParam searchVideoParam);
 

+ 4 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/video/impl/CardGeneratorServiceImpl.java

@@ -13,7 +13,10 @@ import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
 
 @Slf4j
 @Service

+ 0 - 3
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/video/impl/MatchVideoServiceImpl.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.tzld.longarticle.recommend.server.common.enums.MinigramEnum;
 import com.tzld.longarticle.recommend.server.common.enums.longArticle.ConstantStatusEnum;
-import com.tzld.longarticle.recommend.server.common.response.CommonResponse;
 import com.tzld.longarticle.recommend.server.model.bo.CardData;
 import com.tzld.longarticle.recommend.server.model.entity.longArticle.*;
 import com.tzld.longarticle.recommend.server.model.param.ChooseMinigramParam;
@@ -20,12 +19,10 @@ import com.tzld.longarticle.recommend.server.util.http.HttpResponseContent;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.UnsupportedEncodingException;
 import java.util.*;
 
 @Slf4j

+ 1 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/util/HttpClientFactory.java

@@ -67,7 +67,7 @@ public class HttpClientFactory {
      * @return httpclient instance
      */
     public static CloseableHttpClient create(int connectTimeout, int socketTimeout, int maxPerRoute, int maxTotal,
-                                                int retryCount, int connectionWaitTimeout) {
+                                             int retryCount, int connectionWaitTimeout) {
         try {
             RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(connectTimeout).setSocketTimeout(socketTimeout).setConnectionRequestTimeout(connectionWaitTimeout).build();
             CloseableHttpClient client = HttpClientBuilder.create()

+ 0 - 10
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/util/LarkRobotUtil.java

@@ -3,20 +3,11 @@ package com.tzld.longarticle.recommend.server.util;
 import com.alibaba.fastjson.JSONObject;
 import com.tzld.longarticle.recommend.server.common.HttpPoolFactory;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
 import java.nio.charset.StandardCharsets;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
 
 @Slf4j
 public class LarkRobotUtil {
@@ -49,5 +40,4 @@ public class LarkRobotUtil {
     }
 
 
-
 }

+ 10 - 9
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/util/MapBuilder.java

@@ -10,31 +10,32 @@ import java.util.Objects;
  **/
 public class MapBuilder {
 
-    private MapBuilder() {}
+    private MapBuilder() {
+    }
 
-    public static <K,V> Builder<K,V> builder() {
+    public static <K, V> Builder<K, V> builder() {
         return new Builder<>(null);
     }
 
-    public static <K,V> Builder<K,V> builder(Map<K,V> map) {
+    public static <K, V> Builder<K, V> builder(Map<K, V> map) {
         return new Builder<>(map);
     }
 
-    public static class Builder<K,V> {
-        private  Map<K,V> resultMap = new HashMap<>();
+    public static class Builder<K, V> {
+        private Map<K, V> resultMap = new HashMap<>();
 
-        private Builder(Map<K,V> map) {
-            if(Objects.nonNull(map)){
+        private Builder(Map<K, V> map) {
+            if (Objects.nonNull(map)) {
                 resultMap = map;
             }
         }
 
-        public Builder<K,V> put(K k, V v) {
+        public Builder<K, V> put(K k, V v) {
             resultMap.put(k, v);
             return this;
         }
 
-        public Map<K,V> build() {
+        public Map<K, V> build() {
             return resultMap;
         }
     }

+ 53 - 53
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/util/Md5Util.java

@@ -5,68 +5,68 @@ import java.io.InputStream;
 import java.security.MessageDigest;
 
 public class Md5Util {
-	static char hexDigits[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };  
-	
-	public static final String encoderByMd5(String msg) {
-		try {
-			byte[] strTemp = msg.getBytes();
+    static char hexDigits[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
+    public static final String encoderByMd5(String msg) {
+        try {
+            byte[] strTemp = msg.getBytes();
             //如果输入“SHA”,就是实现SHA加密。
-			MessageDigest mdTemp = MessageDigest.getInstance("MD5"); 
-			mdTemp.update(strTemp);
-			byte[] md = mdTemp.digest();
-			int j = md.length;
-			char str[] = new char[j * 2];
-			int k = 0;
-			for (int i = 0; i < j; i++) {
-				byte byte0 = md[i];
-				str[k++] = hexDigits[byte0 >>> 4 & 0xf];
-				str[k++] = hexDigits[byte0 & 0xf];
-			}
-			return new String(str);
-		} catch (Exception e) {
-			return null;
-		}
-	}
+            MessageDigest mdTemp = MessageDigest.getInstance("MD5");
+            mdTemp.update(strTemp);
+            byte[] md = mdTemp.digest();
+            int j = md.length;
+            char str[] = new char[j * 2];
+            int k = 0;
+            for (int i = 0; i < j; i++) {
+                byte byte0 = md[i];
+                str[k++] = hexDigits[byte0 >>> 4 & 0xf];
+                str[k++] = hexDigits[byte0 & 0xf];
+            }
+            return new String(str);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public static final String encoderFileByMd5(InputStream is) {
+        try {
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            byte[] buffer = new byte[2048];
+            int length = -1;
+            while ((length = is.read(buffer)) != -1) {
+                md.update(buffer, 0, length);
+            }
+            byte[] b = md.digest();
+            return byteToHexString(b);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        } finally {
+            try {
+                is.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
 
-	public static final String encoderFileByMd5(InputStream is){
-        try {  
-            MessageDigest md = MessageDigest.getInstance("MD5");  
-            byte[] buffer = new byte[2048];  
-            int length = -1;  
-            while ((length = is.read(buffer)) != -1) {  
-                md.update(buffer, 0, length);  
-            }  
-            byte[] b = md.digest();  
-            return byteToHexString(b);  
-        } catch (Exception e) {  
-            e.printStackTrace();  
-            return null;  
-        } finally {  
-            try {  
-                is.close();  
-            } catch (IOException e) {  
-                e.printStackTrace();  
-            }  
-        }  
-	}
-	
-	private static String byteToHexString(byte[] tmp) {  
-        String s;  
+    private static String byteToHexString(byte[] tmp) {
+        String s;
         // 用字节表示就是 16 个字节  
         // 每个字节用 16 进制表示的话,使用两个字符,所以表示成 16 进制需要 32 个字符  
         // 比如一个字节为01011011,用十六进制字符来表示就是“5b”  
-        char str[] = new char[16 * 2];  
+        char str[] = new char[16 * 2];
         int k = 0; // 表示转换结果中对应的字符位置  
         for (int i = 0; i < 16; i++) { // 从第一个字节开始,对 MD5 的每一个字节转换成 16 进制字符的转换  
             byte byte0 = tmp[i]; // 取第 i 个字节  
             str[k++] = hexDigits[byte0 >>> 4 & 0xf]; // 取字节中高 4 位的数字转换, >>> 为逻辑右移,将符号位一起右移  
             str[k++] = hexDigits[byte0 & 0xf]; // 取字节中低 4 位的数字转换  
-        }  
+        }
         s = new String(str); // 换后的结果转换为字符串  
-        return s;  
-    }  
-	
-	public static void main(String[] args) {
-		System.out.println(encoderByMd5("test1002"));
-	}
+        return s;
+    }
+
+    public static void main(String[] args) {
+        System.out.println(encoderByMd5("test1002"));
+    }
 }

+ 1 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/util/http/HttpClientUtils.java

@@ -38,7 +38,6 @@ import java.util.Map.Entry;
 
 /**
  * 基于apache httpclient4.5.5 的HTTP工具类
- *
  */
 public class HttpClientUtils {
 
@@ -374,7 +373,7 @@ public class HttpClientUtils {
      * post请求,form表单,不能包含二进制数据
      *
      * @param url            请求的url
-     * @param nvps      form表单参数
+     * @param nvps           form表单参数
      * @param connectTimeout 连接超时设置,毫秒
      * @param readTimeout    读取超时设置,毫秒
      * @param headerMap      form表单header

+ 84 - 86
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/util/http/HttpResponseContent.java

@@ -6,94 +6,92 @@ import java.io.UnsupportedEncodingException;
 
 /**
  * HTTP请求响应报文封装类
- * 
  */
 public class HttpResponseContent {
 
-	private int statusCode; // 响应状态码
-	private String mimeType; // mime类型
-	private String charsetName; // 字符集
-	private byte[] contentBytes; // 响应报文主体内容的二进制数据
-	private Header[] headers; // 响应头
-
-	/**
-	 * 获取响应报文主体内容,字符串,使用响应报文中的字符集编码
-	 * 
-	 * @return
-	 */
-	public String getBodyContent() {
-		return this.getBodyContent(charsetName);
-	}
-
-	/**
-	 * 获取响应报文主体内容,字符串
-	 * 
-	 * @param charsetName
-	 *            指定的字符编码
-	 * @return
-	 */
-	public String getBodyContent(String charsetName) {
-		String str = null;
-		if (charsetName == null) {
-			charsetName = "UTF-8";
-		}
-		try {
-			str = new String(contentBytes, charsetName);
-		} catch (UnsupportedEncodingException e) {
-			// 忽略异常
-			e.printStackTrace();
-		}
-		return str;
-	}
-
-	public boolean isSuccessful(){
-		return statusCode == 200;
-	}
-
-	public int getStatusCode() {
-		return statusCode;
-	}
-
-	public void setStatusCode(int statusCode) {
-		this.statusCode = statusCode;
-	}
-
-	public String getMimeType() {
-		return mimeType;
-	}
-
-	public void setMimeType(String mimeType) {
-		this.mimeType = mimeType;
-	}
-
-	public String getCharsetName() {
-		return charsetName;
-	}
-
-	public void setCharsetName(String charsetName) {
-		this.charsetName = charsetName;
-	}
-
-	public byte[] getContentBytes() {
-		return contentBytes;
-	}
-
-	public void setContentBytes(byte[] contentBytes) {
-		this.contentBytes = contentBytes;
-	}
-
-	public Header[] getHeaders() {
-		return headers;
-	}
-
-	public void setHeaders(Header[] headers) {
-		this.headers = headers;
-	}
-
-	@Override
-	public String toString() {
-		return "HttpResponseContent [statusCode=" + statusCode + ", mimeType=" + mimeType + ", charsetName=" + charsetName
-				+ ", bodyContent=" + getBodyContent() + "]";
-	}
+    private int statusCode; // 响应状态码
+    private String mimeType; // mime类型
+    private String charsetName; // 字符集
+    private byte[] contentBytes; // 响应报文主体内容的二进制数据
+    private Header[] headers; // 响应头
+
+    /**
+     * 获取响应报文主体内容,字符串,使用响应报文中的字符集编码
+     *
+     * @return
+     */
+    public String getBodyContent() {
+        return this.getBodyContent(charsetName);
+    }
+
+    /**
+     * 获取响应报文主体内容,字符串
+     *
+     * @param charsetName 指定的字符编码
+     * @return
+     */
+    public String getBodyContent(String charsetName) {
+        String str = null;
+        if (charsetName == null) {
+            charsetName = "UTF-8";
+        }
+        try {
+            str = new String(contentBytes, charsetName);
+        } catch (UnsupportedEncodingException e) {
+            // 忽略异常
+            e.printStackTrace();
+        }
+        return str;
+    }
+
+    public boolean isSuccessful() {
+        return statusCode == 200;
+    }
+
+    public int getStatusCode() {
+        return statusCode;
+    }
+
+    public void setStatusCode(int statusCode) {
+        this.statusCode = statusCode;
+    }
+
+    public String getMimeType() {
+        return mimeType;
+    }
+
+    public void setMimeType(String mimeType) {
+        this.mimeType = mimeType;
+    }
+
+    public String getCharsetName() {
+        return charsetName;
+    }
+
+    public void setCharsetName(String charsetName) {
+        this.charsetName = charsetName;
+    }
+
+    public byte[] getContentBytes() {
+        return contentBytes;
+    }
+
+    public void setContentBytes(byte[] contentBytes) {
+        this.contentBytes = contentBytes;
+    }
+
+    public Header[] getHeaders() {
+        return headers;
+    }
+
+    public void setHeaders(Header[] headers) {
+        this.headers = headers;
+    }
+
+    @Override
+    public String toString() {
+        return "HttpResponseContent [statusCode=" + statusCode + ", mimeType=" + mimeType + ", charsetName=" + charsetName
+                + ", bodyContent=" + getBodyContent() + "]";
+    }
 
 }

+ 1 - 0
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/util/page/Page.java

@@ -92,6 +92,7 @@ public class Page<T> {
     public boolean containData() {
         return getTotalSize() > 0;
     }
+
     @Override
     public String toString() {
         return "Page [currentPage=" + getCurrentPage() + ", totalSize=" + getTotalSize() + ", pageSize=" + getPageSize()

+ 2 - 10
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/WeComController.java

@@ -1,16 +1,8 @@
 package com.tzld.longarticle.recommend.server.web;
 
 import com.tzld.longarticle.recommend.server.common.response.CommonResponse;
-import com.tzld.longarticle.recommend.server.model.param.AccessTokenParam;
-import com.tzld.longarticle.recommend.server.model.param.CallbackParam;
-import com.tzld.longarticle.recommend.server.model.param.PushMessageParam;
 import com.tzld.longarticle.recommend.server.model.param.WeComPushMessageParam;
-import com.tzld.longarticle.recommend.server.model.vo.AccessTokenVo;
-import com.tzld.longarticle.recommend.server.model.vo.PushMessageVo;
 import com.tzld.longarticle.recommend.server.model.vo.WeComPushMessageVo;
-import com.tzld.longarticle.recommend.server.mq.MessageCallbackProducer;
-import com.tzld.longarticle.recommend.server.service.exterior.AccessTokenService;
-import com.tzld.longarticle.recommend.server.service.exterior.ThirdPartyService;
 import com.tzld.longarticle.recommend.server.service.exterior.WeComService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,8 +19,8 @@ import java.util.List;
 public class WeComController {
 
 
-   @Autowired
-   private WeComService weComService;
+    @Autowired
+    private WeComService weComService;
 
 
     @PostMapping("/pushMessage/get")

+ 4 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/recommend/ArticleCategoryController.java

@@ -8,7 +8,10 @@ import com.tzld.longarticle.recommend.server.service.recommend.ArticleCategorySe
 import com.tzld.longarticle.recommend.server.util.page.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+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.RestController;
 
 @RestController
 @RequestMapping("/internal/articleCategory")

+ 4 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/recommend/ArticleController.java

@@ -5,7 +5,10 @@ import com.tzld.longarticle.recommend.server.model.param.ArticleFindSourceParam;
 import com.tzld.longarticle.recommend.server.service.recommend.ArticleService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+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.RestController;
 
 @RestController
 @RequestMapping("/article")

+ 1 - 0
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/recommend/ArticleVideoPoolController.java

@@ -20,6 +20,7 @@ public class ArticleVideoPoolController {
 
     @Autowired
     private ArticleVideoPoolService service;
+
     @PostMapping("/getSource")
     public CommonResponse<List<ArticleVideoPoolSourceVO>> getSource(@RequestBody ArticleVideoPoolSourceParam param) {
         return CommonResponse.success(service.getSource(param));

+ 5 - 0
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/recommend/DataFlushController.java

@@ -21,30 +21,35 @@ public class DataFlushController {
             service.flushGetOffVideos(pageNum);
         }).start();
     }
+
     @GetMapping("/flush/long_articles_root_source_id")
     public void flushLongArticlesRootSourceId(Integer pageNum) {
         new Thread(() -> {
             service.flushLongArticlesRootSourceId(pageNum);
         }).start();
     }
+
     @GetMapping("/flush/long_articles_crawler_videos")
     public void flushLongArticlesCrawlerVideos(Integer pageNum) {
         new Thread(() -> {
             service.flushLongArticlesCrawlerVideos(pageNum);
         }).start();
     }
+
     @GetMapping("/flush/long_articles_video")
     public void flushLongArticlesVideos(Integer pageNum, Long id) {
         new Thread(() -> {
             service.flushLongArticlesVideos(pageNum, id);
         }).start();
     }
+
     @GetMapping("/flush/long_articles_text")
     public void flushLongArticlesText() {
         new Thread(() -> {
             service.flushLongArticlesText();
         }).start();
     }
+
     @GetMapping("/update/long_article_match_videos/response")
     public void updateLongArticleMatchVideosResponse(Long id) {
         new Thread(() -> {

+ 0 - 3
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/video/MatchVideoController.java

@@ -1,7 +1,6 @@
 package com.tzld.longarticle.recommend.server.web.video;
 
 import com.alibaba.fastjson.JSONObject;
-import com.tzld.longarticle.recommend.server.common.response.CommonResponse;
 import com.tzld.longarticle.recommend.server.model.param.ChooseMinigramParam;
 import com.tzld.longarticle.recommend.server.model.param.GetOffVideosParam;
 import com.tzld.longarticle.recommend.server.model.param.RecallVideosParam;
@@ -13,8 +12,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.io.UnsupportedEncodingException;
-
 @RestController
 @RequestMapping("/matchVideo")
 public class MatchVideoController {