From 4015ba090376e8fa93a95ef7f4e29ac5f0bed4b8 Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期二, 22 八月 2023 15:05:00 +0800 Subject: [PATCH] 日志优化 --- src/main/java/com/ard/config/MinioClientSingleton.java | 42 ++++++++++++++++-------------------------- 1 files changed, 16 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/ard/config/MinioClientSingleton.java b/src/main/java/com/ard/config/MinioClientSingleton.java index eaf92cf..3cdbd35 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,10 +27,10 @@ private volatile static MinioClient minioClient; static { - domainUrl = getYmlNew("minio.endpoint"); - accessKey = getYmlNew("minio.accessKey"); - secretKey = getYmlNew("minio.secretKey"); - log.info("minio淇℃伅锛�" + domainUrl + "(" + accessKey + "/" + secretKey + ")"); + domainUrl = SpringTool.getYmlInfo("minio.endpoint"); + accessKey = SpringTool.getYmlInfo("minio.accessKey"); + secretKey = SpringTool.getYmlInfo("minio.secretKey"); + log.debug("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