Merge branch 'release' into 'master'

Release

See merge request rays/pcloud-book!1595

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

@@ -3573,8 +3573,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 																Integer currentPage, Integer numPerPage) {
 		BookSearchDto bookSearchDto = new BookSearchDto();
 		if (!StringUtil.isEmpty(isbn)) {
-			isbn = isbn.replace("-", "").replace("/", "");
-			String[] nameList = isbn.trim().split("[\u00A0|\u3000|\u0020]+");
+ 			String[] nameList = isbn.trim().split("[\u00A0|\u3000|\u0020]+");
 			if (nameList.length > 1) {
 				bookSearchDto.setBookNames(Lists.newArrayList(nameList));
 			}

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/ResourcePageBizImpl.java

@@ -2241,10 +2241,10 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
 
     // 是不是rays链接
     public Boolean isRaysLink(String url) {
-      return ReUtil.contains("^(https|http?)://weixin\\w+[.]",url) || ReUtil.contains("^(https|http?)://(app\\w*)[.]",url);
+      return ReUtil.contains("^(https|http)?://weixin\\w+[.]",url) || ReUtil.contains("^(https|http)?://(app\\w*)[.]",url);
     }
 
-    public static final  String  DOMAIN_REG = "^(https|http?)://([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,6}(\\/)";
+    public static final  String  DOMAIN_REG = "^(https|http)?://([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,6}(\\/)";
 
     // 阿法迪单独特殊处理（临时方案）
     public String aFaDiExchangeLinkDomain(String url,String domain,Boolean isReplaceAccountId) {
@@ -2256,7 +2256,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             domain += '/';
         }
         url =  ReUtil.replaceAll(url, DOMAIN_REG, domain);
-        return isReplaceAccountId ? url.replace("/W(d\\*)/", "/W${"+officialAccountId+"}/") : url;
+        return isReplaceAccountId ? url.replaceAll("/W(\\d+)/C", "/W"+officialAccountId+"/C") : url;
     }
 
     // url处理
@@ -2269,7 +2269,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         }
         url =  ReUtil.replaceAll(url, DOMAIN_REG, domain);
         // OFFICIAL_ACCOUNT_ID 测试23， uat35515, 生产23
-        return isReplaceAccountId ? url.replace("/W(d\\*)/", "/W${"+getOffAccount()+"}/") : url;
+        return isReplaceAccountId ? url.replaceAll("/W(\\d+)/C", "/W"+getOffAccount()+"/C") : url;
     }
 
     public Long getOffAccount(){