Merge branch 'feat-dw-1001710' into 'master'

feat 1001710

See merge request rays/pcloud-book!175

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

@@ -312,14 +312,6 @@ public class SendWeixinRequestTools {
         WxGroupSDK.sendTextMessage(sendTextMessageVO);
     }
 
-    public static void main(String[] args) {
-//        SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
-//        sendTextMessageVO.setContent("关键词1：a" + "\n" + "换行换行换行" + "\n");
-//        sendTextMessageVO.setAltId("wxid_qj200bf0key022");
-//        sendTextMessageVO.setWxGroupId("14108963419@chatroom");
-//        WxGroupSDK.sendTextMessage(sendTextMessageVO);
-    }
-
     /**
      * 发送默认欢迎语
      */
@@ -355,7 +347,7 @@ public class SendWeixinRequestTools {
                 isOld = false;
                 sb.append("\n\n本群配有以下资源服务，戳链接立即获取：\n");
                 for (KeywordDTO keyword : keywords) {
-                    if (sb.length() + (keyword.getKeywords() + "\n").length() >= 830) {
+                    if (sb.length() + (keyword.getKeywords() + "\n").length() >= 730) {
                         break;
                     }
                     sb.append("【").append(keyword.getKeywords()).append("】\n");
@@ -367,7 +359,7 @@ public class SendWeixinRequestTools {
             } else {
                 sb.append("\n\n在群内回复以下关键词，领取任务或资源：\n");
                 for (KeywordDTO keyword : keywords) {
-                    if ((content.length() + sb.length()) >= 1000 && (sb.length() + (keyword.getKeywords() + "\n").length()) >= 922) {
+                    if ((content.length() + sb.length()) >= 1000 && (sb.length() + (keyword.getKeywords() + "\n").length()) >= 892) {
                         break;
                     }
                     sb.append("【").append(keyword.getKeywords()).append("】");
@@ -379,6 +371,12 @@ public class SendWeixinRequestTools {
         if (haveKeyword && !isOld) {
             groupKeyword.append("后续也可以回复【】里的关键词，再次领取");
         }
+        // 拼接反馈链接
+        AccountSettingDto accountSettingDto = dto.getAccountSettingDto();
+        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));
         // 1001692 自定义欢迎语+关键词文案，如果超过300字，关键词拆分出来发
         if ((content.length() + sb.length()) >= 1000) {
             sendTextMessage(content.toString(), robotId, weixinGroupId, ip);
@@ -388,6 +386,7 @@ public class SendWeixinRequestTools {
         }
     }
 
+
     @ParamLog("发送欢迎语消息")
     public static void sendGuideMessage(SendGuideMessageDTO dto) {
         if (Objects.isNull(dto) || CollectionUtils.isEmpty(dto.getReplyMessages())) {
@@ -424,7 +423,7 @@ public class SendWeixinRequestTools {
                             isOld = false;
                             sb.append("\n\n本群配有以下资源服务，戳链接立即获取：\n");
                             for (KeywordDTO keyword : keywords) {
-                                if (sb.length() + (keyword.getKeywords() + "\n").length() >= 850) {
+                                if (sb.length() + (keyword.getKeywords() + "\n").length() >= 730) {
                                     break;
                                 }
                                 sb.append("【").append(keyword.getKeywords()).append("】\n");
@@ -436,7 +435,7 @@ public class SendWeixinRequestTools {
                         } else {
                             sb.append("\n\n在群内回复以下关键词，领取任务或资源：\n");
                             for (KeywordDTO keyword : keywords) {
-                                if ((s.length() + sb.length()) >= 1000 && (sb.length() + (keyword.getKeywords() + "\n").length()) >= 922) {
+                                if ((s.length() + sb.length()) >= 1000 && (sb.length() + (keyword.getKeywords() + "\n").length()) >= 892) {
                                     break;
                                 }
                                 sb.append("【").append(keyword.getKeywords()).append("】");
@@ -447,6 +446,12 @@ public class SendWeixinRequestTools {
                     if (haveKeyword && !isOld) {
                         groupKeyword.append("后续也可以回复【】里的关键词，再次领取");
                     }
+                    // 拼接反馈链接
+                    AccountSettingDto accountSettingDto = dto.getAccountSettingDto();
+                    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));
                     // 1001692 自定义欢迎语+关键词文案，如果超过300字，关键词拆分出来发
                     if (s.length() + groupKeyword.length() >= 1000) {
                         sendMessageDTO.setContent(s);