瀏覽代碼

使用 group 和 node 字段标识 dfs-store 所属的组和节点

reghao 3 年之前
父節點
當前提交
fd7a022e0f

+ 6 - 16
src/main/java/cn/reghao/tnb/file/app/config/DfsProperties.java

@@ -1,7 +1,9 @@
 package cn.reghao.tnb.file.app.config;
 
 import lombok.AllArgsConstructor;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
@@ -13,26 +15,14 @@ import java.util.List;
  */
 @AllArgsConstructor
 @NoArgsConstructor
+@Getter
+@Setter
 @Component
 @ConfigurationProperties(prefix = "dfs")
 public class DfsProperties {
     private String domain;
+    private int group;
+    private int node;
     // TODO 修改为 mountedDirs, 表示磁盘挂载的目录
     private List<String> baseDirs;
-
-    public void setDomain(String domain) {
-        this.domain = domain;
-    }
-
-    public String getDomain() {
-        return domain;
-    }
-
-    public void setBaseDirs(List<String> baseDirs) {
-        this.baseDirs = baseDirs;
-    }
-
-    public List<String> getBaseDirs() {
-        return baseDirs;
-    }
 }

+ 2 - 2
src/main/java/cn/reghao/tnb/file/app/model/po/FileUrl.java

@@ -19,8 +19,8 @@ public class FileUrl extends BaseObject<Integer> {
     private String relativePath;
     private String url;
     private String path;
-    private String dcId;
-    private String nodeId;
+    private int group;
+    private int node;
 
     public FileUrl(String fileId, String blockId, String relativePath, String url, String path) {
         this.fileId = fileId;

+ 2 - 0
src/main/resources/application-dev.yml

@@ -5,6 +5,8 @@ spring:
     password: Dev@123456
 dfs:
   domain: file1.reghao.cn
+  group: 0
+  node: 0
   baseDirs:
     - /opt/file/disk0/
     - /home/reghao/opt/file/disk0/

+ 2 - 0
src/main/resources/application-test.yml

@@ -5,6 +5,8 @@ spring:
     password: Test@123456
 dfs:
   domain: file.reghao.cn
+  group: 0
+  node: 0
   baseDirs:
     - /opt/file/disk0/
     - /opt/file/disk1/

+ 2 - 2
src/main/resources/mapper/FileUrlMapper.xml

@@ -4,9 +4,9 @@
 <mapper namespace="cn.reghao.tnb.file.app.db.mapper.FileUrlMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into file_url
-        (`id`,`deleted`,`create_time`,`update_time`,`file_id`,`block_id`,`relative_path`,`url`,`path`,`dc_id`,`node_id`)
+        (`id`,`deleted`,`create_time`,`update_time`,`file_id`,`block_id`,`relative_path`,`url`,`path`,`group`,`node`)
         values 
-        (#{id},#{deleted},#{createTime},#{updateTime},#{fileId},#{blockId},#{relativePath},#{url},#{path},#{dcId},#{nodeId})
+        (#{id},#{deleted},#{createTime},#{updateTime},#{fileId},#{blockId},#{relativePath},#{url},#{path},#{group},#{node})
     </insert>
 
     <update id="updateSetFileUrl">