|
@@ -7,7 +7,6 @@ import org.springframework.context.annotation.Configuration;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
|
|
|
|
|
import javax.validation.Valid;
|
|
import javax.validation.Valid;
|
|
|
-import javax.validation.constraints.Email;
|
|
|
|
|
import javax.validation.constraints.NotEmpty;
|
|
import javax.validation.constraints.NotEmpty;
|
|
|
|
|
|
|
|
@Data
|
|
@Data
|
|
@@ -20,8 +19,8 @@ public class ApplicationProperties {
|
|
|
private Gitlab gitlab = new Gitlab();
|
|
private Gitlab gitlab = new Gitlab();
|
|
|
@Valid
|
|
@Valid
|
|
|
private Docker docker = new Docker();
|
|
private Docker docker = new Docker();
|
|
|
- @Valid
|
|
|
|
|
- private Mail mail = new Mail();
|
|
|
|
|
|
|
+// @Valid
|
|
|
|
|
+// private Mail mail = new Mail();
|
|
|
@Valid
|
|
@Valid
|
|
|
private K8s k8s = new K8s();
|
|
private K8s k8s = new K8s();
|
|
|
@Valid
|
|
@Valid
|
|
@@ -65,14 +64,14 @@ public class ApplicationProperties {
|
|
|
private String registryPassword;
|
|
private String registryPassword;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- @Data
|
|
|
|
|
- public static class Mail {
|
|
|
|
|
- @Email
|
|
|
|
|
- @NotEmpty
|
|
|
|
|
- private String from;
|
|
|
|
|
- @NotEmpty
|
|
|
|
|
- private String personal = "MOOCODER";
|
|
|
|
|
- }
|
|
|
|
|
|
|
+// @Data
|
|
|
|
|
+// public static class Mail {
|
|
|
|
|
+// @Email
|
|
|
|
|
+// @NotEmpty
|
|
|
|
|
+// private String from;
|
|
|
|
|
+// @NotEmpty
|
|
|
|
|
+// private String personal = "MOOCODER";
|
|
|
|
|
+// }
|
|
|
|
|
|
|
|
|
|
|
|
|
@Data
|
|
@Data
|
