Merge branch 'fix-zyq-1014150' into feat-zyq-1001743

# Conflicts:
#	pcloud-service-book/src/main/java/com/pcloud/book/adnews/biz/impl/AdNewsBizImpl.java

pcloud-service-book/src/main/java/com/pcloud/book/adnews/biz/impl/AdNewsBizImpl.java

@@ -14,11 +14,9 @@ import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.consumer.wechatgroup.WechatGroupConsr;
 import com.pcloud.book.group.biz.WeixinQrcodeBiz;
 import com.pcloud.book.group.dao.GroupQrcodeDao;
-import com.pcloud.book.group.dto.BookGroupDTO;
 import com.pcloud.book.group.dto.BookWxQrcodeDTO;
 import com.pcloud.book.group.dto.GroupQrcodeFoAdDTO;
 import com.pcloud.common.core.aspect.ParamLog;
-import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
 import com.pcloud.common.utils.DateUtils;
@@ -92,7 +90,7 @@ public class AdNewsBizImpl implements AdNewsBiz {
     private static final String AD_EVENING_NEWS_SCHEDULE_PRE = "AD_EVENING_NEWS_SCHEDULE_";
 
     // 发送消息的长度限制
-    private static final Integer SEND_MESSAGE_LENGTH=300;
+    private static final Integer SEND_MESSAGE_LENGTH=1000;
 
     @Value("${wechat.group.link.prefix}")
     private String wechatGroupLinkPrefix;
@@ -251,6 +249,9 @@ public class AdNewsBizImpl implements AdNewsBiz {
                     LOGGER.info("BookGroupId:"+ groupQrcodeFoAdDTO.getBookGroupId() + " 没有可供发送的早晚报！");
                     continue;
                 }
+
+                this.replaceUnescaped(groupQrcodeFoAdDTO.getAdNewsList());
+
                 for (AdNews adNews : groupQrcodeFoAdDTO.getAdNewsList()) {
                     adNewsGroupRecord = new AdNewsGroupRecord();
                     adNewsGroupRecord.setAdNewsId(adNews.getId());