From cb5035579ae02a3aca05904ab419816f2fc509f2 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 09 八月 2023 14:33:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/hiksdk/config/MinioClientSingleton.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/config/MinioClientSingleton.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/config/MinioClientSingleton.java
index 31916f8..7433fed 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/config/MinioClientSingleton.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/config/MinioClientSingleton.java
@@ -21,11 +21,10 @@
**/
@Slf4j(topic = "minio")
-@Data
@Component
public class MinioClientSingleton {
- private static String domainUrl;
+ public static String domainUrl;
private static String accessKey;
private static String secretKey;
@@ -35,7 +34,7 @@
domainUrl = getYmlNew("minio.endpoint");
accessKey = getYmlNew("minio.accessKey");
secretKey = getYmlNew("minio.secretKey");
- log.info("minio淇℃伅锛�" + domainUrl + "(" + accessKey + "/" + secretKey + ")");
+ log.debug("minio淇℃伅锛�" + domainUrl + "(" + accessKey + "/" + secretKey + ")");
}
/**
@@ -59,7 +58,7 @@
/*yml閰嶇疆淇℃伅鑾峰彇*/
public static String getYmlNew(String key) {
- Resource resource = new ClassPathResource("application.yml");
+ Resource resource = new ClassPathResource("application-ard.yml");
Properties properties = null;
try {
YamlPropertiesFactoryBean yamlFactory = new YamlPropertiesFactoryBean();
--
Gitblit v1.9.3