fix:允许图生图不带提示词

This commit is contained in:
litianxiang
2026-02-05 17:38:38 +08:00
parent d51aa84647
commit d5bfaa8822

View File

@@ -1221,7 +1221,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
String style = generateDTO.getText().substring(0, firstCommaIndex).trim();
String prompt = generateDTO.getText().substring(firstCommaIndex + 1).trim();
prompt = getPrintboardPrompt(style, prompt,modelName);
prompt = getPrintboardPrompt(style, prompt,modelName,isUseImage);
modelAndPromptMap.put(ModelConstants.PROMPT, prompt);
@@ -1570,7 +1570,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
}
private String getPrintboardPrompt(String style, String userInput, String modelName) {
private String getPrintboardPrompt(String style, String userInput, String modelName, boolean isUseImage) {
String systemPrompt = null;
String prompt;
@@ -1601,7 +1601,11 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
}
if (userInput == null || userInput.trim().isEmpty()) {
throw new BusinessException("prompt null");
if (isUseImage){
prompt = "Theme: Image content" + "\nRequirement: " + systemPrompt;
}else {
throw new BusinessException("prompt null");
}
} else {
prompt = "Theme: " + userInput.trim() + "\nRequirement: " + systemPrompt;
}