Merge branch 'dev-xym-core5' into dev-xym-core6

# Conflicts:
#	long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CoreServiceImpl.java

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CoreServiceImpl.java

@@ -610,16 +610,21 @@ public class CoreServiceImpl implements CoreService {
                 long createTimestamp = entry.getValue().get(0).getCreateTime().getTime();
                 long nowTimestamp = System.currentTimeMillis();
                 if (nowTimestamp - createTimestamp > TimeConstant.MILLISECOND_HOUR * 2) {
-                    PublishContentExample publishContentExample = new PublishContentExample();
-                    publishContentExample.createCriteria().andPushIdEqualTo(pushId);
-                    PublishContent update = new PublishContent();
                     if (StringUtils.isNotEmpty(pushStatusVO.getErrorMsg())) {
-                        update.setReason(pushStatusVO.getErrorMsg());
+                        PublishContentExample publishContentExample = new PublishContentExample();
+                        publishContentExample.createCriteria().andPushIdEqualTo(pushId);
+                        PublishContent update = new PublishContent();
+                        if (StringUtils.isNotEmpty(pushStatusVO.getErrorMsg())) {
+                            update.setReason(pushStatusVO.getErrorMsg());
+                        }
+                        update.setStatus(3);
+                        publishContentMapper.updateByExampleSelective(update, publishContentExample);
+                        planAccountService.updateRetry(planAccount);
+                        LarkRobotUtil.sendMessage("重试超过2h失败，pushId=", pushId);
+                    } else {
+                        long hour = (nowTimestamp - createTimestamp) / 1000 / 3600;
+                        LarkRobotUtil.sendMessage("重试时间：" + hour + "pushId=", pushId);
                     }
-                    update.setStatus(3);
-                    publishContentMapper.updateByExampleSelective(update, publishContentExample);
-                    planAccountService.updateRetry(planAccount);
-                    LarkRobotUtil.sendMessage("重试超过2h失败，pushId=", pushId);
                 }
             }
             if (StringUtils.isNotEmpty(pushStatusVO.getErrorMsg()) && !pushStatusVO.getErrorMsg().contains("45028")) {

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/remote/impl/VideoServiceImpl.java

@@ -114,12 +114,6 @@ public class VideoServiceImpl implements VideoService {
             com.alibaba.fastjson.JSONObject params = new com.alibaba.fastjson.JSONObject();
             params.put("traceId", traceId);
             String post = HTTP_POOL_CLIENT_UTIL_DEFAULT.post(apiUrl, params.toJSONString());
-            System.out.println(post);
-            JSONObject jsonObject = JSONUtil.parseObj(post);
-            String status = jsonObject.getStr("status");
-            if (!Objects.equals(status, "success")) {
-                LarkRobotUtil.sendMessage("get_off_videos失败  traceId=" + traceId);
-            }
         } catch (Exception e) {
             LarkRobotUtil.sendMessage("get_off_videos失败  traceId=" + traceId);
             log.error("miniProgramVideoOff error {}", e.getMessage());