seo兼容2

src/main/java/com/caimei365/commodity/utils/AppletsLinkUtil.java

@@ -17,7 +17,7 @@ import java.util.regex.Pattern;
  */
 @Slf4j
 public class AppletsLinkUtil {
-     /**
+    /**
      * 1二级页面
      */
     public static final Pattern pattern1 = Pattern.compile("/cmpage/info-1");
@@ -27,6 +27,7 @@ public class AppletsLinkUtil {
      */
     public static final Pattern pattern2 = Pattern.compile("/cmpage/info-2");
     public static final Pattern pattern6 = Pattern.compile("equipment/detail");
+    public static final Pattern pattern6_1 = Pattern.compile("/equipment-");
     /**
      * 3直播页面
      */
@@ -142,7 +143,7 @@ public class AppletsLinkUtil {
         if (StringUtils.isNotEmpty(link)) {
             if (pattern1.matcher(link).find() || pattern34.matcher(link).find()) {
                 return 1;
-            } else if (pattern2.matcher(link).find() || pattern6.matcher(link).find()) {
+            } else if (pattern2.matcher(link).find() || pattern6.matcher(link).find() || pattern6_1.matcher(link).find()) {
                 return 2;
             } else if (pattern3.matcher(link).find() || pattern36.matcher(link).find()) {
                 return 3;
@@ -221,7 +222,7 @@ public class AppletsLinkUtil {
                 map.put("id", split3[0]);
             }
         } else if (linkType == 1 || linkType == 2 || linkType == 4 || linkType == 7) {
-            if (pattern1.matcher(link).find() || pattern2.matcher(link).find() || pattern8_1.matcher(link).find() || pattern4.matcher(link).find() || pattern7.matcher(link).find() || pattern10.matcher(link).find() || pattern33_1.matcher(link).find()) {
+            if (pattern1.matcher(link).find() || pattern2.matcher(link).find() || pattern6_1.matcher(link).find() || pattern8_1.matcher(link).find() || pattern4.matcher(link).find() || pattern7.matcher(link).find() || pattern10.matcher(link).find() || pattern33_1.matcher(link).find()) {
                 //-{id}.html
                 if (split3 != null && split3.length == 2) {
                     map.put("id", split3[0]);