从 oss.yml 配置文件中获取 host 地址

oss-store/src/main/java/cn/reghao/oss/store/config/BeansConfig.java

@@ -1,7 +1,5 @@
 package cn.reghao.oss.store.config;
 
-import cn.reghao.jutil.jdk.machine.id.MachineId;
-import cn.reghao.jutil.jdk.machine.id.MachineIdLinux;
 import cn.reghao.oss.sdk.OssConsoleClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -16,9 +14,4 @@ public class BeansConfig {
     public OssConsoleClient ossConsoleClient(OssProperties ossProperties) {
         return new OssConsoleClient(ossProperties.getConsoleEndpoint());
     }
-
-    @Bean
-    public MachineId machineId() {
-        return new MachineIdLinux();
-    }
 }

oss-store/src/main/java/cn/reghao/oss/store/config/spring/AppLifecycle.java

@@ -1,6 +1,5 @@
 package cn.reghao.oss.store.config.spring;
 
-import cn.reghao.jutil.jdk.machine.id.MachineId;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import cn.reghao.jutil.jdk.store.LocalStores;
 import cn.reghao.jutil.jdk.store.SubDirCount;
@@ -36,18 +35,16 @@ public class AppLifecycle implements ApplicationRunner, DisposableBean {
     private final DataBlockMapper dataBlockMapper;
     private final FileTask fileTask;
     private final SpringProperties springProperties;
-    private final MachineId machineId;
     private final OssConsoleClient ossConsoleClient;
     private final StoreLocalCache storeLocalCache;
     private final StoreChannelService storeChannelService;
 
     public AppLifecycle(DataBlockMapper dataBlockMapper, FileTask fileTask, SpringProperties springProperties,
-                        MachineId machineId, OssConsoleClient ossConsoleClient, StoreLocalCache storeLocalCache,
+                        OssConsoleClient ossConsoleClient, StoreLocalCache storeLocalCache,
                         StoreChannelService storeChannelService) {
         this.dataBlockMapper = dataBlockMapper;
         this.fileTask = fileTask;
         this.springProperties = springProperties;
-        this.machineId = machineId;
         this.ossConsoleClient = ossConsoleClient;
         this.storeLocalCache = storeLocalCache;
         this.storeChannelService = storeChannelService;
@@ -93,7 +90,7 @@ public class AppLifecycle implements ApplicationRunner, DisposableBean {
     private void initStoreNode() throws Exception {
         log.info("初始化 StoreNode...");
         List<StoreDiskDto> list = storeLocalCache.getStoreDisks();
-        String nodeAddr = machineId.ipv4();
+        String nodeAddr = springProperties.getHost();
         int httpPort = springProperties.getHttpPort();
         int rpcPort = springProperties.getRpcPort();
         StoreNodeDto storeNodeDto = new StoreNodeDto(nodeAddr, httpPort, rpcPort, list);