From bf5d1b405c759de3faa42af37b1f10f42823b105 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 20 六月 2019 17:07:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
utils/src/main/java/org/yeshi/utils/taobao/TbImgUtil.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/utils/src/main/java/org/yeshi/utils/taobao/TbImgUtil.java b/utils/src/main/java/org/yeshi/utils/taobao/TbImgUtil.java
index 1f693f5..aaf8769 100644
--- a/utils/src/main/java/org/yeshi/utils/taobao/TbImgUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/taobao/TbImgUtil.java
@@ -5,7 +5,6 @@
import org.yeshi.utils.StringUtil;
public class TbImgUtil {
-
public static String getTBSize320Img(String url) {
return getTBSizeImg(url, 320);
@@ -18,9 +17,6 @@
public static String getTBSize320ImgWebp(String url) {
return getTBSizeImgWebp(url, 320);
}
-
-
-
public static String getTBSize220ImgWebp(String url) {
return getTBSizeImgWebp(url, 220);
@@ -29,7 +25,8 @@
public static String getTBSizeImg(String url, int size) {
if (StringUtil.isNullOrEmpty(url))
return url;
- if (url.contains("img.alicdn.com")||url.contains("gw.alicdn.com")) {
+ if (url.contains("img.alicdn.com") || url.contains("gw.alicdn.com") || url.contains("gd1.alicdn.com")
+ || url.contains("gd2.alicdn.com") || url.contains("gd3.alicdn.com") || url.contains("gd4.alicdn.com")) {
boolean isMatch = Pattern.matches(".*[0-9]x[0-9].*", url);
if (isMatch)
return url;
@@ -42,7 +39,8 @@
public static String getTBSizeImgWebp(String url, int size) {
if (StringUtil.isNullOrEmpty(url))
return url;
- if (url.contains("img.alicdn.com")||url.contains("gw.alicdn.com")) {
+ if (url.contains("img.alicdn.com") || url.contains("gw.alicdn.com") || url.contains("gd1.alicdn.com")
+ || url.contains("gd2.alicdn.com") || url.contains("gd3.alicdn.com") || url.contains("gd4.alicdn.com")) {
boolean isMatch = Pattern.matches(".*[0-9]x[0-9].*", url);
if (isMatch)
return url;
--
Gitblit v1.8.0