From 545f0e62205b9a1731d5e0ed495443717ee0b570 Mon Sep 17 00:00:00 2001 From: pserimal Date: Tue, 20 Jun 2023 11:10:36 +0800 Subject: [PATCH] =?UTF-8?q?OSSServer=E8=B0=83=E6=95=B4=E4=B8=BACDN?= =?UTF-8?q?=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/oss/OSSServer.java | 5 ++++- .../java/com/cool/store/service/impl/FlowServiceImpl.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/oss/OSSServer.java b/coolstore-partner-service/src/main/java/com/cool/store/oss/OSSServer.java index 6f6261d31..03f7bfcf9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/oss/OSSServer.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/oss/OSSServer.java @@ -26,6 +26,9 @@ public class OSSServer { @Value("${corp.id:null}") private String corpId; + @Value("${cdn.url:null}") + private String cdnUrl; + /** * 服务端上传文件的方法 * ObjectName 为文件存放位置 + 名字，不可包含 bucket @@ -38,7 +41,7 @@ public class OSSServer { PutObjectRequest putObjectRequest = new PutObjectRequest(bucket, objectName, inputStream); // 创建PutObject请求。 ossClient.putObject(putObjectRequest); - return "http://" + bucket + "." + endpoint + "/" + objectName; + return cdnUrl + "/partner/" + corpId + "/" + objectName; } catch (OSSException oe) { log.error("Caught an OSSException, which means your request made it to OSS, " + "but was rejected with an error response for some reason."); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java index bd74b8a3a..c72ac90be 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java @@ -260,13 +260,13 @@ public class FlowServiceImpl implements FlowService { ByteArrayOutputStream pdfOut = PassLetterUtils.genPassLetter(partnerName, passCode, verifyCity, passTime); //生成的 pdf 通过函内存输入流 ByteArrayInputStream inputStream = new ByteArrayInputStream(pdfOut.toByteArray()); - String passPdfUrl = ossServer.uploadFileServer(inputStream, "partner/passLetter/" + passCode + ".pdf"); + String passPdfUrl = ossServer.uploadFileServer(inputStream, "passLetter/" + passCode + ".pdf"); //转换为图片 inputStream.reset(); ByteArrayOutputStream imageOut = PDFUtils.pdf2Img(inputStream, 2.0f); inputStream = new ByteArrayInputStream(imageOut.toByteArray()); //上传 OSS - String passImageUrl = ossServer.uploadFileServer(inputStream, "partner/passLetter/" + passCode + ".png"); + String passImageUrl = ossServer.uploadFileServer(inputStream, "passLetter/" + passCode + ".png"); //计算有效期截止日期 DateTime expiryDate = DateUtil.offsetDay(passTime, 60); HyPartnerInterviewDO interviewDO = new HyPartnerInterviewDO();