From b8b5a3895e741d5348ecdd39ad2e5cbd443f8e89 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 01 Apr 2026 12:17:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-sample/src/main/java/com/ard/sample/config/DockConfiguration.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/config/DockConfiguration.java b/ard-sample/src/main/java/com/ard/sample/config/DockConfiguration.java
index aa892df..3c82057 100644
--- a/ard-sample/src/main/java/com/ard/sample/config/DockConfiguration.java
+++ b/ard-sample/src/main/java/com/ard/sample/config/DockConfiguration.java
@@ -1,7 +1,9 @@
package com.ard.sample.config;
-import com.ard.common.config.OssConfiguration;
+import com.ard.oss.model.enums.OssTypeEnum;
+import io.minio.MinioClient;
import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Component;
@Component
@@ -9,7 +11,14 @@
public class DockConfiguration {
public static String endpoint;
+ public static String bucket;
+
public void setEndpoint(String endpoint) {
DockConfiguration.endpoint = endpoint;
}
+
+ public void setBucket(String bucket) {
+ DockConfiguration.bucket = bucket;
+ }
+
}
--
Gitblit v1.9.3