From 609591f8e300dda2bde32aa3c3990e540afcdb3c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 07 十一月 2023 16:10:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/common/service/OssService.java | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/crm/common/service/OssService.java b/src/main/java/com/zy/crm/common/service/OssService.java
index 7695aa6..1f11c6f 100644
--- a/src/main/java/com/zy/crm/common/service/OssService.java
+++ b/src/main/java/com/zy/crm/common/service/OssService.java
@@ -28,8 +28,6 @@
private static Logger log = LoggerFactory.getLogger(OssService.class);
-// private static final String OSS_ENDPOINT = "http://oss-cn-hangzhou-internal.aliyuncs.com";
-
@Value("${aliyun.oss.id}")
private String accessKeyId;
@@ -41,6 +39,9 @@
@Value("${aliyun.oss.endpoint}")
private String OSS_ENDPOINT;
+
+ @Value("${aliyun.oss.endpoint2}")
+ private String OSS_ENDPOINT2;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@@ -146,20 +147,9 @@
// .body(resource);
// }
- public static ByteArrayInputStream convertToByteArrayInputStream(InputStream inputStream) throws IOException {
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- byte[] buffer = new byte[4096];
- int bytesRead;
- while ((bytesRead = inputStream.read(buffer)) != -1) {
- outputStream.write(buffer, 0, bytesRead);
- }
- byte[] data = outputStream.toByteArray();
- return new ByteArrayInputStream(data);
- }
-
@Deprecated
public String download(String name) {
- OSSClient ossClient = new OSSClient(OSS_ENDPOINT, accessKeyId, accessKeySecret);
+ OSSClient ossClient = new OSSClient(OSS_ENDPOINT2, accessKeyId, accessKeySecret);
//鑾峰彇涓存椂涓嬭浇閾炬帴
URL url = ossClient.generatePresignedUrl(bucket, name, new Date(new Date().getTime() + 3600 * 1000));
log.info("OSS鏂囦欢涓存椂涓嬭浇璺緞锛孶RL璺緞: {}", url);
--
Gitblit v1.9.1