From 839c6baa8a75ed98cf8504cd94d5de8e186d80f4 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Wed, 11 Oct 2023 16:19:35 +0800 Subject: [PATCH 1/7] =?UTF-8?q?BUGFIX:=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E6=B1=A0=E9=85=8D=E7=BD=AE=E8=B0=83=E8=AF=95;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-test.properties | 5 +++++ 1 file changed, 5 insertions(+) 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 From 65c84ae5b5ef6f740a0ad9d4c000317c222a7a3e Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Wed, 11 Oct 2023 16:24:26 +0800 Subject: [PATCH 2/7] =?UTF-8?q?BUGFIX:=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E6=B1=A0=E9=85=8D=E7=BD=AE=E8=B0=83=E8=AF=95;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/python/PythonService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index f51b4b12..6e798983 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; From 990a270a7b6ba4e3e63a0a088d9499bfc7e695e5 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Wed, 11 Oct 2023 16:56:08 +0800 Subject: [PATCH 3/7] =?UTF-8?q?BUGFIX:=E6=9C=BA=E5=99=A8=E4=BA=BA=E8=BF=94?= =?UTF-8?q?=E5=9B=9Eminio=20url=20=E6=80=A7=E5=88=AB;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java | 2 +- src/main/java/com/ai/da/service/impl/DesignServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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..ab7f1a3d 100644 --- a/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java @@ -206,7 +206,7 @@ public class ChatRobotServiceImpl implements ChatRobotService { if (!CollectionUtils.isEmpty(libraryList)) { chatRobotLibraryVO.setId(libraryList.get(0).getId()); } - String aidaSysImage = minioUtil.getPresignedUrl("aida-sys-image", "images/" + array.getString(i), 24 * 60); + String aidaSysImage = minioUtil.getPresignedUrl("aida-sys-image/images/female" + array.getString(i), 24 * 60); chatRobotLibraryVO.setUrl(bucketName + "/" + path); chatRobotLibraryVO.setPresignedUrl(aidaSysImage); chatRobotLibraryVOList.add(chatRobotLibraryVO); 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 635ca07e..43db43e8 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); From 3ebb3842c27f5a3676bb0ba5d4940c8cadbd4d09 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Wed, 11 Oct 2023 16:58:40 +0800 Subject: [PATCH 4/7] =?UTF-8?q?BUGFIX:=E6=9C=BA=E5=99=A8=E4=BA=BA=E8=BF=94?= =?UTF-8?q?=E5=9B=9Eminio=20url=20=E6=80=A7=E5=88=AB;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ab7f1a3d..85f66ffe 100644 --- a/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java @@ -206,7 +206,7 @@ public class ChatRobotServiceImpl implements ChatRobotService { if (!CollectionUtils.isEmpty(libraryList)) { chatRobotLibraryVO.setId(libraryList.get(0).getId()); } - String aidaSysImage = minioUtil.getPresignedUrl("aida-sys-image/images/female" + array.getString(i), 24 * 60); + String aidaSysImage = minioUtil.getPresignedUrl("aida-sys-image/images/female/" + array.getString(i), 24 * 60); chatRobotLibraryVO.setUrl(bucketName + "/" + path); chatRobotLibraryVO.setPresignedUrl(aidaSysImage); chatRobotLibraryVOList.add(chatRobotLibraryVO); From 6549e2baeb6d1496d7bf005bf1079029ccc6a548 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Wed, 11 Oct 2023 17:10:45 +0800 Subject: [PATCH 5/7] =?UTF-8?q?BUGFIX:=E6=9C=BA=E5=99=A8=E4=BA=BA=E8=81=8A?= =?UTF-8?q?=E5=A4=A9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/da/service/impl/ChatRobotServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 85f66ffe..c19b4fb0 100644 --- a/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java @@ -199,7 +199,7 @@ 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); @@ -207,7 +207,7 @@ public class ChatRobotServiceImpl implements ChatRobotService { chatRobotLibraryVO.setId(libraryList.get(0).getId()); } String aidaSysImage = minioUtil.getPresignedUrl("aida-sys-image/images/female/" + array.getString(i), 24 * 60); - chatRobotLibraryVO.setUrl(bucketName + "/" + path); + chatRobotLibraryVO.setUrl(bucketName + "/female/" + path); chatRobotLibraryVO.setPresignedUrl(aidaSysImage); chatRobotLibraryVOList.add(chatRobotLibraryVO); } From 47df80138b08add3faded5cf1c9f74536d8ed9cb Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Thu, 12 Oct 2023 09:57:48 +0800 Subject: [PATCH 6/7] =?UTF-8?q?BUGFIX:=20workspace=E6=96=B0=E5=A2=9E;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/model/enums/Sex.java | 4 ++-- .../java/com/ai/da/service/impl/WorkspaceServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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/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()); From bad3f86d6d4a7b9bb8191f188a0c4ccfa54fb17d Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Thu, 12 Oct 2023 10:07:23 +0800 Subject: [PATCH 7/7] =?UTF-8?q?BUGFIX:=20=E6=9C=BA=E5=99=A8=E4=BA=BA?= =?UTF-8?q?=E5=96=9C=E6=AC=A2=E5=9B=BE=E7=89=87=E5=96=9C=E6=AC=A2;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ai/da/service/impl/ChatRobotServiceImpl.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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 c19b4fb0..8be8f53f 100644 --- a/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java @@ -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 {