Merge branch 'wyp/1211-articleDeleteFix' of Server/long-article-recommend into master

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/remote/WxAccessTokenRemoteService.java

@@ -42,6 +42,11 @@ public class WxAccessTokenRemoteService {
     private Map<String, Map<String, String>> gzhConfig;
 
     public String getAccessToken(String gzhId) {
+        try {
+            return cache.getUnchecked(gzhId);
+        } catch (Exception e) {
+            log.error("get user error gzhId {} ", gzhId, e);
+        }
         return cache.getUnchecked(gzhId);
     }
 

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

@@ -218,23 +218,27 @@ public class ArticleAuditService {
     public ReturnT<String> articleVideoDelete(String param) {
         List<LongArticleAuditDelete> dealList = longArticleAuditDeleteRepository.getByStatus(ArticleDeleteStatusEnum.WAITING.getCode());
         for (LongArticleAuditDelete delete : dealList) {
-            if (Objects.equals(delete.getPushType(), PushTypeEnum.AUTO_GROUP_PUBLISH.getVal())) {
-                // 获取token
-                String token = wxAccessTokenRemoteService.getAccessToken(delete.getGhId());
-                // 删除文章
-                RequestResult<String> result = wxArticleDeleteService.deleteArticle(token, delete.getMsgId(), delete.getIndex());
-                if (result.isSuccess()) {
-                    delete.setStatus(ArticleDeleteStatusEnum.SUCCESS.getCode());
+            try {
+                if (Objects.equals(delete.getPushType(), PushTypeEnum.AUTO_GROUP_PUBLISH.getVal())) {
+                    // 获取token
+                    String token = wxAccessTokenRemoteService.getAccessToken(delete.getGhId());
+                    // 删除文章
+                    RequestResult<String> result = wxArticleDeleteService.deleteArticle(token, delete.getMsgId(), delete.getIndex());
+                    if (result.isSuccess()) {
+                        delete.setStatus(ArticleDeleteStatusEnum.SUCCESS.getCode());
+                    } else {
+                        delete.setStatus(ArticleDeleteStatusEnum.FAIL.getCode());
+                        delete.setFailReason(result.getFailReason());
+                    }
                 } else {
-                    delete.setStatus(ArticleDeleteStatusEnum.FAIL.getCode());
-                    delete.setFailReason(result.getFailReason());
+                    deleteFailAlarm(delete.getPublishContentId(), "非自动群发", delete.getIndex());
+                    delete.setStatus(ArticleDeleteStatusEnum.SUCCESS.getCode());
                 }
-            } else {
-                deleteFailAlarm(delete.getPublishContentId(), "非自动群发", delete.getIndex());
-                delete.setStatus(ArticleDeleteStatusEnum.SUCCESS.getCode());
+                delete.setFinishTimestamp(System.currentTimeMillis());
+                longArticleAuditDeleteRepository.save(delete);
+            } catch (Exception e) {
+                log.error("articleVideoDelete ghId:{} error", delete.getGhId(), e);
             }
-            delete.setFinishTimestamp(System.currentTimeMillis());
-            longArticleAuditDeleteRepository.save(delete);
         }
         return ReturnT.SUCCESS;
     }