diff --git a/src/main/java/com/ai/da/model/enums/Sex.java b/src/main/java/com/ai/da/model/enums/Sex.java index 6169402b..63e99bf7 100644 --- a/src/main/java/com/ai/da/model/enums/Sex.java +++ b/src/main/java/com/ai/da/model/enums/Sex.java @@ -11,9 +11,9 @@ public enum Sex implements IEnumDisplay { FEMALE("Female"), - MALE("Male"), + MALE("Male") - CHILD("Child") +// CHILD("Child") ; private String value; diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index a4248a50..2cebcf2d 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -1574,7 +1574,7 @@ public class PythonService { .url("http://18.167.251.121:9991/api/attribute_retrieve") // .url(accessPythonIp+":9991/aifda/api/v1.0/attribute_retrieval") .method("POST", body) -// .addHeader("Authorization", "Basic YWlkbGFiOjEyMw==") + .addHeader("Authorization", "Basic YWlkbGFiOjEyMw==") .addHeader("Content-Type", "application/json") .build(); Response response = null; 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 7e1fd107..8be8f53f 100644 --- a/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java @@ -199,15 +199,15 @@ public class ChatRobotServiceImpl implements ChatRobotService { String bucketName = "aida-sys-image"; String path = "images/" + array.getString(i); QueryWrapper qw = new QueryWrapper<>(); - qw.lambda().eq(Library::getUrl, bucketName + "/" + path); + qw.lambda().eq(Library::getUrl, bucketName + "/female/" + path); qw.lambda().eq(Library::getAccountId, chatSendDTO.getUser_id()); qw.lambda().last("limit 1"); List libraryList = libraryMapper.selectList(qw); if (!CollectionUtils.isEmpty(libraryList)) { chatRobotLibraryVO.setId(libraryList.get(0).getId()); } - String aidaSysImage = minioUtil.getPresignedUrl("aida-sys-image", "images/" + array.getString(i), 24 * 60); - chatRobotLibraryVO.setUrl(bucketName + "/" + path); + String aidaSysImage = minioUtil.getPresignedUrl("aida-sys-image/images/female/" + array.getString(i), 24 * 60); + chatRobotLibraryVO.setUrl(bucketName + "/female/" + path); chatRobotLibraryVO.setPresignedUrl(aidaSysImage); chatRobotLibraryVOList.add(chatRobotLibraryVO); } @@ -246,17 +246,23 @@ public class ChatRobotServiceImpl implements ChatRobotService { library.setUrl(chatRobotLibraryDTO.getUrl()); library.setLevel1Type(LibraryLevel1TypeEnum.SKETCH_BOARD.getRealName()); String[] split = chatRobotLibraryDTO.getUrl().split("/"); - if (split.length == 4) { - String level2Type = split[2]; + if (split.length == 5) { + String level3Type = split[2]; + if (level3Type != null && !level3Type.isEmpty()) { + library.setLevel3Type(Character.toUpperCase(level3Type.charAt(0)) + level3Type.substring(1)); + } + String level2Type = split[3]; if (level2Type != null && !level2Type.isEmpty()) { library.setLevel2Type(Character.toUpperCase(level2Type.charAt(0)) + level2Type.substring(1)); } - String name = split[3]; + String name = split[4]; if (name.contains(".")) { library.setName(name.split("\\.")[0]); }else { library.setName(name); } + }else { + throw new BusinessException("error url"); } try { diff --git a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java index e3364612..53b1e8b4 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -488,7 +488,7 @@ public class DesignServiceImpl extends ServiceImpl impleme String designUrl = designPythonOutfit.getDesignUrl(); if (!StringUtils.isEmpty(designUrl) && designUrl.contains("/")) { int firstIndex = designUrl.indexOf("/"); - designCollectionItemVO.setDesignOutfitUrl(minIoUtil.getPresignedUrl(designUrl.substring(0,firstIndex), designUrl.substring(firstIndex+1), 24 * 60)); + designCollectionItemVO.setDesignOutfitUrl(minIoUtil.getPresignedUrl(designUrl.substring(0,firstIndex) + "/" + designUrl.substring(firstIndex+1), 24 * 60)); } //response designCollectionItems.add(designCollectionItemVO); 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 02e95b2d..5cff6df5 100644 --- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java @@ -96,7 +96,7 @@ public class WorkspaceServiceImpl extends ServiceImpl systemMaleQw = new QueryWrapper<>(); systemMaleQw.lambda().eq(SysFile::getLevel1Type, "Models"); systemMaleQw.lambda().eq(SysFile::getLevel2Type, "Male"); - List sysMaleFiles = sysFileMapper.selectList(systemFemaleQw); + List sysMaleFiles = sysFileMapper.selectList(systemMaleQw); if (!CollectionUtils.isEmpty(sysMaleFiles)) { workspace.setMannequinMaleId(sysMaleFiles.get(0).getId()); workspace.setMannequinMaleType(MannequinType.SYSTEM.getValue()); diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index 1d99016b..8e3eaea0 100644 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -6,6 +6,11 @@ spring.datasource.url=jdbc:mysql://18.167.251.121:33006/aida?useUnicode=true&cha spring.datasource.username=root spring.datasource.password=root +#??? +spring.datasource.hikari.minimum-idle=5 +spring.datasource.hikari.maximum-pool-size=40 +spring.datasource.hikari.idle-timeout=60000 + #security spring.security.jwtSecret=JWTSECRET spring.security.jwtTokenHeader=Authorization