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

This commit is contained in:
shahaibo
2023-11-23 14:05:20 +08:00

View File

@@ -194,7 +194,7 @@ public class ChatRobotServiceImpl implements ChatRobotService {
} }
ChatRobotLibraryVO chatRobotLibraryVO = new ChatRobotLibraryVO(); ChatRobotLibraryVO chatRobotLibraryVO = new ChatRobotLibraryVO();
String bucketName = sysImage; String bucketName = sysImage;
String prefix = getPrefix(array.getString(i)); String prefix = getPrefix(array.getString(i),chatSendDTO.getGender());
String path = prefix; String path = prefix;
// String path = prefix + array.getString(i); // String path = prefix + array.getString(i);
QueryWrapper<Library> qw = new QueryWrapper<>(); QueryWrapper<Library> qw = new QueryWrapper<>();
@@ -314,22 +314,24 @@ public class ChatRobotServiceImpl implements ChatRobotService {
} }
} }
private String getPrefix(String minioPath){ private String getPrefix(String minioPath,String gender){
String substring = minioPath.substring(minioPath.lastIndexOf("/") + 1, minioPath.lastIndexOf("_")); if (gender.equals("Male")){
String folder = minioPath.substring(0,minioPath.lastIndexOf("/")); String substring = minioPath.substring(minioPath.lastIndexOf("/") + 1, minioPath.lastIndexOf("_"));
if ("mens_test".equals(substring)){ String folder = minioPath.substring(0,minioPath.lastIndexOf("/"));
switch (folder){ if ("mens_test".equals(substring)){
case "bottom": switch (folder){
minioPath = minioPath.replace("bottom","bottoms"); case "bottom":
break; minioPath = minioPath.replace("bottom","bottoms");
case "top": break;
minioPath = minioPath.replace("top","tops"); case "top":
break; minioPath = minioPath.replace("top","tops");
case "outer": break;
minioPath = minioPath.replace("outer","outwear"); case "outer":
break; minioPath = minioPath.replace("outer","outwear");
break;
}
return "images/male/" + minioPath;
} }
return "images/male/" + minioPath;
} }
return "images/female/" + minioPath; return "images/female/" + minioPath;
} }