From b863b079d9f34a48c9f99562a3dc28d08185f9f0 Mon Sep 17 00:00:00 2001 From: duandazhi Date: Tue, 20 Jul 2021 23:46:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20AliyunOssConfig=20=20?= =?UTF-8?q?=E8=AE=BF=E9=97=AEkey=E3=80=81=E8=AE=BF=E9=97=AEsecret=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0=EF=BC=8C=E6=96=B9=E4=BE=BF=E5=92=8C?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=87=A0=E7=A7=8D=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/file/config/AliyunOssConfig.java | 24 +++++++++---------- .../file/service/AliyunOssDsfServiceImpl.java | 11 ++++----- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/AliyunOssConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/AliyunOssConfig.java index e95408be..a0005c88 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/AliyunOssConfig.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/AliyunOssConfig.java @@ -20,8 +20,8 @@ public class AliyunOssConfig { /** * aliyun oss相关配置 * ACCESS_KEY_SECRET - * AccessKeyId eg:LTAI4GFov2QymkmPf9cXdH5z - * AccessKeySecret eg:ap8nmIvD1TctcCLsADS4JbkOoXOluW + * AccessKeyId 【secretKey】eg:LTAI4GFov2QymkmPf9cXdH5z + * AccessKeySecret 【secretKey】 eg:ap8nmIvD1TctcCLsADS4JbkOoXOluW * BucketName eg:yuebaoxiao * Endpoint eg:oss-cn-shenzhen.aliyuncs.com * @@ -29,8 +29,8 @@ public class AliyunOssConfig { * * 具体项目里面必须替换掉 */ - private String accessKeyId = ""; - private String accessKeySecret = ""; + private String accessKey = ""; + private String secretKey = ""; private String bucketName = ""; private String endpoint = ""; /** @@ -45,20 +45,20 @@ public class AliyunOssConfig { */ private String domain = null; - public String getAccessKeyId() { - return accessKeyId; + public String getAccessKey() { + return accessKey; } - public void setAccessKeyId(String accessKeyId) { - this.accessKeyId = accessKeyId; + public void setAccessKey(String accessKey) { + this.accessKey = accessKey; } - public String getAccessKeySecret() { - return accessKeySecret; + public String getSecretKey() { + return secretKey; } - public void setAccessKeySecret(String accessKeySecret) { - this.accessKeySecret = accessKeySecret; + public void setSecretKey(String secretKey) { + this.secretKey = secretKey; } public String getBucketName() { diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssDsfServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssDsfServiceImpl.java index 3299de61..b5b1b8af 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssDsfServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssDsfServiceImpl.java @@ -10,7 +10,6 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -112,7 +111,7 @@ public class AliyunOssDsfServiceImpl implements IDfsService { /* * Constructs a client instance with your account for accessing OSS */ - OSS client = new OSSClientBuilder().build(aliyunOssConfig.getEndpoint(), aliyunOssConfig.getAccessKeyId(), aliyunOssConfig.getAccessKeySecret()); + OSS client = new OSSClientBuilder().build(aliyunOssConfig.getEndpoint(), aliyunOssConfig.getAccessKey(), aliyunOssConfig.getSecretKey()); String storePath = getStorePath(fileUrl); List keys = new ArrayList<>(); keys.add(storePath); @@ -190,7 +189,7 @@ public class AliyunOssDsfServiceImpl implements IDfsService { * demo https://github.com/aliyun/aliyun-oss-java-sdk/blob/master/src/samples/UploadSample.java */ private String ossUploadFileSmall(String endpoint, String picturePath, MultipartFile file) throws IOException { - OSS ossClient = new OSSClientBuilder().build(endpoint, aliyunOssConfig.getAccessKeyId(), aliyunOssConfig.getAccessKeySecret()); + OSS ossClient = new OSSClientBuilder().build(endpoint, aliyunOssConfig.getAccessKey(), aliyunOssConfig.getSecretKey()); try { // 上传文件 (上传文件流的形式) PutObjectResult putResult = ossClient.putObject(aliyunOssConfig.getBucketName(), picturePath, file.getInputStream()); @@ -271,7 +270,7 @@ public class AliyunOssDsfServiceImpl implements IDfsService { */ ClientBuilderConfiguration conf = new ClientBuilderConfiguration(); conf.setIdleConnectionTime(1000); - OSS client = new OSSClientBuilder().build(endpoint, aliyunOssConfig.getAccessKeyId(), aliyunOssConfig.getAccessKeySecret(), conf); + OSS client = new OSSClientBuilder().build(endpoint, aliyunOssConfig.getAccessKey(), aliyunOssConfig.getSecretKey(), conf); try { /* @@ -485,7 +484,7 @@ public class AliyunOssDsfServiceImpl implements IDfsService { @Override public String objectsCapacityStr() { - OSS client = new OSSClientBuilder().build(aliyunOssConfig.getEndpoint(), aliyunOssConfig.getAccessKeyId(), aliyunOssConfig.getAccessKeySecret()); + OSS client = new OSSClientBuilder().build(aliyunOssConfig.getEndpoint(), aliyunOssConfig.getAccessKey(), aliyunOssConfig.getSecretKey()); final int maxKeys = 200; String nextMarker = null; ObjectListing objectListing; @@ -545,7 +544,7 @@ public class AliyunOssDsfServiceImpl implements IDfsService { } catch (MalformedURLException e) { // 忽略 } - OSS ossClient = new OSSClientBuilder().build(aliyunOssConfig.getEndpoint(), aliyunOssConfig.getAccessKeyId(), aliyunOssConfig.getAccessKeySecret()); + OSS ossClient = new OSSClientBuilder().build(aliyunOssConfig.getEndpoint(), aliyunOssConfig.getAccessKey(), aliyunOssConfig.getSecretKey()); // 设置URL过期时间为12小时，最大值就是43200 Date expiration = new Date(System.currentTimeMillis() + (43200 * 1000)); // 生成以GET方法访问的签名URL，访客可以直接通过浏览器访问相关内容。