From 6e8d28cf20456c7ac8aacebe39cf105a7a78c596 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 10 Aug 2020 18:55:19 +0800 Subject: [PATCH] qrcode --- .../com/iformall/service/impl/QrCodeServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java index 10a0fb264..9684a82b8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java @@ -20,6 +20,7 @@ import com.iformall.domain.po.MallResource; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxAppinfo; import com.iformall.exception.MallinkException; +import com.iformall.file.aliyun.AliyunOSS; import com.iformall.service.MallResourceService; import com.iformall.service.QrCodeService; import com.iformall.service.WxAppinfoService; @@ -59,6 +60,9 @@ public class QrCodeServiceImpl implements QrCodeService { private AmazonS3 s3 = null; + @Autowired + private AliyunOSS aliyunOSS; + @Override public ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, TenantEntity tenantEntity) { ResultData data = new ResultData(); @@ -286,14 +290,16 @@ public class QrCodeServiceImpl implements QrCodeService { String fn = UUID.randomUUID().toString(); int dot = fileName.lastIndexOf('.'); + String fileFormat = ""; if (dot >= 0) { - String fileFormat = dest.getName().substring(dot, dest.getName().length()); + fileFormat = dest.getName().substring(dot, dest.getName().length()); fn = getFileName(tenantEntity, fn + fileFormat); } else { fn = getFileName(tenantEntity, fn); } - ResultData data = awsUpload(new FileInputStream(dest), metadata, fn, tenantEntity); +// ResultData data = awsUpload(new FileInputStream(dest), metadata, fn, tenantEntity); + ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, new FileInputStream(dest)); org.apache.commons.io.FileUtils.forceDelete(dest); return data; } catch (Exception e) {