上传工具类的修改

platform/src/main/java/com/jzg/controller/FileUploadController.java

@@ -5,9 +5,9 @@ import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.po.SysUploadFiles;
 import com.jzg.commons.util.FileUtils;
+import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.mapper.SysUploadFilesMapper;
-import com.jzg.util.MinioUtils;
 import io.minio.*;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,8 +33,6 @@ public class FileUploadController extends BaseController {
     @Autowired
     private MinioClient minioClient;
 
-    @Autowired
-    private MinioUtils minioUtils;
 
     @Autowired
     private SysUploadFilesMapper sysUploadFilesMapper;
@@ -110,7 +108,7 @@ public class FileUploadController extends BaseController {
             sysUploadFiles.setCreateBy(getUserName());
             sysUploadFilesMapper.insert(sysUploadFiles);
         }
-        sysUploadFiles.setDownloadUrl(minioUtils.getPresignedObjectUrl(bucketName,fileName));
+        sysUploadFiles.setDownloadUrl(MinioUtils.getPresignedObjectUrl(bucketName,fileName));
         return sysUploadFiles;
     }
 
@@ -131,7 +129,7 @@ public class FileUploadController extends BaseController {
         sysUploadFiles.setBucketName(bucketName);
         sysUploadFiles.setEtag(objectWriteResponse.etag());
         sysUploadFiles.setCreateTime(LocalDateTime.now());
-        sysUploadFiles.setDownloadUrl(minioUtils.getPresignedObjectUrl(bucketName,objectName));
+        sysUploadFiles.setDownloadUrl(MinioUtils.getPresignedObjectUrl(bucketName,objectName));
         sysUploadFilesMapper.insert(sysUploadFiles);
         return sysUploadFiles;
     }

platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -13,11 +13,10 @@ import com.jzg.commons.entity.po.*;
 import com.jzg.commons.entity.vo.SysSystemPermsVo;
 import com.jzg.commons.entity.vo.SysSystemVo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
+import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.StringUtils;
-import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.mapper.*;
 import com.jzg.service.SysSystemService;
-import com.jzg.util.MinioUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -56,8 +55,6 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
     private SysUserJzgInfoMapper sysUserJzgInfoMapper;
     @Autowired
     private SysUserPlateInfoMapper sysUserPlateInfoMapper;
-    @Autowired
-    private MinioUtils minioUtils;
     @Value("${minio.bucket-name}")
     private String bucketName;
 
@@ -178,7 +175,7 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
             sysSystemList.forEach(sysSystem->{
                 SysUploadFiles files = sysUploadFilesMapper.selectById(sysSystem.getSysIcon());
                 if(StringUtils.isNotNull(files)){
-                    sysSystem.setSysIconUrl(minioUtils.getPresignedObjectUrl(bucketName,files.getFileName()));
+                    sysSystem.setSysIconUrl(MinioUtils.getPresignedObjectUrl(bucketName,files.getFileName()));
                 }
                 if(deptMap.containsKey(sysSystem.getSysCode())){
                     int count = deptMap.get(sysSystem.getSysCode()).size();
@@ -197,7 +194,7 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         if(StringUtils.isNotEmpty(vo.getSysIcon())){
             SysUploadFiles files = sysUploadFilesMapper.selectById(system.getSysIcon());
             if(StringUtils.isNotNull(files)){
-                vo.setSysIconUrl(minioUtils.getPresignedObjectUrl(bucketName,files.getFileName()));
+                vo.setSysIconUrl(MinioUtils.getPresignedObjectUrl(bucketName,files.getFileName()));
             }
         }
         SysUser user = sysUserMapper.selectById(system.getUserId());