Browse Source

file-service 的 UserNode 添加一个 protocol 字段, 指定 domain 字段使用的是 http 或 https

reghao 2 months ago
parent
commit
676d49bd8c

+ 4 - 0
file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/model/dto/NodeAddDto.java

@@ -1,5 +1,6 @@
 package cn.reghao.tnb.file.app.zoss.model.dto;
 package cn.reghao.tnb.file.app.zoss.model.dto;
 
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 
@@ -19,4 +20,7 @@ public class NodeAddDto {
     @Pattern(regexp = "^[a-z0-9]+([\\-\\.]{1}[a-z0-9]+)*\\.[a-z]{2,6}$", message = "域名格式不正确")
     @Pattern(regexp = "^[a-z0-9]+([\\-\\.]{1}[a-z0-9]+)*\\.[a-z]{2,6}$", message = "域名格式不正确")
     @Size(max = 128, message = "域名长度应小于 128 个字符")
     @Size(max = 128, message = "域名长度应小于 128 个字符")
     private String domain;
     private String domain;
+    @NotBlank
+    @Size(max = 5, message = "协议应该是 http 或 https")
+    private String protocol;
 }
 }

+ 4 - 0
file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/model/dto/NodeUpdateDto.java

@@ -1,5 +1,6 @@
 package cn.reghao.tnb.file.app.zoss.model.dto;
 package cn.reghao.tnb.file.app.zoss.model.dto;
 
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 
@@ -19,6 +20,9 @@ public class NodeUpdateDto {
     @Pattern(regexp = "^[a-z0-9]+([\\-\\.]{1}[a-z0-9]+)*\\.[a-z]{2,6}$", message = "域名格式不正确")
     @Pattern(regexp = "^[a-z0-9]+([\\-\\.]{1}[a-z0-9]+)*\\.[a-z]{2,6}$", message = "域名格式不正确")
     @Size(max = 128, message = "域名长度应小于 128 个字符")
     @Size(max = 128, message = "域名长度应小于 128 个字符")
     private String domain;
     private String domain;
+    @NotBlank
+    @Size(max = 5, message = "协议应该是 http 或 https")
+    private String protocol;
     private String referer;
     private String referer;
     private String secretKey;
     private String secretKey;
 }
 }

+ 3 - 0
file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/model/po/UserNode.java

@@ -25,6 +25,7 @@ public class UserNode extends BaseObject<Integer> {
     @NotBlank
     @NotBlank
     @Pattern(regexp = "^[a-z0-9]+([\\-\\.]{1}[a-z0-9]+)*\\.[a-z]{2,6}$", message = "域名格式不正确")
     @Pattern(regexp = "^[a-z0-9]+([\\-\\.]{1}[a-z0-9]+)*\\.[a-z]{2,6}$", message = "域名格式不正确")
     private String domain;
     private String domain;
+    private String protocol;
     private String secretKey;
     private String secretKey;
     private String referer;
     private String referer;
     @NotNull
     @NotNull
@@ -35,12 +36,14 @@ public class UserNode extends BaseObject<Integer> {
     public UserNode(NodeAddDto nodeAddDto, int createBy) {
     public UserNode(NodeAddDto nodeAddDto, int createBy) {
         this.storeNodeId = nodeAddDto.getStoreNodeId();
         this.storeNodeId = nodeAddDto.getStoreNodeId();
         this.domain = nodeAddDto.getDomain();
         this.domain = nodeAddDto.getDomain();
+        this.protocol = nodeAddDto.getProtocol();
         this.createBy = createBy;
         this.createBy = createBy;
     }
     }
 
 
     public UserNode(int storeNodeId, String domain, String secretKey, String referer, int createBy) {
     public UserNode(int storeNodeId, String domain, String secretKey, String referer, int createBy) {
         this.storeNodeId = storeNodeId;
         this.storeNodeId = storeNodeId;
         this.domain = domain;
         this.domain = domain;
+        this.protocol = "http";
         this.secretKey = secretKey;
         this.secretKey = secretKey;
         this.referer = referer;
         this.referer = referer;
         this.createBy = createBy;
         this.createBy = createBy;

+ 2 - 1
file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/rpc/ConsoleServiceImpl.java

@@ -93,8 +93,9 @@ public class ConsoleServiceImpl implements ConsoleService {
             return null;
             return null;
         }
         }
 
 
+        String protocol = userNode.getProtocol();
         String domain = userNode.getDomain();
         String domain = userNode.getDomain();
-        String ossUrl = String.format("https://%s", domain);
+        String ossUrl = String.format("%s://%s", protocol, domain);
         long maxSize = uploadChannel.getMaxSize();
         long maxSize = uploadChannel.getMaxSize();
 
 
         try {
         try {

+ 1 - 1
file/file-service/src/main/resources/mapper/oss/UserNodeMapper.xml

@@ -19,7 +19,7 @@
 
 
     <update id="updateUserNode">
     <update id="updateUserNode">
         update file_user_node
         update file_user_node
-        set update_time=now(),`domain`=#{domain},`referer`=#{referer},`secret_key`=#{secretKey}
+        set update_time=now(),`domain`=#{domain},`protocol`=#{protocol},`referer`=#{referer},`secret_key`=#{secretKey}
         where id=#{userNodeId}
         where id=#{userNodeId}
     </update>
     </update>