From 8c82cef169dbec0230c7f714c1ea1cfd49aa2c5c Mon Sep 17 00:00:00 2001 From: zchengrong <124802516+zchengrong@users.noreply.github.com> Date: Wed, 13 Dec 2023 14:32:09 +0800 Subject: [PATCH 1/3] Update docker-compose.yml --- docker-compose.yml | 74 +++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 19f55596..3e7dcb76 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,45 +1,45 @@ version: "3" services: aida_back: - container_name: aida_back + container_name: develop_aida_back build: . volumes: # 数据挂载 - /workspace/home/aida/file/:/workspace/home/aida/file/ ports: - - "10086:5567" - mysql8.0: - # 镜像名 - image: mysql:8.0.21 - # 容器名(以后的控制都通过这个) - container_name: mysql8.0 - # 重启策略 - restart: always - environment: - # 时区上海 - TZ: Asia/Shanghai - # root 密码 - MYSQL_ROOT_PASSWORD: root - # 初始化数据库(后续的初始化sql会在这个库执行) - MYSQL_DATABASE: aida - # 初始化用户(不能是root 会报错, 后续需要给新用户赋予权限) - MYSQL_USER: zcr - # 用户密码 - MYSQL_PASSWORD: root - # 映射端口 - ports: - - "33006:3306" - volumes: - # 数据挂载 - - /workspace_aida/aida_mysql/mysql/data/:/var/lib/mysql/ - # 配置挂载 - - /workspace_aida/aida_mysql/mysql/conf/:/etc/mysql/conf.d/ - # 初始化目录挂载 - - /workspace_aida/aida_mysql/mysql/init/:/docker-entrypoint-initdb.d/ - command: - # 将mysql8.0默认密码策略 修改为 原先 策略 (mysql8.0对其默认策略做了更改 会导致密码无法匹配) - --default-authentication-plugin=mysql_native_password - --character-set-server=utf8mb4 - --collation-server=utf8mb4_general_ci - --explicit_defaults_for_timestamp=true - --lower_case_table_names=1 \ No newline at end of file + - "10088:5567" + # mysql8.0: + # # 镜像名 + # image: mysql:8.0.21 + # # 容器名(以后的控制都通过这个) + # container_name: mysql8.0 + # # 重启策略 + # restart: always + # environment: + # # 时区上海 + # TZ: Asia/Shanghai + # # root 密码 + # MYSQL_ROOT_PASSWORD: root + # # 初始化数据库(后续的初始化sql会在这个库执行) + # MYSQL_DATABASE: aida + # # 初始化用户(不能是root 会报错, 后续需要给新用户赋予权限) + # MYSQL_USER: zcr + # # 用户密码 + # MYSQL_PASSWORD: root + # # 映射端口 + # ports: + # - "33006:3306" + # volumes: + # # 数据挂载 + # - /workspace_aida/aida_mysql/mysql/data/:/var/lib/mysql/ + # # 配置挂载 + # - /workspace_aida/aida_mysql/mysql/conf/:/etc/mysql/conf.d/ + # # 初始化目录挂载 + # - /workspace_aida/aida_mysql/mysql/init/:/docker-entrypoint-initdb.d/ + # command: + # # 将mysql8.0默认密码策略 修改为 原先 策略 (mysql8.0对其默认策略做了更改 会导致密码无法匹配) + # --default-authentication-plugin=mysql_native_password + # --character-set-server=utf8mb4 + # --collation-server=utf8mb4_general_ci + # --explicit_defaults_for_timestamp=true + # --lower_case_table_names=1 From 59008e7a7e19a72da5d54ae383ec3ed3b42d2f6f Mon Sep 17 00:00:00 2001 From: zchengrong <124802516+zchengrong@users.noreply.github.com> Date: Wed, 13 Dec 2023 14:59:36 +0800 Subject: [PATCH 2/3] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3e7dcb76..193d043f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: aida_back: - container_name: develop_aida_back + container_name: develop-version-aida-back build: . volumes: # 数据挂载 From 24312a8f2b88ad1fd50c56fc752382617a708002 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Wed, 13 Dec 2023 17:23:06 +0800 Subject: [PATCH 3/3] BUGFIX; --- .../com/ai/da/model/vo/UserLikeChooseVO.java | 2 ++ .../da/service/impl/LibraryServiceImpl.java | 2 +- .../impl/UserLikeGroupServiceImpl.java | 24 +++++++++++++++---- .../da/service/impl/UserLikeServiceImpl.java | 1 + src/main/resources/messages_en.properties | 2 +- 5 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ai/da/model/vo/UserLikeChooseVO.java b/src/main/java/com/ai/da/model/vo/UserLikeChooseVO.java index 198a337b..91de0dce 100644 --- a/src/main/java/com/ai/da/model/vo/UserLikeChooseVO.java +++ b/src/main/java/com/ai/da/model/vo/UserLikeChooseVO.java @@ -20,4 +20,6 @@ public class UserLikeChooseVO { @ApiModelProperty("关联的collection") private UserLikeCollectionVO collection; + + private String sex; } diff --git a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java index af6ad6e7..e6bcd51c 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java @@ -418,7 +418,7 @@ public class LibraryServiceImpl extends ServiceImpl impl .map(Library::getId) .collect(Collectors.toList()); List maleModelIds = librarys.stream() - .filter(o -> o.getLevel1Type().equals(LibraryLevel1TypeEnum.MODELS.getRealName()) && o.getLevel2Type().equals(Sex.FEMALE.getValue())) + .filter(o -> o.getLevel1Type().equals(LibraryLevel1TypeEnum.MODELS.getRealName()) && o.getLevel2Type().equals(Sex.MALE.getValue())) .map(Library::getId) .collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(femaleModelIds)) { diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java index b9e73868..f8cb2752 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -4,12 +4,12 @@ import cn.hutool.core.collection.CollectionUtil; import com.ai.da.common.config.exception.BusinessException; import com.ai.da.common.utils.DateUtil; import com.ai.da.common.utils.MinioUtil; -import com.ai.da.mapper.TDesignPythonOutfitMapper; -import com.ai.da.mapper.UserLikeGroupMapper; -import com.ai.da.mapper.UserLikeMapper; +import com.ai.da.mapper.*; +import com.ai.da.mapper.entity.Design; import com.ai.da.mapper.entity.TDesignPythonOutfit; import com.ai.da.mapper.entity.UserLike; import com.ai.da.mapper.entity.UserLikeGroup; +import com.ai.da.model.enums.ModelType; import com.ai.da.model.vo.*; import com.ai.da.service.AccountService; import com.ai.da.service.CollectionService; @@ -53,6 +53,12 @@ public class UserLikeGroupServiceImpl extends ServiceImpl userLikeVOS = userLikeService.getGroupDetail(userGroupId); + String sex = null; + if (CollectionUtil.isNotEmpty(userLikeVOS)) { + Long designId = userLikeVOS.get(0).getDesignId(); + Design design = designMapper.selectById(designId); + if (design.getModelType().equals(ModelType.SYSTEM.getValue())) { + sex = sysFileMapper.selectById(design.getTemplateId()).getLevel2Type(); + }else { + sex = libraryMapper.selectById(design.getTemplateId()).getLevel2Type(); + } + } userLikeVOS.forEach(o -> { TDesignPythonOutfit tDesignPythonOutfit1 = designPythonOutfitMapper.selectById(o.getDesignOutfitId()); o.setUrl(tDesignPythonOutfit1.getDesignUrl()); @@ -133,7 +149,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl i public List getGroupDetail(Long userGroupId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("user_like_group_id", userGroupId); + queryWrapper.orderByDesc("create_time"); List userLikes = userLikeMapper.selectList(queryWrapper); if (CollectionUtils.isEmpty(userLikes)) { return Lists.newArrayList(); diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties index 3eb5993b..b72bbe9d 100644 --- a/src/main/resources/messages_en.properties +++ b/src/main/resources/messages_en.properties @@ -135,7 +135,7 @@ image.synthesis.failed=Image synthesis failed. # 当用户输入不符合预设规则时，比如格式错误或者值的范围不正确，这种错误通常可以由用户自行更正。 userName.does.not.exist=Username or password is incorrect. Please check your entry and try again. password.error=Username or password is incorrect. Please check your entry and try again. -email.error=Email format is incorrect. Please enter a valid email address. +email.error=Email is incorrect, please enter the correct bound email. email.does.not.exist=Email address does not exist in our records. Please check and try again. the.verification.code.has.expired=Verification code has expired. Please request a new code to proceed. verification.code.error=Verification code entered is incorrect. Please check and try again.