reghao 2 rokov pred
rodič
commit
d8e91b0a50

+ 8 - 6
oss-api/src/main/java/cn/reghao/oss/api/constant/ObjectScope.java

@@ -17,11 +17,10 @@ public enum ObjectScope {
 
     private final int code;
     private final String desc;
-
-    private static Map<Integer, String> descMap = new HashMap<>();
+    private static final Map<Integer, ObjectScope> map = new HashMap<>();
     static {
         for (ObjectScope scope : ObjectScope.values()) {
-            descMap.put(scope.code, scope.desc);
+            map.put(scope.code, scope);
         }
     }
 
@@ -49,8 +48,11 @@ public enum ObjectScope {
         return code;
     }
 
-    // TODO 第一次调用时会初始化 descMap
-    public static String getDescByCode(int code) {
-        return descMap.get(code);
+    public String getDesc() {
+        return desc;
+    }
+
+    public static ObjectScope getByCode(int code) {
+        return map.get(code);
     }
 }

+ 6 - 6
oss-api/src/main/java/cn/reghao/oss/api/constant/ObjectType.java

@@ -8,12 +8,12 @@ import java.util.Map;
  * @date 2023-06-13 15:09:09
  */
 public enum ObjectType {
-    Dir(1000, "目录"),
-    Image(1001, "图片"),
-    Video(1002, "视频"),
-    Audio(1003, "音频"),
-    Text(1004, "文本"),
-    Other(1005, "其他");
+    Dir(1000, "directory"),
+    Image(1001, "image"),
+    Video(1002, "video"),
+    Audio(1003, "audio"),
+    Text(1004, "text"),
+    Other(1005, "application");
 
     private final int code;
     private final String desc;

+ 14 - 8
oss-api/src/main/java/cn/reghao/oss/api/constant/UploadChannel.java

@@ -10,26 +10,28 @@ import java.util.Map;
 @Deprecated
 public enum UploadChannel {
     // 网盘上传(单个文件最大 20GiB)
-    disk(1, "file/", 1024L*1024*1024*20),
+    disk(101, "file/", 1024L*1024*1024*20, 1005),
     // 视频上传(单个文件最大 10GiB)
-    video(2, "video/playback/", 1024L*1024*1024*10),
+    video(102, "video/playback/", 1024L*1024*1024*10, 1002),
     // 音频上传(单个文件最大 1GiB)
-    audio(3, "audio/playback/", 1024L*1024*1024),
+    audio(103, "audio/playback/", 1024L*1024*1024, 1003),
     // 用户头像上传(单个文件最大 2MiB)
-    avatar(4, "image/a/", 1024L*1024*2),
+    avatar(104, "image/a/", 1024L*1024*2, 1001),
     // 图片上传(单个文件最大 10MiB)
-    image(5, "image/i/", 1024L*1024*10),
+    image(105, "image/i/", 1024L*1024*10, 1001),
     // 用户状态照片上传(单个文件最大 100MiB)
-    photo(6, "image/p/", 1024L*1024*100),
-    img(7, "img/", 1024L*1024*10);
+    photo(106, "image/p/", 1024L*1024*100, 1001),
+    img(107, "img/", 1024L*1024*10, 1001);
 
     private final int code;
     private final String prefix;
     private final long maxSize;
-    UploadChannel(int code, String prefix, long maxSize) {
+    private final int fileType;
+    UploadChannel(int code, String prefix, long maxSize, int fileType) {
         this.code = code;
         this.prefix = prefix;
         this.maxSize = maxSize;
+        this.fileType = fileType;
     }
 
     private static Map<Integer, UploadChannel> map = new HashMap<>();
@@ -60,4 +62,8 @@ public enum UploadChannel {
     public long getMaxSize() {
         return maxSize;
     }
+
+    public int getFileType() {
+        return fileType;
+    }
 }

+ 2 - 1
oss-api/src/main/java/cn/reghao/oss/api/dto/ObjectChannel.java

@@ -17,6 +17,7 @@ public class ObjectChannel implements Serializable {
     private String name;
     private String prefix;
     private Long maxSize;
-    private String contentType;
+    private Integer fileType;
+    private Integer scope;
     private String domain;
 }

+ 0 - 13
oss-api/src/main/java/cn/reghao/oss/api/iface/ChannelService.java

@@ -1,13 +0,0 @@
-package cn.reghao.oss.api.iface;
-
-import cn.reghao.oss.api.dto.ChannelDto;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2023-06-02 10:27:58
- */
-public interface ChannelService {
-    List<ChannelDto> getChannels();
-}