From cf7a09fdfb98e41039e08af1ff5e9dacfbecfc03 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 23 八月 2023 17:13:31 +0800
Subject: [PATCH] 新增配置工具类 迁移配置信息实体类到common包
---
ard-work/src/main/java/com/ruoyi/storage/minio/utils/MinioConfig.java | 52 ++++++----------------------------------------------
1 files changed, 6 insertions(+), 46 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/storage/minio/utils/MinioConfig.java b/ard-work/src/main/java/com/ruoyi/storage/minio/utils/MinioConfig.java
index 2a3989f..28b2235 100644
--- a/ard-work/src/main/java/com/ruoyi/storage/minio/utils/MinioConfig.java
+++ b/ard-work/src/main/java/com/ruoyi/storage/minio/utils/MinioConfig.java
@@ -1,5 +1,6 @@
package com.ruoyi.storage.minio.utils;
+import io.minio.MinioClient;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
@@ -16,60 +17,19 @@
@Component
public class MinioConfig {
@Value("${minio.endpoint}")
- private String endpoint;
+ private String endpoint;
@Value("${minio.accessKey}")
- private String accessKey;
+ private String accessKey;
@Value("${minio.secretKey}")
- private String secretKey;
-
-// private volatile static MinioClient minioClient;
+ private String secretKey;
@Bean
- public io.minio.MinioClient getMinioClient() {
- return io.minio.MinioClient.builder()
+ public MinioClient getMinioClient() {
+ return MinioClient.builder()
.endpoint(endpoint)
.credentials(accessKey, secretKey)
.build();
}
-
-// /**
-// * 鑾峰彇minio瀹㈡埛绔疄渚�
-// *
-// * @return {@link MinioClient}
-// */
-// public static MinioClient getMinioClient() {
-// if (minioClient == null) {
-// synchronized (MinioClientSingleton.class) {
-// if (minioClient == null) {
-// minioClient = MinioClient.builder()
-// .endpoint(endpoint)
-// .credentials(accessKey, secretKey)
-// .build();
-// }
-// }
-// }
-// return minioClient;
-// }
- // static {
-// domainUrl = getYmlNew("minio.endpoint");
-// accessKey = getYmlNew("minio.accessKey");
-// secretKey = getYmlNew("minio.secretKey");
-// log.debug("minio淇℃伅锛�" + domainUrl + "(" + accessKey + "/" + secretKey + ")");
-// }
- /*yml閰嶇疆淇℃伅鑾峰彇*/
-// public static String getYmlNew(String key) {
-// Resource resource = new ClassPathResource("application-prod.yml");
-// Properties properties = null;
-// try {
-// YamlPropertiesFactoryBean yamlFactory = new YamlPropertiesFactoryBean();
-// yamlFactory.setResources(resource);
-// properties = yamlFactory.getObject();
-// } catch (Exception e) {
-// e.printStackTrace();
-// return null;
-// }
-// return properties.get(key).toString();
-// }
}
--
Gitblit v1.9.3