From 2cd8f35436fd324431f1ae78196f8140ecb3d8b0 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 14 十一月 2024 11:25:11 +0800
Subject: [PATCH] Merge branch '视频专网' of http://42.193.1.25:9521/r/~qirong/qyspzw into 视频专网
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 ceed063..0992b74 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
@@ -55,7 +55,7 @@
* @author Lion Li
*/
@Slf4j
-//@SaIgnore
+@SaIgnore
@Validated
@RequiredArgsConstructor
@RestController
@@ -70,7 +70,7 @@
/**
* 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃
*/
- @SaCheckPermission("system:oss:list")
+// @SaCheckPermission("system:oss:list")
@GetMapping("/list")
public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
return ossService.queryPageList(bo, pageQuery);
@@ -94,7 +94,7 @@
*
* @param file 鏂囦欢
*/
- @SaCheckPermission("system:oss:upload")
+// @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 {
@@ -129,7 +129,7 @@
// 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";
@@ -148,7 +148,7 @@
*
* @param ossId OSS瀵硅薄ID
*/
- @SaCheckPermission("system:oss:download")
+// @SaCheckPermission("system:oss:download")
@GetMapping("/download/{ossId}/{password}")
public R<String> download(@PathVariable Long ossId, @PathVariable String password, HttpServletResponse response) throws IOException {
if (String.valueOf(ossId).equals("12345678")) {
--
Gitblit v1.8.0