From ad047e06bdfa5ee222080cb357403dc34fbc0f50 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 13 May 2021 21:04:50 +0800
Subject: [PATCH] 1.desk,service,user 模块 pom依赖修改 2.新增 blade-onenetstudio 模块，集成onenetstudio 基于MQTT协议的sdk,实现设备的属性上报功能
---
blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java
index 8283ceb..22f81d0 100644
--- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java
+++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java
@@ -31,6 +31,7 @@
import org.springblade.core.tool.utils.StringPool;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.core.tool.utils.WebUtil;
+import org.springblade.resource.config.CustomOssRule;
import org.springblade.resource.entity.Oss;
import org.springblade.resource.service.IOssService;
@@ -95,9 +96,9 @@
OssRule ossRule;
// 若采用默认设置则开启多租户模式, 若是用户自定义oss则不开启
if (oss.getEndpoint().equals(ossProperties.getEndpoint()) && oss.getAccessKey().equals(ossProperties.getAccessKey()) && ossProperties.getTenantMode()) {
- ossRule = new BladeOssRule(Boolean.TRUE);
+ ossRule = new CustomOssRule(Boolean.TRUE);
} else {
- ossRule = new BladeOssRule(Boolean.FALSE);
+ ossRule = new CustomOssRule(Boolean.FALSE);
}
if (oss.getCategory() == OssEnum.MINIO.getCategory()) {
template = MinioOssBuilder.template(oss, ossRule);
--
Gitblit v1.9.3