From 66232862129c84f2c98fabdc73a59f4fe0e0a360 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 11 九月 2024 22:26:21 +0800
Subject: [PATCH] 视频专网端代码初始化
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
index a5b58ae..9765cf1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
@@ -89,47 +89,47 @@
return R.ok(list);
}
-// /**
-// * 涓婁紶OSS瀵硅薄瀛樺偍 瑙嗛涓撶綉
-// *
-// * @param file 鏂囦欢
-// */
-// @SaCheckPermission("system:oss:upload")
-// @Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.INSERT)
-// @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-// public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) throws IOException {
-//
-// if (ObjectUtil.isNull(file)) {
-// return R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
-// }
-// SysOssVo oss = ossService.upload(file);
-//
-// SysOssUploadVo uploadVo = new SysOssUploadVo();
-// uploadVo.setUrl(oss.getUrl());
-// uploadVo.setFileName(oss.getOriginalName());
-// uploadVo.setOssId(oss.getOssId().toString());
-// uploadVo.setPassword(oss.getPassword());
-//
-// return R.ok(uploadVo);
-// }
-
/**
- * 涓婁紶OSS瀵硅薄瀛樺偍 浜掕仈缃�
+ * 涓婁紶OSS瀵硅薄瀛樺偍 瑙嗛涓撶綉
*
* @param file 鏂囦欢
*/
@SaCheckPermission("system:oss:upload")
@Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.INSERT)
@PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- public R<String> upload(@RequestPart("file") MultipartFile file) throws IOException {
- String originalfileName = file.getOriginalFilename();
- long l = System.currentTimeMillis();
- String password = PasswordUtil.randomPassword(6);
- String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
- FtpApche.uploadFile(ftpConfig, file, password + String.valueOf(l) + suffix);
- return R.ok(password);
+ public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) throws IOException {
+
+ if (ObjectUtil.isNull(file)) {
+ return R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
+ }
+ SysOssVo oss = ossService.upload(file);
+
+ SysOssUploadVo uploadVo = new SysOssUploadVo();
+ uploadVo.setUrl(oss.getUrl());
+ uploadVo.setFileName(oss.getOriginalName());
+ uploadVo.setOssId(oss.getOssId().toString());
+ uploadVo.setPassword(oss.getPassword());
+
+ return R.ok(uploadVo);
}
+// /**
+// * 涓婁紶OSS瀵硅薄瀛樺偍 浜掕仈缃�
+// *
+// * @param file 鏂囦欢
+// */
+// @SaCheckPermission("system:oss:upload")
+// @Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.INSERT)
+// @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+// public R<String> upload(@RequestPart("file") MultipartFile file) throws IOException {
+// String originalfileName = file.getOriginalFilename();
+// long l = System.currentTimeMillis();
+// String password = PasswordUtil.randomPassword(6);
+// String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
+// FtpApche.uploadFile(ftpConfig, file, password + String.valueOf(l) + suffix);
+// return R.ok(password);
+// }
+//
private String post(VideoRequest request) throws IOException {
HashMap<String, String> headers = new HashMap<>(3);
String requestUrl = boundary.getChief() + "/resource/synchronization/uploadTwo";
--
Gitblit v1.8.0