From 5a90071cd2797bcacc286fcad31a8b0b0875d6aa Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 03 Feb 2021 10:27:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeOssConfiguration.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeOssConfiguration.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeOssConfiguration.java
index 2ac744b..6cb0a83 100644
--- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeOssConfiguration.java
+++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeOssConfiguration.java
@@ -18,6 +18,7 @@
import lombok.AllArgsConstructor;
import org.springblade.core.oss.props.OssProperties;
+import org.springblade.core.oss.rule.OssRule;
import org.springblade.resource.builder.oss.OssBuilder;
import org.springblade.resource.service.IOssService;
import org.springframework.context.annotation.Bean;
@@ -40,5 +41,9 @@
public OssBuilder ossBuilder() {
return new OssBuilder(ossProperties, ossService);
}
+ @Bean
+ public OssRule ossRule(){
+ return new CustomOssRule(ossProperties.getTenantMode());
+ }
}
--
Gitblit v1.9.3