From e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 30 十一月 2023 16:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java b/ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java
index c59be61..eeb2a40 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java
@@ -193,13 +193,17 @@
@PostMapping("/oss/sign")
public CommonResult ossSign(@RequestBody OssFileDto dto) {
- log.info("鎺ユ敹鍒癴ile");
+
if (StringUtils.isNullOrEmpty(dto.getMediaId()) || StringUtils.isNullOrEmpty(dto.getExtension())) {
return CommonResult.failed("鍙傛暟涓嶈兘涓虹┖锛�");
}
ExecutableClient executableClient = DdTest.getExecutableClient();
CloseableHttpResponse response = null;
OSS ossClient = null;
+
+ DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+ System.out.println("寮�濮嬭幏鍙�--" + dtf2.format(LocalDateTime.now()));
try {
//浠庨拤閽夎幏鍙栬棰戞祦
String api = "/media/download";
@@ -212,13 +216,10 @@
response = getClient.getB();
HttpEntity entity = response.getEntity();
InputStream is = entity.getContent();
- DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
- String strDate2 = dtf2.format(LocalDateTime.now());
+// MultipartFile file = getMultipartFile(is, fileName);
- String fileName = strDate2 + RandomUtils.generateRandomInt(4) + "." + dto.getExtension();
- MultipartFile file = getMultipartFile(is, fileName);
- String url = ossService.uploadImages(file);
+ String url = ossService.uploadImages(is,dto.getExtension());
return CommonResult.success(url);
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.8.0