From d44957773c0739b5bb86bba66c334ba25e67cf3d Mon Sep 17 00:00:00 2001 From: shizisheng Date: Fri, 16 May 2025 17:33:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=A9=E7=BF=BC=E4=BA=91-minio=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=AE=E5=A4=8D=EF=BC=8C=E9=81=BF=E5=85=8D=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/config/OssTianyiConfig.java | 52 +++++-------------- 1 file changed, 12 insertions(+), 40 deletions(-) diff --git a/dk-modules/system/src/main/java/org/dromara/system/config/OssTianyiConfig.java b/dk-modules/system/src/main/java/org/dromara/system/config/OssTianyiConfig.java index 8ea7cdb..3d03a4d 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/config/OssTianyiConfig.java +++ b/dk-modules/system/src/main/java/org/dromara/system/config/OssTianyiConfig.java @@ -1,6 +1,9 @@ package org.dromara.system.config; import io.minio.MinioClient; +import lombok.Getter; +import lombok.Setter; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -12,51 +15,23 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConfigurationProperties(prefix = "osstianyi") +@Getter +@Setter public class OssTianyiConfig { + @Value("${osstianyi.endPoint:https://jiangsu-10.zos.ctyun.cn}") private String endPoint; - private String accessKey; - private String secretKey; - private String bucketName; - - public String getEndPoint() { - return endPoint; - } - - public void setEndPoint(String endPoint) { - this.endPoint = endPoint; - } - - public String getAccessKey() - { - return accessKey; - } - - public void setAccessKey(String accessKey) - { - this.accessKey = accessKey; - } - public String getSecretKey() - { - return secretKey; - } + @Value("${osstianyi.accessKey:22e3f37368a242b38f4f25d98c9baf1f}") + private String accessKey; - public void setSecretKey(String secretKey) - { - this.secretKey = secretKey; - } + @Value("${osstianyi.secretKey:0d858850666248e59830d9a596847062}") + private String secretKey; - public String getBucketName() - { - return bucketName; - } + @Value("${osstianyi.bucketName:dkossbucket}") + private String bucketName; - public void setBucketName(String bucketName) - { - this.bucketName = bucketName; - } @Override public String toString() { @@ -71,9 +46,6 @@ public class OssTianyiConfig @Bean public MinioClient getMinioClient() { -// System.out.println("OssTianyiConfig"); -// System.out.println("OssTianyiConfig" + endPoint); - System.out.println(toString()); return MinioClient.builder().endpoint(endPoint).credentials(accessKey, secretKey).build(); } } From d3a3107accfef0f78a9ccfba3239d0210fb1fec3 Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Mon, 19 May 2025 15:50:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4;=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sample/manage/service/impl/DeviceQrtzServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java index ed730c3..343173e 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java @@ -292,7 +292,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService { DateTimeFormatter formatterS = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); // 格式化当前日期 String formattedDate = currentDate.format(formatter); - List qrtzFileEntityList = deviceQrtzFileMapper.selectList(new QueryWrapper().eq("device_sn", device.getDeviceSn()).eq("exec_date", formattedDate).eq("status", DeviceQrtzConstants.QRTZ_FILE_STATUS_1).orderByAsc("sort")); + List qrtzFileEntityList = deviceQrtzFileMapper.selectList(new QueryWrapper().eq("device_sn", qrtzEntityList.get(0).getDeviceSn()).eq("exec_date", formattedDate).eq("status", DeviceQrtzConstants.QRTZ_FILE_STATUS_1).orderByAsc("sort")); if (!qrtzFileEntityList.isEmpty()) { DeviceQrtzFileEntity deviceQrtzFileEntity = qrtzFileEntityList.get(0); List qrtzDateEntityList = deviceQrtzDateMapper.listDeviceQrtzDateByQrtzAndDate(deviceQrtzFileEntity.getQrtzId()); From edead5b97d4378c0f25e07b047cdcb2c8a6c7ee0 Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Mon, 19 May 2025 16:59:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sample/manage/service/impl/DeviceQrtzServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java index 343173e..c99d426 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java @@ -292,7 +292,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService { DateTimeFormatter formatterS = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); // 格式化当前日期 String formattedDate = currentDate.format(formatter); - List qrtzFileEntityList = deviceQrtzFileMapper.selectList(new QueryWrapper().eq("device_sn", qrtzEntityList.get(0).getDeviceSn()).eq("exec_date", formattedDate).eq("status", DeviceQrtzConstants.QRTZ_FILE_STATUS_1).orderByAsc("sort")); + List qrtzFileEntityList = deviceQrtzFileMapper.selectList(new QueryWrapper().eq("device_sn", qrtzEntityList.get(0).getDeviceSn()).eq("exec_date", formattedDate).eq("qrtz_id",qrtzEntityList.get(0).getId()).eq("status", DeviceQrtzConstants.QRTZ_FILE_STATUS_1).orderByAsc("sort")); if (!qrtzFileEntityList.isEmpty()) { DeviceQrtzFileEntity deviceQrtzFileEntity = qrtzFileEntityList.get(0); List qrtzDateEntityList = deviceQrtzDateMapper.listDeviceQrtzDateByQrtzAndDate(deviceQrtzFileEntity.getQrtzId());