|
@@ -85,6 +85,10 @@ 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 ossCached = ossPool.get(tenantId);
|
|
|
OssTemplate template = templatePool.get(tenantId);
|
|
|
// 若为空或者不一致,则重新加载
|
|
@@ -127,7 +131,11 @@ public class OssBuilder {
|
|
|
* @return Oss
|
|
|
*/
|
|
|
public Oss getOss(String tenantId, String code) {
|
|
|
+ if(tenantId=="" || tenantId==null || Func.isNull(tenantId)){
|
|
|
+ tenantId = "000000";
|
|
|
+ }
|
|
|
String key = tenantId;
|
|
|
+
|
|
|
LambdaQueryWrapper<Oss> lqw = Wrappers.<Oss>query().lambda().eq(Oss::getTenantId, key);
|
|
|
// 获取传参的资源编号并查询,若有则返回,若没有则调启用的配置
|
|
|
String ossCode = StringUtil.isBlank(code) ? WebUtil.getParameter(OSS_PARAM_KEY) : code;
|