将 StoreNode 中的 ipv4Addr 字段修改为 nodeAddr

oss-console/src/main/java/cn/reghao/oss/console/app/db/repository/StoreNodeRepository.java

@@ -10,7 +10,7 @@ import java.util.List;
  * @date 2024-02-23 11:31:05
  */
 public interface StoreNodeRepository extends JpaRepository<StoreNode, Integer> {
-    StoreNode findByIpv4Addr(String ipv4Addr);
+    StoreNode findByNodeAddr(String nodeAddr);
     StoreNode findByDomain(String domain);
     List<StoreNode> findByDomainIn(List<String> domains);
 }

oss-console/src/main/java/cn/reghao/oss/console/app/model/dto/StoreNodeUpdateDto.java

@@ -17,7 +17,7 @@ import javax.validation.constraints.NotNull;
 public class StoreNodeUpdateDto {
     @NotNull
     private Integer id;
-    private String ipv4Addr;
+    private String nodeAddr;
     @NotBlank(message = "必须指定域名")
     private String domain;
     private String location;

oss-console/src/main/java/cn/reghao/oss/console/app/model/po/StoreNode.java

@@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull;
 @Entity
 public class StoreNode extends BaseEntity {
     @Column(nullable = false, unique = true)
-    private String ipv4Addr;
+    private String nodeAddr;
     @NotNull
     private Integer httpPort;
     @NotNull

oss-console/src/main/java/cn/reghao/oss/console/app/model/po/UploadChannel.java

@@ -6,6 +6,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 
 /**
@@ -19,6 +20,7 @@ import javax.persistence.Entity;
 public class UploadChannel extends BaseEntity {
     private Integer channelId;
     private String name;
+    @Column(nullable = false, unique = true)
     private String prefix;
     private Long maxSize;
     private Integer fileType;

oss-console/src/main/java/cn/reghao/oss/console/app/rpc/ImageService.java

@@ -43,7 +43,7 @@ public class ImageService {
         }
 
         RemoteService<ImageFileService> remoteService = new RemoteService<>();
-        String host = storeNode.getIpv4Addr();
+        String host = storeNode.getNodeAddr();
         int port = storeNode.getRpcPort();
         return remoteService.getService(host, port, ImageFileService.class);
     }

oss-console/src/main/java/cn/reghao/oss/console/app/rpc/OssObjectService.java

@@ -70,7 +70,7 @@ public class OssObjectService {
         }
 
         RemoteService<ObjectService> remoteService = new RemoteService<>();
-        String host = storeNode.getIpv4Addr();
+        String host = storeNode.getNodeAddr();
         int port = storeNode.getRpcPort();
         return remoteService.getService(host, port, ObjectService.class);
     }

oss-console/src/main/java/cn/reghao/oss/console/app/rpc/OssService.java

@@ -46,7 +46,7 @@ public class OssService {
             throw new Exception(errMsg);
         }
 
-        String host = storeNode.getIpv4Addr();
+        String host = storeNode.getNodeAddr();
         int port = storeNode.getRpcPort();
         RemoteService<OssServerService> remoteService = new RemoteService<>();
         OssServerService ossServerService = remoteService.getService(host, port, OssServerService.class);

oss-console/src/main/java/cn/reghao/oss/console/app/rpc/VideoService.java

@@ -61,7 +61,7 @@ public class VideoService {
         }
 
         RemoteService<VideoFileService> remoteService = new RemoteService<>();
-        String host = storeNode.getIpv4Addr();
+        String host = storeNode.getNodeAddr();
         int port = storeNode.getRpcPort();
         return remoteService.getService(host, port, VideoFileService.class);
     }

oss-console/src/main/java/cn/reghao/oss/console/app/service/OssStoreService.java

@@ -35,7 +35,7 @@ public class OssStoreService {
     }
 
     public List<ObjectChannel> getObjectChannels(String nodeAddr) {
-        StoreNode storeNode = storeNodeRepository.findByIpv4Addr(nodeAddr);
+        StoreNode storeNode = storeNodeRepository.findByNodeAddr(nodeAddr);
         if (storeNode == null) {
             return Collections.emptyList();
         }
@@ -47,7 +47,7 @@ public class OssStoreService {
     }
 
     public ObjectChannel getObjectChannel(int createBy, String nodeAddr, int channelId) {
-        StoreNode storeNode = storeNodeRepository.findByIpv4Addr(nodeAddr);
+        StoreNode storeNode = storeNodeRepository.findByNodeAddr(nodeAddr);
         if (storeNode == null) {
             return null;
         }
@@ -83,7 +83,7 @@ public class OssStoreService {
     }
 
     public StoreProperties getStoreProperties(String nodeAddr) {
-        StoreNode storeNode = storeNodeRepository.findByIpv4Addr(nodeAddr);
+        StoreNode storeNode = storeNodeRepository.findByNodeAddr(nodeAddr);
         String domain = storeNode.getDomain();
         String referer = storeNode.getReferer();
         String secretKey = storeNode.getSecretKey();

oss-console/src/main/java/cn/reghao/oss/console/app/service/StoreNodeService.java

@@ -21,8 +21,8 @@ public class StoreNodeService {
     }
 
     public void add(StoreNode storeNode) {
-        String ipv4 = storeNode.getIpv4Addr();
-        StoreNode entity = storeNodeRepository.findByIpv4Addr(ipv4);
+        String ipv4 = storeNode.getNodeAddr();
+        StoreNode entity = storeNodeRepository.findByNodeAddr(ipv4);
         if (entity == null) {
             storeNodeRepository.save(storeNode);
         }

oss-console/src/main/java/cn/reghao/oss/console/app/service/UploadChannelService.java

@@ -68,7 +68,7 @@ public class UploadChannelService {
         int scope = uploadChannel.getScope();
         ObjectChannel channel = new ObjectChannel(channelId, name, channelPrefix, maxSize, fileType, processFile, scope, domain);
 
-        String host = storeNode.getIpv4Addr();
+        String host = storeNode.getNodeAddr();
         int port = storeNode.getRpcPort();
         RemoteService<OssServerService> remoteService = new RemoteService<>();
         OssServerService ossServerService = remoteService.getService(host, port, OssServerService.class);

oss-console/src/main/resources/templates/node/detail.html

@@ -25,7 +25,7 @@
             <tbody>
             <tr>
                 <th>地址</th>
-                <td th:text="${storeNode.ipv4Addr}"></td>
+                <td th:text="${storeNode.nodeAddr}"></td>
                 <th>HTTP 端口</th>
                 <td th:text="${storeNode.httpPort}"></td>
                 <th>RPC 端口</th>

oss-console/src/main/resources/templates/node/edit.html

@@ -15,7 +15,7 @@
                 <td>
                     <div class="layui-form-item">
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="ipv4Addr" readonly="readonly" th:value="${storeNode.ipv4Addr}">
+                            <input class="layui-input" type="text" name="nodeAddr" readonly="readonly" th:value="${storeNode.nodeAddr}">
                         </div>
                     </div>
                 </td>

oss-console/src/main/resources/templates/node/index.html

@@ -59,7 +59,7 @@
                 </thead>
                 <tbody>
                 <tr th:each="item:${list}">
-                    <td th:text="${item.ipv4Addr}">应用名</td>
+                    <td th:text="${item.nodeAddr}">应用名</td>
                     <td th:text="${item.httpPort}">应用 ID</td>
                     <td th:text="${item.rpcPort}">分支</td>
                     <td th:text="${item.domain}">应用名</td>

oss-console/src/main/resources/templates/usernode/index1.html

@@ -64,7 +64,7 @@
                 <tbody>
                 <tr th:each="item:${list}">
                     <td th:text="${item.domain}">节点域名</td>
-                    <td th:text="${item.ipv4Addr}">节点地址</td>
+                    <td th:text="${item.nodeAddr}">节点地址</td>
                     <td>
                         <a class="open-popup" data-title="存储节点详细信息" th:attr="data-url=@{'/app/config/app/detail/'+${item.id}}"
                            data-size="640,480" href="#">详细</a>