Merge branch 'v2.3.1' into 'master'

发送wxmp异常catch

See merge request !103

community-service/src/main/java/com/tanpu/community/service/quartz/TopicReportService.java

@@ -7,18 +7,21 @@ import com.tanpu.community.dao.entity.community.TopicEntity;
 import com.tanpu.community.dao.entity.community.TopicManagerEntity;
 import com.tanpu.community.feign.fatools.FeignClientForFatools;
 import com.tanpu.community.feign.wxcp.FeignClientForWxcp;
-import com.tanpu.community.manager.TopicManager;
 import com.tanpu.community.service.CommentService;
 import com.tanpu.community.service.ThemeService;
 import com.tanpu.community.service.TopicService;
 import com.tanpu.community.service.VisitLogService;
-import lombok.extern.log4j.Log4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service
 @Slf4j
@@ -156,7 +159,11 @@ public class TopicReportService {
         parmMap.put("list", wxcpIds);
 
         log.info("sendTopicReportMessage wxcpIds: {}, content: {}", JSON.toJSONString(wxcpIds), content);
-        feignClientForWxcp.sendMessage(agentId, corpId, JSON.toJSONString(parmMap));
+        try {
+            feignClientForWxcp.sendMessage(agentId, corpId, JSON.toJSONString(parmMap));
+        }catch (Exception e){
+            log.error("圈子报告企业微信，发送wxmp微信客服消息失败，error：{}",e.getMessage());
+        }
     }
 
     public List<String> getTopicManagerWxcpIds(String topicId) {

community-service/src/main/resources/mapper/community/ThemeEntityMapper.xml

@@ -42,7 +42,7 @@
         select
         <include refid="Base_Column_List"/>
         from theme
-        where topic_id = #{topicId}
+        where topic_id = #{topicId} and delete_tag = 0
         order by update_time desc
         limit 1
     </select>