TRX 1 年之前
父节点
当前提交
d82dbe97c1

+ 1 - 1
src/main/java/com/zswl/dataservice/domain/docker/DockerMeta.java

@@ -34,7 +34,7 @@ public class DockerMeta extends SuperEntity {
     private String image;
 
     @Schema(description = "环境变量,格式如:name=lishi")
-    private List<String> env = new ArrayList<>();
+    private List<EnvModel> env = new ArrayList<>();
 
     @Schema(description = "networkTypes")
     private String networkTypes;

+ 20 - 0
src/main/java/com/zswl/dataservice/domain/docker/EnvModel.java

@@ -0,0 +1,20 @@
+package com.zswl.dataservice.domain.docker;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author TRX
+ * @date 2024/7/25
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class EnvModel {
+    @Schema(description = "key,如:name")
+    private String key;
+    @Schema(description = "值,如:李四")
+    private String value;
+}

+ 7 - 7
src/main/java/com/zswl/dataservice/domain/docker/Mount.java

@@ -14,15 +14,15 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class Mount {
-    @Schema(description = "Type")
-    @JsonProperty("Type")
-    private String Type = "bind";
+    @Schema(description = "Type,默认为bind")
+    @JsonProperty("type")
+    private String type = "bind";
 
     @Schema(description = "Source")
-    @JsonProperty("Source")
-    private String Source;
+    @JsonProperty("source")
+    private String source;
 
     @Schema(description = "Target")
-    @JsonProperty("Target")
-    private String Target;
+    @JsonProperty("target")
+    private String target;
 }

+ 3 - 3
src/main/java/com/zswl/dataservice/domain/docker/PortBinding.java

@@ -14,12 +14,12 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class PortBinding {
 
-    @Schema(description = "")
+    @Schema(description = "端口,如:8080")
     private String port;
 
     @Schema(description = "HostIp,如:0.0.0.0")
-    private String HostIp;
+    private String hostIp;
 
     @Schema(description = "端口,如:8088")
-    private String HostPort;
+    private String hostPort;
 }

+ 2 - 2
src/main/java/com/zswl/dataservice/domain/docker/RestartPolicy.java

@@ -15,10 +15,10 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class RestartPolicy {
 
-    @JsonProperty("Name")
+    @JsonProperty("name")
     private String name;
 
     @Schema(description = "MaximumRetryCount")
-    @JsonProperty("MaximumRetryCount")
+    @JsonProperty("maximumRetryCount")
     private Integer maximumRetryCount = 0;
 }

+ 0 - 27
src/main/java/com/zswl/dataservice/model/docker/DockerMetaMaxParam.java

@@ -1,27 +0,0 @@
-package com.zswl.dataservice.model.docker;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author TRX
- * @date 2024/7/25
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class DockerMetaMaxParam {
-    @Schema(description = "")
-    private String name;
-
-    @Schema(description = "")
-    private String registry;
-
-    @Schema(description = "")
-    private String repository;
-
-    @Schema(description = "")
-    private String tag;
-}

+ 2 - 1
src/main/java/com/zswl/dataservice/model/docker/DockerMetaModel.java

@@ -1,6 +1,7 @@
 package com.zswl.dataservice.model.docker;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.zswl.dataservice.domain.docker.EnvModel;
 import com.zswl.dataservice.domain.docker.Mount;
 import com.zswl.dataservice.domain.docker.PortBinding;
 import com.zswl.dataservice.domain.docker.RestartPolicy;
@@ -32,7 +33,7 @@ public class DockerMetaModel extends SuperModel {
     private String image;
 
     @Schema(description = "环境变量")
-    private List<String> env = new ArrayList<>();
+    private List<EnvModel> env = new ArrayList<>();
 
     @Schema(description = "networkTypes")
     private String networkTypes;

+ 4 - 2
src/main/java/com/zswl/dataservice/model/docker/DockerMetaParam.java

@@ -1,6 +1,7 @@
 package com.zswl.dataservice.model.docker;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.zswl.dataservice.domain.docker.EnvModel;
 import com.zswl.dataservice.domain.docker.Mount;
 import com.zswl.dataservice.domain.docker.PortBinding;
 import com.zswl.dataservice.domain.docker.RestartPolicy;
@@ -22,6 +23,7 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 public class DockerMetaParam extends SuperParam {
+
     @Schema(description = "分组名称", required = true)
     private String groupCode;
 
@@ -31,8 +33,8 @@ public class DockerMetaParam extends SuperParam {
     @Schema(description = "镜像名称", required = true)
     private String image;
 
-    @Schema(description = "环境变量")
-    private List<String> env = new ArrayList<>();
+    @Schema(description = "环境变量列表")
+    private List<EnvModel> env = new ArrayList<>();
 
     @Schema(description = "networkTypes")
     private String networkTypes;

+ 2 - 1
src/main/java/com/zswl/dataservice/model/docker/DockerMetaSearch.java

@@ -1,6 +1,7 @@
 package com.zswl.dataservice.model.docker;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.zswl.dataservice.domain.docker.EnvModel;
 import com.zswl.dataservice.domain.docker.Mount;
 import com.zswl.dataservice.domain.docker.PortBinding;
 import com.zswl.dataservice.domain.docker.RestartPolicy;
@@ -32,7 +33,7 @@ public class DockerMetaSearch extends SuperSearchParam {
     private String image;
 
     @Schema(description = "环境变量")
-    private List<String> env = new ArrayList<>();
+    private List<EnvModel> env = new ArrayList<>();
 
     @Schema(description = "networkTypes")
     private String networkTypes;