chao пре 3 година
родитељ
комит
1d3724902b
1 измењених фајлова са 7 додато и 5 уклоњено
  1. 7 5
      src/main/java/com/caimei365/commodity/utils/AppletsLinkUtil.java

+ 7 - 5
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");
@@ -36,7 +36,8 @@ public class AppletsLinkUtil {
      * 4自由页面
      */
     public static final Pattern pattern4 = Pattern.compile("/cmpage/info-4");
-    public static final Pattern pattern33 = Pattern.compile("page.html");
+    public static final Pattern pattern33 = Pattern.compile("/page.html");
+    public static final Pattern pattern33_1 = Pattern.compile("/page-");
     /**
      * 5商品详情
      */
@@ -47,6 +48,7 @@ public class AppletsLinkUtil {
      */
     public static final Pattern pattern7 = Pattern.compile("supplier/prolist");
     public static final Pattern pattern8 = Pattern.compile("supplier/index.html");
+    public static final Pattern pattern8_1 = Pattern.compile("/supplier-");
     public static final Pattern pattern9 = Pattern.compile("view/supplierHomePage.jsp");
     public static final Pattern pattern10 = Pattern.compile("supplier/productlist-");
     /**
@@ -144,11 +146,11 @@ public class AppletsLinkUtil {
                 return 2;
             } else if (pattern3.matcher(link).find() || pattern36.matcher(link).find()) {
                 return 3;
-            } else if (pattern4.matcher(link).find() || pattern33.matcher(link).find()) {
+            } else if (pattern4.matcher(link).find() || pattern33.matcher(link).find() || pattern33_1.matcher(link).find()) {
                 return 4;
             } else if (pattern5.matcher(link).find()) {
                 return 5;
-            } else if (pattern7.matcher(link).find() || pattern8.matcher(link).find() || pattern9.matcher(link).find() || pattern10.matcher(link).find()) {
+            } else if (pattern7.matcher(link).find() || pattern8.matcher(link).find() || pattern8_1.matcher(link).find() || pattern9.matcher(link).find() || pattern10.matcher(link).find()) {
                 return 7;
             } else if (pattern11.matcher(link).find() || pattern12.matcher(link).find()) {
                 return 8;
@@ -219,7 +221,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() || pattern4.matcher(link).find() || pattern7.matcher(link).find() || pattern10.matcher(link).find()) {
+            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()) {
                 //-{id}.html
                 if (split3 != null && split3.length == 2) {
                     map.put("id", split3[0]);