Parcourir la source

本地OSS分类

chenr il y a 3 mois
Parent
commit
2b41812c0d

+ 13 - 3
blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java

@@ -18,6 +18,9 @@ package org.springblade.resource.builder.oss;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springblade.common.constant.CommonConstant;
+import org.springblade.common.utils.CommonUtil;
+import org.springblade.common.utils.SystemUtils;
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.oss.OssTemplate;
@@ -33,10 +36,12 @@ import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.core.tool.utils.WebUtil;
 import org.springblade.resource.entity.Oss;
 import org.springblade.resource.service.IOssService;
+import org.springblade.system.cache.ParamCache;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static org.springblade.core.cache.constant.CacheConstant.PARAM_CACHE;
 import static org.springblade.core.cache.constant.CacheConstant.RESOURCE_CACHE;
 
 /**
@@ -85,9 +90,14 @@ public class OssBuilder {
 	public OssTemplate template(String code) {
 		String tenantId = AuthUtil.getTenantId();
 		Oss oss = getOss(tenantId, code);
-
-		//oss.setEndpoint("http://183.247.216.148:9000/");
-		// oss.setEndpoint("https://xinan1.zos.ctyun.cn");
+        String sys_isonline = ParamCache.getValue(CommonConstant.SYS_ISONLINE);
+        if(SystemUtils.isMacOs()||SystemUtils.isWindows()){
+            if("20".equals(sys_isonline)){
+                oss.setEndpoint("http://183.247.216.148:9000/");
+            }else {
+                oss.setEndpoint("https://xinan1.zos.ctyun.cn");
+            }
+        }
 		Oss ossCached = ossPool.get(tenantId);
 		OssTemplate template = templatePool.get(tenantId);
 		// 若为空或者不一致,则重新加载