diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlowVersion.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlowVersion.java index 65aab7c..6f928c2 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlowVersion.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlowVersion.java @@ -91,4 +91,10 @@ public class WorkFlowVersion { @TableField(exist = false) @ApiModelProperty("解密文件秘钥") private String keyRate; + + /** + * 是否加密(0不加密 1加密) + */ + @ApiModelProperty(value = "是否加密") + private Integer isEncrypt; } 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 ecd1040..865ec1a 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 @@ -35,7 +35,7 @@ public class FileServiceImpl implements FileService { return AjaxResult.error("文件不存在"); } - return AjaxResult.success(modelVersion.getKeyRate()); + return AjaxResult.success(modelVersion); }else if (type.equals("work")){ WorkFlowVersion workFlowVersion = workFlowVersionMapper.selectByFileName(name); if (workFlowVersion == null) { @@ -43,7 +43,7 @@ public class FileServiceImpl implements FileService { return AjaxResult.error("文件不存在"); } - return AjaxResult.success(workFlowVersion.getKeyRate()); + return AjaxResult.success(workFlowVersion); } return AjaxResult.error("type不合法"); diff --git a/mcwl-resource/src/main/resources/mapper/resource/ModelVersionMapper.xml b/mcwl-resource/src/main/resources/mapper/resource/ModelVersionMapper.xml index 39ef2b4..9cc7f76 100644 --- a/mcwl-resource/src/main/resources/mapper/resource/ModelVersionMapper.xml +++ b/mcwl-resource/src/main/resources/mapper/resource/ModelVersionMapper.xml @@ -32,7 +32,7 @@ diff --git a/mcwl-resource/src/main/resources/mapper/resource/WorkFlowVersionMapper.xml b/mcwl-resource/src/main/resources/mapper/resource/WorkFlowVersionMapper.xml index 6e635f0..4ad185c 100644 --- a/mcwl-resource/src/main/resources/mapper/resource/WorkFlowVersionMapper.xml +++ b/mcwl-resource/src/main/resources/mapper/resource/WorkFlowVersionMapper.xml @@ -24,6 +24,6 @@