Merge branch 'master' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone

dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java

@@ -113,7 +113,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService {
 
     @Override
     public List<DeviceQrtzFileEntity> manageDeviceQrtzFileByQrtzId(Long qrtzId) {
-        return deviceQrtzFileMapper.selectList(new QueryWrapper<DeviceQrtzFileEntity>().eq("qrtz_id", qrtzId));
+        return deviceQrtzFileMapper.selectList(new QueryWrapper<DeviceQrtzFileEntity>().eq("qrtz_id", qrtzId).orderByAsc("sort"));
     }
 
     @Override

dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java

@@ -156,7 +156,7 @@ public class FileServiceImpl implements IFileService {
             return new ArrayList<>();
         }else {
             entities.forEach(entity -> {
-                entity.setFilePath(this.getObjectUrlOne(MinIOConstants.BUCKET_DKCY,entity.getObjectKey(),3600).toString());
+                entity.setFilePath(this.getObjectUrlOne(MinIOConstants.BUCKET_MEDIAFILE,entity.getObjectKey(),3600).toString());
             });
             return entities.stream().map(this::entityConvertToDto).collect(Collectors.toList());
         }