From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java
index fba8054..2eb4539 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java
@@ -1,37 +1,32 @@
package com.ruoyi.file.config;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import io.minio.MinioClient;
-
/**
* Minio 配置信息
*
* @author jqs
*/
-@Configuration
+/*@Configuration
@ConfigurationProperties(prefix = "minio")
public class MinioConfig
{
- /**
+ *//**
* 服务地址
- */
+ *//*
private String url;
- /**
+ *//**
* 用户名
- */
+ *//*
private String accessKey;
- /**
+ *//**
* 密码
- */
+ *//*
private String secretKey;
- /**
+ *//**
* 存储桶名称
- */
+ *//*
private String bucketName;
public String getUrl()
@@ -79,4 +74,4 @@
{
return MinioClient.builder().endpoint(url).credentials(accessKey, secretKey).build();
}
-}
+}*/
--
Gitblit v1.7.1