Преглед изворни кода

refactor: 删除无用老旧类

370774330@qq.com пре 5 година
родитељ
комит
36630cfa34

+ 0 - 47
common/src/main/java/seecoder/devcloud/common/constant/Constants.java

@@ -1,47 +0,0 @@
-package seecoder.devcloud.common.constant;
-
-public abstract class Constants {
-
-    public static final String NAME_PATTERN = "^[0-9a-zA-Z-]{8,}$";
-
-    //标签域名前缀
-    private static final String LABEL_PREFIX = "demo.seec.nju.cn";
-    //课程前缀
-    public static final String TYPE_LABEL = LABEL_PREFIX + "/type";
-    //描述
-    public static final String DESCRIPTION_LABEL = LABEL_PREFIX + "/description";
-    //应用
-    public static final String APPLICATION_LABEL = LABEL_PREFIX + "/app";
-
-    public static final String DEPLOY_ID_LABEL = LABEL_PREFIX + "/deployid";
-    // 用户namespace的label
-    public static final String USERSPACE_LABEL = LABEL_PREFIX +"/userspace";
-    // pod的label
-    public static final String SELECTOR_LABEL = LABEL_PREFIX + "/app";
-    // 非对外service的label
-    public static final String INTERNAL_LABEL = LABEL_PREFIX + "/internal";
-    // 对外service的label
-    public static final String EXTERNAL_LABEL = LABEL_PREFIX + "/external";
-    // 持久卷访问模式
-    public static final String STORAGE_ACCESS_MODE = "ReadWriteMany";
-    // 持久卷存储类型
-    public static final String STORAGE_CLASS = "glusterfs";
-
-    public static final String RESOURCE_STORAGE = "storage";
-
-    public static final String STARTS_AT_LABEL = LABEL_PREFIX + "/start";
-
-    public static final String ENDS_AT_LABEL = LABEL_PREFIX + "/end";
-
-    public static final String PRETTY_FORMAT = "true";
-
-    //cascade清除策略
-    //Deployment必须使用Foreground,否则只会删除Replica Set 不会删除底下的Pod
-    //https://github.com/kubernetes/kubeadm/issues/149#issuecomment-284766613
-    public static final String FOREGROUND_PROPAGATION_POLICY = "Foreground";
-
-    public static final String METADATA_NAME_SELECTOR = "metadata.name=";
-
-    public static final String DB_SECRET_NAME = "db-secret";
-
-}

+ 0 - 9
common/src/main/java/seecoder/devcloud/common/exceptions/AlreadyInExaminationException.java

@@ -1,9 +0,0 @@
-package seecoder.devcloud.common.exceptions;
-
-public class AlreadyInExaminationException extends ConflictException {
-	private static final String MESSAGE = "已经参加了所选考试!";
-
-	public AlreadyInExaminationException() {
-		super(MESSAGE);
-	}
-}

+ 0 - 11
common/src/main/java/seecoder/devcloud/common/exceptions/MalformedProblemException.java

@@ -1,11 +0,0 @@
-package seecoder.devcloud.common.exceptions;
-
-import org.springframework.http.HttpStatus;
-
-public class MalformedProblemException extends ServiceException {
-	private static final HttpStatus HTTP_STATUS = HttpStatus.BAD_REQUEST;
-
-	public MalformedProblemException(String message) {
-		super(HTTP_STATUS.value(), message);
-	}
-}

+ 0 - 13
common/src/main/java/seecoder/devcloud/common/serializer/CustomLocalDateTimeDeserializer.java

@@ -1,13 +0,0 @@
-package seecoder.devcloud.common.serializer;
-
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-
-import java.time.format.DateTimeFormatter;
-
-public class CustomLocalDateTimeDeserializer extends LocalDateTimeDeserializer {
-	private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm");
-
-	public CustomLocalDateTimeDeserializer() {
-		super(FORMATTER);
-	}
-}

+ 0 - 13
common/src/main/java/seecoder/devcloud/common/serializer/CustomLocalDateTimeSerializer.java

@@ -1,13 +0,0 @@
-package seecoder.devcloud.common.serializer;
-
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-
-import java.time.format.DateTimeFormatter;
-
-public class CustomLocalDateTimeSerializer extends LocalDateTimeSerializer {
-	private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm");
-
-	public CustomLocalDateTimeSerializer() {
-		super(FORMATTER);
-	}
-}

+ 0 - 32
common/src/main/java/seecoder/devcloud/common/serializer/TimestampLocalDateDeserializer.java

@@ -1,32 +0,0 @@
-package seecoder.devcloud.common.serializer;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-
-import java.io.IOException;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-
-public class TimestampLocalDateDeserializer extends JsonDeserializer<LocalDateTime> {
-	@Override
-	public LocalDateTime deserialize(JsonParser p, DeserializationContext context) throws IOException {
-		Long epochSecond = null;
-		if (p.hasToken(JsonToken.VALUE_NUMBER_INT)) {
-			epochSecond = p.getLongValue();
-		} else if (p.hasToken(JsonToken.VALUE_STRING)) {
-			String value = p.getText().trim();
-			try {
-				epochSecond = Long.valueOf(value);
-			} catch (NumberFormatException e) {
-				epochSecond = null;
-			}
-		}
-		if (epochSecond != null) {
-			return LocalDateTime.ofInstant(Instant.ofEpochSecond(epochSecond), ZoneId.systemDefault());
-		}
-		return null;
-	}
-}

+ 0 - 29
common/src/main/java/seecoder/devcloud/common/serializer/TimestampLocalDateTimeSerializer.java

@@ -1,29 +0,0 @@
-package seecoder.devcloud.common.serializer;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-
-public class TimestampLocalDateTimeSerializer extends LocalDateTimeSerializer {
-	@Override
-	protected LocalDateTimeSerializer withFormat(Boolean useTimestamp, DateTimeFormatter f, JsonFormat.Shape shape) {
-		return this;
-	}
-
-	@Override
-	public void serialize(LocalDateTime value, JsonGenerator g, SerializerProvider provider) throws IOException {
-		g.writeNumber(value.atZone(ZoneId.systemDefault()).toEpochSecond());
-	}
-
-	@Override
-	public void serializeWithType(LocalDateTime value, JsonGenerator g, SerializerProvider provider, TypeSerializer typeSer) throws IOException {
-		serialize(value, g, provider);
-	}
-}

+ 1 - 1
common/src/main/java/seecoder/devcloud/common/validate/FieldCompare.java

@@ -20,7 +20,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 @Constraint(validatedBy = FieldCompareValidator.class)
 @Documented
 public @interface FieldCompare {
-	String message() default "{com.moekr.moocoder.util.validate.FieldCompare}";
+	String message() default "{seecoder.devcloud.common.validate.FieldCompare}";
 
 	Class<?>[] groups() default {};
 

+ 1 - 1
common/src/main/java/seecoder/devcloud/common/validate/FieldEquals.java

@@ -19,7 +19,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 @Constraint(validatedBy = FieldEqualsValidator.class)
 @Documented
 public @interface FieldEquals {
-	String message() default "{com.moekr.moocoder.util.validate.FieldEquals}";
+	String message() default "{seecoder.devcloud.common.validate.FieldEquals}";
 
 	Class<?>[] groups() default {};
 

+ 1 - 0
core/src/main/java/seecoder/devcloud/core/pipeline/handler/K8sDeploymentHandler.java

@@ -66,6 +66,7 @@ public class K8sDeploymentHandler extends AbstractHandler {
         ContainerPort containerPort = ContainerPort.builder()
                 .port(port)
                 .build();
+
         //配置容器
         Container container = Container.builder()
                 .image(image)

+ 0 - 1
web/pom.xml

@@ -132,7 +132,6 @@
                 <version>2.3.4.RELEASE</version>
                 <configuration>
                     <mainClass>seecoder.devcloud.web.devcloudWebApplication</mainClass>
-                    <!--  todo 打包时需排除一些无法回滚的测试类  -->
                 </configuration>
                 <executions>
                     <execution>

+ 0 - 3
web/src/main/java/seecoder/devcloud/web/service/impl/user/UserServiceImpl.java

@@ -2,11 +2,9 @@ package seecoder.devcloud.web.service.impl.user;
 
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.digest.DigestUtils;
 import org.gitlab4j.api.GitLabApiException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.DependsOn;
 import org.springframework.data.domain.Sort;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -18,7 +16,6 @@ import org.springframework.util.Assert;
 import seecoder.devcloud.api.gitlab.GitlabApi;
 import seecoder.devcloud.api.gitlab.model.GitlabUser;
 import seecoder.devcloud.api.jenkins.JenkinsApi;
-import seecoder.devcloud.common.exceptions.Asserts;
 import seecoder.devcloud.common.exceptions.InvalidRequestException;
 import seecoder.devcloud.common.exceptions.ServiceException;
 import seecoder.devcloud.common.util.ToolKit;

+ 0 - 3
web/src/main/java/seecoder/devcloud/web/vo/user/UserVO.java

@@ -1,17 +1,14 @@
 package seecoder.devcloud.web.vo.user;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
-import seecoder.devcloud.common.serializer.TimestampLocalDateTimeSerializer;
 import seecoder.devcloud.web.enums.UserIdentity;
 import seecoder.devcloud.web.po.user.User;
 
 import java.sql.Timestamp;
-import java.time.LocalDateTime;
 
 @Data
 @NoArgsConstructor