From 7fa8a26800a55a73fb41885182fa20b6716cb302 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 26 十月 2023 20:58:20 +0800
Subject: [PATCH] bug修改

---
 ycl-platform/src/main/resources/application-dev.yml                        |    8 ++++----
 ycl-platform/src/main/java/com/ycl/dto/video/OssFileDto.java               |   11 +++++++++++
 ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java |    9 +++++----
 3 files changed, 20 insertions(+), 8 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..c59be61 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,9 +192,9 @@
 
 
     @PostMapping("/oss/sign")
-    public CommonResult ossSign(@RequestParam("mediaId") String mediaId, @RequestParam("extension") String extension) {
+    public CommonResult ossSign(@RequestBody OssFileDto dto) {
         log.info("鎺ユ敹鍒癴ile");
-        if (StringUtils.isNullOrEmpty(mediaId) || StringUtils.isNullOrEmpty(extension)) {
+        if (StringUtils.isNullOrEmpty(dto.getMediaId()) || StringUtils.isNullOrEmpty(dto.getExtension())) {
             return CommonResult.failed("鍙傛暟涓嶈兘涓虹┖锛�");
         }
         ExecutableClient executableClient = DdTest.getExecutableClient();
@@ -207,7 +208,7 @@
             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();
@@ -215,7 +216,7 @@
 
             String strDate2 = dtf2.format(LocalDateTime.now());
 
-            String fileName = strDate2 + RandomUtils.generateRandomInt(4) + "." + extension;
+            String fileName = strDate2 + RandomUtils.generateRandomInt(4) + "." + dto.getExtension();
             MultipartFile file = getMultipartFile(is, fileName);
             String url = ossService.uploadImages(file);
             return CommonResult.success(url);
diff --git a/ycl-platform/src/main/java/com/ycl/dto/video/OssFileDto.java b/ycl-platform/src/main/java/com/ycl/dto/video/OssFileDto.java
new file mode 100644
index 0000000..32e2629
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/dto/video/OssFileDto.java
@@ -0,0 +1,11 @@
+package com.ycl.dto.video;
+
+import lombok.Data;
+
+@Data
+public class OssFileDto {
+    public String base64;
+    public String fileName;
+    public String mediaId;
+    public String extension;
+}
diff --git a/ycl-platform/src/main/resources/application-dev.yml b/ycl-platform/src/main/resources/application-dev.yml
index 2ea872f..5490789 100644
--- a/ycl-platform/src/main/resources/application-dev.yml
+++ b/ycl-platform/src/main/resources/application-dev.yml
@@ -75,10 +75,10 @@
 
 aliyun:
   oss:
-    endpoint: https://oss-cn-chengdu.aliyuncs.com
-    keyId: LTAI5tRpMjypcziJ2WAWEKsV
-    keySecret: U7CPi1JqOWvTbdLR99duJ8ev3tcjRp
-    bucketName: upload-bzh-new
+    endpoint: https://oss-cn-zhangjiakou.aliyuncs.com
+    keyId: LTAIDlTWjHW0IVyW
+    keySecret: 6fO78NmgyF49TK5GWFAzXuSAexl9PL
+    bucketName: hcjs-mte-internal
 
 #涓撴湁閽夐拤鍙傛暟
 zzding :

--
Gitblit v1.8.0