From a5d08e700a86da398051369379f3820b757e61e8 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Fri, 22 Dec 2023 11:17:35 +0800 Subject: [PATCH 1/5] BUGFIX:retrieve; --- .../java/com/ai/da/service/impl/CollectionServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java index 651e640f..5a20b7de 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java @@ -141,7 +141,11 @@ public class CollectionServiceImpl extends ServiceImpl 1) { - d.setId(StringUtil.isNullOrEmpty(idName[0]) ? null : Integer.valueOf(idName[0])); + if (idName[0].equals("null")) { + d.setId(null); + }else { + d.setId(StringUtil.isNullOrEmpty(idName[0]) ? null : Integer.valueOf(idName[0])); + } d.setName(idName[1]); d.setTcx(idName[2]); } From ce7c6c657b0c6c8689f165444af5d6053990337d Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Fri, 22 Dec 2023 14:05:31 +0800 Subject: [PATCH 2/5] =?UTF-8?q?BUGFIX:=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81?= =?UTF-8?q?;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/model/dto/AccountRegisterDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ai/da/model/dto/AccountRegisterDTO.java b/src/main/java/com/ai/da/model/dto/AccountRegisterDTO.java index 5d8c4065..ecb0b1f2 100644 --- a/src/main/java/com/ai/da/model/dto/AccountRegisterDTO.java +++ b/src/main/java/com/ai/da/model/dto/AccountRegisterDTO.java @@ -14,7 +14,7 @@ public class AccountRegisterDTO { @ApiModelProperty("邮箱") private String email; - @NotBlank(message = "password.cannot.be.empty") +// @NotBlank(message = "password.cannot.be.empty") @ApiModelProperty("密码") private String password; From bd116ff011f7ab47d17d86b51309f3e01b6e7f94 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Fri, 22 Dec 2023 14:12:20 +0800 Subject: [PATCH 3/5] =?UTF-8?q?BUGFIX:=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81?= =?UTF-8?q?;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/da/model/dto/AccountRegisterDTO.java | 1 + .../da/service/impl/AccountServiceImpl.java | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/ai/da/model/dto/AccountRegisterDTO.java b/src/main/java/com/ai/da/model/dto/AccountRegisterDTO.java index ecb0b1f2..041a9bc6 100644 --- a/src/main/java/com/ai/da/model/dto/AccountRegisterDTO.java +++ b/src/main/java/com/ai/da/model/dto/AccountRegisterDTO.java @@ -14,6 +14,7 @@ public class AccountRegisterDTO { @ApiModelProperty("邮箱") private String email; + private Boolean verifyEmail; // @NotBlank(message = "password.cannot.be.empty") @ApiModelProperty("密码") private String password; diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 2641f34e..9b3f87c0 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -254,16 +254,19 @@ public class AccountServiceImpl extends ServiceImpl impl @Transactional @Override public Boolean forgetPwd(AccountRegisterDTO accountDTO) { - Account emailAccount = getOneByEmail(accountDTO.getEmail()); +// Account emailAccount = getOneByEmail(accountDTO.getEmail()); //校验邮箱验证码 - String verifyCode = LocalCacheUtils.getVerifyCodeCache(AuthenticationOperationTypeEnum.FORGET_PWD.name() + "_" + accountDTO.getEmail()); - if (StringUtils.isBlank(verifyCode)) { - throw new BusinessException("the.verification.code.has.expired", ResultEnum.PROMPT.getCode()); + if (accountDTO.getVerifyEmail()) { + String verifyCode = LocalCacheUtils.getVerifyCodeCache(AuthenticationOperationTypeEnum.FORGET_PWD.name() + "_" + accountDTO.getEmail()); + if (StringUtils.isBlank(verifyCode)) { + throw new BusinessException("the.verification.code.has.expired", ResultEnum.PROMPT.getCode()); + } + if (!verifyCode.equals(accountDTO.getEmailVerifyCode())) { + throw new BusinessException("verification.code.error", ResultEnum.PROMPT.getCode()); + } + }else { + updatePwdByEmail(accountDTO.getPassword(), accountDTO.getEmail()); } - if (!verifyCode.equals(accountDTO.getEmailVerifyCode())) { - throw new BusinessException("verification.code.error", ResultEnum.PROMPT.getCode()); - } - updatePwdByEmail(accountDTO.getPassword(), accountDTO.getEmail()); return Boolean.TRUE; } From 91012a00b6189ed0fea5d7ae6b1cbd1e2b25e1ba Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Wed, 27 Dec 2023 11:08:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?BUGFIX:element=E4=B8=8A=E4=BC=A0;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ai/da/service/impl/CollectionElementServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java index 94ff5792..241c6cb4 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java @@ -144,7 +144,7 @@ public class CollectionElementServiceImpl extends ServiceImpl Date: Thu, 28 Dec 2023 09:45:44 +0800 Subject: [PATCH 5/5] =?UTF-8?q?generate=20=E4=B8=BAversion=201=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0str=E5=89=8D=E7=BC=80=E5=8F=8A=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index 9819c70c..722d5720 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -105,6 +105,7 @@ public class GenerateServiceImpl extends ServiceImpl i GenerateModeEnum.TEXT_IMAGE.getCode(); String category = generateThroughImageTextDTO.getLevel1Type().equals(SKETCH_BOARD.getRealName()) ? "sketch" : generateThroughImageTextDTO.getLevel1Type().equals(PRINT_BOARD.getRealName()) ? "print" : "moodboard"; + text = !StringUtil.isNullOrEmpty(text) && generateThroughImageTextDTO.getVersion().equals("1") ? "painting style, " + text : text; List generatedSketchUrl = pythonService.generateSketchOrPrint(accountId, Objects.isNull(elementId) ? null : collectionElement.getUrl(), category, text, mode, generateThroughImageTextDTO.getVersion(), generateThroughImageTextDTO.getGender());