Merge branch 'feature/admin' into preview

mcwl-admin/src/main/java/com/mcwl/web/controller/resource/FileController.java

@@ -4,6 +4,7 @@ import com.mcwl.common.core.domain.AjaxResult;
 import com.mcwl.common.core.domain.R;
 import com.mcwl.common.utils.obs.ObsUtils;
 import com.mcwl.resource.domain.request.RequestFile;
+import com.mcwl.resource.domain.vo.FileVo;
 import com.mcwl.resource.service.impl.FileServiceImpl;
 import com.mcwl.web.controller.common.OssUtil;
 import com.obs.services.ObsClient;
@@ -115,22 +116,20 @@ public class FileController {
 
     /**
      * 根据文件名查找是否存在
-     * @param name
-     * @param type
      * @return
      */
     @GetMapping("/selectFileName")
     @ApiOperation(value = "根据文件名查找是否存在并返回秘钥")
-    public AjaxResult selectFileName(@RequestParam String name,String type){
+    public AjaxResult selectFileName(@RequestBody FileVo fileVo){
 
-        return fileService.selectFileName(name,type);
+        return fileService.selectFileName(fileVo.getName(), fileVo.getType());
     }
 
     @GetMapping("/selectFile")
     @ApiOperation(value = "根据文件名查找是否存在")
-    public AjaxResult selectFile(@RequestParam String name,String type){
+    public AjaxResult selectFile(@RequestBody FileVo fileVo){
 
-        return fileService.selectFile(name,type);
+        return fileService.selectFile(fileVo.getName(), fileVo.getType());
     }
 
     @GetMapping("/download")

mcwl-framework/src/main/java/com/mcwl/framework/interceptor/RepeatSubmitInterceptor.java

@@ -1,15 +1,17 @@
 package com.mcwl.framework.interceptor;
 
-import java.lang.reflect.Method;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.alibaba.fastjson2.JSON;
+import com.mcwl.common.annotation.RepeatSubmit;
+import com.mcwl.common.constant.HttpStatus;
+import com.mcwl.common.core.domain.AjaxResult;
+import com.mcwl.common.utils.ServletUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
-import com.alibaba.fastjson2.JSON;
-import com.mcwl.common.annotation.RepeatSubmit;
-import com.mcwl.common.core.domain.AjaxResult;
-import com.mcwl.common.utils.ServletUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Method;
 
 /**
  * 防止重复提交拦截器
@@ -31,7 +33,7 @@ public abstract class RepeatSubmitInterceptor implements HandlerInterceptor
             {
                 if (this.isRepeatSubmit(request, annotation))
                 {
-                    AjaxResult ajaxResult = AjaxResult.error(annotation.message());
+                    AjaxResult ajaxResult = AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,annotation.message());
                     ServletUtils.renderString(response, JSON.toJSONString(ajaxResult));
                     return false;
                 }

mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/FileVo.java

@@ -0,0 +1,28 @@
+package com.mcwl.resource.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 根据文件名校验入参
+ *
+ * @author DaiZibo
+ * @date 2025/3/22
+ * @apiNote
+ */
+
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class FileVo {
+
+    @ApiModelProperty("文件名字")
+    private String name;
+
+    @ApiModelProperty("文件类型 model/workflow")
+    private String type;
+
+}

mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelVersionServiceImpl.java

@@ -100,9 +100,14 @@ public class ModelVersionServiceImpl  extends ServiceImpl< ModelVersionMapper,Mo
         Long userIdMax = SecurityUtils.getUserIdMax();
         if (userIdMax != 0){
 
+            //擦掉敏感数据
             for (ModelVersion modelVersion : modelVersions) {
+                modelVersion.setObjectKey("");
+                modelVersion.setEncryptionObjectKey("");
                 modelVersion.setFilePath("");
                 modelVersion.setEncryptionFilePath("");
+                modelVersion.setKeyRate("");
+
                 //模型字典 0 工作流字典 1
                 Integer type = 0;
                 //校验是否收藏