Kaynağa Gözat

feat: query模块用于内部查询分析,将包名重构为统一的cn.seecoder

370774330@qq.com 5 yıl önce
ebeveyn
işleme
3866d8df2e
100 değiştirilmiş dosya ile 329 ekleme ve 333 silme
  1. 1 1
      api/src/main/java/cn/seecoder/api/ApplicationProperties.java
  2. 7 5
      api/src/main/java/cn/seecoder/api/DevcloudApiAutoConfiguration.java
  3. 1 1
      api/src/main/java/cn/seecoder/api/docker/DockerApi.java
  4. 3 3
      api/src/main/java/cn/seecoder/api/docker/impl/DockerApiImpl.java
  5. 1 1
      api/src/main/java/cn/seecoder/api/git/GitApi.java
  6. 3 3
      api/src/main/java/cn/seecoder/api/git/impl/GitApiImpl.java
  7. 3 3
      api/src/main/java/cn/seecoder/api/k8s/AbstractApi.java
  8. 7 0
      api/src/main/java/cn/seecoder/api/k8s/ConfigMapApi.java
  9. 4 4
      api/src/main/java/cn/seecoder/api/k8s/DeploymentApi.java
  10. 2 2
      api/src/main/java/cn/seecoder/api/k8s/ExecApi.java
  11. 2 2
      api/src/main/java/cn/seecoder/api/k8s/IngressApi.java
  12. 2 2
      api/src/main/java/cn/seecoder/api/k8s/K8sApiConfiguration.java
  13. 1 1
      api/src/main/java/cn/seecoder/api/k8s/K8sConstants.java
  14. 1 1
      api/src/main/java/cn/seecoder/api/k8s/LogApi.java
  15. 8 0
      api/src/main/java/cn/seecoder/api/k8s/NamespaceApi.java
  16. 7 0
      api/src/main/java/cn/seecoder/api/k8s/PersistentVolumeClaimApi.java
  17. 7 0
      api/src/main/java/cn/seecoder/api/k8s/PodApi.java
  18. 3 3
      api/src/main/java/cn/seecoder/api/k8s/SecretApi.java
  19. 8 0
      api/src/main/java/cn/seecoder/api/k8s/ServiceApi.java
  20. 1 1
      api/src/main/java/cn/seecoder/api/k8s/WatchApi.java
  21. 1 1
      api/src/main/java/cn/seecoder/api/k8s/exception/K8sApiException.java
  22. 11 11
      api/src/main/java/cn/seecoder/api/k8s/impl/ConfigMapApiImpl.java
  23. 11 11
      api/src/main/java/cn/seecoder/api/k8s/impl/DeploymentApiImpl.java
  24. 8 10
      api/src/main/java/cn/seecoder/api/k8s/impl/ExecApiImpl.java
  25. 10 10
      api/src/main/java/cn/seecoder/api/k8s/impl/IngressApiImpl.java
  26. 6 7
      api/src/main/java/cn/seecoder/api/k8s/impl/LogApiImpl.java
  27. 20 23
      api/src/main/java/cn/seecoder/api/k8s/impl/NamespaceApiImpl.java
  28. 12 12
      api/src/main/java/cn/seecoder/api/k8s/impl/PersistentVolumeClaimImpl.java
  29. 11 11
      api/src/main/java/cn/seecoder/api/k8s/impl/PodApiImpl.java
  30. 7 7
      api/src/main/java/cn/seecoder/api/k8s/impl/SecretApiImpl.java
  31. 10 10
      api/src/main/java/cn/seecoder/api/k8s/impl/ServiceApiImpl.java
  32. 3 3
      api/src/main/java/cn/seecoder/api/k8s/impl/WatchApiImpl.java
  33. 1 1
      api/src/main/java/cn/seecoder/api/k8s/model/ConfigMap.java
  34. 1 1
      api/src/main/java/cn/seecoder/api/k8s/model/Container.java
  35. 1 1
      api/src/main/java/cn/seecoder/api/k8s/model/ContainerPort.java
  36. 1 1
      api/src/main/java/cn/seecoder/api/k8s/model/CpuQuantity.java
  37. 1 1
      api/src/main/java/cn/seecoder/api/k8s/model/Deployment.java
  38. 1 1
      api/src/main/java/cn/seecoder/api/k8s/model/DeploymentStatus.java
  39. 1 1
      api/src/main/java/cn/seecoder/api/k8s/model/HttpGetAction.java
  40. 1 1
      api/src/main/java/cn/seecoder/api/k8s/model/Ingress.java
  41. 1 1
      api/src/main/java/cn/seecoder/api/k8s/model/K8sAbstractObject.java
  42. 1 1
      api/src/main/java/cn/seecoder/api/k8s/model/K8sObject.java
  43. 1 1
      api/src/main/java/cn/seecoder/api/k8s/model/K8sObjectRequest.java
  44. 1 1
      api/src/main/java/cn/seecoder/api/k8s/model/K8sObjectTransformer.java
  45. 1 1
      api/src/main/java/cn/seecoder/api/k8s/model/LabelSelector.java
  46. 2 2
      api/src/main/java/cn/seecoder/api/k8s/model/Namespace.java
  47. 1 1
      api/src/main/java/cn/seecoder/api/k8s/model/PersistentVolumeClaim.java
  48. 1 1
      api/src/main/java/cn/seecoder/api/k8s/model/Pod.java
  49. 1 1
      api/src/main/java/cn/seecoder/api/k8s/model/PodStatus.java
  50. 1 1
      api/src/main/java/cn/seecoder/api/k8s/model/Service.java
  51. 1 1
      api/src/main/java/cn/seecoder/api/k8s/model/ServicePort.java
  52. 1 1
      api/src/main/java/cn/seecoder/api/k8s/util/SecretTypeEnum.java
  53. 2 2
      api/src/main/java/cn/seecoder/api/k8s/vo/SecretVO.java
  54. 0 7
      api/src/main/java/seecoder/devcloud/api/k8s/ConfigMapApi.java
  55. 0 8
      api/src/main/java/seecoder/devcloud/api/k8s/NamespaceApi.java
  56. 0 7
      api/src/main/java/seecoder/devcloud/api/k8s/PersistentVolumeClaimApi.java
  57. 0 7
      api/src/main/java/seecoder/devcloud/api/k8s/PodApi.java
  58. 0 8
      api/src/main/java/seecoder/devcloud/api/k8s/ServiceApi.java
  59. 1 1
      api/src/main/resources/META-INF/spring.factories
  60. 3 3
      common/src/main/java/cn/seecoder/common/CommonAutoConfiguration.java
  61. 1 1
      common/src/main/java/cn/seecoder/common/exceptions/AccessDeniedException.java
  62. 1 1
      common/src/main/java/cn/seecoder/common/exceptions/Asserts.java
  63. 1 1
      common/src/main/java/cn/seecoder/common/exceptions/ConflictException.java
  64. 1 1
      common/src/main/java/cn/seecoder/common/exceptions/EntityConflictException.java
  65. 1 1
      common/src/main/java/cn/seecoder/common/exceptions/EntityNotAvailableException.java
  66. 1 1
      common/src/main/java/cn/seecoder/common/exceptions/EntityNotFoundException.java
  67. 1 1
      common/src/main/java/cn/seecoder/common/exceptions/InvalidRequestException.java
  68. 1 1
      common/src/main/java/cn/seecoder/common/exceptions/ServiceException.java
  69. 1 1
      common/src/main/java/cn/seecoder/common/util/DateUtil.java
  70. 1 1
      common/src/main/java/cn/seecoder/common/util/FileUtil.java
  71. 1 1
      common/src/main/java/cn/seecoder/common/util/JwtTokenUtil.java
  72. 1 1
      common/src/main/java/cn/seecoder/common/util/LoggerUtil.java
  73. 1 1
      common/src/main/java/cn/seecoder/common/util/Method.java
  74. 1 1
      common/src/main/java/cn/seecoder/common/util/RandomStringUtil.java
  75. 1 1
      common/src/main/java/cn/seecoder/common/util/SpringUtil.java
  76. 1 1
      common/src/main/java/cn/seecoder/common/util/ToolKit.java
  77. 1 1
      common/src/main/resources/META-INF/spring.factories
  78. 1 2
      core/src/main/java/cn/seecoder/core/CoreApplication.java
  79. 1 1
      core/src/main/java/cn/seecoder/core/commit/CommitResolver.java
  80. 1 1
      core/src/main/java/cn/seecoder/core/commit/CommitRule.java
  81. 1 1
      core/src/main/java/cn/seecoder/core/commit/CommitState.java
  82. 1 1
      core/src/main/java/cn/seecoder/core/commit/CommitType.java
  83. 2 2
      core/src/main/java/cn/seecoder/core/pipeline/Context.java
  84. 1 1
      core/src/main/java/cn/seecoder/core/pipeline/Handler.java
  85. 1 1
      core/src/main/java/cn/seecoder/core/pipeline/Pipeline.java
  86. 1 1
      core/src/main/java/cn/seecoder/core/pipeline/PipelineException.java
  87. 4 4
      core/src/main/java/cn/seecoder/core/pipeline/PipelineFactory.java
  88. 4 3
      core/src/main/java/cn/seecoder/core/pipeline/config/HandlerConfigTable.java
  89. 4 4
      core/src/main/java/cn/seecoder/core/pipeline/handler/AbstractHandler.java
  90. 7 7
      core/src/main/java/cn/seecoder/core/pipeline/handler/JavaImageBuildHandler.java
  91. 14 14
      core/src/main/java/cn/seecoder/core/pipeline/handler/K8sDeploymentHandler.java
  92. 10 10
      core/src/main/java/cn/seecoder/core/pipeline/handler/K8sIngressHandler.java
  93. 9 9
      core/src/main/java/cn/seecoder/core/pipeline/handler/K8sNamespaceHandler.java
  94. 10 10
      core/src/main/java/cn/seecoder/core/pipeline/handler/K8sServiceHandler.java
  95. 7 7
      core/src/main/java/cn/seecoder/core/pipeline/handler/NodeImageBuildHandler.java
  96. 5 5
      core/src/main/java/cn/seecoder/core/pipeline/inspector/PipelineInspector.java
  97. 2 2
      core/src/main/java/cn/seecoder/core/pipeline/inspector/PipelineInspectorFactory.java
  98. 5 5
      core/src/main/java/cn/seecoder/core/pipeline/pipeline/PipelineImpl.java
  99. 2 2
      core/src/main/java/cn/seecoder/core/pipeline/template/PipelineTemplateTable.java
  100. 10 10
      core/src/test/java/cn/seecoder/core/CoreApplicationTests.java

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/ApplicationProperties.java → api/src/main/java/cn/seecoder/api/ApplicationProperties.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api;
+package cn.seecoder.api;
 
 import lombok.Data;
 import org.hibernate.validator.constraints.URL;

+ 7 - 5
api/src/main/java/seecoder/devcloud/api/DevcloudApiAutoConfiguration.java → api/src/main/java/cn/seecoder/api/DevcloudApiAutoConfiguration.java

@@ -1,15 +1,17 @@
-package seecoder.devcloud.api;
+package cn.seecoder.api;
 
+import cn.seecoder.api.k8s.*;
+import cn.seecoder.api.k8s.impl.*;
 import com.nju.edu.gitlab.SeecoderGitlabApi;
 import com.nju.edu.gitlab.SeecoderGitlabClient;
 import com.spotify.docker.client.exceptions.DockerCertificateException;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import seecoder.devcloud.api.docker.DockerApi;
-import seecoder.devcloud.api.docker.impl.DockerApiImpl;
-import seecoder.devcloud.api.git.GitApi;
-import seecoder.devcloud.api.git.impl.GitApiImpl;
+import cn.seecoder.api.docker.DockerApi;
+import cn.seecoder.api.docker.impl.DockerApiImpl;
+import cn.seecoder.api.git.GitApi;
+import cn.seecoder.api.git.impl.GitApiImpl;
 import seecoder.devcloud.api.k8s.*;
 import seecoder.devcloud.api.k8s.impl.*;
 

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/docker/DockerApi.java → api/src/main/java/cn/seecoder/api/docker/DockerApi.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.docker;
+package cn.seecoder.api.docker;
 
 import com.spotify.docker.client.ProgressHandler;
 import com.spotify.docker.client.messages.Image;

+ 3 - 3
api/src/main/java/seecoder/devcloud/api/docker/impl/DockerApiImpl.java → api/src/main/java/cn/seecoder/api/docker/impl/DockerApiImpl.java

@@ -1,6 +1,7 @@
-package seecoder.devcloud.api.docker.impl;
+package cn.seecoder.api.docker.impl;
 
 
+import cn.seecoder.api.ApplicationProperties;
 import com.spotify.docker.client.*;
 import com.spotify.docker.client.auth.ConfigFileRegistryAuthSupplier;
 import com.spotify.docker.client.auth.RegistryAuthSupplier;
@@ -12,8 +13,7 @@ import lombok.extern.apachecommons.CommonsLog;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.system.ApplicationHome;
 import org.springframework.stereotype.Component;
-import seecoder.devcloud.api.ApplicationProperties;
-import seecoder.devcloud.api.docker.DockerApi;
+import cn.seecoder.api.docker.DockerApi;
 
 import java.io.File;
 import java.io.IOException;

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/git/GitApi.java → api/src/main/java/cn/seecoder/api/git/GitApi.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.git;
+package cn.seecoder.api.git;
 
 import org.eclipse.jgit.api.Git;
 

+ 3 - 3
api/src/main/java/seecoder/devcloud/api/git/impl/GitApiImpl.java → api/src/main/java/cn/seecoder/api/git/impl/GitApiImpl.java

@@ -1,13 +1,13 @@
-package seecoder.devcloud.api.git.impl;
+package cn.seecoder.api.git.impl;
 
 
+import cn.seecoder.api.ApplicationProperties;
+import cn.seecoder.api.git.GitApi;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.transport.CredentialsProvider;
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import seecoder.devcloud.api.ApplicationProperties;
-import seecoder.devcloud.api.git.GitApi;
 
 import java.io.File;
 

+ 3 - 3
api/src/main/java/seecoder/devcloud/api/k8s/AbstractApi.java → api/src/main/java/cn/seecoder/api/k8s/AbstractApi.java

@@ -1,8 +1,8 @@
-package seecoder.devcloud.api.k8s;
+package cn.seecoder.api.k8s;
 
 
-import seecoder.devcloud.api.k8s.model.K8sAbstractObject;
-import seecoder.devcloud.api.k8s.model.K8sObjectRequest;
+import cn.seecoder.api.k8s.model.K8sAbstractObject;
+import cn.seecoder.api.k8s.model.K8sObjectRequest;
 
 import java.util.List;
 

+ 7 - 0
api/src/main/java/cn/seecoder/api/k8s/ConfigMapApi.java

@@ -0,0 +1,7 @@
+package cn.seecoder.api.k8s;
+
+
+import cn.seecoder.api.k8s.model.ConfigMap;
+
+public interface ConfigMapApi extends AbstractApi<ConfigMap> {
+}

+ 4 - 4
api/src/main/java/seecoder/devcloud/api/k8s/DeploymentApi.java → api/src/main/java/cn/seecoder/api/k8s/DeploymentApi.java

@@ -1,9 +1,9 @@
-package seecoder.devcloud.api.k8s;
+package cn.seecoder.api.k8s;
 
 
-import seecoder.devcloud.api.k8s.exception.K8sApiException;
-import seecoder.devcloud.api.k8s.model.Deployment;
-import seecoder.devcloud.api.k8s.model.DeploymentStatus;
+import cn.seecoder.api.k8s.exception.K8sApiException;
+import cn.seecoder.api.k8s.model.Deployment;
+import cn.seecoder.api.k8s.model.DeploymentStatus;
 
 /**
  * author: rale

+ 2 - 2
api/src/main/java/seecoder/devcloud/api/k8s/ExecApi.java → api/src/main/java/cn/seecoder/api/k8s/ExecApi.java

@@ -1,7 +1,7 @@
-package seecoder.devcloud.api.k8s;
+package cn.seecoder.api.k8s;
 
 
-import seecoder.devcloud.api.k8s.exception.K8sApiException;
+import cn.seecoder.api.k8s.exception.K8sApiException;
 
 import java.util.List;
 

+ 2 - 2
api/src/main/java/seecoder/devcloud/api/k8s/IngressApi.java → api/src/main/java/cn/seecoder/api/k8s/IngressApi.java

@@ -1,7 +1,7 @@
-package seecoder.devcloud.api.k8s;
+package cn.seecoder.api.k8s;
 
 
-import seecoder.devcloud.api.k8s.model.Ingress;
+import cn.seecoder.api.k8s.model.Ingress;
 
 /**
  * author: rale

+ 2 - 2
api/src/main/java/seecoder/devcloud/api/k8s/K8sApiConfiguration.java → api/src/main/java/cn/seecoder/api/k8s/K8sApiConfiguration.java

@@ -1,5 +1,6 @@
-package seecoder.devcloud.api.k8s;
+package cn.seecoder.api.k8s;
 
+import cn.seecoder.api.ApplicationProperties;
 import io.kubernetes.client.Exec;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.apis.AppsV1Api;
@@ -8,7 +9,6 @@ import io.kubernetes.client.openapi.apis.ExtensionsV1beta1Api;
 import io.kubernetes.client.util.Config;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import seecoder.devcloud.api.ApplicationProperties;
 
 
 @Configuration

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/K8sConstants.java → api/src/main/java/cn/seecoder/api/k8s/K8sConstants.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s;
+package cn.seecoder.api.k8s;
 
 public class K8sConstants {
 

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/LogApi.java → api/src/main/java/cn/seecoder/api/k8s/LogApi.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s;
+package cn.seecoder.api.k8s;
 
 import java.time.LocalDateTime;
 

+ 8 - 0
api/src/main/java/cn/seecoder/api/k8s/NamespaceApi.java

@@ -0,0 +1,8 @@
+package cn.seecoder.api.k8s;
+
+
+import cn.seecoder.api.k8s.model.Namespace;
+
+public interface NamespaceApi extends AbstractApi<Namespace> {
+
+}

+ 7 - 0
api/src/main/java/cn/seecoder/api/k8s/PersistentVolumeClaimApi.java

@@ -0,0 +1,7 @@
+package cn.seecoder.api.k8s;
+
+
+import cn.seecoder.api.k8s.model.PersistentVolumeClaim;
+
+public interface PersistentVolumeClaimApi extends AbstractApi<PersistentVolumeClaim> {
+}

+ 7 - 0
api/src/main/java/cn/seecoder/api/k8s/PodApi.java

@@ -0,0 +1,7 @@
+package cn.seecoder.api.k8s;
+
+
+import cn.seecoder.api.k8s.model.Pod;
+
+public interface PodApi extends AbstractApi<Pod> {
+}

+ 3 - 3
api/src/main/java/seecoder/devcloud/api/k8s/SecretApi.java → api/src/main/java/cn/seecoder/api/k8s/SecretApi.java

@@ -1,7 +1,7 @@
-package seecoder.devcloud.api.k8s;
+package cn.seecoder.api.k8s;
 
-import seecoder.devcloud.api.k8s.util.SecretTypeEnum;
-import seecoder.devcloud.api.k8s.vo.SecretVO;
+import cn.seecoder.api.k8s.vo.SecretVO;
+import cn.seecoder.api.k8s.util.SecretTypeEnum;
 
 import java.util.List;
 import java.util.Map;

+ 8 - 0
api/src/main/java/cn/seecoder/api/k8s/ServiceApi.java

@@ -0,0 +1,8 @@
+package cn.seecoder.api.k8s;
+
+
+import cn.seecoder.api.k8s.model.Service;
+
+public interface ServiceApi extends AbstractApi<Service>{
+
+}

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/WatchApi.java → api/src/main/java/cn/seecoder/api/k8s/WatchApi.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s;
+package cn.seecoder.api.k8s;
 
 /**
  * author: rale

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/exception/K8sApiException.java → api/src/main/java/cn/seecoder/api/k8s/exception/K8sApiException.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.exception;
+package cn.seecoder.api.k8s.exception;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

+ 11 - 11
api/src/main/java/seecoder/devcloud/api/k8s/impl/ConfigMapApiImpl.java → api/src/main/java/cn/seecoder/api/k8s/impl/ConfigMapApiImpl.java

@@ -1,6 +1,8 @@
-package seecoder.devcloud.api.k8s.impl;
+package cn.seecoder.api.k8s.impl;
 
 
+import cn.seecoder.api.k8s.model.ConfigMap;
+import cn.seecoder.api.k8s.model.LabelSelector;
 import com.google.gson.JsonSyntaxException;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
@@ -11,21 +13,19 @@ import io.kubernetes.client.openapi.models.V1DeleteOptionsBuilder;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import seecoder.devcloud.api.k8s.ConfigMapApi;
-import seecoder.devcloud.api.k8s.exception.K8sApiException;
-import seecoder.devcloud.api.k8s.model.ConfigMap;
-import seecoder.devcloud.api.k8s.model.K8sObjectRequest;
-import seecoder.devcloud.api.k8s.model.LabelSelector;
-import seecoder.devcloud.common.util.LoggerUtil;
+import cn.seecoder.api.k8s.ConfigMapApi;
+import cn.seecoder.api.k8s.exception.K8sApiException;
+import cn.seecoder.api.k8s.model.K8sObjectRequest;
+import cn.seecoder.common.util.LoggerUtil;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static seecoder.devcloud.api.k8s.K8sConstants.FOREGROUND_PROPAGATION_POLICY;
-import static seecoder.devcloud.api.k8s.K8sConstants.PRETTY_FORMAT;
-import static seecoder.devcloud.api.k8s.exception.K8sApiException.ALREADY_EXIST;
-import static seecoder.devcloud.api.k8s.exception.K8sApiException.NOT_FOUND;
+import static cn.seecoder.api.k8s.K8sConstants.FOREGROUND_PROPAGATION_POLICY;
+import static cn.seecoder.api.k8s.K8sConstants.PRETTY_FORMAT;
+import static cn.seecoder.api.k8s.exception.K8sApiException.ALREADY_EXIST;
+import static cn.seecoder.api.k8s.exception.K8sApiException.NOT_FOUND;
 
 
 @Service

+ 11 - 11
api/src/main/java/seecoder/devcloud/api/k8s/impl/DeploymentApiImpl.java → api/src/main/java/cn/seecoder/api/k8s/impl/DeploymentApiImpl.java

@@ -1,6 +1,8 @@
-package seecoder.devcloud.api.k8s.impl;
+package cn.seecoder.api.k8s.impl;
 
 
+import cn.seecoder.api.k8s.model.K8sObjectRequest;
+import cn.seecoder.api.k8s.model.LabelSelector;
 import com.google.gson.JsonSyntaxException;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.apis.AppsV1Api;
@@ -11,21 +13,19 @@ import io.kubernetes.client.openapi.models.V1DeploymentList;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import seecoder.devcloud.api.k8s.DeploymentApi;
-import seecoder.devcloud.api.k8s.exception.K8sApiException;
-import seecoder.devcloud.api.k8s.model.Deployment;
-import seecoder.devcloud.api.k8s.model.DeploymentStatus;
-import seecoder.devcloud.api.k8s.model.K8sObjectRequest;
-import seecoder.devcloud.api.k8s.model.LabelSelector;
-import seecoder.devcloud.common.util.LoggerUtil;
+import cn.seecoder.api.k8s.DeploymentApi;
+import cn.seecoder.api.k8s.exception.K8sApiException;
+import cn.seecoder.api.k8s.model.Deployment;
+import cn.seecoder.api.k8s.model.DeploymentStatus;
+import cn.seecoder.common.util.LoggerUtil;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static seecoder.devcloud.api.k8s.K8sConstants.FOREGROUND_PROPAGATION_POLICY;
-import static seecoder.devcloud.api.k8s.K8sConstants.PRETTY_FORMAT;
-import static seecoder.devcloud.api.k8s.exception.K8sApiException.*;
+import static cn.seecoder.api.k8s.K8sConstants.FOREGROUND_PROPAGATION_POLICY;
+import static cn.seecoder.api.k8s.K8sConstants.PRETTY_FORMAT;
+import static cn.seecoder.api.k8s.exception.K8sApiException.*;
 
 
 /**

+ 8 - 10
api/src/main/java/seecoder/devcloud/api/k8s/impl/ExecApiImpl.java → api/src/main/java/cn/seecoder/api/k8s/impl/ExecApiImpl.java

@@ -1,21 +1,19 @@
-package seecoder.devcloud.api.k8s.impl;
+package cn.seecoder.api.k8s.impl;
 
 
+import cn.seecoder.api.k8s.ExecApi;
+import cn.seecoder.api.k8s.exception.K8sApiException;
 import io.kubernetes.client.Exec;
 import io.kubernetes.client.openapi.ApiException;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import seecoder.devcloud.api.k8s.ExecApi;
-import seecoder.devcloud.api.k8s.exception.K8sApiException;
-import seecoder.devcloud.common.util.LoggerUtil;
+import cn.seecoder.common.util.LoggerUtil;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import static seecoder.devcloud.api.k8s.exception.K8sApiException.NOT_FOUND;
-
 
 @Service
 public class ExecApiImpl implements ExecApi {
@@ -53,8 +51,8 @@ public class ExecApiImpl implements ExecApi {
         } catch (ApiException e) {
             LoggerUtil.error(logger, e, "指令执行异常, namespace={}, podName={}, commands={}, response={}",
                 namespace, podName, commands, e.getResponseBody());
-            if (e.getCode() == NOT_FOUND) {
-                throw new K8sApiException(NOT_FOUND, "容器不存在");
+            if (e.getCode() == K8sApiException.NOT_FOUND) {
+                throw new K8sApiException(K8sApiException.NOT_FOUND, "容器不存在");
             }else{
                 throw K8sApiException.K8s_SYSTEM_ERROR_EXCEPTION;
             }
@@ -83,8 +81,8 @@ public class ExecApiImpl implements ExecApi {
         } catch (ApiException e) {
             LoggerUtil.error(logger, e, "指令执行异常, namespace={}, podName={}, response={}",
                     namespace, podName, e.getResponseBody());
-            if (e.getCode() == NOT_FOUND) {
-                throw new K8sApiException(NOT_FOUND, "容器不存在");
+            if (e.getCode() == K8sApiException.NOT_FOUND) {
+                throw new K8sApiException(K8sApiException.NOT_FOUND, "容器不存在");
             }else{
                 throw K8sApiException.K8s_SYSTEM_ERROR_EXCEPTION;
             }

+ 10 - 10
api/src/main/java/seecoder/devcloud/api/k8s/impl/IngressApiImpl.java → api/src/main/java/cn/seecoder/api/k8s/impl/IngressApiImpl.java

@@ -1,5 +1,6 @@
-package seecoder.devcloud.api.k8s.impl;
+package cn.seecoder.api.k8s.impl;
 
+import cn.seecoder.api.k8s.model.LabelSelector;
 import com.google.gson.JsonSyntaxException;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.apis.ExtensionsV1beta1Api;
@@ -10,20 +11,19 @@ import io.kubernetes.client.openapi.models.V1DeleteOptionsBuilder;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import seecoder.devcloud.api.k8s.IngressApi;
-import seecoder.devcloud.api.k8s.exception.K8sApiException;
-import seecoder.devcloud.api.k8s.model.Ingress;
-import seecoder.devcloud.api.k8s.model.K8sObjectRequest;
-import seecoder.devcloud.api.k8s.model.LabelSelector;
-import seecoder.devcloud.common.util.LoggerUtil;
+import cn.seecoder.api.k8s.IngressApi;
+import cn.seecoder.api.k8s.exception.K8sApiException;
+import cn.seecoder.api.k8s.model.Ingress;
+import cn.seecoder.api.k8s.model.K8sObjectRequest;
+import cn.seecoder.common.util.LoggerUtil;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static seecoder.devcloud.api.k8s.K8sConstants.FOREGROUND_PROPAGATION_POLICY;
-import static seecoder.devcloud.api.k8s.K8sConstants.PRETTY_FORMAT;
-import static seecoder.devcloud.api.k8s.exception.K8sApiException.*;
+import static cn.seecoder.api.k8s.K8sConstants.FOREGROUND_PROPAGATION_POLICY;
+import static cn.seecoder.api.k8s.K8sConstants.PRETTY_FORMAT;
+import static cn.seecoder.api.k8s.exception.K8sApiException.*;
 
 /**
  * author: rale

+ 6 - 7
api/src/main/java/seecoder/devcloud/api/k8s/impl/LogApiImpl.java → api/src/main/java/cn/seecoder/api/k8s/impl/LogApiImpl.java

@@ -1,19 +1,18 @@
-package seecoder.devcloud.api.k8s.impl;
+package cn.seecoder.api.k8s.impl;
 
 
+import cn.seecoder.api.k8s.K8sConstants;
+import cn.seecoder.api.k8s.exception.K8sApiException;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import seecoder.devcloud.api.k8s.LogApi;
-import seecoder.devcloud.api.k8s.exception.K8sApiException;
-import seecoder.devcloud.common.util.LoggerUtil;
+import cn.seecoder.api.k8s.LogApi;
+import cn.seecoder.common.util.LoggerUtil;
 
 import java.time.LocalDateTime;
 
-import static seecoder.devcloud.api.k8s.K8sConstants.PRETTY_FORMAT;
-
 
 /**
  * author: rale
@@ -81,7 +80,7 @@ public class LogApiImpl implements LogApi {
                     null,
                     null,
                     null,
-                    PRETTY_FORMAT,
+                    K8sConstants.PRETTY_FORMAT,
                     false,
                     sinceNSecondsBefore,
                     NLastLines,

+ 20 - 23
api/src/main/java/seecoder/devcloud/api/k8s/impl/NamespaceApiImpl.java → api/src/main/java/cn/seecoder/api/k8s/impl/NamespaceApiImpl.java

@@ -1,5 +1,11 @@
-package seecoder.devcloud.api.k8s.impl;
+package cn.seecoder.api.k8s.impl;
 
+import cn.seecoder.api.k8s.K8sConstants;
+import cn.seecoder.api.k8s.NamespaceApi;
+import cn.seecoder.api.k8s.exception.K8sApiException;
+import cn.seecoder.api.k8s.model.K8sObjectRequest;
+import cn.seecoder.api.k8s.model.LabelSelector;
+import cn.seecoder.api.k8s.model.Namespace;
 import com.google.gson.JsonSyntaxException;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
@@ -10,21 +16,12 @@ import io.kubernetes.client.openapi.models.V1NamespaceList;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import seecoder.devcloud.api.k8s.NamespaceApi;
-import seecoder.devcloud.api.k8s.exception.K8sApiException;
-import seecoder.devcloud.api.k8s.model.K8sObjectRequest;
-import seecoder.devcloud.api.k8s.model.LabelSelector;
-import seecoder.devcloud.api.k8s.model.Namespace;
-import seecoder.devcloud.common.util.LoggerUtil;
+import cn.seecoder.common.util.LoggerUtil;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static seecoder.devcloud.api.k8s.K8sConstants.FOREGROUND_PROPAGATION_POLICY;
-import static seecoder.devcloud.api.k8s.K8sConstants.PRETTY_FORMAT;
-import static seecoder.devcloud.api.k8s.exception.K8sApiException.*;
-
 
 @Service
 public class NamespaceApiImpl implements NamespaceApi {
@@ -49,24 +46,24 @@ public class NamespaceApiImpl implements NamespaceApi {
     public Namespace create(Namespace namespace) {
         V1Namespace v1Namespace = namespace.toK8sObject();
         try {
-            V1Namespace result = coreV1Api.createNamespace(v1Namespace, PRETTY_FORMAT, null, null);
+            V1Namespace result = coreV1Api.createNamespace(v1Namespace, K8sConstants.PRETTY_FORMAT, null, null);
             return result == null ? null : new Namespace(result);
         } catch (ApiException e) {
             LoggerUtil.error(logger, e, "Namespace创建失败,namespace={}, v1Namespace={}, response={}", namespace, v1Namespace, e.getResponseBody());
-            if (e.getCode() == ALREADY_EXIST) {
-                throw new K8sApiException(ALREADY_EXIST);
+            if (e.getCode() == K8sApiException.ALREADY_EXIST) {
+                throw new K8sApiException(K8sApiException.ALREADY_EXIST);
             } else {
-                throw K8s_SYSTEM_ERROR_EXCEPTION;
+                throw K8sApiException.K8s_SYSTEM_ERROR_EXCEPTION;
             }
         } catch (Exception e) {
             LoggerUtil.error(logger, e, "Namespace创建异常, namespace={}, v1Namespace={}", namespace, v1Namespace);
-            throw K8s_SYSTEM_ERROR_EXCEPTION;
+            throw K8sApiException.K8s_SYSTEM_ERROR_EXCEPTION;
         }
     }
 
     @Override
     public Namespace update(Namespace namespace) {
-        throw K8s_NOT_SUPPORT_METHOD;
+        throw K8sApiException.K8s_NOT_SUPPORT_METHOD;
     }
 
     @Override
@@ -74,19 +71,19 @@ public class NamespaceApiImpl implements NamespaceApi {
         try {
             V1DeleteOptions v1DeleteOptions = new V1DeleteOptionsBuilder()
                     .withApiVersion(Namespace.API_VERSION)
-                    .withPropagationPolicy(FOREGROUND_PROPAGATION_POLICY)
+                    .withPropagationPolicy(K8sConstants.FOREGROUND_PROPAGATION_POLICY)
                     .build();
             coreV1Api.deleteNamespace(
                     namespace.getName(),
-                    PRETTY_FORMAT,
+                    K8sConstants.PRETTY_FORMAT,
                     null,
                     null,
                     null,
-                    FOREGROUND_PROPAGATION_POLICY,
+                    K8sConstants.FOREGROUND_PROPAGATION_POLICY,
                     v1DeleteOptions);
         } catch (ApiException e) {
             LoggerUtil.error(logger, e, "Namespace删除失败,name={}, response={}", namespace.getName() , e.getResponseBody());
-            if (e.getCode() == NOT_FOUND) {
+            if (e.getCode() == K8sApiException.NOT_FOUND) {
                 return;
             }else {
                 return;
@@ -105,7 +102,7 @@ public class NamespaceApiImpl implements NamespaceApi {
             if (request.getName() != null) {
                 V1Namespace v1Namespace = coreV1Api.readNamespace(
                         request.getName(),
-                        PRETTY_FORMAT,
+                        K8sConstants.PRETTY_FORMAT,
                         null,
                         null);
                 return v1Namespace == null ? Collections.emptyList() : Collections.singletonList(new Namespace(v1Namespace));
@@ -121,7 +118,7 @@ public class NamespaceApiImpl implements NamespaceApi {
                 selector.addAll(request.getLabels());
             }
             V1NamespaceList v1NamespaceList = coreV1Api.listNamespace(
-                    PRETTY_FORMAT,
+                    K8sConstants.PRETTY_FORMAT,
                     null,
                     null,
                     null,

+ 12 - 12
api/src/main/java/seecoder/devcloud/api/k8s/impl/PersistentVolumeClaimImpl.java → api/src/main/java/cn/seecoder/api/k8s/impl/PersistentVolumeClaimImpl.java

@@ -1,5 +1,7 @@
-package seecoder.devcloud.api.k8s.impl;
+package cn.seecoder.api.k8s.impl;
 
+import cn.seecoder.api.k8s.model.K8sObjectRequest;
+import cn.seecoder.api.k8s.model.LabelSelector;
 import com.google.gson.JsonSyntaxException;
 import io.kubernetes.client.custom.V1Patch;
 import io.kubernetes.client.openapi.ApiException;
@@ -11,22 +13,20 @@ import io.kubernetes.client.openapi.models.V1PersistentVolumeClaimList;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import seecoder.devcloud.api.k8s.DeploymentApi;
-import seecoder.devcloud.api.k8s.PersistentVolumeClaimApi;
-import seecoder.devcloud.api.k8s.exception.K8sApiException;
-import seecoder.devcloud.api.k8s.model.K8sObjectRequest;
-import seecoder.devcloud.api.k8s.model.LabelSelector;
-import seecoder.devcloud.api.k8s.model.PersistentVolumeClaim;
-import seecoder.devcloud.common.util.LoggerUtil;
+import cn.seecoder.api.k8s.DeploymentApi;
+import cn.seecoder.api.k8s.PersistentVolumeClaimApi;
+import cn.seecoder.api.k8s.exception.K8sApiException;
+import cn.seecoder.api.k8s.model.PersistentVolumeClaim;
+import cn.seecoder.common.util.LoggerUtil;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static seecoder.devcloud.api.k8s.K8sConstants.FOREGROUND_PROPAGATION_POLICY;
-import static seecoder.devcloud.api.k8s.K8sConstants.PRETTY_FORMAT;
-import static seecoder.devcloud.api.k8s.exception.K8sApiException.ALREADY_EXIST;
-import static seecoder.devcloud.api.k8s.exception.K8sApiException.NOT_FOUND;
+import static cn.seecoder.api.k8s.K8sConstants.FOREGROUND_PROPAGATION_POLICY;
+import static cn.seecoder.api.k8s.K8sConstants.PRETTY_FORMAT;
+import static cn.seecoder.api.k8s.exception.K8sApiException.ALREADY_EXIST;
+import static cn.seecoder.api.k8s.exception.K8sApiException.NOT_FOUND;
 
 
 @Service

+ 11 - 11
api/src/main/java/seecoder/devcloud/api/k8s/impl/PodApiImpl.java → api/src/main/java/cn/seecoder/api/k8s/impl/PodApiImpl.java

@@ -1,5 +1,6 @@
-package seecoder.devcloud.api.k8s.impl;
+package cn.seecoder.api.k8s.impl;
 
+import cn.seecoder.api.k8s.model.LabelSelector;
 import com.google.gson.JsonSyntaxException;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
@@ -10,21 +11,20 @@ import io.kubernetes.client.openapi.models.V1PodList;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import seecoder.devcloud.api.k8s.PodApi;
-import seecoder.devcloud.api.k8s.model.K8sObjectRequest;
-import seecoder.devcloud.api.k8s.model.LabelSelector;
-import seecoder.devcloud.api.k8s.model.Namespace;
-import seecoder.devcloud.api.k8s.model.Pod;
-import seecoder.devcloud.common.util.LoggerUtil;
+import cn.seecoder.api.k8s.PodApi;
+import cn.seecoder.api.k8s.model.K8sObjectRequest;
+import cn.seecoder.api.k8s.model.Namespace;
+import cn.seecoder.api.k8s.model.Pod;
+import cn.seecoder.common.util.LoggerUtil;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static seecoder.devcloud.api.k8s.K8sConstants.FOREGROUND_PROPAGATION_POLICY;
-import static seecoder.devcloud.api.k8s.K8sConstants.PRETTY_FORMAT;
-import static seecoder.devcloud.api.k8s.exception.K8sApiException.K8s_NOT_SUPPORT_METHOD;
-import static seecoder.devcloud.api.k8s.exception.K8sApiException.NOT_FOUND;
+import static cn.seecoder.api.k8s.K8sConstants.FOREGROUND_PROPAGATION_POLICY;
+import static cn.seecoder.api.k8s.K8sConstants.PRETTY_FORMAT;
+import static cn.seecoder.api.k8s.exception.K8sApiException.K8s_NOT_SUPPORT_METHOD;
+import static cn.seecoder.api.k8s.exception.K8sApiException.NOT_FOUND;
 
 /**
  * author: rale

+ 7 - 7
api/src/main/java/seecoder/devcloud/api/k8s/impl/SecretApiImpl.java → api/src/main/java/cn/seecoder/api/k8s/impl/SecretApiImpl.java

@@ -1,6 +1,9 @@
-package seecoder.devcloud.api.k8s.impl;
+package cn.seecoder.api.k8s.impl;
 
 
+import cn.seecoder.api.k8s.SecretApi;
+import cn.seecoder.api.k8s.util.SecretTypeEnum;
+import cn.seecoder.api.k8s.vo.SecretVO;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.openapi.models.*;
@@ -8,11 +11,8 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import seecoder.devcloud.api.k8s.SecretApi;
-import seecoder.devcloud.api.k8s.exception.K8sApiException;
-import seecoder.devcloud.api.k8s.util.SecretTypeEnum;
-import seecoder.devcloud.api.k8s.vo.SecretVO;
-import seecoder.devcloud.common.util.LoggerUtil;
+import cn.seecoder.api.k8s.exception.K8sApiException;
+import cn.seecoder.common.util.LoggerUtil;
 
 import java.util.Base64;
 import java.util.HashMap;
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static seecoder.devcloud.api.k8s.K8sConstants.PRETTY_FORMAT;
+import static cn.seecoder.api.k8s.K8sConstants.PRETTY_FORMAT;
 
 
 @Service

+ 10 - 10
api/src/main/java/seecoder/devcloud/api/k8s/impl/ServiceApiImpl.java → api/src/main/java/cn/seecoder/api/k8s/impl/ServiceApiImpl.java

@@ -1,5 +1,7 @@
-package seecoder.devcloud.api.k8s.impl;
+package cn.seecoder.api.k8s.impl;
 
+import cn.seecoder.api.k8s.ServiceApi;
+import cn.seecoder.api.k8s.model.LabelSelector;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.openapi.models.V1DeleteOptions;
@@ -8,20 +10,18 @@ import io.kubernetes.client.openapi.models.V1Service;
 import io.kubernetes.client.openapi.models.V1ServiceList;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
-import seecoder.devcloud.api.k8s.ServiceApi;
-import seecoder.devcloud.api.k8s.exception.K8sApiException;
-import seecoder.devcloud.api.k8s.model.K8sObjectRequest;
-import seecoder.devcloud.api.k8s.model.LabelSelector;
-import seecoder.devcloud.api.k8s.model.Service;
-import seecoder.devcloud.common.util.LoggerUtil;
+import cn.seecoder.api.k8s.exception.K8sApiException;
+import cn.seecoder.api.k8s.model.K8sObjectRequest;
+import cn.seecoder.api.k8s.model.Service;
+import cn.seecoder.common.util.LoggerUtil;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static seecoder.devcloud.api.k8s.K8sConstants.FOREGROUND_PROPAGATION_POLICY;
-import static seecoder.devcloud.api.k8s.K8sConstants.PRETTY_FORMAT;
-import static seecoder.devcloud.api.k8s.exception.K8sApiException.*;
+import static cn.seecoder.api.k8s.K8sConstants.FOREGROUND_PROPAGATION_POLICY;
+import static cn.seecoder.api.k8s.K8sConstants.PRETTY_FORMAT;
+import static cn.seecoder.api.k8s.exception.K8sApiException.*;
 
 @org.springframework.stereotype.Service
 public class ServiceApiImpl implements ServiceApi {

+ 3 - 3
api/src/main/java/seecoder/devcloud/api/k8s/impl/WatchApiImpl.java → api/src/main/java/cn/seecoder/api/k8s/impl/WatchApiImpl.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.impl;
+package cn.seecoder.api.k8s.impl;
 
 import com.google.common.reflect.TypeToken;
 import io.kubernetes.client.openapi.ApiClient;
@@ -8,11 +8,11 @@ import io.kubernetes.client.openapi.models.V1Deployment;
 import io.kubernetes.client.util.Watch;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import seecoder.devcloud.api.k8s.WatchApi;
+import cn.seecoder.api.k8s.WatchApi;
 
 import java.io.IOException;
 
-import static seecoder.devcloud.api.k8s.K8sConstants.PRETTY_FORMAT;
+import static cn.seecoder.api.k8s.K8sConstants.PRETTY_FORMAT;
 
 
 /**

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/model/ConfigMap.java → api/src/main/java/cn/seecoder/api/k8s/model/ConfigMap.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.model;
+package cn.seecoder.api.k8s.model;
 
 import io.kubernetes.client.openapi.models.V1ConfigMap;
 import io.kubernetes.client.openapi.models.V1ConfigMapBuilder;

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/model/Container.java → api/src/main/java/cn/seecoder/api/k8s/model/Container.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.model;
+package cn.seecoder.api.k8s.model;
 
 import io.kubernetes.client.openapi.models.*;
 import lombok.AllArgsConstructor;

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/model/ContainerPort.java → api/src/main/java/cn/seecoder/api/k8s/model/ContainerPort.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.model;
+package cn.seecoder.api.k8s.model;
 
 import io.kubernetes.client.openapi.models.V1ContainerPort;
 import io.kubernetes.client.openapi.models.V1ContainerPortBuilder;

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/model/CpuQuantity.java → api/src/main/java/cn/seecoder/api/k8s/model/CpuQuantity.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.model;
+package cn.seecoder.api.k8s.model;
 
 import io.kubernetes.client.custom.Quantity;
 import lombok.Getter;

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/model/Deployment.java → api/src/main/java/cn/seecoder/api/k8s/model/Deployment.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.model;
+package cn.seecoder.api.k8s.model;
 
 import io.kubernetes.client.openapi.models.*;
 import lombok.*;

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/model/DeploymentStatus.java → api/src/main/java/cn/seecoder/api/k8s/model/DeploymentStatus.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.model;
+package cn.seecoder.api.k8s.model;
 
 import io.kubernetes.client.openapi.models.V1DeploymentCondition;
 import io.kubernetes.client.openapi.models.V1DeploymentStatus;

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/model/HttpGetAction.java → api/src/main/java/cn/seecoder/api/k8s/model/HttpGetAction.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.model;
+package cn.seecoder.api.k8s.model;
 
 import io.kubernetes.client.custom.IntOrString;
 import io.kubernetes.client.openapi.models.V1HTTPGetAction;

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/model/Ingress.java → api/src/main/java/cn/seecoder/api/k8s/model/Ingress.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.model;
+package cn.seecoder.api.k8s.model;
 
 import io.kubernetes.client.custom.IntOrString;
 import io.kubernetes.client.openapi.models.*;

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/model/K8sAbstractObject.java → api/src/main/java/cn/seecoder/api/k8s/model/K8sAbstractObject.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.model;
+package cn.seecoder.api.k8s.model;
 
 import io.kubernetes.client.common.KubernetesObject;
 import lombok.Data;

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/model/K8sObject.java → api/src/main/java/cn/seecoder/api/k8s/model/K8sObject.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.model;
+package cn.seecoder.api.k8s.model;
 
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder;

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/model/K8sObjectRequest.java → api/src/main/java/cn/seecoder/api/k8s/model/K8sObjectRequest.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.model;
+package cn.seecoder.api.k8s.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/model/K8sObjectTransformer.java → api/src/main/java/cn/seecoder/api/k8s/model/K8sObjectTransformer.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.model;
+package cn.seecoder.api.k8s.model;
 
 public interface K8sObjectTransformer<T> {
 

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/model/LabelSelector.java → api/src/main/java/cn/seecoder/api/k8s/model/LabelSelector.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.model;
+package cn.seecoder.api.k8s.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 2 - 2
api/src/main/java/seecoder/devcloud/api/k8s/model/Namespace.java → api/src/main/java/cn/seecoder/api/k8s/model/Namespace.java

@@ -1,11 +1,11 @@
-package seecoder.devcloud.api.k8s.model;
+package cn.seecoder.api.k8s.model;
 
 import io.kubernetes.client.openapi.models.V1Namespace;
 import io.kubernetes.client.openapi.models.V1NamespaceBuilder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import seecoder.devcloud.common.util.DateUtil;
+import cn.seecoder.common.util.DateUtil;
 
 import java.time.LocalDateTime;
 

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/model/PersistentVolumeClaim.java → api/src/main/java/cn/seecoder/api/k8s/model/PersistentVolumeClaim.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.model;
+package cn.seecoder.api.k8s.model;
 
 import io.kubernetes.client.custom.Quantity;
 import io.kubernetes.client.openapi.models.V1PersistentVolumeClaim;

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/model/Pod.java → api/src/main/java/cn/seecoder/api/k8s/model/Pod.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.model;
+package cn.seecoder.api.k8s.model;
 
 import io.kubernetes.client.openapi.models.V1Pod;
 import io.kubernetes.client.openapi.models.V1PodBuilder;

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/model/PodStatus.java → api/src/main/java/cn/seecoder/api/k8s/model/PodStatus.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.model;
+package cn.seecoder.api.k8s.model;
 
 /**
  * author: rale

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/model/Service.java → api/src/main/java/cn/seecoder/api/k8s/model/Service.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.model;
+package cn.seecoder.api.k8s.model;
 
 import io.kubernetes.client.openapi.models.V1Service;
 import io.kubernetes.client.openapi.models.V1ServiceBuilder;

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/model/ServicePort.java → api/src/main/java/cn/seecoder/api/k8s/model/ServicePort.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.model;
+package cn.seecoder.api.k8s.model;
 
 import io.kubernetes.client.custom.IntOrString;
 import io.kubernetes.client.openapi.models.V1ServicePort;

+ 1 - 1
api/src/main/java/seecoder/devcloud/api/k8s/util/SecretTypeEnum.java → api/src/main/java/cn/seecoder/api/k8s/util/SecretTypeEnum.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.api.k8s.util;
+package cn.seecoder.api.k8s.util;
 
 import org.apache.commons.lang.StringUtils;
 

+ 2 - 2
api/src/main/java/seecoder/devcloud/api/k8s/vo/SecretVO.java → api/src/main/java/cn/seecoder/api/k8s/vo/SecretVO.java

@@ -1,10 +1,10 @@
-package seecoder.devcloud.api.k8s.vo;
+package cn.seecoder.api.k8s.vo;
 
 import io.kubernetes.client.openapi.models.V1Secret;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.util.CollectionUtils;
-import seecoder.devcloud.api.k8s.util.SecretTypeEnum;
+import cn.seecoder.api.k8s.util.SecretTypeEnum;
 
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;

+ 0 - 7
api/src/main/java/seecoder/devcloud/api/k8s/ConfigMapApi.java

@@ -1,7 +0,0 @@
-package seecoder.devcloud.api.k8s;
-
-
-import seecoder.devcloud.api.k8s.model.ConfigMap;
-
-public interface ConfigMapApi extends AbstractApi<ConfigMap> {
-}

+ 0 - 8
api/src/main/java/seecoder/devcloud/api/k8s/NamespaceApi.java

@@ -1,8 +0,0 @@
-package seecoder.devcloud.api.k8s;
-
-
-import seecoder.devcloud.api.k8s.model.Namespace;
-
-public interface NamespaceApi extends AbstractApi<Namespace> {
-
-}

+ 0 - 7
api/src/main/java/seecoder/devcloud/api/k8s/PersistentVolumeClaimApi.java

@@ -1,7 +0,0 @@
-package seecoder.devcloud.api.k8s;
-
-
-import seecoder.devcloud.api.k8s.model.PersistentVolumeClaim;
-
-public interface PersistentVolumeClaimApi extends AbstractApi<PersistentVolumeClaim> {
-}

+ 0 - 7
api/src/main/java/seecoder/devcloud/api/k8s/PodApi.java

@@ -1,7 +0,0 @@
-package seecoder.devcloud.api.k8s;
-
-
-import seecoder.devcloud.api.k8s.model.Pod;
-
-public interface PodApi extends AbstractApi<Pod> {
-}

+ 0 - 8
api/src/main/java/seecoder/devcloud/api/k8s/ServiceApi.java

@@ -1,8 +0,0 @@
-package seecoder.devcloud.api.k8s;
-
-
-import seecoder.devcloud.api.k8s.model.Service;
-
-public interface ServiceApi extends AbstractApi<Service>{
-
-}

+ 1 - 1
api/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-seecoder.devcloud.api.DevcloudApiAutoConfiguration
+cn.seecoder.api.DevcloudApiAutoConfiguration

+ 3 - 3
common/src/main/java/seecoder/devcloud/common/CommonAutoConfiguration.java → common/src/main/java/cn/seecoder/common/CommonAutoConfiguration.java

@@ -1,9 +1,9 @@
-package seecoder.devcloud.common;
+package cn.seecoder.common;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import seecoder.devcloud.common.util.JwtTokenUtil;
-import seecoder.devcloud.common.util.SpringUtil;
+import cn.seecoder.common.util.JwtTokenUtil;
+import cn.seecoder.common.util.SpringUtil;
 
 /**
  * @author PuHong Weng

+ 1 - 1
common/src/main/java/seecoder/devcloud/common/exceptions/AccessDeniedException.java → common/src/main/java/cn/seecoder/common/exceptions/AccessDeniedException.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.common.exceptions;
+package cn.seecoder.common.exceptions;
 
 import org.springframework.http.HttpStatus;
 

+ 1 - 1
common/src/main/java/seecoder/devcloud/common/exceptions/Asserts.java → common/src/main/java/cn/seecoder/common/exceptions/Asserts.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.common.exceptions;
+package cn.seecoder.common.exceptions;
 
 public abstract class Asserts {
 	public static void notNull(Object object) throws EntityNotFoundException {

+ 1 - 1
common/src/main/java/seecoder/devcloud/common/exceptions/ConflictException.java → common/src/main/java/cn/seecoder/common/exceptions/ConflictException.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.common.exceptions;
+package cn.seecoder.common.exceptions;
 
 import org.springframework.http.HttpStatus;
 

+ 1 - 1
common/src/main/java/seecoder/devcloud/common/exceptions/EntityConflictException.java → common/src/main/java/cn/seecoder/common/exceptions/EntityConflictException.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.common.exceptions;
+package cn.seecoder.common.exceptions;
 
 public class EntityConflictException extends ConflictException {
 	public EntityConflictException(String message) {

+ 1 - 1
common/src/main/java/seecoder/devcloud/common/exceptions/EntityNotAvailableException.java → common/src/main/java/cn/seecoder/common/exceptions/EntityNotAvailableException.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.common.exceptions;
+package cn.seecoder.common.exceptions;
 
 import org.springframework.http.HttpStatus;
 

+ 1 - 1
common/src/main/java/seecoder/devcloud/common/exceptions/EntityNotFoundException.java → common/src/main/java/cn/seecoder/common/exceptions/EntityNotFoundException.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.common.exceptions;
+package cn.seecoder.common.exceptions;
 
 import org.springframework.http.HttpStatus;
 

+ 1 - 1
common/src/main/java/seecoder/devcloud/common/exceptions/InvalidRequestException.java → common/src/main/java/cn/seecoder/common/exceptions/InvalidRequestException.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.common.exceptions;
+package cn.seecoder.common.exceptions;
 
 import org.springframework.http.HttpStatus;
 

+ 1 - 1
common/src/main/java/seecoder/devcloud/common/exceptions/ServiceException.java → common/src/main/java/cn/seecoder/common/exceptions/ServiceException.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.common.exceptions;
+package cn.seecoder.common.exceptions;
 
 import lombok.Getter;
 import lombok.ToString;

+ 1 - 1
common/src/main/java/seecoder/devcloud/common/util/DateUtil.java → common/src/main/java/cn/seecoder/common/util/DateUtil.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.common.util;
+package cn.seecoder.common.util;
 
 import org.joda.time.DateTime;
 

+ 1 - 1
common/src/main/java/seecoder/devcloud/common/util/FileUtil.java → common/src/main/java/cn/seecoder/common/util/FileUtil.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.common.util;
+package cn.seecoder.common.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;

+ 1 - 1
common/src/main/java/seecoder/devcloud/common/util/JwtTokenUtil.java → common/src/main/java/cn/seecoder/common/util/JwtTokenUtil.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.common.util;
+package cn.seecoder.common.util;
 
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;

+ 1 - 1
common/src/main/java/seecoder/devcloud/common/util/LoggerUtil.java → common/src/main/java/cn/seecoder/common/util/LoggerUtil.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.common.util;
+package cn.seecoder.common.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 1 - 1
common/src/main/java/seecoder/devcloud/common/util/Method.java → common/src/main/java/cn/seecoder/common/util/Method.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.common.util;
+package cn.seecoder.common.util;
 
 @FunctionalInterface
 public interface Method {

+ 1 - 1
common/src/main/java/seecoder/devcloud/common/util/RandomStringUtil.java → common/src/main/java/cn/seecoder/common/util/RandomStringUtil.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.common.util;
+package cn.seecoder.common.util;
 
 import java.util.Random;
 

+ 1 - 1
common/src/main/java/seecoder/devcloud/common/util/SpringUtil.java → common/src/main/java/cn/seecoder/common/util/SpringUtil.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.common.util;
+package cn.seecoder.common.util;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeansException;

+ 1 - 1
common/src/main/java/seecoder/devcloud/common/util/ToolKit.java → common/src/main/java/cn/seecoder/common/util/ToolKit.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.common.util;
+package cn.seecoder.common.util;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.http.HttpStatus;

+ 1 - 1
common/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-seecoder.devcloud.common.CommonAutoConfiguration
+cn.seecoder.common.CommonAutoConfiguration

+ 1 - 2
core/src/main/java/seecoder/devcloud/core/CoreApplication.java → core/src/main/java/cn/seecoder/core/CoreApplication.java

@@ -1,10 +1,9 @@
-package seecoder.devcloud.core;
+package cn.seecoder.core;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 

+ 1 - 1
core/src/main/java/seecoder/devcloud/core/commit/CommitResolver.java → core/src/main/java/cn/seecoder/core/commit/CommitResolver.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.core.commit;
+package cn.seecoder.core.commit;
 
 /**
  * @author PuHong Weng

+ 1 - 1
core/src/main/java/seecoder/devcloud/core/commit/CommitRule.java → core/src/main/java/cn/seecoder/core/commit/CommitRule.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.core.commit;
+package cn.seecoder.core.commit;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
core/src/main/java/seecoder/devcloud/core/commit/CommitState.java → core/src/main/java/cn/seecoder/core/commit/CommitState.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.core.commit;
+package cn.seecoder.core.commit;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

+ 1 - 1
core/src/main/java/seecoder/devcloud/core/commit/CommitType.java → core/src/main/java/cn/seecoder/core/commit/CommitType.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.core.commit;
+package cn.seecoder.core.commit;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

+ 2 - 2
core/src/main/java/seecoder/devcloud/core/pipeline/Context.java → core/src/main/java/cn/seecoder/core/pipeline/Context.java

@@ -1,10 +1,10 @@
-package seecoder.devcloud.core.pipeline;
+package cn.seecoder.core.pipeline;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import seecoder.devcloud.api.ApplicationProperties;
+import cn.seecoder.api.ApplicationProperties;
 
 import java.util.HashMap;
 import java.util.Map;

+ 1 - 1
core/src/main/java/seecoder/devcloud/core/pipeline/Handler.java → core/src/main/java/cn/seecoder/core/pipeline/Handler.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.core.pipeline;
+package cn.seecoder.core.pipeline;
 
 /**
  * @author PuHong Weng

+ 1 - 1
core/src/main/java/seecoder/devcloud/core/pipeline/Pipeline.java → core/src/main/java/cn/seecoder/core/pipeline/Pipeline.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.core.pipeline;
+package cn.seecoder.core.pipeline;
 
 /**
  * @author PuHong Weng

+ 1 - 1
core/src/main/java/seecoder/devcloud/core/pipeline/PipelineException.java → core/src/main/java/cn/seecoder/core/pipeline/PipelineException.java

@@ -1,4 +1,4 @@
-package seecoder.devcloud.core.pipeline;
+package cn.seecoder.core.pipeline;
 
 /**
  * @author PuHong Weng

+ 4 - 4
core/src/main/java/seecoder/devcloud/core/pipeline/PipelineFactory.java → core/src/main/java/cn/seecoder/core/pipeline/PipelineFactory.java

@@ -1,13 +1,13 @@
-package seecoder.devcloud.core.pipeline;
+package cn.seecoder.core.pipeline;
 
+import cn.seecoder.core.pipeline.handler.AbstractHandler;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.http.HttpStatus;
-import seecoder.devcloud.core.pipeline.config.HandlerConfigTable;
-import seecoder.devcloud.core.pipeline.handler.AbstractHandler;
-import seecoder.devcloud.core.pipeline.pipeline.PipelineImpl;
+import cn.seecoder.core.pipeline.config.HandlerConfigTable;
+import cn.seecoder.core.pipeline.pipeline.PipelineImpl;
 
 import java.util.List;
 

+ 4 - 3
core/src/main/java/seecoder/devcloud/core/pipeline/config/HandlerConfigTable.java → core/src/main/java/cn/seecoder/core/pipeline/config/HandlerConfigTable.java

@@ -1,11 +1,12 @@
-package seecoder.devcloud.core.pipeline.config;
+package cn.seecoder.core.pipeline.config;
 
+import cn.seecoder.core.pipeline.Handler;
+import cn.seecoder.core.pipeline.PipelineException;
+import cn.seecoder.core.pipeline.handler.*;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpStatus;
-import seecoder.devcloud.core.pipeline.Handler;
-import seecoder.devcloud.core.pipeline.PipelineException;
 import seecoder.devcloud.core.pipeline.handler.*;
 
 import java.lang.reflect.Field;

+ 4 - 4
core/src/main/java/seecoder/devcloud/core/pipeline/handler/AbstractHandler.java → core/src/main/java/cn/seecoder/core/pipeline/handler/AbstractHandler.java

@@ -1,9 +1,9 @@
-package seecoder.devcloud.core.pipeline.handler;
+package cn.seecoder.core.pipeline.handler;
 
 import lombok.Data;
-import seecoder.devcloud.core.pipeline.Context;
-import seecoder.devcloud.core.pipeline.Handler;
-import seecoder.devcloud.core.pipeline.PipelineException;
+import cn.seecoder.core.pipeline.Context;
+import cn.seecoder.core.pipeline.Handler;
+import cn.seecoder.core.pipeline.PipelineException;
 
 /**
  * @author PuHong Weng

+ 7 - 7
core/src/main/java/seecoder/devcloud/core/pipeline/handler/JavaImageBuildHandler.java → core/src/main/java/cn/seecoder/core/pipeline/handler/JavaImageBuildHandler.java

@@ -1,5 +1,8 @@
-package seecoder.devcloud.core.pipeline.handler;
+package cn.seecoder.core.pipeline.handler;
 
+import cn.seecoder.core.pipeline.Context;
+import cn.seecoder.core.pipeline.PipelineException;
+import cn.seecoder.core.pipeline.template.PipelineTemplateTable;
 import com.spotify.docker.client.ProgressHandler;
 import com.spotify.docker.client.exceptions.DockerException;
 import com.spotify.docker.client.messages.ProgressMessage;
@@ -9,12 +12,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpStatus;
 import org.eclipse.jgit.api.Git;
-import seecoder.devcloud.api.docker.DockerApi;
-import seecoder.devcloud.api.git.GitApi;
-import seecoder.devcloud.common.util.SpringUtil;
-import seecoder.devcloud.core.pipeline.Context;
-import seecoder.devcloud.core.pipeline.PipelineException;
-import seecoder.devcloud.core.pipeline.template.PipelineTemplateTable;
+import cn.seecoder.api.docker.DockerApi;
+import cn.seecoder.api.git.GitApi;
+import cn.seecoder.common.util.SpringUtil;
 
 import java.io.IOException;
 import java.nio.file.Files;

+ 14 - 14
core/src/main/java/seecoder/devcloud/core/pipeline/handler/K8sDeploymentHandler.java → core/src/main/java/cn/seecoder/core/pipeline/handler/K8sDeploymentHandler.java

@@ -1,20 +1,20 @@
-package seecoder.devcloud.core.pipeline.handler;
+package cn.seecoder.core.pipeline.handler;
 
+import cn.seecoder.core.pipeline.Context;
+import cn.seecoder.core.pipeline.PipelineException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpStatus;
-import seecoder.devcloud.api.ApplicationProperties;
-import seecoder.devcloud.api.k8s.DeploymentApi;
-import seecoder.devcloud.api.k8s.K8sConstants;
-import seecoder.devcloud.api.k8s.SecretApi;
-import seecoder.devcloud.api.k8s.exception.K8sApiException;
-import seecoder.devcloud.api.k8s.model.Container;
-import seecoder.devcloud.api.k8s.model.ContainerPort;
-import seecoder.devcloud.api.k8s.model.Deployment;
-import seecoder.devcloud.api.k8s.model.K8sObjectRequest;
-import seecoder.devcloud.api.k8s.vo.SecretVO;
-import seecoder.devcloud.common.util.SpringUtil;
-import seecoder.devcloud.core.pipeline.Context;
-import seecoder.devcloud.core.pipeline.PipelineException;
+import cn.seecoder.api.ApplicationProperties;
+import cn.seecoder.api.k8s.DeploymentApi;
+import cn.seecoder.api.k8s.K8sConstants;
+import cn.seecoder.api.k8s.SecretApi;
+import cn.seecoder.api.k8s.exception.K8sApiException;
+import cn.seecoder.api.k8s.model.Container;
+import cn.seecoder.api.k8s.model.ContainerPort;
+import cn.seecoder.api.k8s.model.Deployment;
+import cn.seecoder.api.k8s.model.K8sObjectRequest;
+import cn.seecoder.api.k8s.vo.SecretVO;
+import cn.seecoder.common.util.SpringUtil;
 
 import java.util.Collections;
 import java.util.List;

+ 10 - 10
core/src/main/java/seecoder/devcloud/core/pipeline/handler/K8sIngressHandler.java → core/src/main/java/cn/seecoder/core/pipeline/handler/K8sIngressHandler.java

@@ -1,16 +1,16 @@
-package seecoder.devcloud.core.pipeline.handler;
+package cn.seecoder.core.pipeline.handler;
 
+import cn.seecoder.core.pipeline.Context;
+import cn.seecoder.core.pipeline.PipelineException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpStatus;
-import seecoder.devcloud.api.ApplicationProperties;
-import seecoder.devcloud.api.k8s.IngressApi;
-import seecoder.devcloud.api.k8s.K8sConstants;
-import seecoder.devcloud.api.k8s.exception.K8sApiException;
-import seecoder.devcloud.api.k8s.model.Ingress;
-import seecoder.devcloud.api.k8s.model.K8sObjectRequest;
-import seecoder.devcloud.common.util.SpringUtil;
-import seecoder.devcloud.core.pipeline.Context;
-import seecoder.devcloud.core.pipeline.PipelineException;
+import cn.seecoder.api.ApplicationProperties;
+import cn.seecoder.api.k8s.IngressApi;
+import cn.seecoder.api.k8s.K8sConstants;
+import cn.seecoder.api.k8s.exception.K8sApiException;
+import cn.seecoder.api.k8s.model.Ingress;
+import cn.seecoder.api.k8s.model.K8sObjectRequest;
+import cn.seecoder.common.util.SpringUtil;
 
 import java.util.Collections;
 import java.util.List;

+ 9 - 9
core/src/main/java/seecoder/devcloud/core/pipeline/handler/K8sNamespaceHandler.java → core/src/main/java/cn/seecoder/core/pipeline/handler/K8sNamespaceHandler.java

@@ -1,15 +1,15 @@
-package seecoder.devcloud.core.pipeline.handler;
+package cn.seecoder.core.pipeline.handler;
 
+import cn.seecoder.core.pipeline.Context;
+import cn.seecoder.core.pipeline.PipelineException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpStatus;
-import seecoder.devcloud.api.k8s.NamespaceApi;
-import seecoder.devcloud.api.k8s.SecretApi;
-import seecoder.devcloud.api.k8s.exception.K8sApiException;
-import seecoder.devcloud.api.k8s.model.K8sObjectRequest;
-import seecoder.devcloud.api.k8s.model.Namespace;
-import seecoder.devcloud.common.util.SpringUtil;
-import seecoder.devcloud.core.pipeline.Context;
-import seecoder.devcloud.core.pipeline.PipelineException;
+import cn.seecoder.api.k8s.NamespaceApi;
+import cn.seecoder.api.k8s.SecretApi;
+import cn.seecoder.api.k8s.exception.K8sApiException;
+import cn.seecoder.api.k8s.model.K8sObjectRequest;
+import cn.seecoder.api.k8s.model.Namespace;
+import cn.seecoder.common.util.SpringUtil;
 
 import java.util.List;
 

+ 10 - 10
core/src/main/java/seecoder/devcloud/core/pipeline/handler/K8sServiceHandler.java → core/src/main/java/cn/seecoder/core/pipeline/handler/K8sServiceHandler.java

@@ -1,16 +1,16 @@
-package seecoder.devcloud.core.pipeline.handler;
+package cn.seecoder.core.pipeline.handler;
 
+import cn.seecoder.core.pipeline.Context;
+import cn.seecoder.core.pipeline.PipelineException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpStatus;
-import seecoder.devcloud.api.k8s.K8sConstants;
-import seecoder.devcloud.api.k8s.ServiceApi;
-import seecoder.devcloud.api.k8s.exception.K8sApiException;
-import seecoder.devcloud.api.k8s.model.K8sObjectRequest;
-import seecoder.devcloud.api.k8s.model.Service;
-import seecoder.devcloud.api.k8s.model.ServicePort;
-import seecoder.devcloud.common.util.SpringUtil;
-import seecoder.devcloud.core.pipeline.Context;
-import seecoder.devcloud.core.pipeline.PipelineException;
+import cn.seecoder.api.k8s.K8sConstants;
+import cn.seecoder.api.k8s.ServiceApi;
+import cn.seecoder.api.k8s.exception.K8sApiException;
+import cn.seecoder.api.k8s.model.K8sObjectRequest;
+import cn.seecoder.api.k8s.model.Service;
+import cn.seecoder.api.k8s.model.ServicePort;
+import cn.seecoder.common.util.SpringUtil;
 
 import java.util.Collections;
 import java.util.List;

+ 7 - 7
core/src/main/java/seecoder/devcloud/core/pipeline/handler/NodeImageBuildHandler.java → core/src/main/java/cn/seecoder/core/pipeline/handler/NodeImageBuildHandler.java

@@ -1,5 +1,8 @@
-package seecoder.devcloud.core.pipeline.handler;
+package cn.seecoder.core.pipeline.handler;
 
+import cn.seecoder.core.pipeline.Context;
+import cn.seecoder.core.pipeline.PipelineException;
+import cn.seecoder.core.pipeline.template.PipelineTemplateTable;
 import com.spotify.docker.client.ProgressHandler;
 import com.spotify.docker.client.exceptions.DockerException;
 import com.spotify.docker.client.messages.ProgressMessage;
@@ -9,12 +12,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpStatus;
 import org.eclipse.jgit.api.Git;
-import seecoder.devcloud.api.docker.DockerApi;
-import seecoder.devcloud.api.git.GitApi;
-import seecoder.devcloud.common.util.SpringUtil;
-import seecoder.devcloud.core.pipeline.Context;
-import seecoder.devcloud.core.pipeline.PipelineException;
-import seecoder.devcloud.core.pipeline.template.PipelineTemplateTable;
+import cn.seecoder.api.docker.DockerApi;
+import cn.seecoder.api.git.GitApi;
+import cn.seecoder.common.util.SpringUtil;
 
 import java.io.IOException;
 import java.nio.file.Files;

+ 5 - 5
core/src/main/java/seecoder/devcloud/core/pipeline/inspector/PipelineInspector.java → core/src/main/java/cn/seecoder/core/pipeline/inspector/PipelineInspector.java

@@ -1,10 +1,10 @@
-package seecoder.devcloud.core.pipeline.inspector;
+package cn.seecoder.core.pipeline.inspector;
 
+import cn.seecoder.api.k8s.*;
+import cn.seecoder.api.k8s.model.*;
+import cn.seecoder.core.pipeline.Context;
 import io.kubernetes.client.openapi.models.V1DeploymentStatus;
-import seecoder.devcloud.api.k8s.*;
-import seecoder.devcloud.api.k8s.model.*;
-import seecoder.devcloud.common.util.SpringUtil;
-import seecoder.devcloud.core.pipeline.Context;
+import cn.seecoder.common.util.SpringUtil;
 
 import java.util.List;
 

+ 2 - 2
core/src/main/java/seecoder/devcloud/core/pipeline/inspector/PipelineInspectorFactory.java → core/src/main/java/cn/seecoder/core/pipeline/inspector/PipelineInspectorFactory.java

@@ -1,6 +1,6 @@
-package seecoder.devcloud.core.pipeline.inspector;
+package cn.seecoder.core.pipeline.inspector;
 
-import seecoder.devcloud.core.pipeline.Context;
+import cn.seecoder.core.pipeline.Context;
 
 /**
  * @author PuHong Weng

+ 5 - 5
core/src/main/java/seecoder/devcloud/core/pipeline/pipeline/PipelineImpl.java → core/src/main/java/cn/seecoder/core/pipeline/pipeline/PipelineImpl.java

@@ -1,9 +1,9 @@
-package seecoder.devcloud.core.pipeline.pipeline;
+package cn.seecoder.core.pipeline.pipeline;
 
-import seecoder.devcloud.core.pipeline.Context;
-import seecoder.devcloud.core.pipeline.Handler;
-import seecoder.devcloud.core.pipeline.Pipeline;
-import seecoder.devcloud.core.pipeline.PipelineException;
+import cn.seecoder.core.pipeline.Context;
+import cn.seecoder.core.pipeline.Pipeline;
+import cn.seecoder.core.pipeline.Handler;
+import cn.seecoder.core.pipeline.PipelineException;
 
 /**
  * @author PuHong Weng

+ 2 - 2
core/src/main/java/seecoder/devcloud/core/pipeline/template/PipelineTemplateTable.java → core/src/main/java/cn/seecoder/core/pipeline/template/PipelineTemplateTable.java

@@ -1,9 +1,9 @@
-package seecoder.devcloud.core.pipeline.template;
+package cn.seecoder.core.pipeline.template;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpStatus;
 import org.springframework.core.io.ClassPathResource;
-import seecoder.devcloud.core.pipeline.PipelineException;
+import cn.seecoder.core.pipeline.PipelineException;
 
 import java.io.IOException;
 import java.nio.file.Files;

+ 10 - 10
core/src/test/java/seecoder/devcloud/core/CoreApplicationTests.java → core/src/test/java/cn/seecoder/core/CoreApplicationTests.java

@@ -1,5 +1,13 @@
-package seecoder.devcloud.core;
-
+package cn.seecoder.core;
+
+import cn.seecoder.api.ApplicationProperties;
+import cn.seecoder.api.k8s.DeploymentApi;
+import cn.seecoder.api.k8s.IngressApi;
+import cn.seecoder.api.k8s.ServiceApi;
+import cn.seecoder.core.pipeline.Context;
+import cn.seecoder.core.pipeline.PipelineException;
+import cn.seecoder.core.pipeline.config.HandlerConfigTable;
+import cn.seecoder.core.pipeline.handler.*;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -12,14 +20,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
-import seecoder.devcloud.api.ApplicationProperties;
-import seecoder.devcloud.api.k8s.DeploymentApi;
-import seecoder.devcloud.api.k8s.IngressApi;
-import seecoder.devcloud.api.k8s.ServiceApi;
-import seecoder.devcloud.core.pipeline.Context;
-import seecoder.devcloud.core.pipeline.PipelineException;
-import seecoder.devcloud.core.pipeline.config.HandlerConfigTable;
-import seecoder.devcloud.core.pipeline.handler.*;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor