Merge remote-tracking branch 'origin/master'

blade-service/blade-archive/src/main/java/org/springblade/archive/utils/FileUtils.java

@@ -628,8 +628,18 @@ public class FileUtils {
     }
 
 
+    /**
+     * 获取路径
+     * @param url
+     * @return
+     */
     public static String getAliYunSubUrl(String url) {
-        return getSubUrl(url,"aliyuncs.com/");
+        int uploadStart = url.indexOf("upload/");
+        if (uploadStart != -1) {  // 如果找到了以 'upload/' 开始的字符串
+            return url.substring(uploadStart);
+        } else {
+            return getSubUrl(url, "aliyuncs.com/");
+        }
     }
 
 //    public static void main(String[] args) {