From 1d6d1ac56a02a884af47d584ed5f9ceffd9936ba Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 25 七月 2023 13:25:07 +0800
Subject: [PATCH] 获取所有app用户pc接口增加最后位置信息 app任务详情增加完成状态和打卡图片 修复app用户任务列表分页total不正确的问题
---
ard-work/src/main/java/com/ruoyi/device/hiksdk/config/MinioClientSingleton.java | 5 ++---
1 files changed, 2 insertions(+), 3 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..8f82918 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;
@@ -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