From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
---
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageStrategy.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageStrategy.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageStrategy.java
index 1a0e91a..3bbf187 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageStrategy.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageStrategy.java
@@ -20,9 +20,10 @@
*/
public class MinioCloudStorageStrategy extends AbstractCloudStorageStrategy {
- private final MinioClient minioClient;
+ private MinioClient minioClient;
- public MinioCloudStorageStrategy(CloudStorageProperties cloudStorageProperties) {
+ @Override
+ public void init(CloudStorageProperties cloudStorageProperties) {
properties = cloudStorageProperties;
try {
minioClient = MinioClient.builder()
@@ -31,7 +32,7 @@
.build();
createBucket();
} catch (Exception e) {
- throw new IllegalArgumentException("Minio瀛樺偍閰嶇疆閿欒! 璇锋鏌ョ郴缁熼厤缃�!");
+ throw new OssException("Minio瀛樺偍閰嶇疆閿欒! 璇锋鏌ョ郴缁熼厤缃�:[" + e.getMessage() + "]");
}
}
@@ -50,7 +51,7 @@
.config(getPolicy(bucketName, PolicyType.READ))
.build());
} catch (Exception e) {
- throw new OssException("鍒涘缓Bucket澶辫触, 璇锋牳瀵筂inio閰嶇疆淇℃伅");
+ throw new OssException("鍒涘缓Bucket澶辫触, 璇锋牳瀵筂inio閰嶇疆淇℃伅:[" + e.getMessage() + "]");
}
}
@@ -74,7 +75,7 @@
.stream(inputStream, inputStream.available(), -1)
.build());
} catch (Exception e) {
- throw new OssException("涓婁紶鏂囦欢澶辫触锛岃鏍稿Minio閰嶇疆淇℃伅");
+ throw new OssException("涓婁紶鏂囦欢澶辫触锛岃鏍稿Minio閰嶇疆淇℃伅:[" + e.getMessage() + "]");
}
return new UploadResult().setUrl(getEndpointLink() + "/" + path).setFilename(path);
}
@@ -94,7 +95,7 @@
@Override
public UploadResult uploadSuffix(byte[] data, String suffix, String contentType) {
- return upload(data, getPath("", suffix), contentType);
+ return upload(data, getPath(properties.getPrefix(), suffix), contentType);
}
@Override
--
Gitblit v1.9.3