Merge branch 'zhuyajie' into 'master'

广告-文本链接

See merge request rays/pcloud-book!27

pcloud-service-book/src/main/java/com/pcloud/book/advertising/biz/impl/AdvertisingSpaceBizImpl.java

@@ -458,8 +458,9 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
                 //多文字+多链接 modifyby zhuyajie
                 //例如：[色]123<link>http://www.baidu.com</link>1111111[闭嘴]
                 String adTitle = advertisingSpace.getAdTitle();
-                List<String> linkList = getLinkList(adTitle);
+                List<String> linkList = getLinkList(adTitle);//提取文本链接
                 if (!ListUtils.isEmpty(linkList)) {
+                    adTitle = adTitle.replaceAll("</link><link>","</link> <link>");//连续两个链接之间要有分隔
                     for (String link : linkList) {
                         String adLink = "";
                         String adLinkOld = link.replaceAll("<link>", "").replace("</link>", "");