From 51522890f227197a73d5ed50b65aa4eaeefd0a19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E2=80=98?= Date: Mon, 1 May 2023 21:34:46 +0800 Subject: [PATCH] =?UTF-8?q?feature-1.0-img:=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=B9=E6=B3=95=E6=94=B9=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bnyer/file/config/QiniuConfig.java | 2 ++ .../com/bnyer/file/enumeration/AddressEnum.java | 2 +- .../bnyer/file/service/impl/QiniuServiceImpl.java | 15 ++++----------- .../java/com/bnyer/file/utils/StringUtil.java | 2 +- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/config/QiniuConfig.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/config/QiniuConfig.java index f7104fa..77cd0d5 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/config/QiniuConfig.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/config/QiniuConfig.java @@ -3,6 +3,7 @@ package com.bnyer.file.config; import lombok.Getter; import lombok.Setter; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Configuration; @@ -10,6 +11,7 @@ import org.springframework.context.annotation.Configuration; @RefreshScope @Getter @Setter +@ConfigurationProperties(prefix = "qiniu") public class QiniuConfig { @Value("${qiniu.accessKey}") diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/enumeration/AddressEnum.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/enumeration/AddressEnum.java index bcd8734..d8873ef 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/enumeration/AddressEnum.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/enumeration/AddressEnum.java @@ -14,7 +14,7 @@ public enum AddressEnum { PHONEBACK(3,"phoneBack/"), FRIEND(4,"friend/"), EMOJI(5,"emoji/"), - WATCH(6,"watch/"); + WATCH(6,"iwatch/"); private Integer businessType; diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/QiniuServiceImpl.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/QiniuServiceImpl.java index 6002a09..7c61323 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/QiniuServiceImpl.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/QiniuServiceImpl.java @@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -37,15 +38,8 @@ public class QiniuServiceImpl implements IQiniuService { @Autowired private QiniuConfig qiniuConfig; - private Zone zone = new Zone.Builder(Zone.zone0()) - .upHttp("http://upload.qiniup.com") - .upHttps("http://upload.qiniup.com") - .upBackupHttp("http://upload.qiniup.com") - .upBackupHttps("http://upload.qiniup.com") - .rsHttp("http://rs.qiniu.com") - .rsfHttp("http://rsf.qiniu.com") - .apiHttp("http://api.qiniu.com") - .iovipHttp("http://iovip.qbox.me").build(); + private Zone zone = Zone.autoZone(); + @Override public String userUpload(MultipartFile file,Integer fileType) { return this.updloadFile(file,fileType); @@ -58,8 +52,7 @@ public class QiniuServiceImpl implements IQiniuService { Configuration cfg = new Configuration(zone); cfg.useHttpsDomains=false; UploadManager uploadManager = new UploadManager(cfg); - Auth auth = Auth.create(qiniuConfig.getAccessKey(), qiniuConfig.getSecretKey()); - String token = auth.uploadToken(qiniuConfig.getBucketName()); + String token = Auth.create(qiniuConfig.getAccessKey(), qiniuConfig.getSecretKey()).uploadToken(qiniuConfig.getBucketName()); // 使用工具类根据上传文件生成唯一图片名称 String imgName = StringUtil.getRandomImgName(fileName); //根据前端传值获取上传地址 diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/utils/StringUtil.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/utils/StringUtil.java index 2ffe9bb..9db8dd7 100644 --- a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/utils/StringUtil.java +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/utils/StringUtil.java @@ -156,7 +156,7 @@ public class StringUtil { // 生成UUID String uuid = UUID.randomUUID().toString().replaceAll("-", ""); // 生成上传至云服务器的路径 - String path = "code/duck/" + DateUtil.today() + "-" + uuid + suffix; + String path = DateUtil.today() + "-" + uuid + suffix; return path; } }