From 37800e7f03c4f4466e40e9de67209ab7f7a40f97 Mon Sep 17 00:00:00 2001 From: Diyu0904 <1819728964@qq.com> Date: Fri, 21 Mar 2025 13:54:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9comfyui=E6=9B=B4=E7=BB=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97=E6=AE=B5=E5=90=8D=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E5=AF=86=E5=90=8E=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=20=E6=96=B0=E5=A2=9E=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E8=AF=8D=E9=BB=98=E8=AE=A4=E6=A0=87=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mcwl/resource/domain/ModelVersion.java | 5 ++++- .../java/com/mcwl/resource/domain/request/RequestFile.java | 4 ++-- .../com/mcwl/resource/domain/response/ResponseCollect.java | 2 +- .../com/mcwl/resource/service/impl/CollectServiceImpl.java | 3 +++ .../java/com/mcwl/resource/service/impl/FileServiceImpl.java | 3 ++- .../mcwl/resource/service/impl/ModelVersionServiceImpl.java | 2 +- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelVersion.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelVersion.java index d64a17f..dda603c 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelVersion.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelVersion.java @@ -207,6 +207,9 @@ public class ModelVersion extends BaseEntity { private String fileHash; @ApiModelProperty(value = "加密后文件新名字") - private String encryptFileName; + private String encryptionFileName; + + @ApiModelProperty(value = "加密后文件大小") + private String encryptionFileSize; } diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/request/RequestFile.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/request/RequestFile.java index dcce50c..1242624 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/request/RequestFile.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/request/RequestFile.java @@ -47,11 +47,11 @@ public class RequestFile { /** * 加密后文件大小 */ - private String encryptFileSize; + private String encryptionFileSize; /** * 加密后新文件名字 */ - private String encryptFileName; + private String encryptionFileName; } diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/response/ResponseCollect.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/response/ResponseCollect.java index 12126fb..d0aec9b 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/response/ResponseCollect.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/response/ResponseCollect.java @@ -53,6 +53,6 @@ public class ResponseCollect { private Integer isDownload; @ApiModelProperty(value = "触发词") - private String triggerWords = "-"; + private String triggerWords; } diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/CollectServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/CollectServiceImpl.java index 3ac3dd6..ae11a96 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/CollectServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/CollectServiceImpl.java @@ -81,6 +81,9 @@ public class CollectServiceImpl implements CollectService { collect.setIsDownload(downloadRecordService.selectDownloadByUser(userIdMax,collect.getId(),0)); //翻译类型 collect.setType(DictInit.getDictValue(DictConstants.MODE_VERSION_TYPE,collect.getType())); + if (collect.getTriggerWords() == null){ + collect.setTriggerWords("-"); + } } return R.ok(responseCollectList); diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/FileServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/FileServiceImpl.java index ac65431..972d8a0 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/FileServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/FileServiceImpl.java @@ -122,7 +122,8 @@ public class FileServiceImpl implements FileService { .keyRate(requestFile.getKeyRate()) .encryptionFilePath(requestFile.getEncryptionFilePath()) .encryptionObjectKey(requestFile.getEncryptionObjectKey()) - .encryptFileName(requestFile.getEncryptFileName()).build(); + .encryptionFileName(requestFile.getEncryptionFileName()) + .encryptionFileSize(requestFile.getEncryptionFileSize()).build(); versionMapper.updateById(modelVersion); diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelVersionServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelVersionServiceImpl.java index 562d719..279445a 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelVersionServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelVersionServiceImpl.java @@ -134,7 +134,7 @@ public class ModelVersionServiceImpl extends ServiceImpl< ModelVersionMapper,Mo } if (modelVersion.getIsEncrypt() == 1){ - return R.ok(modelVersion.getEncryptionFilePath()); + return R.ok(modelVersion.getEncryptionFilePath(),modelVersion.getEncryptionFileName()); } return R.ok(modelVersion.getFilePath(),modelVersion.getFileName()); }