From 64e6ac37d0bc034f849efa1d94792a7ef97c3adb Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 24 Dec 2024 16:48:00 +0800
Subject: [PATCH] 新增按前缀上传文件，相关查询修改
---
src/main/java/org/springblade/modules/resource/rule/oss/OssDataRule.java | 22 +++-------------------
1 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/springblade/modules/resource/rule/oss/OssDataRule.java b/src/main/java/org/springblade/modules/resource/rule/oss/OssDataRule.java
index 209960a..4895ba7 100644
--- a/src/main/java/org/springblade/modules/resource/rule/oss/OssDataRule.java
+++ b/src/main/java/org/springblade/modules/resource/rule/oss/OssDataRule.java
@@ -1,25 +1,8 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
package org.springblade.modules.resource.rule.oss;
import com.yomahub.liteflow.annotation.LiteflowComponent;
import com.yomahub.liteflow.core.NodeComponent;
import org.springblade.core.oss.props.OssProperties;
-import org.springblade.core.oss.rule.BladeOssRule;
import org.springblade.modules.resource.rule.context.OssContext;
import org.springblade.modules.resource.entity.Oss;
@@ -33,13 +16,14 @@
@Override
public void process() throws Exception {
OssContext contextBean = this.getContextBean(OssContext.class);
+ String prefix = contextBean.getPrefix();
Oss oss = contextBean.getOss();
OssProperties ossProperties = contextBean.getOssProperties();
// 若采用默认设置则开启多租户模式, 若是用户自定义oss则不开启
if (oss.getEndpoint().equals(ossProperties.getEndpoint()) && oss.getAccessKey().equals(ossProperties.getAccessKey()) && ossProperties.getTenantMode()) {
- contextBean.setOssRule(new BladeOssRule(Boolean.TRUE));
+ contextBean.setOssRule(new MyOssRule(Boolean.TRUE,prefix));
} else {
- contextBean.setOssRule(new BladeOssRule(Boolean.FALSE));
+ contextBean.setOssRule(new MyOssRule(Boolean.FALSE,prefix));
}
}
}
--
Gitblit v1.9.3