Эх сурвалжийг харах

Revert "OSS内网公共方法优化"

This reverts commit a43722b17bc502c0109acd923d6de9a3d762bcca.
lvy 4 өдөр өмнө
parent
commit
4ef2580c09

+ 2 - 7
blade-common/src/main/java/org/springblade/common/utils/CommonUtil.java

@@ -1046,7 +1046,7 @@ public class CommonUtil {
         String filePath = getCacheValue(CommonConstant.SYS_LOCAL_URL);
         String sysFileNetUrl = getCacheValue(CommonConstant.SYS_FILE_NET_URL);
         String sysIsOnline = getCacheValue(CommonConstant.SYS_ISONLINE);
-        if (StringUtils.isBlank(filePath) || StringUtils.isBlank(sysFileNetUrl) || StringUtils.isBlank(sysIsOnline)) {
+        if (filePath.isEmpty() || sysFileNetUrl.isEmpty() || sysIsOnline.isEmpty()) {
             return fileUrl;
         }
         String filePath2 = getSysLocalFileUrl(filePath, sysIsOnline);
@@ -1058,12 +1058,7 @@ public class CommonUtil {
                     return sysFileNetUrl + fileUrl.replaceAll("//", "/").replaceAll(filePath2, "");
                 }
             }else{
-                if (SystemUtils.isLinux() && ("1".equals(sysIsOnline) || sysIsOnline.equals("20"))) {
-                    // 正式环境,走内网
-                    return fileUrl.replace("https://", "http://").replace("xinan1.zos.ctyun.cn", "100.86.2.1");
-                } else {
-                    return fileUrl;
-                }
+                return fileUrl;
             }
         } else {
             if("20".equals(sysIsOnline)){