DeXun/double-rack
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(file): 修复MinIO服务初始化和端口配置问题

Browse Source 
- 修正MinIO端点端口号从10990改为10900
- 移除对MinioConfig的直接依赖注入，改用minioService.isInitialized()判断
- 重构MinioService实现延迟初始化和异常处理机制
- 添加初始化状态检查方法避免未初始化时的操作
- 更新依赖配置确保OkHttp和okio版本兼容性
This commit is contained in:
Joshi
2026-06-09 13:33:12 +08:00
parent 78e2c3023b
commit ab2f4a611a
7 changed files with 80 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
View File

@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.config.MinioConfig;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -41,9 +40,6 @@ public class CommonController
@Autowired(required = false)
private MinioService minioService;
@Autowired(required = false)
private MinioConfig minioConfig;
private static final String FILE_DELIMETER = ",";
/**
@@ -220,6 +216,6 @@ public class CommonController
*/
private boolean isMinioEnabled()
{
return minioService != null && minioConfig != null && minioConfig.isEnabled();
return minioService != null && minioService.isInitialized();
}
}

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/FileUploadController.java
View File

@@ -1,7 +1,6 @@
package com.ruoyi.web.controller.common;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.config.MinioConfig;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.exception.NonCaptureException;
@@ -31,9 +30,6 @@ public class FileUploadController {
@Autowired(required = false)
private MinioService minioService;
@Autowired(required = false)
private MinioConfig minioConfig;
@Anonymous
@PostMapping("/upload")
@SuppressWarnings("DuplicatedCode")
@@ -75,6 +71,6 @@ public class FileUploadController {
*/
private boolean isMinioEnabled()
{
return minioService != null && minioConfig != null && minioConfig.isEnabled();
return minioService != null && minioService.isInitialized();
}
}

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
View File

@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.config.MinioConfig;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -44,9 +43,6 @@ public class SysProfileController extends BaseController
@Autowired(required = false)
private MinioService minioService;
@Autowired(required = false)
private MinioConfig minioConfig;
/**
* 个人信息
*/
@@ -159,6 +155,6 @@ public class SysProfileController extends BaseController
*/
private boolean isMinioEnabled()
{
return minioService != null && minioConfig != null && minioConfig.isEnabled();
return minioService != null && minioService.isInitialized();
}
}