Merge branch 'feature/1006021' into 'master'

feat:[1006021]域名合并

See merge request rays/pcloud-common-parent!238

pcloud-common/src/main/java/com/pcloud/common/utils/ServeLinkUtils.java

@@ -227,20 +227,47 @@ public class ServeLinkUtils {
             protocol = "http://";
         }
         String resultUrl = "";
+        if (StringUtil.isEmpty(random)) {
+            random = officialAccountsId;
+        }
         if (!StringUtil.isEmpty(serveLink)) {
+            if (serveLink.startsWith("http")) {
+                return serveLink;
+            }
             if (serveLink.startsWith("*")) {
-                String endUrl = serveLink.substring(serveLink.indexOf("/"), serveLink.length());
-                if (random == null) {
-                    resultUrl = protocol + "app." + firstDomain + "/" + serveLink.substring(1, serveLink.indexOf("/")) + "/W"
+                String endUrl = serveLink.substring(serveLink.indexOf("/"));
+                resultUrl = protocol + "weixin" + random + "." + firstDomain + "/" + serveLink.substring(1, serveLink.indexOf("/")) + "/W"
                             + officialAccountsId + endUrl;
-                } else {
-                    resultUrl = protocol + "app" + random + "." + firstDomain + "/" + serveLink.substring(1, serveLink.indexOf("/")) + "/W"
-                            + officialAccountsId + endUrl;
-                }
             } else {
                 resultUrl = protocol + domain + "/W" + officialAccountsId + serveLink;
             }
         }
         return resultUrl;
     }
+
+    /**
+     * 获取作品/应用跳转链接（包含域名）
+     */
+    public static String splitUrl(String url, Long officialAccountsId, String protocol, String domain, String firstDomain, Long random) {
+        if (StringUtil.isEmpty(url) || null == officialAccountsId) {
+            return url;
+        }
+        if (null == random) {
+            random = officialAccountsId;
+        }
+        return getCompleteLink(url, officialAccountsId.toString(), protocol, domain, firstDomain, random.toString());
+    }
+
+    /**
+     * 获取作品/应用跳转链接的域名
+     */
+    public static String getAppDomain(Long officialAccountsId, Long random, String firstDomain) {
+        if (null == officialAccountsId || StringUtil.isEmpty(firstDomain)){
+            return null;
+        }
+        if (null == random) {
+            random = officialAccountsId;
+        }
+        return "weixin" + random + "." + firstDomain;
+    }
 }