소스 검색

优化文件上传

wangxiaofei 1 개월 전
부모
커밋
003723bff1

+ 1 - 1
taphole-admin/src/main/java/com/sckj/admin/controller/UploadController.java

@@ -119,7 +119,7 @@ public class UploadController {
         Map<String, String> album = new LinkedHashMap<>();
         album.put("cid", cid);
         album.put("aid", String.valueOf(TapholeAdminThreadLocal.getAdminId()));
-        album.put("type", String.valueOf(AlbumEnum.Video.getCode()));
+        album.put("type", String.valueOf(AlbumEnum.Audio.getCode()));
         album.put("ext", vo.getExt());
         album.put("size", vo.getSize().toString());
         album.put("url", vo.getUrl());

+ 8 - 0
taphole-common/src/main/java/com/sckj/common/config/GlobalConfig.java

@@ -55,4 +55,12 @@ public class GlobalConfig {
     public static Integer uploadCertificateSize = 1024 * 1024 * 30;
     public static String[] uploadCertificateExt = new String[] {"txt", "doc", "docx", "pdf", "jpg", "png"};
 
+    /**
+     * @author feng
+     * 上传模型限制
+     * 上传模型扩展
+     */
+    public static Integer uploadModelize = 1024 * 1024 * 30;
+    public static String[] uploadModelExt = new String[] {"pb", "mdl"};
+
 }

+ 2 - 2
taphole-common/src/main/java/com/sckj/common/enums/AlbumEnum.java

@@ -7,9 +7,9 @@ public enum AlbumEnum {
 
     IMAGE(10, "图片"),
     Video(20, "视频"),
-    Audio(30, "音频"),
+    Audio(60, "音频"),
     Certificate(40, "证书"),
-    Model(40, "模型文件");
+    Model(50, "模型文件");
 
     /**
      * 构造方法

+ 10 - 2
taphole-common/src/main/java/com/sckj/common/plugin/storage/StorageDriver.java

@@ -80,8 +80,8 @@ public class StorageDriver {
         vo.setName(multipartFile.getOriginalFilename());
         vo.setSize(multipartFile.getSize());
         vo.setExt(origFileExt.toLowerCase());
-        vo.setUrl(UrlUtils.toAbsoluteUrl(newFileName));
-        vo.setPath(newFileName);
+        vo.setUrl(newFileName);
+        vo.setPath(UrlUtils.toAbsoluteUrl(newFileName));
         return vo;
     }
 
@@ -150,6 +150,14 @@ public class StorageDriver {
                 throw new OperateException("上传视频不能超出限制:" + (GlobalConfig.uploadCertificateSize / 1024 / 1024) + "M");
             }
         }
+        else if (type == 50) {
+            if (!Arrays.asList(GlobalConfig.uploadModelExt).contains(fileExt)) {
+                throw new OperateException("不被支持的扩展:" + fileExt);
+            }
+            if (fileSize > GlobalConfig.uploadModelize) {
+                throw new OperateException("上传模型不能超出限制:" + (GlobalConfig.uploadModelize / 1024 / 1024) + "M");
+            }
+        }
     }
 
 }

+ 0 - 1
taphole-warn/src/main/java/com/sckj/warn/service/impl/TAudioServiceImpl.java

@@ -121,7 +121,6 @@ public class TAudioServiceImpl extends ServiceImpl<TAudioMapper,TAudio>  {
         model.setExceptionType(createValidate.getExceptionType());
         model.setExceptionLevel(createValidate.getExceptionLevel());
         //默认新增的音频初始状态为停用
-        model.setStatus("0");
         tAudioMapper.insert(model);
     }