Merge branch 'feature/admin' into preview

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;
 
 }

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;
 
 }

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;
 
 }

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);

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);
 

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());
     }