From f18c27fe0273434264b4a54ff6fedd7459a56a53 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Thu, 19 Oct 2023 16:12:42 +0800 Subject: [PATCH] =?UTF-8?q?BUGFIX:=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/da/controller/LibraryController.java | 6 +++++- .../com/ai/da/service/impl/ChatRobotServiceImpl.java | 6 +++++- .../service/impl/CollectionElementServiceImpl.java | 6 +++++- .../com/ai/da/service/impl/LibraryServiceImpl.java | 8 +++++--- .../com/ai/da/service/impl/WorkspaceServiceImpl.java | 12 ++++++++---- src/main/resources/application-test.properties | 2 +- 6 files changed, 29 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/ai/da/controller/LibraryController.java b/src/main/java/com/ai/da/controller/LibraryController.java index 6d7cdee5..24d563f1 100644 --- a/src/main/java/com/ai/da/controller/LibraryController.java +++ b/src/main/java/com/ai/da/controller/LibraryController.java @@ -22,6 +22,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -50,6 +51,9 @@ public class LibraryController { @Resource private MinioUtil minioUtil; + @Value("${minio.bucketName.sysImage}") + private String sysImage; + @ApiOperation(value = "Library分页列表") @PostMapping("/queryLibraryPage") public Response> queryLibraryPage(@Valid @RequestBody QueryLibraryPageDTO query) { @@ -118,7 +122,7 @@ public class LibraryController { Assert.notEmpty(librarys,"librarys does not exist!"); libraryService.removeBatchByIds(deleteDTO.getLibraryIds()); for (Library library : librarys) { - if (library.getUrl().startsWith("aida-sys-image")) { + if (library.getUrl().startsWith(sysImage)) { continue; } minioUtil.deleteObject(library.getUrl()); diff --git a/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java b/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java index 0b7476ca..d190aaa7 100644 --- a/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java @@ -32,6 +32,7 @@ import com.google.gson.GsonBuilder; import io.minio.errors.MinioException; import lombok.extern.slf4j.Slf4j; import okhttp3.*; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -79,6 +80,9 @@ public class ChatRobotServiceImpl implements ChatRobotService { @Resource private LibraryMapper libraryMapper; + @Value("${minio.bucketName.sysImage}") + private String sysImage; + Gson gson = new GsonBuilder().create(); private final ExecutorService executorService = Executors.newSingleThreadExecutor(); @@ -198,7 +202,7 @@ public class ChatRobotServiceImpl implements ChatRobotService { continue; } ChatRobotLibraryVO chatRobotLibraryVO = new ChatRobotLibraryVO(); - String bucketName = "aida-sys-image"; + String bucketName = sysImage; String path = "images/female/" + array.getString(i); QueryWrapper qw = new QueryWrapper<>(); qw.lambda().eq(Library::getUrl, bucketName + "/" + path); diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java index 5b32f34e..2f19ecbd 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java @@ -27,6 +27,7 @@ import javafx.scene.chart.ValueAxis; import lombok.extern.slf4j.Slf4j; import org.bouncycastle.LICENSE; import org.bouncycastle.cms.CMSAuthenticatedGenerator; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.reactive.AbstractReactiveTransactionManager; @@ -72,6 +73,9 @@ public class CollectionElementServiceImpl extends ServiceImpl impl private LibraryModelPointService libraryModelPointService; @Resource private MinioUtil minioUtil; - @Value("${minio.bucketName.mannequins}") - private String mannequins; + @Value("${minio.bucketName.users}") private String users; + @Value("${minio.bucketName.sysImage}") + private String sysImage; + private static List top = Arrays.asList(CollectionLevel2TypeEnum.DRESS.getRealName(), CollectionLevel2TypeEnum.OUTWEAR.getRealName(),CollectionLevel2TypeEnum.BLOUSE.getRealName()); private static List bottom = Arrays.asList(CollectionLevel2TypeEnum.SKIRT.getRealName(), @@ -187,7 +189,7 @@ public class LibraryServiceImpl extends ServiceImpl impl libraryUpdateVo.setCheckMd5(Boolean.TRUE); return libraryUpdateVo; }else if (libraryUploadDTO.getModelType().equals(ModelType.SYSTEM.getValue())) { - bucketName = "aida-sys-image"; + bucketName = sysImage; path = "models/" + libraryUploadDTO.getModelSex().toLowerCase(); String filePath = minioUtil.upload(bucketName, path, libraryUploadDTO.getFile()); String newFilePath = processMannequins(filePath); diff --git a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java index 6ab3f331..94886de9 100644 --- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java @@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -69,8 +70,11 @@ public class WorkspaceServiceImpl extends ServiceImpl