From 92c93a6f3bf72227fca3e8b973937ce6ca6ed6cc Mon Sep 17 00:00:00 2001
From: kalencaya <1942460489@qq.com>
Date: Wed, 1 May 2024 17:18:25 +0800
Subject: [PATCH] [Bug][scaleph-workspace-seatunnel] fix scaleph flink jar and
seatunnel job error (#709)
* ci: fix paimon docker error and add reusable workflow
* fix: fix doris cluster status error
* fix: file-fetcher error
* fix: flink sql image error
* fix: flink job detail state error
* fix: seatunnel jdbc sink error
* fix: seatunnel jdbc sink error
---
.github/workflows/ci-docker-build.yml | 3 +-
.github/workflows/ci-maven.yml | 3 +-
.github/workflows/ci-npm.yml | 3 +-
.github/workflows/ci.yml | 37 +++++++++++++++++++
.../release-manual-docker-paimon.yml | 2 +-
.../ws/WsDorisOperatorInstanceController.java | 16 ++++----
.../ws/WsDorisOperatorTemplateController.java | 12 +++---
.../DorisOperatorInstanceStatusSyncJob.java | 6 +--
.../{doris => }/operator/DorisCluster.java | 6 +--
.../{doris => }/operator/spec/AdminUser.java | 2 +-
.../operator/spec/AutoScalerVersion.java | 2 +-
.../operator/spec/AutoScalingPolicy.java | 2 +-
.../{doris => }/operator/spec/BaseSpec.java | 2 +-
.../{doris => }/operator/spec/BeSpec.java | 2 +-
.../{doris => }/operator/spec/BrokerSpec.java | 2 +-
.../{doris => }/operator/spec/CnSpec.java | 2 +-
.../operator/spec/ConfigMapInfo.java | 2 +-
.../spec/ContainerResourceMetricSource.java | 2 +-
.../spec/CrossVersionObjectReference.java | 2 +-
.../operator/spec/DorisClusterSpec.java | 2 +-
.../operator/spec/DorisServicePort.java | 2 +-
.../{doris => }/operator/spec/Endpoints.java | 2 +-
.../operator/spec/ExportService.java | 3 +-
.../operator/spec/ExternalMetricSource.java | 2 +-
.../{doris => }/operator/spec/FeAddress.java | 2 +-
.../{doris => }/operator/spec/FeSpec.java | 2 +-
.../{doris => }/operator/spec/HPAPolicy.java | 2 +-
.../operator/spec/HPAScalingPolicy.java | 2 +-
.../operator/spec/HPAScalingPolicyType.java | 2 +-
.../operator/spec/HPAScalingRules.java | 2 +-
.../spec/HorizontalPodAutoscalerBehavior.java | 2 +-
.../operator/spec/HorizontalScaler.java | 2 +-
.../operator/spec/MetricIdentifier.java | 2 +-
.../operator/spec/MetricSourceType.java | 2 +-
.../{doris => }/operator/spec/MetricSpec.java | 2 +-
.../operator/spec/MetricTarget.java | 2 +-
.../operator/spec/MetricTargetType.java | 2 +-
.../operator/spec/ObjectMetricSource.java | 2 +-
.../operator/spec/PersistentVolume.java | 2 +-
.../operator/spec/PodsMetricSource.java | 2 +-
.../operator/spec/ResourceMetricSource.java | 2 +-
.../operator/spec/ScalingPolicySelect.java | 2 +-
.../operator/spec/ServiceRole.java | 2 +-
.../operator/spec/SystemInitialization.java | 2 +-
.../{doris => }/operator/status/CnStatus.java | 4 +-
.../operator/status/ComponentCondition.java | 2 +-
.../operator/status/ComponentPhase.java | 2 +-
.../operator/status/ComponentStatus.java | 2 +-
.../operator/status/DorisClusterStatus.java | 2 +-
.../service/DorisClusterEndpointService.java | 4 +-
.../service/DorisOperatorService.java | 4 +-
.../WsDorisOperatorInstanceService.java | 16 ++++----
.../WsDorisOperatorTemplateService.java | 12 +++---
.../WsDorisOperatorInstanceConvert.java | 10 ++---
.../WsDorisOperatorTemplateConvert.java | 6 +--
.../service/dto/DorisClusterFeEndpoint.java | 2 +-
.../dto/WsDorisOperatorInstanceDTO.java | 8 ++--
.../dto/WsDorisOperatorTemplateDTO.java | 4 +-
.../impl/DorisClusterEndpointServiceImpl.java | 12 +++---
.../impl/DorisOperatorServiceImpl.java | 6 +--
.../WsDorisOperatorInstanceServiceImpl.java | 26 ++++++-------
.../WsDorisOperatorTemplateServiceImpl.java | 18 ++++-----
.../WsDorisOperatorInstanceAddParam.java | 4 +-
.../WsDorisOperatorInstanceListParam.java | 2 +-
.../WsDorisOperatorInstanceUpdateParam.java | 4 +-
.../WsDorisOperatorTemplateAddParam.java | 4 +-
.../WsDorisOperatorTemplateListParam.java | 2 +-
.../WsDorisOperatorTemplateUpdateParam.java | 4 +-
.../cluster/DorisClusterConverter.java | 8 ++--
.../resource/template/DorisTemplate.java | 6 +--
.../template/DorisTemplateConverter.java | 6 +--
...FlinkKubernetesJobInstanceServiceImpl.java | 5 +--
.../kubernetes/resource/ResourceNames.java | 2 +-
.../kubernetes/resource/ScalephVersion.java | 25 +++++++++++++
.../src/main/resources/application-dev.yml | 14 +++++--
scaleph-ui-react/src/app.tsx | 2 +-
.../Engine/Compute/Flink/Job/Detail/index.tsx | 17 +++------
tools/docker/build/scaleph-api/Dockerfile | 1 +
.../build/scaleph-file-fetcher/Dockerfile | 3 ++
.../docker/mysql/init.d/scaleph-dag-mysql.sql | 17 ++++-----
.../docker/mysql/init.d/scaleph-ws-mysql.sql | 14 +++----
81 files changed, 248 insertions(+), 191 deletions(-)
create mode 100644 .github/workflows/ci.yml
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/action/DorisOperatorInstanceStatusSyncJob.java (92%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/DorisCluster.java (85%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/AdminUser.java (94%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/AutoScalerVersion.java (94%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/AutoScalingPolicy.java (95%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/BaseSpec.java (98%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/BeSpec.java (93%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/BrokerSpec.java (94%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/CnSpec.java (94%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/ConfigMapInfo.java (94%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/ContainerResourceMetricSource.java (96%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/CrossVersionObjectReference.java (95%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/DorisClusterSpec.java (96%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/DorisServicePort.java (97%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/Endpoints.java (94%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/ExportService.java (94%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/ExternalMetricSource.java (95%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/FeAddress.java (95%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/FeSpec.java (94%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/HPAPolicy.java (96%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/HPAScalingPolicy.java (95%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/HPAScalingPolicyType.java (95%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/HPAScalingRules.java (96%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/HorizontalPodAutoscalerBehavior.java (96%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/HorizontalScaler.java (94%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/MetricIdentifier.java (95%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/MetricSourceType.java (97%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/MetricSpec.java (97%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/MetricTarget.java (96%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/MetricTargetType.java (95%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/ObjectMetricSource.java (95%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/PersistentVolume.java (95%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/PodsMetricSource.java (95%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/ResourceMetricSource.java (96%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/ScalingPolicySelect.java (95%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/ServiceRole.java (93%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/spec/SystemInitialization.java (94%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/status/CnStatus.java (87%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/status/ComponentCondition.java (95%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/status/ComponentPhase.java (93%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/status/ComponentStatus.java (95%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/operator/status/DorisClusterStatus.java (95%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/DorisClusterEndpointService.java (86%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/DorisOperatorService.java (89%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/WsDorisOperatorInstanceService.java (75%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/WsDorisOperatorTemplateService.java (71%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/convert/WsDorisOperatorInstanceConvert.java (92%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/convert/WsDorisOperatorTemplateConvert.java (93%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/dto/DorisClusterFeEndpoint.java (94%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/dto/WsDorisOperatorInstanceDTO.java (88%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/dto/WsDorisOperatorTemplateDTO.java (92%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/impl/DorisClusterEndpointServiceImpl.java (87%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/impl/DorisOperatorServiceImpl.java (92%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/impl/WsDorisOperatorInstanceServiceImpl.java (91%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/impl/WsDorisOperatorTemplateServiceImpl.java (86%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/param/WsDorisOperatorInstanceAddParam.java (93%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/param/WsDorisOperatorInstanceListParam.java (94%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/param/WsDorisOperatorInstanceUpdateParam.java (93%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/param/WsDorisOperatorTemplateAddParam.java (92%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/param/WsDorisOperatorTemplateListParam.java (94%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/param/WsDorisOperatorTemplateUpdateParam.java (92%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/resource/cluster/DorisClusterConverter.java (91%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/resource/template/DorisTemplate.java (85%)
rename scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/{doris => }/service/resource/template/DorisTemplateConverter.java (92%)
create mode 100644 scaleph-config/src/main/java/cn/sliew/scaleph/config/kubernetes/resource/ScalephVersion.java
diff --git a/.github/workflows/ci-docker-build.yml b/.github/workflows/ci-docker-build.yml
index b042ee097..b0e99b776 100644
--- a/.github/workflows/ci-docker-build.yml
+++ b/.github/workflows/ci-docker-build.yml
@@ -21,9 +21,8 @@ on:
paths-ignore: ['docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
pull_request:
paths-ignore: [ 'docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
- schedule:
- - cron: '0 20 * * *' # automatic test while every day on 04:00 am at UTC+10
workflow_dispatch:
+ workflow_call:
env:
HUB: ghcr.io/flowerfine/scaleph
diff --git a/.github/workflows/ci-maven.yml b/.github/workflows/ci-maven.yml
index 816561a87..7806927d8 100644
--- a/.github/workflows/ci-maven.yml
+++ b/.github/workflows/ci-maven.yml
@@ -21,9 +21,8 @@ on:
paths-ignore: ['docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
push:
paths-ignore: ['docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
- schedule:
- - cron: '0 20 * * *' # automatic test while every day on 04:00 am at UTC+10
workflow_dispatch:
+ workflow_call:
jobs:
build:
diff --git a/.github/workflows/ci-npm.yml b/.github/workflows/ci-npm.yml
index e83042b6a..46c2094ad 100644
--- a/.github/workflows/ci-npm.yml
+++ b/.github/workflows/ci-npm.yml
@@ -21,9 +21,8 @@ on:
paths-ignore: ['docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
push:
paths-ignore: ['docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
- schedule:
- - cron: '0 20 * * *' # automatic test while every day on 04:00 am at UTC+10
workflow_dispatch:
+ workflow_call:
jobs:
build:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000..5f0954e58
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,37 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: CI
+
+on:
+ schedule:
+ - cron: '0 20 * * *' # automatic test while every day on 04:00 am at UTC+10
+ workflow_dispatch:
+
+jobs:
+ ## 调用公共和专用存储库中的可重用工作流。
+ ## flowerfine/scaleph/.github/workflows/ci-maven.yml@dev
+ ## 调用同一仓库的工作流
+ ## ./.github/workflows/ci-npm.yml
+
+ build_maven:
+ uses: ./.github/workflows/ci-maven.yml
+
+ build_npm:
+ uses: ./.github/workflows/ci-npm.yml
+
+ build_docker:
+ uses: ./.github/workflows/ci-docker-build.yml
\ No newline at end of file
diff --git a/.github/workflows/release-manual-docker-paimon.yml b/.github/workflows/release-manual-docker-paimon.yml
index ec9da424c..050437af3 100644
--- a/.github/workflows/release-manual-docker-paimon.yml
+++ b/.github/workflows/release-manual-docker-paimon.yml
@@ -59,7 +59,7 @@ jobs:
with:
fetch-depth: 1
- name: Log in to the Container registry
- uses: docker/login-action@3
+ uses: docker/login-action@v3
with:
registry: ${{ env.HUB }}
username: ${{ github.actor }}
diff --git a/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisOperatorInstanceController.java b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisOperatorInstanceController.java
index a83cbe100..84fa5c13e 100644
--- a/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisOperatorInstanceController.java
+++ b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisOperatorInstanceController.java
@@ -19,14 +19,14 @@
package cn.sliew.scaleph.api.controller.ws;
import cn.sliew.scaleph.api.annotation.Logging;
-import cn.sliew.scaleph.application.doris.doris.operator.DorisCluster;
-import cn.sliew.scaleph.application.doris.doris.service.DorisClusterEndpointService;
-import cn.sliew.scaleph.application.doris.doris.service.WsDorisOperatorInstanceService;
-import cn.sliew.scaleph.application.doris.doris.service.dto.DorisClusterFeEndpoint;
-import cn.sliew.scaleph.application.doris.doris.service.dto.WsDorisOperatorInstanceDTO;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorInstanceAddParam;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorInstanceListParam;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorInstanceUpdateParam;
+import cn.sliew.scaleph.application.doris.operator.DorisCluster;
+import cn.sliew.scaleph.application.doris.service.DorisClusterEndpointService;
+import cn.sliew.scaleph.application.doris.service.WsDorisOperatorInstanceService;
+import cn.sliew.scaleph.application.doris.service.dto.DorisClusterFeEndpoint;
+import cn.sliew.scaleph.application.doris.service.dto.WsDorisOperatorInstanceDTO;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorInstanceAddParam;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorInstanceListParam;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorInstanceUpdateParam;
import cn.sliew.scaleph.system.model.ResponseVO;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
diff --git a/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisOperatorTemplateController.java b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisOperatorTemplateController.java
index 6a73ed04f..7af434a1f 100644
--- a/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisOperatorTemplateController.java
+++ b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisOperatorTemplateController.java
@@ -19,12 +19,12 @@
package cn.sliew.scaleph.api.controller.ws;
import cn.sliew.scaleph.api.annotation.Logging;
-import cn.sliew.scaleph.application.doris.doris.service.WsDorisOperatorTemplateService;
-import cn.sliew.scaleph.application.doris.doris.service.dto.WsDorisOperatorTemplateDTO;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorTemplateAddParam;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorTemplateListParam;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorTemplateUpdateParam;
-import cn.sliew.scaleph.application.doris.doris.service.resource.template.DorisTemplate;
+import cn.sliew.scaleph.application.doris.service.WsDorisOperatorTemplateService;
+import cn.sliew.scaleph.application.doris.service.dto.WsDorisOperatorTemplateDTO;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorTemplateAddParam;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorTemplateListParam;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorTemplateUpdateParam;
+import cn.sliew.scaleph.application.doris.service.resource.template.DorisTemplate;
import cn.sliew.scaleph.system.model.ResponseVO;
import cn.sliew.scaleph.system.snowflake.exception.UidGenerateException;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/action/DorisOperatorInstanceStatusSyncJob.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/action/DorisOperatorInstanceStatusSyncJob.java
similarity index 92%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/action/DorisOperatorInstanceStatusSyncJob.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/action/DorisOperatorInstanceStatusSyncJob.java
index ee3cc6e7b..3fed93e47 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/action/DorisOperatorInstanceStatusSyncJob.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/action/DorisOperatorInstanceStatusSyncJob.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.action;
+package cn.sliew.scaleph.application.doris.action;
import cn.sliew.milky.common.filter.ActionListener;
import cn.sliew.milky.common.util.JacksonUtil;
-import cn.sliew.scaleph.application.doris.doris.service.WsDorisOperatorInstanceService;
-import cn.sliew.scaleph.application.doris.doris.operator.status.DorisClusterStatus;
+import cn.sliew.scaleph.application.doris.service.WsDorisOperatorInstanceService;
+import cn.sliew.scaleph.application.doris.operator.status.DorisClusterStatus;
import cn.sliew.scaleph.workflow.engine.action.ActionContext;
import cn.sliew.scaleph.workflow.engine.action.ActionResult;
import cn.sliew.scaleph.workflow.engine.workflow.AbstractWorkFlow;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/DorisCluster.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/DorisCluster.java
similarity index 85%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/DorisCluster.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/DorisCluster.java
index a57efb2d2..b84794dc3 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/DorisCluster.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/DorisCluster.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator;
+package cn.sliew.scaleph.application.doris.operator;
-import cn.sliew.scaleph.application.doris.doris.operator.spec.DorisClusterSpec;
+import cn.sliew.scaleph.application.doris.operator.spec.DorisClusterSpec;
+import cn.sliew.scaleph.application.doris.operator.status.DorisClusterStatus;
import cn.sliew.scaleph.config.kubernetes.resource.ResourceLabels;
-import cn.sliew.scaleph.application.doris.doris.operator.status.DorisClusterStatus;
import io.fabric8.kubernetes.api.model.Namespaced;
import io.fabric8.kubernetes.client.CustomResource;
import io.fabric8.kubernetes.model.annotation.Group;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/AdminUser.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/AdminUser.java
similarity index 94%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/AdminUser.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/AdminUser.java
index ac77db690..e0cc23942 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/AdminUser.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/AdminUser.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/AutoScalerVersion.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/AutoScalerVersion.java
similarity index 94%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/AutoScalerVersion.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/AutoScalerVersion.java
index cc0df164b..c12e70f9f 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/AutoScalerVersion.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/AutoScalerVersion.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
public enum AutoScalerVersion {
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/AutoScalingPolicy.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/AutoScalingPolicy.java
similarity index 95%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/AutoScalingPolicy.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/AutoScalingPolicy.java
index fa32eb3f2..0d56ad110 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/AutoScalingPolicy.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/AutoScalingPolicy.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/BaseSpec.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/BaseSpec.java
similarity index 98%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/BaseSpec.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/BaseSpec.java
index 8c377fe78..c8fe513b1 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/BaseSpec.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/BaseSpec.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.fabric8.kubernetes.api.model.*;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/BeSpec.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/BeSpec.java
similarity index 93%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/BeSpec.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/BeSpec.java
index 349ac6db1..f57484dd3 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/BeSpec.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/BeSpec.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/BrokerSpec.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/BrokerSpec.java
similarity index 94%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/BrokerSpec.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/BrokerSpec.java
index 8da6a3e29..b7f796cf0 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/BrokerSpec.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/BrokerSpec.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/CnSpec.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/CnSpec.java
similarity index 94%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/CnSpec.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/CnSpec.java
index 745d978bf..c31cf5e63 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/CnSpec.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/CnSpec.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ConfigMapInfo.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ConfigMapInfo.java
similarity index 94%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ConfigMapInfo.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ConfigMapInfo.java
index f945d670d..6b0604edf 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ConfigMapInfo.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ConfigMapInfo.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ContainerResourceMetricSource.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ContainerResourceMetricSource.java
similarity index 96%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ContainerResourceMetricSource.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ContainerResourceMetricSource.java
index 86ffcac48..52351f39e 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ContainerResourceMetricSource.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ContainerResourceMetricSource.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/CrossVersionObjectReference.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/CrossVersionObjectReference.java
similarity index 95%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/CrossVersionObjectReference.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/CrossVersionObjectReference.java
index 4617bb58f..ad311d2e5 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/CrossVersionObjectReference.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/CrossVersionObjectReference.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/DorisClusterSpec.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/DorisClusterSpec.java
similarity index 96%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/DorisClusterSpec.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/DorisClusterSpec.java
index 9d8710ac4..775db5656 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/DorisClusterSpec.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/DorisClusterSpec.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/DorisServicePort.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/DorisServicePort.java
similarity index 97%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/DorisServicePort.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/DorisServicePort.java
index 411f02b5a..d704b7ed1 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/DorisServicePort.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/DorisServicePort.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/Endpoints.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/Endpoints.java
similarity index 94%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/Endpoints.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/Endpoints.java
index 0cc3371fb..f640fe5d9 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/Endpoints.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/Endpoints.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ExportService.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ExportService.java
similarity index 94%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ExportService.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ExportService.java
index 981d9879b..fad10e1d8 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ExportService.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ExportService.java
@@ -16,9 +16,8 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
-import cn.sliew.scaleph.common.dict.flink.ServiceExposedType;
import lombok.Data;
import javax.annotation.Nullable;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ExternalMetricSource.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ExternalMetricSource.java
similarity index 95%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ExternalMetricSource.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ExternalMetricSource.java
index 969ca39a3..f785c76ce 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ExternalMetricSource.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ExternalMetricSource.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/FeAddress.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/FeAddress.java
similarity index 95%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/FeAddress.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/FeAddress.java
index 2cbb43679..817f4b606 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/FeAddress.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/FeAddress.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/FeSpec.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/FeSpec.java
similarity index 94%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/FeSpec.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/FeSpec.java
index 108671c54..21000907c 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/FeSpec.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/FeSpec.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/HPAPolicy.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/HPAPolicy.java
similarity index 96%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/HPAPolicy.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/HPAPolicy.java
index 863d46330..bcf0d8e22 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/HPAPolicy.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/HPAPolicy.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/HPAScalingPolicy.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/HPAScalingPolicy.java
similarity index 95%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/HPAScalingPolicy.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/HPAScalingPolicy.java
index af489037c..88fb91fee 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/HPAScalingPolicy.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/HPAScalingPolicy.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/HPAScalingPolicyType.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/HPAScalingPolicyType.java
similarity index 95%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/HPAScalingPolicyType.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/HPAScalingPolicyType.java
index 02f203482..e8a34577d 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/HPAScalingPolicyType.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/HPAScalingPolicyType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
/**
* HPAScalingPolicyType is the type of the policy which could be used while making scaling decisions.
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/HPAScalingRules.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/HPAScalingRules.java
similarity index 96%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/HPAScalingRules.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/HPAScalingRules.java
index b6beed30a..841f3e179 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/HPAScalingRules.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/HPAScalingRules.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/HorizontalPodAutoscalerBehavior.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/HorizontalPodAutoscalerBehavior.java
similarity index 96%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/HorizontalPodAutoscalerBehavior.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/HorizontalPodAutoscalerBehavior.java
index 9e0c77ad4..37d9a65cf 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/HorizontalPodAutoscalerBehavior.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/HorizontalPodAutoscalerBehavior.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/HorizontalScaler.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/HorizontalScaler.java
similarity index 94%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/HorizontalScaler.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/HorizontalScaler.java
index 442fe3b9e..86aa17812 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/HorizontalScaler.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/HorizontalScaler.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/MetricIdentifier.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/MetricIdentifier.java
similarity index 95%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/MetricIdentifier.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/MetricIdentifier.java
index 3143243dd..312a0b939 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/MetricIdentifier.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/MetricIdentifier.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import io.fabric8.kubernetes.api.model.LabelSelector;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/MetricSourceType.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/MetricSourceType.java
similarity index 97%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/MetricSourceType.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/MetricSourceType.java
index 265ebd49c..e04f5cf0a 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/MetricSourceType.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/MetricSourceType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
/**
* MetricSourceType indicates the type of metric.
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/MetricSpec.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/MetricSpec.java
similarity index 97%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/MetricSpec.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/MetricSpec.java
index 121ae8bc9..c721b3f65 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/MetricSpec.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/MetricSpec.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/MetricTarget.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/MetricTarget.java
similarity index 96%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/MetricTarget.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/MetricTarget.java
index cdbfa1389..f6e66ebd8 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/MetricTarget.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/MetricTarget.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import io.fabric8.kubernetes.api.model.Quantity;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/MetricTargetType.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/MetricTargetType.java
similarity index 95%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/MetricTargetType.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/MetricTargetType.java
index c394f1782..86c5f736b 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/MetricTargetType.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/MetricTargetType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
/**
* MetricTargetType specifies the type of metric being targeted, and should be either “Value”, “AverageValue”, or “Utilization”
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ObjectMetricSource.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ObjectMetricSource.java
similarity index 95%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ObjectMetricSource.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ObjectMetricSource.java
index b703f71c1..12c6da1e3 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ObjectMetricSource.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ObjectMetricSource.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/PersistentVolume.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/PersistentVolume.java
similarity index 95%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/PersistentVolume.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/PersistentVolume.java
index 58ecb3488..0cc377e0d 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/PersistentVolume.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/PersistentVolume.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/PodsMetricSource.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/PodsMetricSource.java
similarity index 95%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/PodsMetricSource.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/PodsMetricSource.java
index f9b7bf5af..5a8a651ca 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/PodsMetricSource.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/PodsMetricSource.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ResourceMetricSource.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ResourceMetricSource.java
similarity index 96%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ResourceMetricSource.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ResourceMetricSource.java
index 1e325f648..5c24ee34d 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ResourceMetricSource.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ResourceMetricSource.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ScalingPolicySelect.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ScalingPolicySelect.java
similarity index 95%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ScalingPolicySelect.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ScalingPolicySelect.java
index 09d49e1a3..d8a4539ba 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ScalingPolicySelect.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ScalingPolicySelect.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
/**
* ScalingPolicySelect is used to specify which policy should be used while scaling in a certain direction
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ServiceRole.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ServiceRole.java
similarity index 93%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ServiceRole.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ServiceRole.java
index 11d2fa920..5ab943edc 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/ServiceRole.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/ServiceRole.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
public enum ServiceRole {
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/SystemInitialization.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/SystemInitialization.java
similarity index 94%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/SystemInitialization.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/SystemInitialization.java
index c5bc8eb08..42eb8cb97 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/spec/SystemInitialization.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/spec/SystemInitialization.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/status/CnStatus.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/status/CnStatus.java
similarity index 87%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/status/CnStatus.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/status/CnStatus.java
index 503e667ee..1a2ad3c90 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/status/CnStatus.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/status/CnStatus.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.status;
+package cn.sliew.scaleph.application.doris.operator.status;
-import cn.sliew.scaleph.application.doris.doris.operator.spec.HorizontalScaler;
+import cn.sliew.scaleph.application.doris.operator.spec.HorizontalScaler;
import lombok.Data;
@Data
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/status/ComponentCondition.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/status/ComponentCondition.java
similarity index 95%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/status/ComponentCondition.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/status/ComponentCondition.java
index 5de0d2c57..9026c5134 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/status/ComponentCondition.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/status/ComponentCondition.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.status;
+package cn.sliew.scaleph.application.doris.operator.status;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/status/ComponentPhase.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/status/ComponentPhase.java
similarity index 93%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/status/ComponentPhase.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/status/ComponentPhase.java
index c8a55ff5f..674bd684e 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/status/ComponentPhase.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/status/ComponentPhase.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.status;
+package cn.sliew.scaleph.application.doris.operator.status;
public enum ComponentPhase {
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/status/ComponentStatus.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/status/ComponentStatus.java
similarity index 95%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/status/ComponentStatus.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/status/ComponentStatus.java
index 995d407a2..8ab204a04 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/status/ComponentStatus.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/status/ComponentStatus.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.status;
+package cn.sliew.scaleph.application.doris.operator.status;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/status/DorisClusterStatus.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/status/DorisClusterStatus.java
similarity index 95%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/status/DorisClusterStatus.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/status/DorisClusterStatus.java
index 05fbd8f30..bfc2a8896 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/operator/status/DorisClusterStatus.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/operator/status/DorisClusterStatus.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.operator.status;
+package cn.sliew.scaleph.application.doris.operator.status;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/DorisClusterEndpointService.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/DorisClusterEndpointService.java
similarity index 86%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/DorisClusterEndpointService.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/DorisClusterEndpointService.java
index a284ff8a6..0d10db06a 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/DorisClusterEndpointService.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/DorisClusterEndpointService.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service;
+package cn.sliew.scaleph.application.doris.service;
-import cn.sliew.scaleph.application.doris.doris.service.dto.DorisClusterFeEndpoint;
+import cn.sliew.scaleph.application.doris.service.dto.DorisClusterFeEndpoint;
public interface DorisClusterEndpointService {
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/DorisOperatorService.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/DorisOperatorService.java
similarity index 89%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/DorisOperatorService.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/DorisOperatorService.java
index 4cb33b366..ef5bbb5f0 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/DorisOperatorService.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/DorisOperatorService.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service;
+package cn.sliew.scaleph.application.doris.service;
-import cn.sliew.scaleph.application.doris.doris.service.dto.WsDorisOperatorInstanceDTO;
+import cn.sliew.scaleph.application.doris.service.dto.WsDorisOperatorInstanceDTO;
import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
import java.util.Optional;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/WsDorisOperatorInstanceService.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/WsDorisOperatorInstanceService.java
similarity index 75%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/WsDorisOperatorInstanceService.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/WsDorisOperatorInstanceService.java
index 7bca36287..d1fccae9d 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/WsDorisOperatorInstanceService.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/WsDorisOperatorInstanceService.java
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service;
-
-import cn.sliew.scaleph.application.doris.doris.operator.DorisCluster;
-import cn.sliew.scaleph.application.doris.doris.operator.status.DorisClusterStatus;
-import cn.sliew.scaleph.application.doris.doris.service.dto.WsDorisOperatorInstanceDTO;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorInstanceAddParam;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorInstanceListParam;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorInstanceUpdateParam;
+package cn.sliew.scaleph.application.doris.service;
+
+import cn.sliew.scaleph.application.doris.operator.DorisCluster;
+import cn.sliew.scaleph.application.doris.operator.status.DorisClusterStatus;
+import cn.sliew.scaleph.application.doris.service.dto.WsDorisOperatorInstanceDTO;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorInstanceAddParam;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorInstanceListParam;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorInstanceUpdateParam;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/WsDorisOperatorTemplateService.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/WsDorisOperatorTemplateService.java
similarity index 71%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/WsDorisOperatorTemplateService.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/WsDorisOperatorTemplateService.java
index 190a70c72..99cc647f8 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/WsDorisOperatorTemplateService.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/WsDorisOperatorTemplateService.java
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service;
+package cn.sliew.scaleph.application.doris.service;
-import cn.sliew.scaleph.application.doris.doris.service.dto.WsDorisOperatorTemplateDTO;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorTemplateAddParam;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorTemplateListParam;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorTemplateUpdateParam;
-import cn.sliew.scaleph.application.doris.doris.service.resource.template.DorisTemplate;
+import cn.sliew.scaleph.application.doris.service.dto.WsDorisOperatorTemplateDTO;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorTemplateAddParam;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorTemplateListParam;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorTemplateUpdateParam;
+import cn.sliew.scaleph.application.doris.service.resource.template.DorisTemplate;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/convert/WsDorisOperatorInstanceConvert.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/convert/WsDorisOperatorInstanceConvert.java
similarity index 92%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/convert/WsDorisOperatorInstanceConvert.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/convert/WsDorisOperatorInstanceConvert.java
index 9a59891ba..b6cdf8125 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/convert/WsDorisOperatorInstanceConvert.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/convert/WsDorisOperatorInstanceConvert.java
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service.convert;
+package cn.sliew.scaleph.application.doris.service.convert;
import cn.sliew.milky.common.util.JacksonUtil;
-import cn.sliew.scaleph.application.doris.doris.operator.spec.*;
-import cn.sliew.scaleph.application.doris.doris.operator.status.CnStatus;
-import cn.sliew.scaleph.application.doris.doris.operator.status.ComponentStatus;
-import cn.sliew.scaleph.application.doris.doris.service.dto.WsDorisOperatorInstanceDTO;
+import cn.sliew.scaleph.application.doris.operator.status.CnStatus;
+import cn.sliew.scaleph.application.doris.operator.status.ComponentStatus;
+import cn.sliew.scaleph.application.doris.service.dto.WsDorisOperatorInstanceDTO;
+import cn.sliew.scaleph.application.doris.operator.spec.*;
import cn.sliew.scaleph.common.convert.BaseConvert;
import cn.sliew.scaleph.dao.entity.master.ws.WsDorisOperatorInstance;
import org.mapstruct.Mapper;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/convert/WsDorisOperatorTemplateConvert.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/convert/WsDorisOperatorTemplateConvert.java
similarity index 93%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/convert/WsDorisOperatorTemplateConvert.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/convert/WsDorisOperatorTemplateConvert.java
index fc6bc5959..d58fbb335 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/convert/WsDorisOperatorTemplateConvert.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/convert/WsDorisOperatorTemplateConvert.java
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service.convert;
+package cn.sliew.scaleph.application.doris.service.convert;
import cn.sliew.milky.common.util.JacksonUtil;
-import cn.sliew.scaleph.application.doris.doris.operator.spec.*;
+import cn.sliew.scaleph.application.doris.operator.spec.*;
+import cn.sliew.scaleph.application.doris.service.dto.WsDorisOperatorTemplateDTO;
import cn.sliew.scaleph.common.convert.BaseConvert;
import cn.sliew.scaleph.dao.entity.master.ws.WsDorisOperatorTemplate;
-import cn.sliew.scaleph.application.doris.doris.service.dto.WsDorisOperatorTemplateDTO;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
import org.mapstruct.factory.Mappers;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/dto/DorisClusterFeEndpoint.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/dto/DorisClusterFeEndpoint.java
similarity index 94%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/dto/DorisClusterFeEndpoint.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/dto/DorisClusterFeEndpoint.java
index eca9de9b6..5d5c7da0d 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/dto/DorisClusterFeEndpoint.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/dto/DorisClusterFeEndpoint.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service.dto;
+package cn.sliew.scaleph.application.doris.service.dto;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/dto/WsDorisOperatorInstanceDTO.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/dto/WsDorisOperatorInstanceDTO.java
similarity index 88%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/dto/WsDorisOperatorInstanceDTO.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/dto/WsDorisOperatorInstanceDTO.java
index 355ff7846..835783c69 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/dto/WsDorisOperatorInstanceDTO.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/dto/WsDorisOperatorInstanceDTO.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service.dto;
+package cn.sliew.scaleph.application.doris.service.dto;
-import cn.sliew.scaleph.application.doris.doris.operator.spec.*;
+import cn.sliew.scaleph.application.doris.operator.spec.*;
+import cn.sliew.scaleph.application.doris.operator.status.CnStatus;
+import cn.sliew.scaleph.application.doris.operator.status.ComponentStatus;
import cn.sliew.scaleph.common.dict.common.YesOrNo;
-import cn.sliew.scaleph.application.doris.doris.operator.status.CnStatus;
-import cn.sliew.scaleph.application.doris.doris.operator.status.ComponentStatus;
import cn.sliew.scaleph.system.model.BaseDTO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/dto/WsDorisOperatorTemplateDTO.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/dto/WsDorisOperatorTemplateDTO.java
similarity index 92%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/dto/WsDorisOperatorTemplateDTO.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/dto/WsDorisOperatorTemplateDTO.java
index b1afe486e..d6cd77b9a 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/dto/WsDorisOperatorTemplateDTO.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/dto/WsDorisOperatorTemplateDTO.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service.dto;
+package cn.sliew.scaleph.application.doris.service.dto;
-import cn.sliew.scaleph.application.doris.doris.operator.spec.*;
+import cn.sliew.scaleph.application.doris.operator.spec.*;
import cn.sliew.scaleph.system.model.BaseDTO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/impl/DorisClusterEndpointServiceImpl.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/impl/DorisClusterEndpointServiceImpl.java
similarity index 87%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/impl/DorisClusterEndpointServiceImpl.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/impl/DorisClusterEndpointServiceImpl.java
index 9d76af438..b5a56c77a 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/impl/DorisClusterEndpointServiceImpl.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/impl/DorisClusterEndpointServiceImpl.java
@@ -16,15 +16,15 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service.impl;
+package cn.sliew.scaleph.application.doris.service.impl;
import cn.sliew.milky.common.util.JacksonUtil;
-import cn.sliew.scaleph.application.doris.doris.operator.status.DorisClusterStatus;
-import cn.sliew.scaleph.application.doris.doris.service.WsDorisOperatorInstanceService;
-import cn.sliew.scaleph.application.doris.doris.service.dto.WsDorisOperatorInstanceDTO;
+import cn.sliew.scaleph.application.doris.operator.status.DorisClusterStatus;
+import cn.sliew.scaleph.application.doris.service.WsDorisOperatorInstanceService;
+import cn.sliew.scaleph.application.doris.service.dto.WsDorisOperatorInstanceDTO;
import cn.sliew.scaleph.common.dict.common.YesOrNo;
-import cn.sliew.scaleph.application.doris.doris.service.DorisClusterEndpointService;
-import cn.sliew.scaleph.application.doris.doris.service.dto.DorisClusterFeEndpoint;
+import cn.sliew.scaleph.application.doris.service.DorisClusterEndpointService;
+import cn.sliew.scaleph.application.doris.service.dto.DorisClusterFeEndpoint;
import cn.sliew.scaleph.kubernetes.service.ServiceService;
import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/impl/DorisOperatorServiceImpl.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/impl/DorisOperatorServiceImpl.java
similarity index 92%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/impl/DorisOperatorServiceImpl.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/impl/DorisOperatorServiceImpl.java
index 90168d36a..baaf5f321 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/impl/DorisOperatorServiceImpl.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/impl/DorisOperatorServiceImpl.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service.impl;
+package cn.sliew.scaleph.application.doris.service.impl;
-import cn.sliew.scaleph.application.doris.doris.service.DorisOperatorService;
-import cn.sliew.scaleph.application.doris.doris.service.dto.WsDorisOperatorInstanceDTO;
+import cn.sliew.scaleph.application.doris.service.DorisOperatorService;
+import cn.sliew.scaleph.application.doris.service.dto.WsDorisOperatorInstanceDTO;
import cn.sliew.scaleph.config.kubernetes.resource.ResourceLabels;
import cn.sliew.scaleph.kubernetes.service.KubernetesService;
import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/impl/WsDorisOperatorInstanceServiceImpl.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/impl/WsDorisOperatorInstanceServiceImpl.java
similarity index 91%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/impl/WsDorisOperatorInstanceServiceImpl.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/impl/WsDorisOperatorInstanceServiceImpl.java
index 55fe54f98..325178d0e 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/impl/WsDorisOperatorInstanceServiceImpl.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/impl/WsDorisOperatorInstanceServiceImpl.java
@@ -16,26 +16,26 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service.impl;
+package cn.sliew.scaleph.application.doris.service.impl;
import cn.sliew.milky.common.exception.Rethrower;
import cn.sliew.milky.common.util.JacksonUtil;
-import cn.sliew.scaleph.application.doris.doris.service.WsDorisOperatorInstanceService;
-import cn.sliew.scaleph.application.doris.doris.service.WsDorisOperatorTemplateService;
-import cn.sliew.scaleph.application.doris.doris.service.resource.cluster.DorisClusterConverter;
+import cn.sliew.scaleph.application.doris.service.WsDorisOperatorInstanceService;
+import cn.sliew.scaleph.application.doris.service.WsDorisOperatorTemplateService;
+import cn.sliew.scaleph.application.doris.service.resource.cluster.DorisClusterConverter;
+import cn.sliew.scaleph.application.doris.operator.status.DorisClusterStatus;
+import cn.sliew.scaleph.application.doris.service.dto.WsDorisOperatorInstanceDTO;
import cn.sliew.scaleph.common.dict.common.YesOrNo;
import cn.sliew.scaleph.common.util.UUIDUtil;
import cn.sliew.scaleph.dao.entity.master.ws.WsDorisOperatorInstance;
import cn.sliew.scaleph.dao.mapper.master.ws.WsDorisOperatorInstanceMapper;
-import cn.sliew.scaleph.application.doris.doris.operator.DorisCluster;
-import cn.sliew.scaleph.application.doris.doris.operator.status.DorisClusterStatus;
-import cn.sliew.scaleph.application.doris.doris.service.DorisOperatorService;
-import cn.sliew.scaleph.application.doris.doris.service.convert.WsDorisOperatorInstanceConvert;
-import cn.sliew.scaleph.application.doris.doris.service.dto.WsDorisOperatorInstanceDTO;
-import cn.sliew.scaleph.application.doris.doris.service.dto.WsDorisOperatorTemplateDTO;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorInstanceAddParam;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorInstanceListParam;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorInstanceUpdateParam;
+import cn.sliew.scaleph.application.doris.operator.DorisCluster;
+import cn.sliew.scaleph.application.doris.service.DorisOperatorService;
+import cn.sliew.scaleph.application.doris.service.convert.WsDorisOperatorInstanceConvert;
+import cn.sliew.scaleph.application.doris.service.dto.WsDorisOperatorTemplateDTO;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorInstanceAddParam;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorInstanceListParam;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorInstanceUpdateParam;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/impl/WsDorisOperatorTemplateServiceImpl.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/impl/WsDorisOperatorTemplateServiceImpl.java
similarity index 86%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/impl/WsDorisOperatorTemplateServiceImpl.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/impl/WsDorisOperatorTemplateServiceImpl.java
index d0db16d50..1a59bce93 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/impl/WsDorisOperatorTemplateServiceImpl.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/impl/WsDorisOperatorTemplateServiceImpl.java
@@ -16,20 +16,20 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service.impl;
+package cn.sliew.scaleph.application.doris.service.impl;
import cn.sliew.milky.common.util.JacksonUtil;
-import cn.sliew.scaleph.application.doris.doris.service.WsDorisOperatorTemplateService;
+import cn.sliew.scaleph.application.doris.service.WsDorisOperatorTemplateService;
+import cn.sliew.scaleph.application.doris.service.resource.template.DorisTemplate;
+import cn.sliew.scaleph.application.doris.service.resource.template.DorisTemplateConverter;
import cn.sliew.scaleph.common.util.UUIDUtil;
import cn.sliew.scaleph.dao.entity.master.ws.WsDorisOperatorTemplate;
import cn.sliew.scaleph.dao.mapper.master.ws.WsDorisOperatorTemplateMapper;
-import cn.sliew.scaleph.application.doris.doris.service.convert.WsDorisOperatorTemplateConvert;
-import cn.sliew.scaleph.application.doris.doris.service.dto.WsDorisOperatorTemplateDTO;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorTemplateAddParam;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorTemplateListParam;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorTemplateUpdateParam;
-import cn.sliew.scaleph.application.doris.doris.service.resource.template.DorisTemplate;
-import cn.sliew.scaleph.application.doris.doris.service.resource.template.DorisTemplateConverter;
+import cn.sliew.scaleph.application.doris.service.convert.WsDorisOperatorTemplateConvert;
+import cn.sliew.scaleph.application.doris.service.dto.WsDorisOperatorTemplateDTO;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorTemplateAddParam;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorTemplateListParam;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorTemplateUpdateParam;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/param/WsDorisOperatorInstanceAddParam.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/param/WsDorisOperatorInstanceAddParam.java
similarity index 93%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/param/WsDorisOperatorInstanceAddParam.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/param/WsDorisOperatorInstanceAddParam.java
index 7ef782175..26c4b5358 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/param/WsDorisOperatorInstanceAddParam.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/param/WsDorisOperatorInstanceAddParam.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service.param;
+package cn.sliew.scaleph.application.doris.service.param;
-import cn.sliew.scaleph.application.doris.doris.operator.spec.*;
+import cn.sliew.scaleph.application.doris.operator.spec.*;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/param/WsDorisOperatorInstanceListParam.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/param/WsDorisOperatorInstanceListParam.java
similarity index 94%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/param/WsDorisOperatorInstanceListParam.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/param/WsDorisOperatorInstanceListParam.java
index 8e344febd..e12736625 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/param/WsDorisOperatorInstanceListParam.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/param/WsDorisOperatorInstanceListParam.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service.param;
+package cn.sliew.scaleph.application.doris.service.param;
import cn.sliew.scaleph.system.model.PaginationParam;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/param/WsDorisOperatorInstanceUpdateParam.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/param/WsDorisOperatorInstanceUpdateParam.java
similarity index 93%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/param/WsDorisOperatorInstanceUpdateParam.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/param/WsDorisOperatorInstanceUpdateParam.java
index a7c0ff5d6..4bd9930c4 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/param/WsDorisOperatorInstanceUpdateParam.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/param/WsDorisOperatorInstanceUpdateParam.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service.param;
+package cn.sliew.scaleph.application.doris.service.param;
-import cn.sliew.scaleph.application.doris.doris.operator.spec.*;
+import cn.sliew.scaleph.application.doris.operator.spec.*;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/param/WsDorisOperatorTemplateAddParam.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/param/WsDorisOperatorTemplateAddParam.java
similarity index 92%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/param/WsDorisOperatorTemplateAddParam.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/param/WsDorisOperatorTemplateAddParam.java
index 65992074c..a7d93a12c 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/param/WsDorisOperatorTemplateAddParam.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/param/WsDorisOperatorTemplateAddParam.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service.param;
+package cn.sliew.scaleph.application.doris.service.param;
-import cn.sliew.scaleph.application.doris.doris.operator.spec.*;
+import cn.sliew.scaleph.application.doris.operator.spec.*;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/param/WsDorisOperatorTemplateListParam.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/param/WsDorisOperatorTemplateListParam.java
similarity index 94%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/param/WsDorisOperatorTemplateListParam.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/param/WsDorisOperatorTemplateListParam.java
index c370f4f26..1f65ed922 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/param/WsDorisOperatorTemplateListParam.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/param/WsDorisOperatorTemplateListParam.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service.param;
+package cn.sliew.scaleph.application.doris.service.param;
import cn.sliew.scaleph.system.model.PaginationParam;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/param/WsDorisOperatorTemplateUpdateParam.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/param/WsDorisOperatorTemplateUpdateParam.java
similarity index 92%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/param/WsDorisOperatorTemplateUpdateParam.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/param/WsDorisOperatorTemplateUpdateParam.java
index 4d32a74a2..578c5128b 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/param/WsDorisOperatorTemplateUpdateParam.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/param/WsDorisOperatorTemplateUpdateParam.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service.param;
+package cn.sliew.scaleph.application.doris.service.param;
-import cn.sliew.scaleph.application.doris.doris.operator.spec.*;
+import cn.sliew.scaleph.application.doris.operator.spec.*;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/resource/cluster/DorisClusterConverter.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/resource/cluster/DorisClusterConverter.java
similarity index 91%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/resource/cluster/DorisClusterConverter.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/resource/cluster/DorisClusterConverter.java
index 5ef47ed5f..51b253655 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/resource/cluster/DorisClusterConverter.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/resource/cluster/DorisClusterConverter.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service.resource.cluster;
+package cn.sliew.scaleph.application.doris.service.resource.cluster;
import cn.sliew.scaleph.config.kubernetes.resource.ResourceLabels;
-import cn.sliew.scaleph.application.doris.doris.operator.DorisCluster;
-import cn.sliew.scaleph.application.doris.doris.operator.spec.DorisClusterSpec;
-import cn.sliew.scaleph.application.doris.doris.service.dto.WsDorisOperatorInstanceDTO;
+import cn.sliew.scaleph.application.doris.operator.DorisCluster;
+import cn.sliew.scaleph.application.doris.operator.spec.DorisClusterSpec;
+import cn.sliew.scaleph.application.doris.service.dto.WsDorisOperatorInstanceDTO;
import cn.sliew.scaleph.kubernetes.resource.ResourceConverter;
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
import org.springframework.util.StringUtils;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/resource/template/DorisTemplate.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/resource/template/DorisTemplate.java
similarity index 85%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/resource/template/DorisTemplate.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/resource/template/DorisTemplate.java
index 4d40c7e9a..e003e151f 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/resource/template/DorisTemplate.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/resource/template/DorisTemplate.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service.resource.template;
+package cn.sliew.scaleph.application.doris.service.resource.template;
-import cn.sliew.scaleph.application.doris.doris.operator.spec.DorisClusterSpec;
-import cn.sliew.scaleph.application.doris.doris.operator.status.DorisClusterStatus;
+import cn.sliew.scaleph.application.doris.operator.spec.DorisClusterSpec;
+import cn.sliew.scaleph.application.doris.operator.status.DorisClusterStatus;
import cn.sliew.scaleph.kubernetes.Constant;
import cn.sliew.scaleph.kubernetes.resource.Resource;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
diff --git a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/resource/template/DorisTemplateConverter.java b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/resource/template/DorisTemplateConverter.java
similarity index 92%
rename from scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/resource/template/DorisTemplateConverter.java
rename to scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/resource/template/DorisTemplateConverter.java
index 79cc81bf9..8ad71b583 100644
--- a/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/doris/service/resource/template/DorisTemplateConverter.java
+++ b/scaleph-application/scaleph-application-doris/src/main/java/cn/sliew/scaleph/application/doris/service/resource/template/DorisTemplateConverter.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package cn.sliew.scaleph.application.doris.doris.service.resource.template;
+package cn.sliew.scaleph.application.doris.service.resource.template;
-import cn.sliew.scaleph.application.doris.doris.operator.spec.DorisClusterSpec;
-import cn.sliew.scaleph.application.doris.doris.service.dto.WsDorisOperatorTemplateDTO;
+import cn.sliew.scaleph.application.doris.operator.spec.DorisClusterSpec;
+import cn.sliew.scaleph.application.doris.service.dto.WsDorisOperatorTemplateDTO;
import cn.sliew.scaleph.config.kubernetes.resource.ResourceLabels;
import cn.sliew.scaleph.kubernetes.resource.ResourceConverter;
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
diff --git a/scaleph-application/scaleph-application-flink/src/main/java/cn/sliew/scaleph/application/flink/service/impl/WsFlinkKubernetesJobInstanceServiceImpl.java b/scaleph-application/scaleph-application-flink/src/main/java/cn/sliew/scaleph/application/flink/service/impl/WsFlinkKubernetesJobInstanceServiceImpl.java
index a695a4006..367df53fa 100644
--- a/scaleph-application/scaleph-application-flink/src/main/java/cn/sliew/scaleph/application/flink/service/impl/WsFlinkKubernetesJobInstanceServiceImpl.java
+++ b/scaleph-application/scaleph-application-flink/src/main/java/cn/sliew/scaleph/application/flink/service/impl/WsFlinkKubernetesJobInstanceServiceImpl.java
@@ -407,10 +407,7 @@ public int clearStatus(Long id) {
record.setError(null);
record.setClusterInfo(null);
record.setTaskManagerInfo(null);
- if (record.getStartTime() != null && record.getEndTime() == null && (record.getJobState() == FlinkJobState.FAILED
- || record.getJobState() == FlinkJobState.CANCELED
- || record.getJobState() == FlinkJobState.FINISHED
- || record.getJobState() == FlinkJobState.SUSPENDED)) {
+ if (record.getStartTime() != null && record.getEndTime() == null) {
record.setEndTime(new Date());
record.setDuration(System.currentTimeMillis() - record.getStartTime().getTime());
}
diff --git a/scaleph-config/src/main/java/cn/sliew/scaleph/config/kubernetes/resource/ResourceNames.java b/scaleph-config/src/main/java/cn/sliew/scaleph/config/kubernetes/resource/ResourceNames.java
index 177d18d27..3b65370d0 100644
--- a/scaleph-config/src/main/java/cn/sliew/scaleph/config/kubernetes/resource/ResourceNames.java
+++ b/scaleph-config/src/main/java/cn/sliew/scaleph/config/kubernetes/resource/ResourceNames.java
@@ -30,7 +30,7 @@ public enum ResourceNames {
public static final String JOB_MANAGER_POD_TEMPLATE_NAME = "task-manager-pod-template";
public static final String TASK_MANAGER_POD_TEMPLATE_NAME = "task-manager-pod-template";
- public static final String FILE_FETCHER_CONTAINER_IMAGE = "ghcr.io/flowerfine/scaleph/scaleph-file-fetcher:latest";
+ public static final String FILE_FETCHER_CONTAINER_IMAGE = "ghcr.io/flowerfine/scaleph/scaleph-file-fetcher:v2.0.2";
public static final String FILE_FETCHER_SCALEPH_VOLUME_NAME = "file-fetcher-scaleph-volume";
public static final String SCALEPH_JAR_DIRECTORY = "/scaleph/jar/";
diff --git a/scaleph-config/src/main/java/cn/sliew/scaleph/config/kubernetes/resource/ScalephVersion.java b/scaleph-config/src/main/java/cn/sliew/scaleph/config/kubernetes/resource/ScalephVersion.java
new file mode 100644
index 000000000..a46ae6a31
--- /dev/null
+++ b/scaleph-config/src/main/java/cn/sliew/scaleph/config/kubernetes/resource/ScalephVersion.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package cn.sliew.scaleph.config.kubernetes.resource;
+
+public enum ScalephVersion {
+ ;
+
+ public static final String VERSION = "v2.0.2";
+}
diff --git a/scaleph-file-fetcher/src/main/resources/application-dev.yml b/scaleph-file-fetcher/src/main/resources/application-dev.yml
index 5268e3ff4..1a0b25312 100644
--- a/scaleph-file-fetcher/src/main/resources/application-dev.yml
+++ b/scaleph-file-fetcher/src/main/resources/application-dev.yml
@@ -15,14 +15,22 @@
# limitations under the License.
#
+
+spring:
+ redis:
+ database: 0
+ host: ${REDIS_HOST:127.0.0.1}
+ port: ${REDIS_PORT:6379}
+ password: ${REDIS_PASSWORD:123456}
+
file-system:
# type: local
type: s3
proxy: false
bucket: ${spring.application.name}
- endPoint: http://127.0.0.1:9000
- accessKey: admin
- secretKey: password
+ endPoint: ${MINIO_ENDPOINT:http://127.0.0.1:9000}
+ accessKey: ${MINIO_ACCESS_KEY:admin}
+ secretKey: ${MINIO_SECRET_KEY:password}
# type: oss
# bucket: ${spring.application.name}
# endPoint: Aliyun OSS endpoint to connect to
diff --git a/scaleph-ui-react/src/app.tsx b/scaleph-ui-react/src/app.tsx
index f8a933bec..64c8665d3 100644
--- a/scaleph-ui-react/src/app.tsx
+++ b/scaleph-ui-react/src/app.tsx
@@ -100,7 +100,7 @@ export const layout: RunTimeLayoutConfig = ({initialState, setInitialState}) =>
return (<>{defaultDom});
},
rightContentRender: () => ,
- // menuDataRender: () => defaultMenus,
+ menuDataRender: () => defaultMenus,
menuItemRender: (menuItemProps: any, defaultDom: any) => {
return (
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Engine/Compute/Flink/Job/Detail/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Engine/Compute/Flink/Job/Detail/index.tsx
index 1774f36a2..7b9601daa 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Engine/Compute/Flink/Job/Detail/index.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Engine/Compute/Flink/Job/Detail/index.tsx
@@ -121,7 +121,7 @@ const FlinkKubernetesJobDetailWeb: React.FC = (props: any) => {
{
WsFlinkKubernetesJobService.restart(props.flinkKubernetesJobDetail.job.jobInstance.id).then(response => {
@@ -134,7 +134,7 @@ const FlinkKubernetesJobDetailWeb: React.FC = (props: any) => {