|
@@ -37,8 +37,10 @@ import java.util.Random;
|
|
public class ComfyUIServiceImpl implements IComfyUIService {
|
|
public class ComfyUIServiceImpl implements IComfyUIService {
|
|
|
|
|
|
public String callbackGenPicUrl="http://47.121.123.230:18660/web/comfyui/updatePromtId";
|
|
public String callbackGenPicUrl="http://47.121.123.230:18660/web/comfyui/updatePromtId";
|
|
|
|
+// public String callbackGenPicUrl="http://cvrbk8.natappfree.cc/comfyui/updatePromtId";
|
|
|
|
|
|
- public String comfyuiUrl = "http://10.168.1.190:43210/prompt";
|
|
|
|
|
|
+ public String comfyuiUrl = "http://121.15.198.153:43210/prompt";
|
|
|
|
+// public String comfyuiUrl = "http://121.15.198.153:8188/prompt";
|
|
|
|
|
|
private final ComfyUIMapper baseMapper;
|
|
private final ComfyUIMapper baseMapper;
|
|
// 图片系统配置类
|
|
// 图片系统配置类
|
|
@@ -86,18 +88,18 @@ public class ComfyUIServiceImpl implements IComfyUIService {
|
|
// comfyuiExecute.setExecuteTime(new Date());
|
|
// comfyuiExecute.setExecuteTime(new Date());
|
|
// int i = baseMapper.updateComfyuiExecute(comfyuiExecute);
|
|
// int i = baseMapper.updateComfyuiExecute(comfyuiExecute);
|
|
|
|
|
|
- JSONObject minioJson = sysOssMapper.queryConfig("1", "minio");
|
|
|
|
- String bucketName = minioJson.getString("bucket_name");
|
|
|
|
|
|
+// JSONObject minioJson = sysOssMapper.queryConfig("1", "minio");
|
|
|
|
+// String bucketName = minioJson.getString("bucket_name");
|
|
// 保存oss表
|
|
// 保存oss表
|
|
- SysOss sysOss = new SysOss();
|
|
|
|
- sysOss.setPromptId(promptId);
|
|
|
|
- sysOss.setService(bucketName);
|
|
|
|
- sysOss.setUrl("");
|
|
|
|
- sysOss.setFileName("");
|
|
|
|
- sysOss.setOriginalName("");
|
|
|
|
- sysOss.setFileSuffix("");
|
|
|
|
- sysOssMapper.insert(sysOss);
|
|
|
|
- ossId = sysOss.getOssId();
|
|
|
|
|
|
+// SysOss sysOss = new SysOss();
|
|
|
|
+// sysOss.setPromptId(promptId);
|
|
|
|
+// sysOss.setService(bucketName);
|
|
|
|
+// sysOss.setUrl("");
|
|
|
|
+// sysOss.setFileName("");
|
|
|
|
+// sysOss.setOriginalName("");
|
|
|
|
+// sysOss.setFileSuffix("");
|
|
|
|
+// sysOssMapper.insert(sysOss);
|
|
|
|
+// ossId = sysOss.getOssId();
|
|
}
|
|
}
|
|
// 保存用户工作流日志
|
|
// 保存用户工作流日志
|
|
// saveUserWorkflow(comfyuiUserWorkflow, jsonObject, promptId);
|
|
// saveUserWorkflow(comfyuiUserWorkflow, jsonObject, promptId);
|
|
@@ -111,7 +113,7 @@ public class ComfyUIServiceImpl implements IComfyUIService {
|
|
baseUserPhotoFolder.setType(1l);
|
|
baseUserPhotoFolder.setType(1l);
|
|
else // SD类型
|
|
else // SD类型
|
|
baseUserPhotoFolder.setType(2l);
|
|
baseUserPhotoFolder.setType(2l);
|
|
- baseUserPhotoFolder.setPhotoOssId(ossId);
|
|
|
|
|
|
+// baseUserPhotoFolder.setPhotoOssId(ossId);
|
|
baseUserPhotoFolder.setBaseUserId(SecurityUser.getUserId());
|
|
baseUserPhotoFolder.setBaseUserId(SecurityUser.getUserId());
|
|
photoFolderMapper.insertOrUpdate(baseUserPhotoFolder);
|
|
photoFolderMapper.insertOrUpdate(baseUserPhotoFolder);
|
|
}
|
|
}
|
|
@@ -125,26 +127,26 @@ public class ComfyUIServiceImpl implements IComfyUIService {
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
public void updatePromtId(Long userId, String minioUrl, String promptId) {
|
|
public void updatePromtId(Long userId, String minioUrl, String promptId) {
|
|
- JSONObject jsonObject = sysOssMapper.queryConfig("1", "minio");
|
|
|
|
|
|
+ JSONObject jsonObject = sysOssMapper.queryConfig("1");
|
|
if (jsonObject == null || jsonObject.getString("bucket_name") == null) {
|
|
if (jsonObject == null || jsonObject.getString("bucket_name") == null) {
|
|
log.error("请先配置minio信息");
|
|
log.error("请先配置minio信息");
|
|
throw new ServerException(ErrorCode.COMFYUI_MINIO_CONFIG);
|
|
throw new ServerException(ErrorCode.COMFYUI_MINIO_CONFIG);
|
|
}
|
|
}
|
|
|
|
|
|
String url = "http://" + jsonObject.getString("endpoint") + File.separator + jsonObject.getString("bucket_name") + File.separator + minioUrl;
|
|
String url = "http://" + jsonObject.getString("endpoint") + File.separator + jsonObject.getString("bucket_name") + File.separator + minioUrl;
|
|
-///comfyui/generate/a46073be387e462eb819e1096cf65dc9.png
|
|
|
|
- SysOss sysOss = sysOssMapper.selectOne(new QueryWrapper<SysOss>().eq("prompt_id", promptId));
|
|
|
|
- if (sysOss == null)
|
|
|
|
- sysOss = new SysOss();
|
|
|
|
- if (minioUrl.lastIndexOf(".") >= 0) {
|
|
|
|
- int lastIndexOf = minioUrl.lastIndexOf(".");
|
|
|
|
- sysOss.setFileSuffix(minioUrl.substring(lastIndexOf));
|
|
|
|
- }
|
|
|
|
- sysOss.setFileName(minioUrl);
|
|
|
|
- sysOss.setUrl(url);
|
|
|
|
- sysOss.setService(jsonObject.getString("bucket_name"));
|
|
|
|
- sysOss.setPromptId(promptId);
|
|
|
|
- sysOssMapper.insertOrUpdate(sysOss);
|
|
|
|
|
|
+/////comfyui/generate/a46073be387e462eb819e1096cf65dc9.png
|
|
|
|
+// SysOss sysOss = sysOssMapper.selectOne(new QueryWrapper<SysOss>().eq("prompt_id", promptId));
|
|
|
|
+// if (sysOss == null)
|
|
|
|
+// sysOss = new SysOss();
|
|
|
|
+// if (minioUrl.lastIndexOf(".") >= 0) {
|
|
|
|
+// int lastIndexOf = minioUrl.lastIndexOf(".");
|
|
|
|
+// sysOss.setFileSuffix(minioUrl.substring(lastIndexOf));
|
|
|
|
+// }
|
|
|
|
+// sysOss.setFileName(minioUrl);
|
|
|
|
+// sysOss.setUrl(url);
|
|
|
|
+// sysOss.setService(jsonObject.getString("bucket_name"));
|
|
|
|
+// sysOss.setPromptId(promptId);
|
|
|
|
+// sysOssMapper.insertOrUpdate(sysOss);
|
|
|
|
|
|
ComfyuiExecute comfyuiExecute = baseMapper.queryComfyUIExecute();
|
|
ComfyuiExecute comfyuiExecute = baseMapper.queryComfyUIExecute();
|
|
comfyuiExecute.setExecuteNum(comfyuiExecute.getExecuteNum() - 1);
|
|
comfyuiExecute.setExecuteNum(comfyuiExecute.getExecuteNum() - 1);
|
|
@@ -161,7 +163,8 @@ public class ComfyUIServiceImpl implements IComfyUIService {
|
|
BaseUserPhotoFolder baseUserPhotoFolder = photoFolderMapper.queryPhotoFolderByPromptId(userId, promptId);
|
|
BaseUserPhotoFolder baseUserPhotoFolder = photoFolderMapper.queryPhotoFolderByPromptId(userId, promptId);
|
|
// .select("is_generate","generate_time"));
|
|
// .select("is_generate","generate_time"));
|
|
baseUserPhotoFolder.setGenerateTime(new Date());
|
|
baseUserPhotoFolder.setGenerateTime(new Date());
|
|
- baseUserPhotoFolder.setIsGenerate(3);
|
|
|
|
|
|
+ baseUserPhotoFolder.setGeneratePicUrl(url); //地址
|
|
|
|
+ baseUserPhotoFolder.setIsGenerate(3); // 生成成功
|
|
photoFolderMapper.updateById(baseUserPhotoFolder);
|
|
photoFolderMapper.updateById(baseUserPhotoFolder);
|
|
|
|
|
|
// photoFolderMapper.selectOne(new QueryWrapper<>().eq("", comfyuiUserWorkflow.getId()))
|
|
// photoFolderMapper.selectOne(new QueryWrapper<>().eq("", comfyuiUserWorkflow.getId()))
|
|
@@ -304,7 +307,12 @@ public class ComfyUIServiceImpl implements IComfyUIService {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public List<ComfyuiModel> getAllModel(ComfyuiModel comfyuiModel) {
|
|
public List<ComfyuiModel> getAllModel(ComfyuiModel comfyuiModel) {
|
|
- return List.of();
|
|
|
|
|
|
+ if (comfyuiModel.getPicType() == null) {
|
|
|
|
+ throw new ServerException(ErrorCode.COMFYUI_NOT_MODEL);
|
|
|
|
+ }
|
|
|
|
+ List<ComfyuiModel> comfyuiModels = baseMapper.queryComfyuiModelList(comfyuiModel.getPicType());
|
|
|
|
+
|
|
|
|
+ return comfyuiModels;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -545,10 +553,10 @@ public class ComfyUIServiceImpl implements IComfyUIService {
|
|
|
|
|
|
Integer width = promptJson.getInteger("width");
|
|
Integer width = promptJson.getInteger("width");
|
|
Integer height = promptJson.getInteger("height");
|
|
Integer height = promptJson.getInteger("height");
|
|
- if(null==width || width<512 || width>1024){
|
|
|
|
|
|
+ if(null==width || width<512 || width>2048){
|
|
throw new ServerException(ErrorCode.COMFYUI_INPUT_WIDTH_SIZE);
|
|
throw new ServerException(ErrorCode.COMFYUI_INPUT_WIDTH_SIZE);
|
|
}
|
|
}
|
|
- if(null==height || height<512 || height>1024){
|
|
|
|
|
|
+ if(null==height || height<512 || height>2048){
|
|
throw new ServerException(ErrorCode.COMFYUI_INPUT_HEIGHT_SIZE);
|
|
throw new ServerException(ErrorCode.COMFYUI_INPUT_HEIGHT_SIZE);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -643,16 +651,16 @@ public class ComfyUIServiceImpl implements IComfyUIService {
|
|
String primitive = promptJson.getString("primitive");
|
|
String primitive = promptJson.getString("primitive");
|
|
// 反向提示词
|
|
// 反向提示词
|
|
String oppositePrimitive = promptJson.getString("oppositePrimitive");
|
|
String oppositePrimitive = promptJson.getString("oppositePrimitive");
|
|
- if (Strings.isBlank(primitive)) {
|
|
|
|
- throw new ServerException(ErrorCode.COMFYUI_INPUT_PRIMITIVE);
|
|
|
|
- }
|
|
|
|
- if (Strings.isBlank(oppositePrimitive)) {
|
|
|
|
- throw new ServerException(ErrorCode.COMFYUI_INPUT_OPPOSITEPRIMITIVE);
|
|
|
|
- }
|
|
|
|
- if(null==width || width<512 || width>1024){
|
|
|
|
|
|
+// if (Strings.isBlank(primitive)) {
|
|
|
|
+// throw new ServerException(ErrorCode.COMFYUI_INPUT_PRIMITIVE);
|
|
|
|
+// }
|
|
|
|
+// if (Strings.isBlank(oppositePrimitive)) {
|
|
|
|
+// throw new ServerException(ErrorCode.COMFYUI_INPUT_OPPOSITEPRIMITIVE);
|
|
|
|
+// }
|
|
|
|
+ if(null==width || width<512 || width>2048){
|
|
throw new ServerException(ErrorCode.COMFYUI_INPUT_WIDTH_SIZE);
|
|
throw new ServerException(ErrorCode.COMFYUI_INPUT_WIDTH_SIZE);
|
|
}
|
|
}
|
|
- if(null==height || height<512 || height>1024){
|
|
|
|
|
|
+ if(null==height || height<512 || height>2048){
|
|
throw new ServerException(ErrorCode.COMFYUI_INPUT_HEIGHT_SIZE);
|
|
throw new ServerException(ErrorCode.COMFYUI_INPUT_HEIGHT_SIZE);
|
|
}
|
|
}
|
|
|
|
|