From e1a5409bfa2cca009160a961d9bff827ff133b1b Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 05 一月 2026 17:55:22 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java | 55 +++++++++++++++++++++++++++++++------------------------
1 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java
index a4eb460..50f24f6 100644
--- a/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java
@@ -72,8 +72,7 @@
Date expiration = new Date(System.currentTimeMillis() + (long) 946080000 * 1000);
String url = ossClient.generatePresignedUrl(bucketName, fileName, expiration).toString();
-
- System.out.println("涓婁紶缁撴潫--" + url + "------" + dtf2.format(LocalDateTime.now()));
+ System.out.println("oss uploadImages_1涓婁紶鎴愬姛锛�" + url);
return url;
} catch (Exception e) {
System.out.println("uploadImages涓婁紶鍥剧墖澶辫触锛�");
@@ -154,29 +153,37 @@
}
@Override
- public boolean deleteImages(String fileUrl) throws UnsupportedEncodingException {
- String endpoint = ConstantPropertiesUtils.END_POINT;
- String accessKeyId = ConstantPropertiesUtils.ACCESS_KEY_ID;
- String accessKeySecret = ConstantPropertiesUtils.ACCESS_KEY_SECRET;
- String bucketName = ConstantPropertiesUtils.BUCKET_NAME;
- //鍒涘缓OSSClient瀹炰緥
- OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
+ public boolean deleteImages(String fileUrl) {
+ try {
- String imgFile = fileUrl.replace(ConstantPropertiesUtils.PREFIX_URL, "");
- String fileName = imgFile;
- if (imgFile.contains("?")) {
- fileName = imgFile.substring(0, imgFile.indexOf("?"));
- }
- fileName = URLDecoder.decode(fileName, "UTF-8");
+ String endpoint = ConstantPropertiesUtils.END_POINT;
+ String accessKeyId = ConstantPropertiesUtils.ACCESS_KEY_ID;
+ String accessKeySecret = ConstantPropertiesUtils.ACCESS_KEY_SECRET;
+ String bucketName = ConstantPropertiesUtils.BUCKET_NAME;
+ //鍒涘缓OSSClient瀹炰緥
+ OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
- // 鏍规嵁BucketName,objectName鍒犻櫎鏂囦欢
- boolean b = ossClient.doesObjectExist(bucketName, fileName);
- if (b) {
- VoidResult voidResult = ossClient.deleteObject(bucketName, fileName);
- System.out.println(voidResult.toString());
+ String imgFile = fileUrl.replace(ConstantPropertiesUtils.PREFIX_URL, "");
+ String fileName = imgFile;
+ if (imgFile.contains("?")) {
+ fileName = imgFile.substring(0, imgFile.indexOf("?"));
+ }
+
+ fileName = URLDecoder.decode(fileName, "UTF-8");
+
+ // 鏍规嵁BucketName,objectName鍒犻櫎鏂囦欢
+ boolean b = ossClient.doesObjectExist(bucketName, fileName);
+ if (b) {
+ VoidResult voidResult = ossClient.deleteObject(bucketName, fileName);
+// System.out.println(voidResult.toString());
+ }
+ ossClient.shutdown();
+ return true;
+
+ } catch (Exception e) {
+ System.out.println("-------鍒犻櫎鍥剧墖澶辫触锛屽浘鐗囧湴鍧�:" + fileUrl);
}
- ossClient.shutdown();
- return true;
+ return false;
}
@Override
@@ -197,7 +204,7 @@
// 鑾峰彇鏂囦欢鐨勫悕绉�
LocalDate date = LocalDate.now();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
- String fileName = "sczf/" + date.format(formatter) + RandomUtils.generateRandomInt(8) + ext;
+ String fileName = "sczf/" + date.format(formatter) + RandomUtils.generateRandomInt(8) + "." + ext;
ObjectMetadata objectMetadata = new ObjectMetadata();
objectMetadata.setContentType(getcontentType(ext));
@@ -210,7 +217,7 @@
Date expiration = new Date(System.currentTimeMillis() + (long) 946080000 * 1000);
String url = ossClient.generatePresignedUrl(bucketName, fileName, expiration).toString();
-// System.out.println("oss涓婁紶鎴愬姛锛�" + url);
+ System.out.println("oss uploadImages_3涓婁紶鎴愬姛锛�" + url);
// System.out.println("涓婁紶瀹屾垚--" + dtf2.format(LocalDateTime.now()));
return url;
--
Gitblit v1.8.0