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..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,7 +14,8 @@ public class AccountRegisterDTO {
     @ApiModelProperty("邮箱")
     private String email;
 
-    @NotBlank(message = "password.cannot.be.empty")
+    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<AccountMapper, Account> 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;
     }
 
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<CollectionElementM
 //        String suffix = pictureCollectonName.substring(pictureCollectonName.lastIndexOf("."));
 //        //获取图片前缀
 //        String prefix = pictureCollectonName.substring(0,pictureCollectonName.lastIndexOf("."));
-        element.setName(DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD));
+        element.setName(uploadDTO.getFile().getName());
         element.setUrl(path);
         //按时区计算
         element.setCreateDate(DateUtil.getByTimeZone(uploadDTO.getTimeZone()));
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<CollectionMapper, Collect
             } else {
                 String[] idName = name.split("_");
                 if (idName.length > 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]);
                 }
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<GenerateMapper, Generate> 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<String> generatedSketchUrl = pythonService.generateSketchOrPrint(accountId, Objects.isNull(elementId) ? null : collectionElement.getUrl(),
                 category, text, mode, generateThroughImageTextDTO.getVersion(), generateThroughImageTextDTO.getGender());