From 704e7207d74b6477c5f472c5aba92d484ab17f98 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 29 十一月 2023 17:07:11 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 13002eb..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
@@ -18,6 +18,7 @@
import com.ycl.config.DdTest;
import com.ycl.config.DingConfig;
import com.ycl.controller.BaseController;
+import com.ycl.dto.video.OssFileDto;
import com.ycl.entity.dingding.DingUserInfo;
import com.ycl.service.auth.AuthService;
import com.ycl.service.ding.BookRemarkService;
@@ -191,14 +192,18 @@
@PostMapping("/oss/sign")
- public CommonResult ossSign(@RequestParam("mediaId") String mediaId, @RequestParam("extension") String extension) {
- log.info("鎺ユ敹鍒癴ile");
- if (StringUtils.isNullOrEmpty(mediaId) || StringUtils.isNullOrEmpty(extension)) {
+ public CommonResult ossSign(@RequestBody OssFileDto dto) {
+
+ 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";
@@ -207,17 +212,14 @@
String token = getToken();
//璁剧疆鍙傛暟
getClient.addParameter("access_token", token);
- getClient.addParameter("media_id", mediaId);
+ getClient.addParameter("media_id", dto.getMediaId());
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) + "." + extension;
- 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