浏览代码

oss路径替换内网

huangtf 2 年之前
父节点
当前提交
6e05b050f7

+ 17 - 0
blade-common/src/main/java/org/springblade/common/utils/CommonUtil.java

@@ -112,6 +112,7 @@ public class CommonUtil {
      */
     public static InputStream getOSSInputStream(String urlStr) throws Exception {
         //获取OSS文件流
+        urlStr = replaceOssUrl(urlStr);
         URL imageUrl = new URL(urlStr);
         try {
             HttpURLConnection conn = (HttpURLConnection) imageUrl.openConnection();
@@ -127,6 +128,7 @@ public class CommonUtil {
      */
     public static InputStream getOSSInputStreamTow(String urlStr) throws Exception {
         //获取OSS文件流
+        urlStr = replaceOssUrl(urlStr);
         URL imageUrl = new URL(urlStr);
         HttpURLConnection conn = null;
         try {
@@ -490,4 +492,19 @@ public class CommonUtil {
         return "";
     }
 
+    public static String replaceOssUrl(String url) {
+        String osName = System.getProperty("os.name");
+        if (osName != null && osName.toLowerCase().contains("linux")) {
+            // 如果当前操作系统是Linux系统
+            Map<String, String> envMap = System.getenv();
+            if (!envMap.containsKey("linuxtesttest")) {
+                // 如果当前环境变量不包含linuxtesttest,则替换URL中的oss路径
+                url = url.replace("oss-cn-hangzhou.aliyuncs.com", "oss-cn-hangzhou-internal.aliyuncs.com");
+            }
+        }
+        //后续删除
+        System.out.println("replaceOssUrl " + url);
+        return url;
+    }
+
 }

+ 2 - 0
blade-common/src/main/java/org/springblade/common/utils/FileUtils.java

@@ -44,6 +44,7 @@ public class FileUtils {
         List<FileSize> reData = new ArrayList<>();
         if (fileList != null) {
             for (String fileUrl : fileList) {
+                fileUrl = CommonUtil.replaceOssUrl(fileUrl);
                 FileSize file = new FileSize();
                 file.setFileUrl(fileUrl);
                 try {
@@ -66,6 +67,7 @@ public class FileUtils {
         if (fileList != null) {
             for (String fileUrl : fileList) {
                 try {
+                    fileUrl = CommonUtil.replaceOssUrl(fileUrl);
                     URLConnection openConnection = new URL(fileUrl).openConnection();
                     count += openConnection.getContentLength();
 

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

@@ -457,7 +457,8 @@ public class FileUtils {
                         url = prefix + URLEncoder.encode(suffix, "UTF-8");
                     }
                     long s = System.currentTimeMillis();
-                    PdfReader pdfReader = new PdfReader(url);
+                    String newurl = CommonUtil.replaceOssUrl(url);
+                    PdfReader pdfReader = new PdfReader(newurl);
                     long e = System.currentTimeMillis();
                     log.info("读取pdf耗时:"+(e-s));
                     s = System.currentTimeMillis();