aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
xupei
2023-10-12 10:11:43 +08:00
parent 39abb48d6f bad3f86d6d
commit 6bbc8e3f1c
6 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/ai/da/model/enums/Sex.java
View File

@@ -11,9 +11,9 @@ public enum Sex implements IEnumDisplay {
FEMALE("Female"), FEMALE("Female"),
MALE("Male"), MALE("Male")
CHILD("Child") // CHILD("Child")
; ;
private String value; private String value;

2
src/main/java/com/ai/da/python/PythonService.java
View File

@@ -1574,7 +1574,7 @@ public class PythonService {
.url("http://18.167.251.121:9991/api/attribute_retrieve") .url("http://18.167.251.121:9991/api/attribute_retrieve")
// .url(accessPythonIp+":9991/aifda/api/v1.0/attribute_retrieval") // .url(accessPythonIp+":9991/aifda/api/v1.0/attribute_retrieval")
.method("POST", body) .method("POST", body)
// .addHeader("Authorization", "Basic YWlkbGFiOjEyMw==") .addHeader("Authorization", "Basic YWlkbGFiOjEyMw==")
.addHeader("Content-Type", "application/json") .addHeader("Content-Type", "application/json")
.build(); .build();
Response response = null; Response response = null;

18
src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
View File

@@ -199,15 +199,15 @@ public class ChatRobotServiceImpl implements ChatRobotService {
String bucketName = "aida-sys-image"; String bucketName = "aida-sys-image";
String path = "images/" + array.getString(i); String path = "images/" + array.getString(i);
QueryWrapper<Library> qw = new QueryWrapper<>(); QueryWrapper<Library> 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().eq(Library::getAccountId, chatSendDTO.getUser_id());
qw.lambda().last("limit 1"); qw.lambda().last("limit 1");
List<Library> libraryList = libraryMapper.selectList(qw); List<Library> libraryList = libraryMapper.selectList(qw);
if (!CollectionUtils.isEmpty(libraryList)) { if (!CollectionUtils.isEmpty(libraryList)) {
chatRobotLibraryVO.setId(libraryList.get(0).getId()); 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.setUrl(bucketName + "/female/" + path);
chatRobotLibraryVO.setPresignedUrl(aidaSysImage); chatRobotLibraryVO.setPresignedUrl(aidaSysImage);
chatRobotLibraryVOList.add(chatRobotLibraryVO); chatRobotLibraryVOList.add(chatRobotLibraryVO);
} }
@@ -246,17 +246,23 @@ public class ChatRobotServiceImpl implements ChatRobotService {
library.setUrl(chatRobotLibraryDTO.getUrl()); library.setUrl(chatRobotLibraryDTO.getUrl());
library.setLevel1Type(LibraryLevel1TypeEnum.SKETCH_BOARD.getRealName()); library.setLevel1Type(LibraryLevel1TypeEnum.SKETCH_BOARD.getRealName());
String[] split = chatRobotLibraryDTO.getUrl().split("/"); String[] split = chatRobotLibraryDTO.getUrl().split("/");
if (split.length == 4) { if (split.length == 5) {
String level2Type = split[2]; 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()) { if (level2Type != null && !level2Type.isEmpty()) {
library.setLevel2Type(Character.toUpperCase(level2Type.charAt(0)) + level2Type.substring(1)); library.setLevel2Type(Character.toUpperCase(level2Type.charAt(0)) + level2Type.substring(1));
} }
String name = split[3]; String name = split[4];
if (name.contains(".")) { if (name.contains(".")) {
library.setName(name.split("\\.")[0]); library.setName(name.split("\\.")[0]);
}else { }else {
library.setName(name); library.setName(name);
} }
}else {
throw new BusinessException("error url");
} }
try { try {

2
src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
View File

@@ -488,7 +488,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
String designUrl = designPythonOutfit.getDesignUrl(); String designUrl = designPythonOutfit.getDesignUrl();
if (!StringUtils.isEmpty(designUrl) && designUrl.contains("/")) { if (!StringUtils.isEmpty(designUrl) && designUrl.contains("/")) {
int firstIndex = designUrl.indexOf("/"); 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 //response
designCollectionItems.add(designCollectionItemVO); designCollectionItems.add(designCollectionItemVO);

2
src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
View File

@@ -96,7 +96,7 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
QueryWrapper<SysFile> systemMaleQw = new QueryWrapper<>(); QueryWrapper<SysFile> systemMaleQw = new QueryWrapper<>();
systemMaleQw.lambda().eq(SysFile::getLevel1Type, "Models"); systemMaleQw.lambda().eq(SysFile::getLevel1Type, "Models");
systemMaleQw.lambda().eq(SysFile::getLevel2Type, "Male"); systemMaleQw.lambda().eq(SysFile::getLevel2Type, "Male");
List<SysFile> sysMaleFiles = sysFileMapper.selectList(systemFemaleQw); List<SysFile> sysMaleFiles = sysFileMapper.selectList(systemMaleQw);
if (!CollectionUtils.isEmpty(sysMaleFiles)) { if (!CollectionUtils.isEmpty(sysMaleFiles)) {
workspace.setMannequinMaleId(sysMaleFiles.get(0).getId()); workspace.setMannequinMaleId(sysMaleFiles.get(0).getId());
workspace.setMannequinMaleType(MannequinType.SYSTEM.getValue()); workspace.setMannequinMaleType(MannequinType.SYSTEM.getValue());

5
src/main/resources/application-test.properties
View File

@@ -6,6 +6,11 @@ spring.datasource.url=jdbc:mysql://18.167.251.121:33006/aida?useUnicode=true&cha
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=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 #security
spring.security.jwtSecret=JWTSECRET spring.security.jwtSecret=JWTSECRET
spring.security.jwtTokenHeader=Authorization spring.security.jwtTokenHeader=Authorization