From 4920f3a1290f2061f7b81db78ce0dab7b6ae8fc2 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 08 八月 2023 09:02:32 +0800
Subject: [PATCH] 优化
---
src/main/java/com/ard/config/MinioClientSingleton.java | 40 +++++++++++++++-------------------------
1 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/ard/config/MinioClientSingleton.java b/src/main/java/com/ard/config/MinioClientSingleton.java
index eaf92cf..a4bc199 100644
--- a/src/main/java/com/ard/config/MinioClientSingleton.java
+++ b/src/main/java/com/ard/config/MinioClientSingleton.java
@@ -1,16 +1,12 @@
package com.ard.config;
+import com.ard.utils.other.SpringTool;
import io.minio.MinioClient;
-import lombok.Data;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
+import org.springframework.context.annotation.Bean;
+import org.springframework.integration.channel.DefaultHeaderChannelRegistry;
+import org.springframework.integration.channel.PublishSubscribeChannel;
import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-import java.util.Properties;
/**
* @Description:
@@ -31,9 +27,9 @@
private volatile static MinioClient minioClient;
static {
- domainUrl = getYmlNew("minio.endpoint");
- accessKey = getYmlNew("minio.accessKey");
- secretKey = getYmlNew("minio.secretKey");
+ domainUrl = SpringTool.getYmlInfo("minio.endpoint");
+ accessKey = SpringTool.getYmlInfo("minio.accessKey");
+ secretKey = SpringTool.getYmlInfo("minio.secretKey");
log.info("minio淇℃伅锛�" + domainUrl + "(" + accessKey + "/" + secretKey + ")");
}
@@ -56,20 +52,14 @@
return minioClient;
}
- /*yml閰嶇疆淇℃伅鑾峰彇*/
- public static String getYmlNew(String key) {
- Resource resource = new ClassPathResource("application.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();
- }
+ @Bean
+ public PublishSubscribeChannel errorChannel() {
+ return new PublishSubscribeChannel();
+ }
+ @Bean
+ public DefaultHeaderChannelRegistry integrationHeaderChannelRegistry() {
+ return new DefaultHeaderChannelRegistry();
+ }
}
--
Gitblit v1.9.3