fix: build warning

都是lombok关于Builder和equal的warning

api/src/main/java/seecoder/devcloud/api/ApplicationProperties.java

@@ -51,8 +51,6 @@ public class ApplicationProperties {
 		private String webHookProxy;
 
 
-//		@NotEmpty
-//		private String username = "root";
         @NotNull
         private Integer userId = 1;
 
@@ -64,9 +62,7 @@ public class ApplicationProperties {
 		@NotEmpty
 		private String token;
 
-//		public String getGitProxy() {
-//			return StringUtils.defaultString(gitProxy, host);
-//		}
+
 	}
 
 	@Data

api/src/main/java/seecoder/devcloud/api/k8s/model/ConfigMap.java

@@ -4,10 +4,7 @@ package seecoder.devcloud.api.k8s.model;
 
 import io.kubernetes.client.openapi.models.V1ConfigMap;
 import io.kubernetes.client.openapi.models.V1ConfigMapBuilder;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -16,18 +13,18 @@ import java.util.Map;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@EqualsAndHashCode(callSuper=false)
 public class ConfigMap extends K8sAbstractObject<V1ConfigMap> {
 
     public static final String API_VERSION = "v1";
 
     public static final String KIND = "ConfigMap";
-
+    @Builder.Default
     private Map<String, String> data = new HashMap<>();
 
 
     public ConfigMap(V1ConfigMap v1ConfigMap) {
         super(v1ConfigMap);
-        this.data = v1ConfigMap.getData();
     }
 
     public void merge(V1ConfigMap v1ConfigMap) {

api/src/main/java/seecoder/devcloud/api/k8s/model/Container.java

@@ -32,11 +32,14 @@ public class Container implements K8sObjectTransformer<V1Container> {
     /* 启动指令 */
     private List<String> command;
 
+    @Builder.Default
     /* 环境变量 */
     private Map<String, String> env = new HashMap<>();
 
+    @Builder.Default
     private Set<ContainerPort> ports = new HashSet<>();
 
+    @Builder.Default
     private List<VolumeMount> volumeMounts = new ArrayList<>();
 
     @Data
@@ -51,6 +54,7 @@ public class Container implements K8sObjectTransformer<V1Container> {
 
         String subPath;
 
+        @Builder.Default
         Boolean readOnly = true;
 
         public VolumeMount(V1VolumeMount v1VolumeMount) {

api/src/main/java/seecoder/devcloud/api/k8s/model/Deployment.java

@@ -1,10 +1,7 @@
 package seecoder.devcloud.api.k8s.model;
 
 import io.kubernetes.client.openapi.models.*;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import org.hibernate.validator.constraints.Range;
 import org.springframework.data.annotation.ReadOnlyProperty;
 
@@ -22,6 +19,7 @@ import java.util.stream.Collectors;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@EqualsAndHashCode(callSuper=false)
 public class Deployment extends K8sAbstractObject<V1Deployment> {
 
     public static final String API_VERSION = "apps/v1";
@@ -34,12 +32,16 @@ public class Deployment extends K8sAbstractObject<V1Deployment> {
 
     public static final String DEFAULT_UPDATE_STRATEGY = "Recreate";
 
+    @Builder.Default
     private List<Container> containers = new ArrayList<>();
 
+    @Builder.Default
     private List<String> imagePullSecrets = new ArrayList<>();
 
+    @Builder.Default
     private List<V1Volume> volumes = new ArrayList<>();
 
+    @Builder.Default
     private Map<String, String> nodeSelectors = new HashMap<>();
     @Range(min = 1, max = 3)
     private int replicas;
@@ -47,11 +49,13 @@ public class Deployment extends K8sAbstractObject<V1Deployment> {
     /**
      * 超过timeout时间未完成启动则提示启动超时
      */
+    @Builder.Default
     private int timeout = DEFAULT_PROGRESS_DEADLINE_SECONDS;
 
     /**
      * 保留历史replica set的个数
      */
+    @Builder.Default
     private int revisionHistoryLimit = DEFAULT_REVISION_HISTORY_LIMIT;
 
     @ReadOnlyProperty

api/src/main/java/seecoder/devcloud/api/k8s/model/Ingress.java

@@ -16,6 +16,7 @@ import java.util.stream.Collectors;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@EqualsAndHashCode(callSuper=false)
 public class Ingress extends K8sAbstractObject<ExtensionsV1beta1Ingress> {
 
     public static final String API_VERSION = "extensions/v1beta1";
@@ -29,6 +30,7 @@ public class Ingress extends K8sAbstractObject<ExtensionsV1beta1Ingress> {
     //重定向的路径，默认为根路径
     private static final String redirectPath = DEFAULT_REWRITE_PATH;
 
+    @Builder.Default
     /*Ingress能暴露HTTP和HTTPS协议口，目前暂不支持HTTPS协议*/
     private List<IngressRule> httpRules = new ArrayList<>();
 
@@ -100,6 +102,7 @@ public class Ingress extends K8sAbstractObject<ExtensionsV1beta1Ingress> {
 
         private String host;
 
+        @Builder.Default
         private Set<IngressPath> ruleValues = new HashSet<>();
 
         public IngressRule(String host) {

api/src/main/java/seecoder/devcloud/api/k8s/model/K8sObjectRequest.java

@@ -16,8 +16,10 @@ public class K8sObjectRequest {
 
     private String namespace;
 
+    @Builder.Default
     private Map<String, String> labels = new HashMap<>();
 
+    @Builder.Default
     private Map<String, String> annotations = new HashMap<>();
 
     private LabelSelector selector;

api/src/main/java/seecoder/devcloud/api/k8s/model/PersistentVolumeClaim.java

@@ -5,10 +5,7 @@ import io.kubernetes.client.openapi.models.V1PersistentVolumeClaim;
 import io.kubernetes.client.openapi.models.V1PersistentVolumeClaimBuilder;
 import io.kubernetes.client.openapi.models.V1PersistentVolumeClaimSpecBuilder;
 import io.kubernetes.client.openapi.models.V1ResourceRequirementsBuilder;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -18,6 +15,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@EqualsAndHashCode(callSuper=false)
 public class PersistentVolumeClaim extends K8sAbstractObject<V1PersistentVolumeClaim> {
 
     public static final String API_VERSION = "v1";
@@ -28,6 +26,7 @@ public class PersistentVolumeClaim extends K8sAbstractObject<V1PersistentVolumeC
 
     private String volumeMode;
 
+    @Builder.Default
     private List<String> accessModes = new ArrayList<>();
 
     private Quantity quantity;

api/src/main/java/seecoder/devcloud/api/k8s/model/Service.java

@@ -4,10 +4,7 @@ import io.kubernetes.client.openapi.models.V1Service;
 import io.kubernetes.client.openapi.models.V1ServiceBuilder;
 import io.kubernetes.client.openapi.models.V1ServiceSpec;
 import io.kubernetes.client.openapi.models.V1ServiceSpecBuilder;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -19,6 +16,7 @@ import java.util.stream.Collectors;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@EqualsAndHashCode(callSuper=false)
 public class Service extends K8sAbstractObject<V1Service> {
 
     public static final String API_VERSION = "v1";
@@ -29,12 +27,13 @@ public class Service extends K8sAbstractObject<V1Service> {
 
     private String namespace;
 
+    @Builder.Default
     private Map<String, String> labels = new HashMap<>();
-
+    @Builder.Default
     private Map<String, String> annotations = new HashMap<>();
-
+    @Builder.Default
     private Set<ServicePort> servicePorts = new HashSet<>();
-
+    @Builder.Default
     private Map<String, String> selectors = new HashMap<>();
 
     public Service(V1Service v1Service) {

common/src/main/java/seecoder/devcloud/common/validate/FieldCompare.java

@@ -1,7 +1,7 @@
 package seecoder.devcloud.common.validate;
 
-import com.moekr.moocoder.util.validate.FieldCompare.List;
-import com.moekr.moocoder.util.validate.validator.FieldCompareValidator;
+
+import seecoder.devcloud.common.validate.validator.FieldCompareValidator;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
@@ -16,7 +16,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 @Target({TYPE, ANNOTATION_TYPE})
 @Retention(RUNTIME)
-@Repeatable(List.class)
+@Repeatable(FieldCompare.List.class)
 @Constraint(validatedBy = FieldCompareValidator.class)
 @Documented
 public @interface FieldCompare {

web/src/main/java/seecoder/devcloud/web/config/SwaggerConfig.java

@@ -12,12 +12,6 @@ import springfox.documentation.oas.annotations.EnableOpenApi;
 import springfox.documentation.service.ApiInfo;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
-
-import java.util.function.Predicate;
-
-import static springfox.documentation.builders.PathSelectors.regex;
 
 /**
  * @author PuHong Weng

web/src/main/java/seecoder/devcloud/web/vo/user/GroupVO.java

@@ -24,13 +24,13 @@ public class GroupVO {
     private String code;
     private List<UserSerializer> members;
 
-    public GroupVO(Group group) {
-        this.id=group.getId();
-        this.name=group.getName();
-        this.code=group.getShareLink();
-        this.members=group.getMembers().stream()
-                .map(UserSerializer::new)
-                .collect(Collectors.toList());
-    }
+//    public GroupVO(Group group) {
+//        this.id=group.getId();
+//        this.name=group.getName();
+//        this.code=group.getShareLink();
+//        this.members=group.getMembers().stream()
+//                .map(UserSerializer::new)
+//                .collect(Collectors.toList());
+//    }
 
 }

web/src/main/java/seecoder/devcloud/web/vo/user/UserSerializer.java

@@ -27,7 +27,6 @@ public class UserSerializer {
         this.role=user.getRole();
         this.username=user.getUsername();
         this.nickname=user.getNickname();
-        this.bio=user.getBio();
         this.email=user.getEmail();
 
     }

web/src/main/resources/application-wph.yml

@@ -1,32 +1,29 @@
 spring:
-
   datasource:
     url: jdbc:mysql://localhost:3306/seecoder?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
     username: root
     password: 123456
-  jpa:
-    hibernate:
-      ddl-auto: update
-      naming:
-        implicit-strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
-        physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-    database-platform: org.hibernate.dialect.MySQL57InnoDBDialec
-
 
+  mail:
+    host: smtp.qq.com
+    username: 370774330@qq.com
+    password: Wshengdasogood0
 server:
   port: 8080
 
+
+
 seecoder:
   k8s:
     api-server: https://192.168.99.105:8443
     token: eyJhbGciOiJSUzI1NiIsImtpZCI6IjBmSXc4RlRjNUpBYVpGYWc4QzRDY1MzUWJad1JMdFhKcDI1cngzWGtiRlkifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJkZXZjbG91ZCIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJkZWZhdWx0LXRva2VuLXNicXY4Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9zZXJ2aWNlLWFjY291bnQubmFtZSI6ImRlZmF1bHQiLCJrdWJlcm5ldGVzLmlvL3NlcnZpY2VhY2NvdW50L3NlcnZpY2UtYWNjb3VudC51aWQiOiI5NmIxNzU1ZS0zZjE3LTQ1ZTctODFmYi01MTRhODA3NDRhMzQiLCJzdWIiOiJzeXN0ZW06c2VydmljZWFjY291bnQ6ZGV2Y2xvdWQ6ZGVmYXVsdCJ9.W0Y1lR6LBi1ZjylBx35YeqYuq2u2AqH-ayK4FD-LDfC26E89DanOwSv9XLrRMnnDBZFS_ZCRBumbnDeMiS5vw2x7-QnrDqj1M5u9FB2fIJsz2LyUkOhATZZmTzj_Uhewvvg09aDKh16ttj6ZX27m-KVk_6MP-VfiuvZnCVxDbqRkRjK-zsor4ty1CEATPyKK-tvugAwS0RFNHUL94DamfZAq_t1PSnH5ZtEHq0uEMZxY2c7j6u9d_aD9lphm_ZpCy_C8OCHfanM21CQPDHlcJTW_aiOO6bAp8qdc1egPO5uIamHl6Zm0N3RkcsRp4DGOHrltTV9y_cGZHXSWmRHfxw
     debugging: true
   gitlab:
-    host: gitlab.192.168.99.105.nip.io
+    host: https://gitlab.192.168.99.105.nip.io
     webHookProxy: http://localhost:3000
     token: wXDeETv2Kmt-JhiApJ9H
   mail:
-    from: seecoder@163.com
+    from: 370774330@qq.com
 
 
   jenkins: