From 89989ff8ff6b38dcee3cab7fa68446ceca5df1de Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 26 九月 2023 10:20:03 +0800
Subject: [PATCH] bug修改
---
ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java | 175 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 96 insertions(+), 79 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 ed4f836..de8b669 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
@@ -17,22 +17,31 @@
import com.ycl.service.auth.AuthService;
import com.ycl.service.ding.BookRemarkService;
import com.ycl.service.ding.DingService;
+import com.ycl.service.oss.OssService;
import com.ycl.utils.ConstantPropertiesUtils;
+import com.ycl.utils.common.RandomUtils;
import com.ycl.vo.AddressBookVO;
import com.ycl.vo.NewAddressBookVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
import javax.annotation.Resource;
import java.io.*;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -73,7 +82,8 @@
private DingConfig dingConfig;
-
+ @Autowired
+ private OssService ossService;
@ApiOperation(value = "鏍规嵁閽夐拤鎺堟潈鐮佽幏鍙杢oken")
@GetMapping("/dingLogin")
@@ -174,111 +184,118 @@
return CommonResult.success(bookRemarkService.updateRemark(user, userId, remark));
}
- private String getVideo(String MediaId,MultipartFile file) {
+ @ApiOperation(value = "閫氳褰曢�掑綊")
+ @GetMapping("/getVideo/{mediaId}")
+ public CommonResult<String> getVideo(@PathVariable String mediaId) {
+ String accessToken = getToken();
+
+ MultipartFile file = getDownload(accessToken, mediaId);
+ String url = ossService.uploadImages(file);
+ return CommonResult.success(url);
+ }
+
+
+ private MultipartFile getDownload(String access_token, String media_id) {
CloseableHttpResponse response = null;
- //璋冪敤API
- GetClient getClient = executableClient.newGetClient(GET_VIDEO);
- String token =getToken();
- //璁剧疆鍙傛暟
try {
- if (ObjectUtil.isNotNull(MediaId)) {
- getClient.addParameter("accessToken", token);
- getClient.addParameter("mediaId", MediaId);
-// String result = getClient.get();
-// return parsingResult(result);
+ String api = "/media/download";
+ GetClient getClient = executableClient.newGetClient(api);
+ //璁剧疆鍙傛暟
+ getClient.addParameter("access_token", "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ7XCJ1c2VySWRcIjozLFwidXNlcm5hbWVcIjpcImFkbWluXCJ9IiwiY3JlYXRlZCI6MTY5NDY2NDE5MjA4MiwiZXhwIjoxNjk1MjY4OTkyfQ.fSc0sEfLhD3pgrguYZ0Q4Tr-0wjZNwY2xnGsaGzN1d4oXMnEoX9MJmDQcwEiZ1uLKZbGQCqUtJciAIvINmNq9w ");
+ getClient.addParameter("media_id", media_id);
+
response = getClient.getB();
HttpEntity entity = response.getEntity();
InputStream is = entity.getContent();
- File voice = new File("/Users/video/log1.xlsx");
+ File voice = new File("D:/IMG_4401.MOV");
OutputStream fos = new FileOutputStream(voice);
int cache = 10 * 1024;
byte[] buffer = new byte[cache];
int ch = 0;
- while ((ch = is.read(buffer)) != -1) {
+ while ((ch = is.read(buffer)) != -1) {
fos.write(buffer, 0, ch);
- }
+ }
is.close();
fos.flush();
fos.close();
- }
- if (file == null) {
- return "涓婁紶瑙嗛涓虹┖";
- }
- String endpoint = ConstantPropertiesUtils.END_POINT;
- String accessKeyId = ConstantPropertiesUtils.ACCESS_KEY_ID;
- String accessKeySecret = ConstantPropertiesUtils.ACCESS_KEY_SECRET;
- String bucketName = ConstantPropertiesUtils.BUCKET_NAME;
+ DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
- // 鍒涘缓OSSClient瀹炰緥
- OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
- // 鑾峰彇鏂囦欢鐨勫悕绉�
- String fileName = "sczf/" + file.getOriginalFilename();
- ObjectMetadata objectMetadata = new ObjectMetadata();
- objectMetadata.setContentType(getcontentType(fileName.substring(fileName.lastIndexOf("."))));
- // 璋冪敤oss鐨勬柟娉曞疄鐜伴暱浼�
- // 绗竴涓弬鏁� bucketName
- // 绗簩涓弬鏁� 涓婁紶鍒皁ss鐨勬枃浠惰矾寰勫拰鏂囦欢鍚嶇О
- ossClient.putObject(bucketName, fileName, new ByteArrayInputStream(file.getBytes()), objectMetadata);
- // 鍏抽棴OSSClient銆�
- ossClient.shutdown();
- // 鎶婁笂浼犵殑鏂囦欢璺緞杩斿洖 锛堟墜鍔ㄦ嫾鎺ワ級
- // 杩欓噷璁剧疆鍥剧墖鏈夋晥鏃堕棿 鎴戣缃簡30骞�
- Date expiration = new Date(System.currentTimeMillis() + (long) 946080000 * 1000);
- String url = ossClient.generatePresignedUrl(bucketName, fileName, expiration).toString();
+ String strDate2 = dtf2.format(LocalDateTime.now());
+ String fileName = strDate2 + RandomUtils.generateRandomInt(4) + ".MOV";
+ return getMultipartFile(is, fileName);
- return url;
- }catch (Exception e) {
- e.printStackTrace();
- }finally {
+ } catch (Exception e) {
+ System.out.println(e);
+ } finally {
if (response != null) {
try {
//鐗瑰埆鎻愰啋锛氶渶瑕佽皟鐢╮esponse鐨刢lose鏂规硶鍏抽棴缃戠粶杩炴帴锛侊紒锛�
response.close();
} catch (Exception e) {
- e.printStackTrace();
+ System.out.println(e);
}
}
}
return null;
}
- public static String getcontentType(String FilenameExtension) {
- if (FilenameExtension.equalsIgnoreCase(".mp4")||FilenameExtension.equalsIgnoreCase(".mov")) {
- return "video/mp4";
- }
- if (FilenameExtension.equalsIgnoreCase(".bmp")) {
- return "image/bmp";
- }
- if (FilenameExtension.equalsIgnoreCase(".gif")) {
- return "image/gif";
- }
- if (FilenameExtension.equalsIgnoreCase(".jpeg") ||
- FilenameExtension.equalsIgnoreCase(".jpg") ||
- FilenameExtension.equalsIgnoreCase(".png")) {
- return "image/jpg";
- }
- if (FilenameExtension.equalsIgnoreCase(".html")) {
- return "text/html";
- }
- if (FilenameExtension.equalsIgnoreCase(".txt")) {
- return "text/plain";
- }
- if (FilenameExtension.equalsIgnoreCase(".vsd")) {
- return "application/vnd.visio";
- }
- if (FilenameExtension.equalsIgnoreCase(".pptx") ||
- FilenameExtension.equalsIgnoreCase(".ppt")) {
- return "application/vnd.ms-powerpoint";
- }
- if (FilenameExtension.equalsIgnoreCase(".docx") ||
- FilenameExtension.equalsIgnoreCase(".doc")) {
- return "application/msword";
- }
- if (FilenameExtension.equalsIgnoreCase(".xml")) {
- return "text/xml";
- }
- return "image/jpg";
+
+ /**
+ * 鑾峰彇灏佽寰桵ultipartFile
+ *
+ * @param inputStream inputStream
+ * @param fileName fileName
+ * @return MultipartFile
+ */
+ public MultipartFile getMultipartFile(InputStream inputStream, String fileName) {
+ FileItem fileItem = createFileItem(inputStream, fileName);
+ //CommonsMultipartFile鏄痜eign瀵筸ultipartFile鐨勫皝瑁咃紝浣嗘槸瑕丗ileItem绫诲璞�
+ return new CommonsMultipartFile(fileItem);
}
+ /**
+ * FileItem绫诲璞″垱寤�
+ *
+ * @param inputStream inputStream
+ * @param fileName fileName
+ * @return FileItem
+ */
+ public FileItem createFileItem(InputStream inputStream, String fileName) {
+ FileItemFactory factory = new DiskFileItemFactory(16, null);
+ String textFieldName = "file";
+ FileItem item = factory.createItem(textFieldName, MediaType.MULTIPART_FORM_DATA_VALUE, true, fileName);
+ int bytesRead = 0;
+ byte[] buffer = new byte[8192];
+ OutputStream os = null;
+ //浣跨敤杈撳嚭娴佽緭鍑鸿緭鍏ユ祦鐨勫瓧鑺�
+ try {
+ os = item.getOutputStream();
+ while ((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) {
+ os.write(buffer, 0, bytesRead);
+ }
+ inputStream.close();
+ } catch (IOException e) {
+ log.error("Stream copy exception", e);
+ throw new IllegalArgumentException("鏂囦欢涓婁紶澶辫触");
+ } finally {
+ if (os != null) {
+ try {
+ os.close();
+ } catch (IOException e) {
+ log.error("Stream close exception", e);
+ }
+ }
+ if (inputStream != null) {
+ try {
+ inputStream.close();
+ } catch (IOException e) {
+ log.error("Stream close exception", e);
+ }
+ }
+ }
+
+ return item;
+ }
}
+
--
Gitblit v1.8.0