Merge remote-tracking branch 'origin/dev' into dev

xinnengyuan/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java

@@ -183,7 +183,7 @@ public class OssClient {
             // 创建异步请求体（length如果为空会报错）
             BlockingInputStreamAsyncRequestBody body = BlockingInputStreamAsyncRequestBody.builder()
                 .contentLength(length)
-                .subscribeTimeout(Duration.ofSeconds(30))
+                .subscribeTimeout(Duration.ofSeconds(120)) // 增加超时时间到120秒
                 .build();
 
             // 使用 transferManager 进行上传

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/controller/SysPackageController.java

@@ -1,6 +1,7 @@
 package org.dromara.app.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.dromara.app.domain.SysPackage;
 import org.dromara.app.service.SysPackageServiceImpl;
 import org.dromara.common.core.domain.R;
@@ -15,6 +16,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
+@Slf4j
 @RestController
 @RequestMapping("/app/sysPackage")
 public class SysPackageController {
@@ -52,7 +54,7 @@ public class SysPackageController {
             SysPackage first = list.getFirst();
             Boolean b = sysOssService.deleteWithValidByIds(List.of(first.getFileId()), false);
             if (!b){
-                return R.fail("删除文件失败");
+                log.error("通过IDS删除文件失败");
             }
         }