From 8ba375ddf6fc3bedf7999bf065575e5e75e5504c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 18 七月 2023 15:06:08 +0800
Subject: [PATCH] 增加APP位置接口 修复ptz设置获取不到用户问题
---
ard-work/src/main/java/com/ruoyi/device/hiksdk/util/minio/MinioUtils.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/minio/MinioUtils.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/minio/MinioUtils.java
index 36f8fa5..81fa418 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/minio/MinioUtils.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/minio/MinioUtils.java
@@ -1,5 +1,6 @@
package com.ruoyi.device.hiksdk.util.minio;
+import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.device.hiksdk.config.MinioClientSingleton;
import io.minio.*;
import io.minio.http.Method;
@@ -149,12 +150,16 @@
}
boolean exsit = exitsBucket(bucketName);
if (!exsit) {
- log.error(bucketName + "-妗朵笉瀛樺湪");
+ boolean bucket = createBucket(bucketName);
+ if(bucket)
+ {
+ log.info(bucketName + "-妗朵笉瀛樺湪,鎴愬姛鍒涘缓妗�");
+ }
}
//鏂囦欢鍚�
String originalFilename = file.getOriginalFilename();
//鏂扮殑鏂囦欢鍚�
- String fileName = UUID.randomUUID().toString().replace("-", "") + originalFilename;
+ String fileName = IdUtils.fastSimpleUUID()+"_"+ originalFilename;
try {
InputStream inputStream = file.getInputStream();
/*涓婁紶瀵硅薄*/
@@ -172,8 +177,11 @@
.builder()
.bucket(bucketName)
.object(fileName)
+ .method(Method.GET)
.build();
- return MinioClientSingleton.getMinioClient().getPresignedObjectUrl(getPresignedObjectUrlArgs);
+ String presignedObjectUrl = MinioClientSingleton.getMinioClient().getPresignedObjectUrl(getPresignedObjectUrlArgs);
+ String ObjectUrl = presignedObjectUrl.substring(0, presignedObjectUrl.indexOf("?"));
+ return ObjectUrl;
} catch (Exception ex) {
log.error("涓婁紶瀵硅薄杩斿洖url寮傚父锛�" + ex.getMessage());
}
@@ -425,6 +433,7 @@
return false;
}
}
+
/**
*@鎻忚堪 鑾峰彇妗朵腑鎵�鏈夊璞�
*@鍙傛暟 [bucketName]
--
Gitblit v1.9.3