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

src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java

@@ -252,7 +252,7 @@ public class ChatRobotServiceImpl implements ChatRobotService {
                 throw new BusinessException("chat-bot.interface.exception");
             }
         }
-        log.error("ChatRobot exception!");
+        log.error("ChatRobot exception! 请求异常：{}", response);
         throw new BusinessException("chat-bot.interface.exception");
     }
 

src/main/java/com/ai/da/service/impl/DesignServiceImpl.java

@@ -629,6 +629,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
                 if (!SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType()) && designItemDetail.getPrintPath() != null) {
                     DesignItemDetailPrint print = new DesignItemDetailPrint();
                     print.setDesignItemDetailId(designItemDetail.getId());
+                    print.setPrintType("print");
                     print.setPath(designItemDetail.getPrintPath());
                     print.setSingleOrOverall("overall");
                     print.setPosition("[0.0,0.0]");

src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java

@@ -529,7 +529,12 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
             if (generateThroughImageTextDTO.getLevel2Type().equals(CollectionLevel2TypeEnum.SLOGAN.getRealName())){
                 if (StringUtil.isNullOrEmpty(generateThroughImageTextDTO.getSloganBase64())){
                     log.error("Printboard-Slogan模式下，slogan image为空");
-                    throw new BusinessException("Slogan can not be empty!");
+                    throw new BusinessException("slogan.image.cannot.be.empty");
+                }
+
+                if (StringUtil.isNullOrEmpty(generateThroughImageTextDTO.getText())){
+                    log.error("Printboard-Slogan模式下，slogan text为空");
+                    throw new BusinessException("slogan.style.cannot.be.empty");
                 }
 
                 times = 1;

src/main/resources/application-dev.properties

@@ -44,7 +44,7 @@ spring.servlet.multipart.max-request-size= 10MB
 #访问python服务的ip(对应环境)
 access.python.ip=http://18.167.251.121
 access.python.port=9992
-access.python.generate_sr_port=http://18.167.251.121:9994
+access.python.generate_sr_port=9994
 access.python.address=http://18.167.251.121:9994
 
 minio.endpoint=https://www.minio.aida.com.hk:9000

src/main/resources/messages_en.properties

@@ -135,6 +135,8 @@ model.not.found=model not found.
 libraryIdList.cannot.be.empty=libraryIdList cannot be empty.
 the.value.range.of.seed=The value range of seed is 0-99999
 image.modify.failed=Image modification failed, please try again later.
+slogan.style.cannot.be.empty=Slogan style text cannot be empty.
+slogan.image.cannot.be.empty=Slogan image cannot be empty.
 
 # 可能会报异常
 # Informative:

src/main/resources/messages_zh.properties

@@ -130,6 +130,8 @@ the.workspace.lastIndex.not.found=未找到工作区的lastIndex。
 gender.cannot.be.empty=性别不能为空。
 image.synthesis.failed=图像合成失败。
 priority.cannot.be.repeated=优先级不能重复。
+slogan.style.cannot.be.empty=标语风格文本不能为空.
+slogan.image.cannot.be.empty=标语图片不能为空.
 
 # 可能会报异常
 # Informative: