From 9f34edee4f3b83395b24690ef1fc9b6f8bebfd95 Mon Sep 17 00:00:00 2001
From: AprilWind <2100166581@qq.com>
Date: 星期二, 10 十二月 2024 12:41:59 +0800
Subject: [PATCH] reset 回滚错误提交
---
ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java | 21 ---------------------
1 files changed, 0 insertions(+), 21 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
index f7b3e8a..1261b47 100644
--- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
@@ -21,7 +21,6 @@
import software.amazon.awssdk.services.s3.S3Configuration;
import software.amazon.awssdk.services.s3.crt.S3CrtHttpConfiguration;
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
-import software.amazon.awssdk.services.s3.model.NoSuchBucketException;
import software.amazon.awssdk.services.s3.presigner.S3Presigner;
import software.amazon.awssdk.transfer.s3.S3TransferManager;
import software.amazon.awssdk.transfer.s3.model.*;
@@ -113,31 +112,11 @@
.serviceConfiguration(config)
.build();
- checkBucket();
} catch (Exception e) {
if (e instanceof OssException) {
throw e;
}
throw new OssException("閰嶇疆閿欒! 璇锋鏌ョ郴缁熼厤缃�:[" + e.getMessage() + "]");
- }
- }
-
- /**
- * 妫�鏌ユ《鏄惁瀛樺湪
- *
- * @throws OssException 褰撳垱寤哄瓨鍌ㄦ《鏃跺彂鐢熷紓甯告椂鎶涘嚭
- */
- public void checkBucket() {
- String bucketName = properties.getBucketName();
- try {
- // 灏濊瘯鑾峰彇瀛樺偍妗剁殑淇℃伅
- client.headBucket(x -> x.bucket(bucketName).build()).join();
- } catch (Exception ex) {
- if (ex.getCause() instanceof NoSuchBucketException) {
- throw new OssException("Bucket妗舵槸涓嶅瓨鍦ㄧ殑锛岃鏍稿閰嶇疆淇℃伅:[" + ex.getMessage() + "]");
- } else {
- throw new OssException("鍒ゆ柇Bucket鏄惁瀛樺湪澶辫触锛岃鏍稿閰嶇疆淇℃伅:[" + ex.getMessage() + "]");
- }
}
}
--
Gitblit v1.9.3