修改欢迎语

pcloud-service-book/src/main/java/com/pcloud/book/group/tools/SendWeixinRequestTools.java

@@ -411,7 +411,7 @@ public class SendWeixinRequestTools {
             // 1001745 包含图片和文字则不合并关键词详情，其他情况走之前的模式
             if (CollectionUtils.isEmpty(collect)) {
                 isOld = false;
-                sb.append("\n\n本群配有以下资源服务，戳链接或回复相应关键词立即获取：\n");
+                sb.append("\n\n本群配有以下资源服务，点击链接或回复相应关键词立即获取：\n");
                 for (KeywordDTO keyword : keywords) {
                     if (sb.length() + (keyword.getKeywords() + "\n").length() >= 730) {
                         break;
@@ -419,7 +419,7 @@ public class SendWeixinRequestTools {
                     sb.append("关键词：").append(keyword.getKeywords()).append("\n");
                     if (ReplyTypeEnum.LINK.value.equals(keyword.getReplyType()) || ReplyTypeEnum.APP.value.equals(keyword.getReplyType())) {
                         String linkUrl = SendWeixinRequestTools.splitUrlNew(accountSettingDto, keyword.getLinkUrl(), classifyQrcodeInfo.getBookGroupId(), classifyQrcodeInfo.getClassifyId(), classifyQrcodeInfo.getGroupQrcodeId());
-                        sb.append(" ").append(keyword.getContent()).append(UrlUtils.getShortUrl4Own(linkUrl)).append("\n\n");
+                        sb.append(" ").append(keyword.getContent()).append("\n->").append(UrlUtils.getShortUrl4Own(linkUrl)).append("\n\n");
                     }
                 }
             } else {
@@ -442,7 +442,7 @@ public class SendWeixinRequestTools {
         String feedbackUrl = "*common/C" + classifyQrcodeInfo.getChannelId() + "/A0/feedback/suggest?groupQrcodeId=" + classifyQrcodeInfo.getGroupQrcodeId();
         String url = splitUrl(accountSettingDto, feedbackUrl);
         LOGGER.info("发送欢迎语反馈链接feedbackUrl:{}, url:{}", feedbackUrl, url);
-        groupKeyword.append("\n\n群资源与书上介绍不符？点这里反馈\n->").append(UrlUtils.getShortUrl4Own(url));
+        groupKeyword.append("群资源与书上介绍不符？点这里反馈\n->").append(UrlUtils.getShortUrl4Own(url));
         return groupKeyword;
     }
 
@@ -461,7 +461,6 @@ public class SendWeixinRequestTools {
         }
 
         if(isOld) {
-            // 旧流程直接输出关键词, 不用考虑换行问题
             if(dto.getReportOpen()) {
                 sb.append("【学习报告】");
             }
@@ -471,33 +470,24 @@ public class SendWeixinRequestTools {
             if(dto.getClockOpen()) {
                 sb.append("【").append(dto.getClockKeyword()).append("】");
             }
+
+            // 最后加入空白行
+            sb.append("\n\n");
         }
         else {
-            //新流程在每个关键词开头检查前面是否有关键词输出, 并决定是否需要添加空行
-            boolean hasItem = false;
             if(dto.getReportOpen()) {
-                sb.append("关键词：学习报告\n回复学习报告，获取个人学习报告，与群成员PK元气值");
-                hasItem = true;
+                sb.append("关键词：学习报告\n 回复学习报告，获取个人学习报告，与群成员PK元气值\n\n");
             }
             if(dto.getRiddleOpen()) {
-                addEmptyLineWhenHasItem(hasItem,sb);
-                sb.append("关键词：猜谜语\n回复猜谜语，开启群游戏，连续答对5题，所有群成员可获得精美礼券");
-                hasItem = true;
+                sb.append("关键词：猜谜语\n 回复猜谜语，开启群游戏，连续答对5题，所有群成员可获得精美礼券\n\n");
             }
             if(dto.getClockOpen()) {
-                addEmptyLineWhenHasItem(hasItem,sb);
-                sb.append("关键词：").append(dto.getClockKeyword()).append("\n").append(dto.getClockGuide());
+                sb.append("关键词：").append(dto.getClockKeyword()).append("\n ").append(dto.getClockGuide()).append("\n\n");
             }
         }
         return sb;
     }
 
-    private static void addEmptyLineWhenHasItem(boolean hasItem, StringBuilder sb) {
-        if(hasItem){
-            sb.append("\n\n");
-        }
-    }
-
     private static String getNickNameStr(String weixinGroupId) {
         StringBuilder nameStr = new StringBuilder();
         Map<String, Integer> nickNames = JedisClusterUtils.getJson("BOOK:WEIXINGROUP:GUIDEUSER" + weixinGroupId, Map.class);