This is an automated email from the ASF dual-hosted git repository.
kriszu pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new c219550a4 [Improve] spark-app dashboard style improvement (#4078)
c219550a4 is described below
commit c219550a4bc8699681d46f5fdc47647f37123e07
Author: benjobs <[email protected]>
AuthorDate: Sat Sep 21 23:23:37 2024 +0800
[Improve] spark-app dashboard style improvement (#4078)
---
pom.xml | 11 -
.../streampark-console-registry/pom.xml | 5 +-
.../streampark-registry-all/pom.xml | 36 ---
.../streampark-registry-api/pom.xml | 2 +
.../README.md | 0
.../pom.xml | 6 +-
.../plugin/registry/core}/JdbcRegistry.java | 14 +-
.../core}/JdbcRegistryAutoConfiguration.java | 22 +-
.../registry/core}/JdbcRegistryProperties.java | 2 +-
.../registry/core}/JdbcRegistryThreadFactory.java | 2 +-
.../plugin/registry/core}/LockUtils.java | 2 +-
.../registry/core}/client/IJdbcRegistryClient.java | 10 +-
.../registry/core}/client/JdbcRegistryClient.java | 18 +-
.../core}/client/JdbcRegistryClientIdentify.java | 2 +-
.../mapper/JdbcRegistryClientHeartbeatMapper.java | 4 +-
.../mapper/JdbcRegistryDataChanceEventMapper.java | 4 +-
.../core}/mapper/JdbcRegistryDataMapper.java | 4 +-
.../core}/mapper/JdbcRegistryLockMapper.java | 4 +-
.../model/DO/JdbcRegistryClientHeartbeat.java | 2 +-
.../registry/core}/model/DO/JdbcRegistryData.java | 2 +-
.../model/DO/JdbcRegistryDataChanceEvent.java | 2 +-
.../registry/core}/model/DO/JdbcRegistryLock.java | 2 +-
.../plugin/registry/core}/model/DTO/DataType.java | 2 +-
.../model/DTO/JdbcRegistryClientHeartbeatDTO.java | 4 +-
.../model/DTO/JdbcRegistryDataChanceEventDTO.java | 6 +-
.../core}/model/DTO/JdbcRegistryDataDTO.java | 4 +-
.../core}/model/DTO/JdbcRegistryLockDTO.java | 4 +-
.../repository/JdbcRegistryClientRepository.java | 8 +-
.../JdbcRegistryDataChanceEventRepository.java | 8 +-
.../repository/JdbcRegistryDataRepository.java | 10 +-
.../repository/JdbcRegistryLockRepository.java | 8 +-
.../core}/server/ConnectionStateListener.java | 2 +-
.../core}/server/IJdbcRegistryDataManager.java | 6 +-
.../core}/server/IJdbcRegistryLockManager.java | 2 +-
.../registry/core}/server/IJdbcRegistryServer.java | 10 +-
.../core}/server/IRegistryRowChangeNotifier.java | 2 +-
.../server/JdbcRegistryDataChangeListener.java | 2 +-
.../core}/server/JdbcRegistryDataManager.java | 18 +-
.../core}/server/JdbcRegistryLockManager.java | 10 +-
.../registry/core}/server/JdbcRegistryServer.java | 26 +-
.../core}/server/JdbcRegistryServerState.java | 4 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
.../src/main/resources/mysql_registry_init.sql | 0
.../main/resources/postgresql_registry_init.sql | 0
.../registry/core}/JdbcRegistryTestCase.java | 4 +-
.../core}/JdbcRegistryThreadFactoryTest.java | 2 +-
.../plugin/registry/core}/LockUtilsTest.java | 2 +-
.../registry/core}/MysqlJdbcRegistryTestCase.java | 2 +-
.../core}/PostgresqlJdbcRegistryTestCase.java | 2 +-
.../src/test/resources/application-mysql.yaml | 0
.../src/test/resources/application-postgresql.yaml | 0
.../src/test/resources/application.yaml | 0
.../src/test/resources/logback.xml | 0
.../streampark-registry-it/pom.xml | 3 +-
.../plugin/registry/RegistryTestCase.java | 0
.../streampark-registry-plugins/pom.xml | 35 ---
.../streampark-console-service/pom.xml | 3 +-
.../src/components/Dropdown/src/Dropdown.vue | 12 +-
.../src/locales/lang/en/spark/app.ts | 8 +-
.../src/locales/lang/zh-CN/flink/app.ts | 2 +-
.../src/locales/lang/zh-CN/spark/app.ts | 6 +-
.../src/views/flink/app/hooks/useAppTableAction.ts | 3 +
.../views/spark/app/components/AppDashboard.vue | 10 +-
.../views/spark/app/components/StatisticCard.vue | 8 +-
.../src/views/spark/app/index.vue | 326 +++++++++++----------
streampark-e2e/pom.xml | 7 +-
.../pages/flink/applications/ApplicationsPage.java | 10 +-
67 files changed, 330 insertions(+), 409 deletions(-)
diff --git a/pom.xml b/pom.xml
index 73b988b7e..888f52430 100644
--- a/pom.xml
+++ b/pom.xml
@@ -584,17 +584,6 @@
<version>${assertj.version}</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.streampark</groupId>
- <artifactId>streampark-registry-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streampark</groupId>
- <artifactId>streampark-registry-all</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/streampark-console/streampark-console-registry/pom.xml
b/streampark-console/streampark-console-registry/pom.xml
index 5c0fc38c9..c29bb0154 100644
--- a/streampark-console/streampark-console-registry/pom.xml
+++ b/streampark-console/streampark-console-registry/pom.xml
@@ -29,8 +29,8 @@
<modules>
<module>streampark-registry-api</module>
- <module>streampark-registry-plugins</module>
- <module>streampark-registry-all</module>
+ <module>streampark-registry-core</module>
+ <module>streampark-registry-it</module>
</modules>
<dependencies>
@@ -88,4 +88,5 @@
<scope>test</scope>
</dependency>
</dependencies>
+
</project>
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-all/pom.xml
b/streampark-console/streampark-console-registry/streampark-registry-all/pom.xml
deleted file mode 100644
index eccde76d5..000000000
---
a/streampark-console/streampark-console-registry/streampark-registry-all/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.streampark</groupId>
- <artifactId>streampark-console-registry</artifactId>
- <version>2.2.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>streampark-registry-all</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.streampark</groupId>
- <artifactId>streampark-registry-jdbc</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-</project>
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-api/pom.xml
b/streampark-console/streampark-console-registry/streampark-registry-api/pom.xml
index 2da4ca6d6..e4de468e4 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-api/pom.xml
+++
b/streampark-console/streampark-console-registry/streampark-registry-api/pom.xml
@@ -27,6 +27,7 @@
</parent>
<artifactId>streampark-registry-api</artifactId>
+ <name>StreamPark : Console Registry API</name>
<dependencies>
<dependency>
@@ -34,4 +35,5 @@
<artifactId>streampark-common_${scala.binary.version}</artifactId>
</dependency>
</dependencies>
+
</project>
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/README.md
b/streampark-console/streampark-console-registry/streampark-registry-core/README.md
similarity index 100%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/README.md
rename to
streampark-console/streampark-console-registry/streampark-registry-core/README.md
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/pom.xml
b/streampark-console/streampark-console-registry/streampark-registry-core/pom.xml
similarity index 95%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/pom.xml
rename to
streampark-console/streampark-console-registry/streampark-registry-core/pom.xml
index 436cebd5b..a4877f699 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/pom.xml
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/pom.xml
@@ -22,11 +22,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.streampark</groupId>
- <artifactId>streampark-registry-plugins</artifactId>
+ <artifactId>streampark-console-registry</artifactId>
<version>2.2.0-SNAPSHOT</version>
</parent>
-
- <artifactId>streampark-registry-jdbc</artifactId>
+ <artifactId>streampark-registry-core</artifactId>
+ <name>StreamPark : Console Registry Core</name>
<dependencies>
<dependency>
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/JdbcRegistry.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/JdbcRegistry.java
similarity index 95%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/JdbcRegistry.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/JdbcRegistry.java
index f29582629..c04d49f75 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/JdbcRegistry.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/JdbcRegistry.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc;
+package org.apache.streampark.plugin.registry.core;
-import org.apache.streampark.plugin.registry.jdbc.client.JdbcRegistryClient;
-import org.apache.streampark.plugin.registry.jdbc.model.DTO.DataType;
-import
org.apache.streampark.plugin.registry.jdbc.model.DTO.JdbcRegistryDataDTO;
-import
org.apache.streampark.plugin.registry.jdbc.server.ConnectionStateListener;
-import org.apache.streampark.plugin.registry.jdbc.server.IJdbcRegistryServer;
-import
org.apache.streampark.plugin.registry.jdbc.server.JdbcRegistryDataChangeListener;
+import org.apache.streampark.plugin.registry.core.client.JdbcRegistryClient;
+import org.apache.streampark.plugin.registry.core.model.DTO.DataType;
+import
org.apache.streampark.plugin.registry.core.model.DTO.JdbcRegistryDataDTO;
+import
org.apache.streampark.plugin.registry.core.server.ConnectionStateListener;
+import org.apache.streampark.plugin.registry.core.server.IJdbcRegistryServer;
+import
org.apache.streampark.plugin.registry.core.server.JdbcRegistryDataChangeListener;
import org.apache.streampark.registry.api.ConnectionListener;
import org.apache.streampark.registry.api.ConnectionState;
import org.apache.streampark.registry.api.Event;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/JdbcRegistryAutoConfiguration.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/JdbcRegistryAutoConfiguration.java
similarity index 88%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/JdbcRegistryAutoConfiguration.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/JdbcRegistryAutoConfiguration.java
index ecb52d47d..e2d10447e 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/JdbcRegistryAutoConfiguration.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/JdbcRegistryAutoConfiguration.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc;
+package org.apache.streampark.plugin.registry.core;
-import
org.apache.streampark.plugin.registry.jdbc.mapper.JdbcRegistryClientHeartbeatMapper;
-import
org.apache.streampark.plugin.registry.jdbc.mapper.JdbcRegistryDataChanceEventMapper;
-import
org.apache.streampark.plugin.registry.jdbc.mapper.JdbcRegistryDataMapper;
-import
org.apache.streampark.plugin.registry.jdbc.mapper.JdbcRegistryLockMapper;
-import
org.apache.streampark.plugin.registry.jdbc.repository.JdbcRegistryClientRepository;
-import
org.apache.streampark.plugin.registry.jdbc.repository.JdbcRegistryDataChanceEventRepository;
-import
org.apache.streampark.plugin.registry.jdbc.repository.JdbcRegistryDataRepository;
-import
org.apache.streampark.plugin.registry.jdbc.repository.JdbcRegistryLockRepository;
-import org.apache.streampark.plugin.registry.jdbc.server.IJdbcRegistryServer;
-import org.apache.streampark.plugin.registry.jdbc.server.JdbcRegistryServer;
+import
org.apache.streampark.plugin.registry.core.mapper.JdbcRegistryClientHeartbeatMapper;
+import
org.apache.streampark.plugin.registry.core.mapper.JdbcRegistryDataChanceEventMapper;
+import
org.apache.streampark.plugin.registry.core.mapper.JdbcRegistryDataMapper;
+import
org.apache.streampark.plugin.registry.core.mapper.JdbcRegistryLockMapper;
+import
org.apache.streampark.plugin.registry.core.repository.JdbcRegistryClientRepository;
+import
org.apache.streampark.plugin.registry.core.repository.JdbcRegistryDataChanceEventRepository;
+import
org.apache.streampark.plugin.registry.core.repository.JdbcRegistryDataRepository;
+import
org.apache.streampark.plugin.registry.core.repository.JdbcRegistryLockRepository;
+import org.apache.streampark.plugin.registry.core.server.IJdbcRegistryServer;
+import org.apache.streampark.plugin.registry.core.server.JdbcRegistryServer;
import org.apache.ibatis.session.SqlSessionFactory;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/JdbcRegistryProperties.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/JdbcRegistryProperties.java
similarity index 98%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/JdbcRegistryProperties.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/JdbcRegistryProperties.java
index 3e9bdda67..ad64575b0 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/JdbcRegistryProperties.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/JdbcRegistryProperties.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc;
+package org.apache.streampark.plugin.registry.core;
import org.apache.streampark.common.utils.NetworkUtils;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/JdbcRegistryThreadFactory.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/JdbcRegistryThreadFactory.java
similarity index 95%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/JdbcRegistryThreadFactory.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/JdbcRegistryThreadFactory.java
index 5b92153d7..e5a527d22 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/JdbcRegistryThreadFactory.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/JdbcRegistryThreadFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc;
+package org.apache.streampark.plugin.registry.core;
import org.apache.streampark.registry.api.thread.ThreadUtils;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/LockUtils.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/LockUtils.java
similarity index 95%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/LockUtils.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/LockUtils.java
index a486040dc..5a873ceff 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/LockUtils.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/LockUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc;
+package org.apache.streampark.plugin.registry.core;
import org.apache.streampark.common.utils.NetworkUtils;
import org.apache.streampark.common.utils.OSUtils;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/client/IJdbcRegistryClient.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/client/IJdbcRegistryClient.java
similarity index 91%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/client/IJdbcRegistryClient.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/client/IJdbcRegistryClient.java
index e02d0f388..54d66b4e8 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/client/IJdbcRegistryClient.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/client/IJdbcRegistryClient.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.client;
+package org.apache.streampark.plugin.registry.core.client;
-import org.apache.streampark.plugin.registry.jdbc.model.DTO.DataType;
-import
org.apache.streampark.plugin.registry.jdbc.model.DTO.JdbcRegistryDataDTO;
-import
org.apache.streampark.plugin.registry.jdbc.server.ConnectionStateListener;
-import
org.apache.streampark.plugin.registry.jdbc.server.JdbcRegistryDataChangeListener;
+import org.apache.streampark.plugin.registry.core.model.DTO.DataType;
+import
org.apache.streampark.plugin.registry.core.model.DTO.JdbcRegistryDataDTO;
+import
org.apache.streampark.plugin.registry.core.server.ConnectionStateListener;
+import
org.apache.streampark.plugin.registry.core.server.JdbcRegistryDataChangeListener;
import java.util.List;
import java.util.Optional;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/client/JdbcRegistryClient.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/client/JdbcRegistryClient.java
similarity index 88%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/client/JdbcRegistryClient.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/client/JdbcRegistryClient.java
index 925188a79..81e75bb1b 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/client/JdbcRegistryClient.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/client/JdbcRegistryClient.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.client;
+package org.apache.streampark.plugin.registry.core.client;
import org.apache.streampark.common.utils.NetworkUtils;
import org.apache.streampark.common.utils.OSUtils;
import org.apache.streampark.common.utils.UUIDUtils;
-import org.apache.streampark.plugin.registry.jdbc.JdbcRegistryProperties;
-import org.apache.streampark.plugin.registry.jdbc.model.DTO.DataType;
-import
org.apache.streampark.plugin.registry.jdbc.model.DTO.JdbcRegistryDataDTO;
-import
org.apache.streampark.plugin.registry.jdbc.server.ConnectionStateListener;
-import org.apache.streampark.plugin.registry.jdbc.server.IJdbcRegistryServer;
-import
org.apache.streampark.plugin.registry.jdbc.server.JdbcRegistryDataChangeListener;
-import
org.apache.streampark.plugin.registry.jdbc.server.JdbcRegistryServerState;
+import org.apache.streampark.plugin.registry.core.JdbcRegistryProperties;
+import org.apache.streampark.plugin.registry.core.model.DTO.DataType;
+import
org.apache.streampark.plugin.registry.core.model.DTO.JdbcRegistryDataDTO;
+import
org.apache.streampark.plugin.registry.core.server.ConnectionStateListener;
+import org.apache.streampark.plugin.registry.core.server.IJdbcRegistryServer;
+import
org.apache.streampark.plugin.registry.core.server.JdbcRegistryDataChangeListener;
+import
org.apache.streampark.plugin.registry.core.server.JdbcRegistryServerState;
import lombok.extern.slf4j.Slf4j;
@@ -34,7 +34,7 @@ import java.util.List;
import java.util.Optional;
/**
- * The client of jdbc registry, used to interact with the {@link
org.apache.streampark.plugin.registry.jdbc.server.JdbcRegistryServer}.
+ * The client of jdbc registry, used to interact with the {@link
org.apache.streampark.plugin.registry.core.server.JdbcRegistryServer}.
*/
@Slf4j
public class JdbcRegistryClient implements IJdbcRegistryClient {
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/client/JdbcRegistryClientIdentify.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/client/JdbcRegistryClientIdentify.java
similarity index 94%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/client/JdbcRegistryClientIdentify.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/client/JdbcRegistryClientIdentify.java
index c54450103..3ca20cb51 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/client/JdbcRegistryClientIdentify.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/client/JdbcRegistryClientIdentify.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.client;
+package org.apache.streampark.plugin.registry.core.client;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/mapper/JdbcRegistryClientHeartbeatMapper.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/mapper/JdbcRegistryClientHeartbeatMapper.java
similarity index 90%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/mapper/JdbcRegistryClientHeartbeatMapper.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/mapper/JdbcRegistryClientHeartbeatMapper.java
index 371a1e614..cbcfefae4 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/mapper/JdbcRegistryClientHeartbeatMapper.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/mapper/JdbcRegistryClientHeartbeatMapper.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.mapper;
+package org.apache.streampark.plugin.registry.core.mapper;
-import
org.apache.streampark.plugin.registry.jdbc.model.DO.JdbcRegistryClientHeartbeat;
+import
org.apache.streampark.plugin.registry.core.model.DO.JdbcRegistryClientHeartbeat;
import org.apache.ibatis.annotations.Select;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/mapper/JdbcRegistryDataChanceEventMapper.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/mapper/JdbcRegistryDataChanceEventMapper.java
similarity index 93%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/mapper/JdbcRegistryDataChanceEventMapper.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/mapper/JdbcRegistryDataChanceEventMapper.java
index dc336f0d1..2563e90db 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/mapper/JdbcRegistryDataChanceEventMapper.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/mapper/JdbcRegistryDataChanceEventMapper.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.mapper;
+package org.apache.streampark.plugin.registry.core.mapper;
-import
org.apache.streampark.plugin.registry.jdbc.model.DO.JdbcRegistryDataChanceEvent;
+import
org.apache.streampark.plugin.registry.core.model.DO.JdbcRegistryDataChanceEvent;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Param;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/mapper/JdbcRegistryDataMapper.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/mapper/JdbcRegistryDataMapper.java
similarity index 93%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/mapper/JdbcRegistryDataMapper.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/mapper/JdbcRegistryDataMapper.java
index c21e3304c..014a1862d 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/mapper/JdbcRegistryDataMapper.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/mapper/JdbcRegistryDataMapper.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.mapper;
+package org.apache.streampark.plugin.registry.core.mapper;
-import org.apache.streampark.plugin.registry.jdbc.model.DO.JdbcRegistryData;
+import org.apache.streampark.plugin.registry.core.model.DO.JdbcRegistryData;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Param;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/mapper/JdbcRegistryLockMapper.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/mapper/JdbcRegistryLockMapper.java
similarity index 92%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/mapper/JdbcRegistryLockMapper.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/mapper/JdbcRegistryLockMapper.java
index 7fd5e33b7..58a23b03c 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/mapper/JdbcRegistryLockMapper.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/mapper/JdbcRegistryLockMapper.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.mapper;
+package org.apache.streampark.plugin.registry.core.mapper;
-import org.apache.streampark.plugin.registry.jdbc.model.DO.JdbcRegistryLock;
+import org.apache.streampark.plugin.registry.core.model.DO.JdbcRegistryLock;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Param;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DO/JdbcRegistryClientHeartbeat.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DO/JdbcRegistryClientHeartbeat.java
similarity index 95%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DO/JdbcRegistryClientHeartbeat.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DO/JdbcRegistryClientHeartbeat.java
index 15356bbe2..689c66b07 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DO/JdbcRegistryClientHeartbeat.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DO/JdbcRegistryClientHeartbeat.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.model.DO;
+package org.apache.streampark.plugin.registry.core.model.DO;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DO/JdbcRegistryData.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DO/JdbcRegistryData.java
similarity index 96%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DO/JdbcRegistryData.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DO/JdbcRegistryData.java
index d527e2d6c..b8c0ef74d 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DO/JdbcRegistryData.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DO/JdbcRegistryData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.model.DO;
+package org.apache.streampark.plugin.registry.core.model.DO;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DO/JdbcRegistryDataChanceEvent.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DO/JdbcRegistryDataChanceEvent.java
similarity index 95%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DO/JdbcRegistryDataChanceEvent.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DO/JdbcRegistryDataChanceEvent.java
index 30d410e22..179a94cdb 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DO/JdbcRegistryDataChanceEvent.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DO/JdbcRegistryDataChanceEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.model.DO;
+package org.apache.streampark.plugin.registry.core.model.DO;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DO/JdbcRegistryLock.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DO/JdbcRegistryLock.java
similarity index 95%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DO/JdbcRegistryLock.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DO/JdbcRegistryLock.java
index 835b6147f..97f393b77 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DO/JdbcRegistryLock.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DO/JdbcRegistryLock.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.model.DO;
+package org.apache.streampark.plugin.registry.core.model.DO;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DTO/DataType.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DTO/DataType.java
similarity index 93%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DTO/DataType.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DTO/DataType.java
index 4d06dc254..83e76752a 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DTO/DataType.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DTO/DataType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.model.DTO;
+package org.apache.streampark.plugin.registry.core.model.DTO;
public enum DataType {
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DTO/JdbcRegistryClientHeartbeatDTO.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DTO/JdbcRegistryClientHeartbeatDTO.java
similarity index 96%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DTO/JdbcRegistryClientHeartbeatDTO.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DTO/JdbcRegistryClientHeartbeatDTO.java
index 6371f0ec0..234ef2137 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DTO/JdbcRegistryClientHeartbeatDTO.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DTO/JdbcRegistryClientHeartbeatDTO.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.model.DTO;
+package org.apache.streampark.plugin.registry.core.model.DTO;
import org.apache.streampark.common.utils.JSONUtils;
-import
org.apache.streampark.plugin.registry.jdbc.model.DO.JdbcRegistryClientHeartbeat;
+import
org.apache.streampark.plugin.registry.core.model.DO.JdbcRegistryClientHeartbeat;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DTO/JdbcRegistryDataChanceEventDTO.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DTO/JdbcRegistryDataChanceEventDTO.java
similarity index 93%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DTO/JdbcRegistryDataChanceEventDTO.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DTO/JdbcRegistryDataChanceEventDTO.java
index f96ff7c84..173a12d5d 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DTO/JdbcRegistryDataChanceEventDTO.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DTO/JdbcRegistryDataChanceEventDTO.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.model.DTO;
+package org.apache.streampark.plugin.registry.core.model.DTO;
import org.apache.streampark.common.utils.JSONUtils;
-import org.apache.streampark.plugin.registry.jdbc.model.DO.JdbcRegistryData;
-import
org.apache.streampark.plugin.registry.jdbc.model.DO.JdbcRegistryDataChanceEvent;
+import org.apache.streampark.plugin.registry.core.model.DO.JdbcRegistryData;
+import
org.apache.streampark.plugin.registry.core.model.DO.JdbcRegistryDataChanceEvent;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DTO/JdbcRegistryDataDTO.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DTO/JdbcRegistryDataDTO.java
similarity index 94%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DTO/JdbcRegistryDataDTO.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DTO/JdbcRegistryDataDTO.java
index f76150f48..8a6433885 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DTO/JdbcRegistryDataDTO.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DTO/JdbcRegistryDataDTO.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.model.DTO;
+package org.apache.streampark.plugin.registry.core.model.DTO;
-import org.apache.streampark.plugin.registry.jdbc.model.DO.JdbcRegistryData;
+import org.apache.streampark.plugin.registry.core.model.DO.JdbcRegistryData;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DTO/JdbcRegistryLockDTO.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DTO/JdbcRegistryLockDTO.java
similarity index 94%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DTO/JdbcRegistryLockDTO.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DTO/JdbcRegistryLockDTO.java
index 1c87e497f..0755654e5 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/model/DTO/JdbcRegistryLockDTO.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/model/DTO/JdbcRegistryLockDTO.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.model.DTO;
+package org.apache.streampark.plugin.registry.core.model.DTO;
-import org.apache.streampark.plugin.registry.jdbc.model.DO.JdbcRegistryLock;
+import org.apache.streampark.plugin.registry.core.model.DO.JdbcRegistryLock;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/repository/JdbcRegistryClientRepository.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/repository/JdbcRegistryClientRepository.java
similarity index 90%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/repository/JdbcRegistryClientRepository.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/repository/JdbcRegistryClientRepository.java
index 40570e611..38c1ce540 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/repository/JdbcRegistryClientRepository.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/repository/JdbcRegistryClientRepository.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.repository;
+package org.apache.streampark.plugin.registry.core.repository;
-import
org.apache.streampark.plugin.registry.jdbc.mapper.JdbcRegistryClientHeartbeatMapper;
-import
org.apache.streampark.plugin.registry.jdbc.model.DO.JdbcRegistryClientHeartbeat;
-import
org.apache.streampark.plugin.registry.jdbc.model.DTO.JdbcRegistryClientHeartbeatDTO;
+import
org.apache.streampark.plugin.registry.core.mapper.JdbcRegistryClientHeartbeatMapper;
+import
org.apache.streampark.plugin.registry.core.model.DO.JdbcRegistryClientHeartbeat;
+import
org.apache.streampark.plugin.registry.core.model.DTO.JdbcRegistryClientHeartbeatDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/repository/JdbcRegistryDataChanceEventRepository.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/repository/JdbcRegistryDataChanceEventRepository.java
similarity index 91%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/repository/JdbcRegistryDataChanceEventRepository.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/repository/JdbcRegistryDataChanceEventRepository.java
index 5a94a9651..707b90825 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/repository/JdbcRegistryDataChanceEventRepository.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/repository/JdbcRegistryDataChanceEventRepository.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.repository;
+package org.apache.streampark.plugin.registry.core.repository;
-import
org.apache.streampark.plugin.registry.jdbc.mapper.JdbcRegistryDataChanceEventMapper;
-import
org.apache.streampark.plugin.registry.jdbc.model.DO.JdbcRegistryDataChanceEvent;
-import
org.apache.streampark.plugin.registry.jdbc.model.DTO.JdbcRegistryDataChanceEventDTO;
+import
org.apache.streampark.plugin.registry.core.mapper.JdbcRegistryDataChanceEventMapper;
+import
org.apache.streampark.plugin.registry.core.model.DO.JdbcRegistryDataChanceEvent;
+import
org.apache.streampark.plugin.registry.core.model.DTO.JdbcRegistryDataChanceEventDTO;
import org.springframework.stereotype.Repository;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/repository/JdbcRegistryDataRepository.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/repository/JdbcRegistryDataRepository.java
similarity index 88%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/repository/JdbcRegistryDataRepository.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/repository/JdbcRegistryDataRepository.java
index 4cf7b5ceb..a680c19f2 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/repository/JdbcRegistryDataRepository.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/repository/JdbcRegistryDataRepository.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.repository;
+package org.apache.streampark.plugin.registry.core.repository;
-import
org.apache.streampark.plugin.registry.jdbc.mapper.JdbcRegistryDataMapper;
-import org.apache.streampark.plugin.registry.jdbc.model.DO.JdbcRegistryData;
-import org.apache.streampark.plugin.registry.jdbc.model.DTO.DataType;
-import
org.apache.streampark.plugin.registry.jdbc.model.DTO.JdbcRegistryDataDTO;
+import
org.apache.streampark.plugin.registry.core.mapper.JdbcRegistryDataMapper;
+import org.apache.streampark.plugin.registry.core.model.DO.JdbcRegistryData;
+import org.apache.streampark.plugin.registry.core.model.DTO.DataType;
+import
org.apache.streampark.plugin.registry.core.model.DTO.JdbcRegistryDataDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/repository/JdbcRegistryLockRepository.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/repository/JdbcRegistryLockRepository.java
similarity index 88%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/repository/JdbcRegistryLockRepository.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/repository/JdbcRegistryLockRepository.java
index e8804bdd0..2a994950c 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/repository/JdbcRegistryLockRepository.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/repository/JdbcRegistryLockRepository.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.repository;
+package org.apache.streampark.plugin.registry.core.repository;
-import
org.apache.streampark.plugin.registry.jdbc.mapper.JdbcRegistryLockMapper;
-import org.apache.streampark.plugin.registry.jdbc.model.DO.JdbcRegistryLock;
-import
org.apache.streampark.plugin.registry.jdbc.model.DTO.JdbcRegistryLockDTO;
+import
org.apache.streampark.plugin.registry.core.mapper.JdbcRegistryLockMapper;
+import org.apache.streampark.plugin.registry.core.model.DO.JdbcRegistryLock;
+import
org.apache.streampark.plugin.registry.core.model.DTO.JdbcRegistryLockDTO;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/ConnectionStateListener.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/ConnectionStateListener.java
similarity index 94%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/ConnectionStateListener.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/ConnectionStateListener.java
index b589387c0..e3231276c 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/ConnectionStateListener.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/ConnectionStateListener.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.server;
+package org.apache.streampark.plugin.registry.core.server;
public interface ConnectionStateListener {
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/IJdbcRegistryDataManager.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/IJdbcRegistryDataManager.java
similarity index 91%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/IJdbcRegistryDataManager.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/IJdbcRegistryDataManager.java
index c32f80c07..7bb17ea23 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/IJdbcRegistryDataManager.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/IJdbcRegistryDataManager.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.server;
+package org.apache.streampark.plugin.registry.core.server;
-import org.apache.streampark.plugin.registry.jdbc.model.DTO.DataType;
-import
org.apache.streampark.plugin.registry.jdbc.model.DTO.JdbcRegistryDataDTO;
+import org.apache.streampark.plugin.registry.core.model.DTO.DataType;
+import
org.apache.streampark.plugin.registry.core.model.DTO.JdbcRegistryDataDTO;
import java.util.List;
import java.util.Optional;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/IJdbcRegistryLockManager.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/IJdbcRegistryLockManager.java
similarity index 96%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/IJdbcRegistryLockManager.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/IJdbcRegistryLockManager.java
index f4017d721..72cf92972 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/IJdbcRegistryLockManager.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/IJdbcRegistryLockManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.server;
+package org.apache.streampark.plugin.registry.core.server;
public interface IJdbcRegistryLockManager {
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/IJdbcRegistryServer.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/IJdbcRegistryServer.java
similarity index 92%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/IJdbcRegistryServer.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/IJdbcRegistryServer.java
index fdc9026df..61ef78f19 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/IJdbcRegistryServer.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/IJdbcRegistryServer.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.server;
+package org.apache.streampark.plugin.registry.core.server;
-import org.apache.streampark.plugin.registry.jdbc.client.IJdbcRegistryClient;
-import org.apache.streampark.plugin.registry.jdbc.model.DTO.DataType;
-import
org.apache.streampark.plugin.registry.jdbc.model.DTO.JdbcRegistryDataDTO;
+import org.apache.streampark.plugin.registry.core.client.IJdbcRegistryClient;
+import org.apache.streampark.plugin.registry.core.model.DTO.DataType;
+import
org.apache.streampark.plugin.registry.core.model.DTO.JdbcRegistryDataDTO;
import java.util.List;
import java.util.Optional;
@@ -52,7 +52,7 @@ public interface IJdbcRegistryServer extends AutoCloseable {
void subscribeConnectionStateChange(ConnectionStateListener
connectionStateListener);
/**
- * Subscribe the {@link
org.apache.streampark.plugin.registry.jdbc.model.DO.JdbcRegistryData} change.
+ * Subscribe the {@link
org.apache.streampark.plugin.registry.core.model.DO.JdbcRegistryData} change.
*/
void subscribeJdbcRegistryDataChange(JdbcRegistryDataChangeListener
jdbcRegistryDataChangeListener);
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/IRegistryRowChangeNotifier.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/IRegistryRowChangeNotifier.java
similarity index 95%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/IRegistryRowChangeNotifier.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/IRegistryRowChangeNotifier.java
index 828fe2343..563d2b5c1 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/IRegistryRowChangeNotifier.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/IRegistryRowChangeNotifier.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.server;
+package org.apache.streampark.plugin.registry.core.server;
public interface IRegistryRowChangeNotifier<T> {
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/JdbcRegistryDataChangeListener.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/JdbcRegistryDataChangeListener.java
similarity index 94%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/JdbcRegistryDataChangeListener.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/JdbcRegistryDataChangeListener.java
index ed26584db..ae55ad51e 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/JdbcRegistryDataChangeListener.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/JdbcRegistryDataChangeListener.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.server;
+package org.apache.streampark.plugin.registry.core.server;
public interface JdbcRegistryDataChangeListener {
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/JdbcRegistryDataManager.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/JdbcRegistryDataManager.java
similarity index 95%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/JdbcRegistryDataManager.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/JdbcRegistryDataManager.java
index 7e066f3f2..1e15458c1 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/JdbcRegistryDataManager.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/JdbcRegistryDataManager.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.server;
-
-import org.apache.streampark.plugin.registry.jdbc.JdbcRegistryProperties;
-import org.apache.streampark.plugin.registry.jdbc.JdbcRegistryThreadFactory;
-import org.apache.streampark.plugin.registry.jdbc.model.DTO.DataType;
-import
org.apache.streampark.plugin.registry.jdbc.model.DTO.JdbcRegistryDataChanceEventDTO;
-import
org.apache.streampark.plugin.registry.jdbc.model.DTO.JdbcRegistryDataDTO;
-import
org.apache.streampark.plugin.registry.jdbc.repository.JdbcRegistryDataChanceEventRepository;
-import
org.apache.streampark.plugin.registry.jdbc.repository.JdbcRegistryDataRepository;
+package org.apache.streampark.plugin.registry.core.server;
+
+import org.apache.streampark.plugin.registry.core.JdbcRegistryProperties;
+import org.apache.streampark.plugin.registry.core.JdbcRegistryThreadFactory;
+import org.apache.streampark.plugin.registry.core.model.DTO.DataType;
+import
org.apache.streampark.plugin.registry.core.model.DTO.JdbcRegistryDataChanceEventDTO;
+import
org.apache.streampark.plugin.registry.core.model.DTO.JdbcRegistryDataDTO;
+import
org.apache.streampark.plugin.registry.core.repository.JdbcRegistryDataChanceEventRepository;
+import
org.apache.streampark.plugin.registry.core.repository.JdbcRegistryDataRepository;
import org.apache.commons.lang3.time.DateUtils;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/JdbcRegistryLockManager.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/JdbcRegistryLockManager.java
similarity index 94%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/JdbcRegistryLockManager.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/JdbcRegistryLockManager.java
index 592e6c358..28aa0e9cd 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/JdbcRegistryLockManager.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/JdbcRegistryLockManager.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.server;
+package org.apache.streampark.plugin.registry.core.server;
-import org.apache.streampark.plugin.registry.jdbc.JdbcRegistryProperties;
-import org.apache.streampark.plugin.registry.jdbc.LockUtils;
-import
org.apache.streampark.plugin.registry.jdbc.model.DTO.JdbcRegistryLockDTO;
-import
org.apache.streampark.plugin.registry.jdbc.repository.JdbcRegistryLockRepository;
+import org.apache.streampark.plugin.registry.core.JdbcRegistryProperties;
+import org.apache.streampark.plugin.registry.core.LockUtils;
+import
org.apache.streampark.plugin.registry.core.model.DTO.JdbcRegistryLockDTO;
+import
org.apache.streampark.plugin.registry.core.repository.JdbcRegistryLockRepository;
import org.apache.streampark.registry.api.thread.ThreadUtils;
import lombok.AllArgsConstructor;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/JdbcRegistryServer.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/JdbcRegistryServer.java
similarity index 95%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/JdbcRegistryServer.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/JdbcRegistryServer.java
index 051585204..a09898b9b 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/JdbcRegistryServer.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/JdbcRegistryServer.java
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.server;
-
-import org.apache.streampark.plugin.registry.jdbc.JdbcRegistryProperties;
-import org.apache.streampark.plugin.registry.jdbc.JdbcRegistryThreadFactory;
-import org.apache.streampark.plugin.registry.jdbc.client.IJdbcRegistryClient;
-import
org.apache.streampark.plugin.registry.jdbc.client.JdbcRegistryClientIdentify;
-import org.apache.streampark.plugin.registry.jdbc.model.DTO.DataType;
-import
org.apache.streampark.plugin.registry.jdbc.model.DTO.JdbcRegistryClientHeartbeatDTO;
-import
org.apache.streampark.plugin.registry.jdbc.model.DTO.JdbcRegistryDataDTO;
-import
org.apache.streampark.plugin.registry.jdbc.repository.JdbcRegistryClientRepository;
-import
org.apache.streampark.plugin.registry.jdbc.repository.JdbcRegistryDataChanceEventRepository;
-import
org.apache.streampark.plugin.registry.jdbc.repository.JdbcRegistryDataRepository;
-import
org.apache.streampark.plugin.registry.jdbc.repository.JdbcRegistryLockRepository;
+package org.apache.streampark.plugin.registry.core.server;
+
+import org.apache.streampark.plugin.registry.core.JdbcRegistryProperties;
+import org.apache.streampark.plugin.registry.core.JdbcRegistryThreadFactory;
+import org.apache.streampark.plugin.registry.core.client.IJdbcRegistryClient;
+import
org.apache.streampark.plugin.registry.core.client.JdbcRegistryClientIdentify;
+import org.apache.streampark.plugin.registry.core.model.DTO.DataType;
+import
org.apache.streampark.plugin.registry.core.model.DTO.JdbcRegistryClientHeartbeatDTO;
+import
org.apache.streampark.plugin.registry.core.model.DTO.JdbcRegistryDataDTO;
+import
org.apache.streampark.plugin.registry.core.repository.JdbcRegistryClientRepository;
+import
org.apache.streampark.plugin.registry.core.repository.JdbcRegistryDataChanceEventRepository;
+import
org.apache.streampark.plugin.registry.core.repository.JdbcRegistryDataRepository;
+import
org.apache.streampark.plugin.registry.core.repository.JdbcRegistryLockRepository;
import org.apache.streampark.registry.api.RegistryException;
import org.apache.commons.collections4.CollectionUtils;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/JdbcRegistryServerState.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/JdbcRegistryServerState.java
similarity index 93%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/JdbcRegistryServerState.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/JdbcRegistryServerState.java
index f01ccb554..eaf40cf29 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/java/org/apache/streampark/plugin/registry/jdbc/server/JdbcRegistryServerState.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/plugin/registry/core/server/JdbcRegistryServerState.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc.server;
+package org.apache.streampark.plugin.registry.core.server;
-import org.apache.streampark.plugin.registry.jdbc.JdbcRegistryProperties;
+import org.apache.streampark.plugin.registry.core.JdbcRegistryProperties;
public enum JdbcRegistryServerState {
/**
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/resources/META-INF/spring.factories
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/resources/META-INF/spring.factories
similarity index 93%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/resources/META-INF/spring.factories
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/resources/META-INF/spring.factories
index f29a793a4..95435421f 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/resources/META-INF/spring.factories
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,4 @@
#
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
- org.apache.streampark.plugin.registry.jdbc.JdbcRegistryAutoConfiguration
+ org.apache.streampark.plugin.registry.core.JdbcRegistryAutoConfiguration
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/resources/mysql_registry_init.sql
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/resources/mysql_registry_init.sql
similarity index 100%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/resources/mysql_registry_init.sql
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/resources/mysql_registry_init.sql
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/resources/postgresql_registry_init.sql
b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/resources/postgresql_registry_init.sql
similarity index 100%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/main/resources/postgresql_registry_init.sql
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/main/resources/postgresql_registry_init.sql
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/java/org/apache/streampark/plugin/registry/jdbc/JdbcRegistryTestCase.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/test/java/org/apache/streampark/plugin/registry/core/JdbcRegistryTestCase.java
similarity index 95%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/java/org/apache/streampark/plugin/registry/jdbc/JdbcRegistryTestCase.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/test/java/org/apache/streampark/plugin/registry/core/JdbcRegistryTestCase.java
index e2cef1ade..4450622a2 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/java/org/apache/streampark/plugin/registry/jdbc/JdbcRegistryTestCase.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/test/java/org/apache/streampark/plugin/registry/core/JdbcRegistryTestCase.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc;
+package org.apache.streampark.plugin.registry.core;
import org.apache.streampark.common.CommonConfiguration;
import org.apache.streampark.plugin.registry.RegistryTestCase;
-import org.apache.streampark.plugin.registry.jdbc.server.IJdbcRegistryServer;
+import org.apache.streampark.plugin.registry.core.server.IJdbcRegistryServer;
import org.apache.streampark.registry.api.ConnectionState;
import lombok.SneakyThrows;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/java/org/apache/streampark/plugin/registry/jdbc/JdbcRegistryThreadFactoryTest.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/test/java/org/apache/streampark/plugin/registry/core/JdbcRegistryThreadFactoryTest.java
similarity index 97%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/java/org/apache/streampark/plugin/registry/jdbc/JdbcRegistryThreadFactoryTest.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/test/java/org/apache/streampark/plugin/registry/core/JdbcRegistryThreadFactoryTest.java
index 484dd1fd3..1059f0c0f 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/java/org/apache/streampark/plugin/registry/jdbc/JdbcRegistryThreadFactoryTest.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/test/java/org/apache/streampark/plugin/registry/core/JdbcRegistryThreadFactoryTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc;
+package org.apache.streampark.plugin.registry.core;
import org.junit.jupiter.api.Test;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/java/org/apache/streampark/plugin/registry/jdbc/LockUtilsTest.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/test/java/org/apache/streampark/plugin/registry/core/LockUtilsTest.java
similarity index 96%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/java/org/apache/streampark/plugin/registry/jdbc/LockUtilsTest.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/test/java/org/apache/streampark/plugin/registry/core/LockUtilsTest.java
index 2b4317847..93be619a5 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/java/org/apache/streampark/plugin/registry/jdbc/LockUtilsTest.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/test/java/org/apache/streampark/plugin/registry/core/LockUtilsTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc;
+package org.apache.streampark.plugin.registry.core;
import org.apache.streampark.common.utils.NetworkUtils;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/java/org/apache/streampark/plugin/registry/jdbc/MysqlJdbcRegistryTestCase.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/test/java/org/apache/streampark/plugin/registry/core/MysqlJdbcRegistryTestCase.java
similarity index 98%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/java/org/apache/streampark/plugin/registry/jdbc/MysqlJdbcRegistryTestCase.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/test/java/org/apache/streampark/plugin/registry/core/MysqlJdbcRegistryTestCase.java
index a8b6f0370..a5f7ec3f2 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/java/org/apache/streampark/plugin/registry/jdbc/MysqlJdbcRegistryTestCase.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/test/java/org/apache/streampark/plugin/registry/core/MysqlJdbcRegistryTestCase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc;
+package org.apache.streampark.plugin.registry.core;
import org.apache.streampark.registry.api.sql.SqlScriptRunner;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/java/org/apache/streampark/plugin/registry/jdbc/PostgresqlJdbcRegistryTestCase.java
b/streampark-console/streampark-console-registry/streampark-registry-core/src/test/java/org/apache/streampark/plugin/registry/core/PostgresqlJdbcRegistryTestCase.java
similarity index 98%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/java/org/apache/streampark/plugin/registry/jdbc/PostgresqlJdbcRegistryTestCase.java
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/test/java/org/apache/streampark/plugin/registry/core/PostgresqlJdbcRegistryTestCase.java
index 071c569d6..5784b2c3a 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/java/org/apache/streampark/plugin/registry/jdbc/PostgresqlJdbcRegistryTestCase.java
+++
b/streampark-console/streampark-console-registry/streampark-registry-core/src/test/java/org/apache/streampark/plugin/registry/core/PostgresqlJdbcRegistryTestCase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.plugin.registry.jdbc;
+package org.apache.streampark.plugin.registry.core;
import org.apache.streampark.registry.api.sql.SqlScriptRunner;
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/resources/application-mysql.yaml
b/streampark-console/streampark-console-registry/streampark-registry-core/src/test/resources/application-mysql.yaml
similarity index 100%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/resources/application-mysql.yaml
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/test/resources/application-mysql.yaml
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/resources/application-postgresql.yaml
b/streampark-console/streampark-console-registry/streampark-registry-core/src/test/resources/application-postgresql.yaml
similarity index 100%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/resources/application-postgresql.yaml
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/test/resources/application-postgresql.yaml
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/resources/application.yaml
b/streampark-console/streampark-console-registry/streampark-registry-core/src/test/resources/application.yaml
similarity index 100%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/resources/application.yaml
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/test/resources/application.yaml
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/resources/logback.xml
b/streampark-console/streampark-console-registry/streampark-registry-core/src/test/resources/logback.xml
similarity index 100%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-jdbc/src/test/resources/logback.xml
rename to
streampark-console/streampark-console-registry/streampark-registry-core/src/test/resources/logback.xml
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-it/pom.xml
b/streampark-console/streampark-console-registry/streampark-registry-it/pom.xml
similarity index 95%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-it/pom.xml
rename to
streampark-console/streampark-console-registry/streampark-registry-it/pom.xml
index 2342e1777..6fce49e99 100644
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-it/pom.xml
+++
b/streampark-console/streampark-console-registry/streampark-registry-it/pom.xml
@@ -20,11 +20,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.streampark</groupId>
- <artifactId>streampark-registry-plugins</artifactId>
+ <artifactId>streampark-console-registry</artifactId>
<version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>streampark-registry-it</artifactId>
+ <name>StreamPark : Console Registry Testcase</name>
<dependencies>
<dependency>
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-it/src/test/java/org/apache/streampark/plugin/registry/RegistryTestCase.java
b/streampark-console/streampark-console-registry/streampark-registry-it/src/test/java/org/apache/streampark/plugin/registry/RegistryTestCase.java
similarity index 100%
rename from
streampark-console/streampark-console-registry/streampark-registry-plugins/streampark-registry-it/src/test/java/org/apache/streampark/plugin/registry/RegistryTestCase.java
rename to
streampark-console/streampark-console-registry/streampark-registry-it/src/test/java/org/apache/streampark/plugin/registry/RegistryTestCase.java
diff --git
a/streampark-console/streampark-console-registry/streampark-registry-plugins/pom.xml
b/streampark-console/streampark-console-registry/streampark-registry-plugins/pom.xml
deleted file mode 100644
index 0879056a9..000000000
---
a/streampark-console/streampark-console-registry/streampark-registry-plugins/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to 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. Apache Software Foundation (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.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.streampark</groupId>
- <artifactId>streampark-console-registry</artifactId>
- <version>2.2.0-SNAPSHOT</version>
- </parent>
- <artifactId>streampark-registry-plugins</artifactId>
- <packaging>pom</packaging>
-
- <modules>
- <module>streampark-registry-jdbc</module>
- <module>streampark-registry-it</module>
- </modules>
-</project>
diff --git a/streampark-console/streampark-console-service/pom.xml
b/streampark-console/streampark-console-service/pom.xml
index 6e2866c58..d32f85d0b 100644
--- a/streampark-console/streampark-console-service/pom.xml
+++ b/streampark-console/streampark-console-service/pom.xml
@@ -466,7 +466,8 @@
<dependency>
<groupId>org.apache.streampark</groupId>
- <artifactId>streampark-registry-all</artifactId>
+ <artifactId>streampark-registry-core</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
diff --git
a/streampark-console/streampark-console-webapp/src/components/Dropdown/src/Dropdown.vue
b/streampark-console/streampark-console-webapp/src/components/Dropdown/src/Dropdown.vue
index c503948b1..20e2f3f7b 100644
---
a/streampark-console/streampark-console-webapp/src/components/Dropdown/src/Dropdown.vue
+++
b/streampark-console/streampark-console-webapp/src/components/Dropdown/src/Dropdown.vue
@@ -5,9 +5,9 @@
</span>
<template #overlay>
<a-menu :selectedKeys="selectedKeys">
- <template v-for="item in dropMenuList" :key="`${item.event}`">
+ <template v-for="(item, index) in dropMenuList" :key="`${item.event ||
index}`">
<a-menu-item
- v-bind="getAttr(item.event)"
+ v-bind="getAttr(item)"
@click="handleClickMenu(item)"
:disabled="item.disabled"
>
@@ -71,7 +71,6 @@
default: () => [],
},
});
-
const emit = defineEmits(['menuEvent']);
function handleClickMenu(item: DropMenu) {
@@ -92,7 +91,12 @@
};
});
- const getAttr = (key: string | number) => ({ key });
+ const getAttr = (item: Recordable) => {
+ return {
+ class: item.class,
+ key: item.event,
+ };
+ };
const getClass = (record) => {
const { color, disabled } = record;
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/en/spark/app.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/en/spark/app.ts
index 910169e1c..7a02aa2a2 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/en/spark/app.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/en/spark/app.ts
@@ -16,7 +16,7 @@
*/
export default {
dashboard: {
- runningTasks: 'Number of Running Applications',
+ runningTasks: 'Running Jobs',
totalTask: 'Total Tasks',
totalStage: 'Total Stages',
completedTask: 'Total Completed Tasks',
@@ -50,9 +50,9 @@ export default {
pending: 'Pending Rollback',
},
id: 'Applications ID',
- appName: 'Applications Name',
- searchName: 'Applications Name',
- tags: 'Applications Tags',
+ appName: 'Job Name',
+ searchName: 'Job Name',
+ tags: 'Tags',
owner: 'Creator',
sparkVersion: 'Spark Version',
duration: 'Runtime',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/app.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/app.ts
index 55ace86b8..86be877c7 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/app.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/app.ts
@@ -222,7 +222,7 @@ export default {
availableTaskSlots: '可用的任务槽数',
taskSlots: '任务槽数',
taskManagers: 'Task Managers',
- runningJobs: '运行的作业',
+ runningJobs: '运行中的作业',
totalTask: '总任务',
runningTask: '运行的任务',
jobManagerMemory: 'JobManager内存',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/spark/app.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/spark/app.ts
index feb904442..501ac24fd 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/spark/app.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/spark/app.ts
@@ -16,13 +16,13 @@
*/
export default {
dashboard: {
- runningTasks: '运行中的应用数',
+ runningTasks: '运行中的作业',
totalTask: 'Task 总数',
totalStage: 'Stage 总数',
- completedTask: '完成的 Task 总数',
+ completedTask: '已进完成的作业数',
completedStage: '完成的 Stage 总数',
memory: '占用的总内存',
- VCore: '占用的总VCores',
+ VCore: '占用的总 VCores',
},
runState: {
added: 'Added',
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useAppTableAction.ts
b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useAppTableAction.ts
index d3671c53b..579542691 100644
---
a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useAppTableAction.ts
+++
b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useAppTableAction.ts
@@ -111,6 +111,7 @@ export const useAppTableAction = (
},
{
tooltip: { title: t('flink.app.operation.detail') },
+ class: 'e2e-flinkapp-detail-btn',
auth: 'app:detail',
icon: 'carbon:data-view-alt',
onClick: handleDetail.bind(null, record),
@@ -142,6 +143,7 @@ export const useAppTableAction = (
{
label: t('flink.app.operation.copy'),
auth: 'app:copy',
+ class: 'e2e-flinkapp-copy-btn',
icon: 'ant-design:copy-outlined',
onClick: handleCopy.bind(null, record),
},
@@ -160,6 +162,7 @@ export const useAppTableAction = (
AppStateEnum.LOST,
].includes(record.state),
auth: 'app:mapping',
+ class: 'e2e-flinkapp-remapping-btn',
icon: 'ant-design:deployment-unit-outlined',
onClick: handleMapping.bind(null, record),
},
diff --git
a/streampark-console/streampark-console-webapp/src/views/spark/app/components/AppDashboard.vue
b/streampark-console/streampark-console-webapp/src/views/spark/app/components/AppDashboard.vue
index 6c9be6b40..0bec2715e 100644
---
a/streampark-console/streampark-console-webapp/src/views/spark/app/components/AppDashboard.vue
+++
b/streampark-console/streampark-console-webapp/src/views/spark/app/components/AppDashboard.vue
@@ -81,14 +81,8 @@
defineExpose({ handleDashboard });
</script>
<template>
- <Row :gutter="24" class="dashboard">
- <Col
- class="gutter-row mt-10px"
- :md="6"
- :xs="24"
- v-for="(value, key) in dashBigScreenMap"
- :key="key"
- >
+ <Row :gutter="24">
+ <Col class="gutter-row" :md="6" :xs="24" v-for="(value, key) in
dashBigScreenMap" :key="key">
<StatisticCard
:statisticProps="value.statistics"
:footerList="value.footer"
diff --git
a/streampark-console/streampark-console-webapp/src/views/spark/app/components/StatisticCard.vue
b/streampark-console/streampark-console-webapp/src/views/spark/app/components/StatisticCard.vue
index 60fd0a244..63e61d2fd 100644
---
a/streampark-console/streampark-console-webapp/src/views/spark/app/components/StatisticCard.vue
+++
b/streampark-console/streampark-console-webapp/src/views/spark/app/components/StatisticCard.vue
@@ -35,15 +35,15 @@
<Statistic
v-bind="statisticProps"
:value-style="{
- color: '#3f8600',
- fontSize: '45px',
+ color: '#52c41a',
+ fontSize: '36px',
fontWeight: 500,
- textShadow: '1px 1px 0 rgba(0,0,0,0.2)',
+ textShadow: '1px 1px 0 rgba(0,0,0,0.1)',
}"
/>
</Card>
<Divider class="def-margin-bottom" />
- <template v-for="(item, index) in footerList" :key="index">
+ <template v-for="(item, index) in footerList" :key="item.field">
<span> {{ item.title }} </span>
<strong class="pl-10px">{{ item.value }}</strong>
<Divider type="vertical" v-if="index !== footerList.length - 1" />
diff --git
a/streampark-console/streampark-console-webapp/src/views/spark/app/index.vue
b/streampark-console/streampark-console-webapp/src/views/spark/app/index.vue
index d0dd6cb31..ef6c70b34 100644
--- a/streampark-console/streampark-console-webapp/src/views/spark/app/index.vue
+++ b/streampark-console/streampark-console-webapp/src/views/spark/app/index.vue
@@ -255,175 +255,179 @@
<template>
<PageWrapper content-full-height content-class="flex flex-col">
<AppDashboard ref="appDashboardRef" />
- <BasicTable
- @register="registerTable"
- :columns="getAppColumns"
- @resize-column="onTableColumnResize"
- class="app_list table-searchbar flex-1 pt-20px !px-0 flex flex-col"
- >
- <template #tableTitle>
- <div class="flex justify-between" style="width: 100%">
- <Form name="appTableForm" :model="searchRef" layout="inline"
class="flex-1 search-bar">
- <Row :gutter="4" class="w-full">
- <Col :span="5">
- <Form.Item>
- <Input
- :placeholder="t('spark.app.searchName')"
- allow-clear
- v-model:value="searchRef.appName"
- @change="() => handleResetReload()"
- @search="() => handleResetReload()"
- />
- </Form.Item>
- </Col>
- <Col :span="4">
- <Form.Item>
- <Select
- :placeholder="t('spark.app.tags')"
- show-search
- allow-clear
- v-model:value="searchRef.tags"
- @change="() => handleResetReload()"
- :options="(tagsOptions || []).map((t: Recordable) => ({
label: t, value: t }))"
- />
- </Form.Item>
- </Col>
- <Col :span="4">
- <Form.Item>
- <Select
- :placeholder="t('spark.app.jobType')"
- show-search
- allow-clear
- v-model:value="searchRef.jobType"
- @change="() => handleResetReload()"
- :options="[
- { label: 'JAR', value: JobTypeEnum.JAR },
- { label: 'SQL', value: JobTypeEnum.SQL },
- ]"
- />
- </Form.Item>
- </Col>
- <Col :span="4">
- <Form.Item>
- <Select
- :placeholder="t('spark.app.owner')"
- show-search
- allow-clear
- v-model:value="searchRef.userId"
- @change="() => handleResetReload()"
- :options="
- (users || []).map((u: Recordable) => ({
- label: u.nickName || u.username,
- value: u.userId,
- }))
- "
- />
- </Form.Item>
- </Col>
- </Row>
- </Form>
- <div v-auth="'app:create'">
- <Button type="primary" @click="() => router.push({ path:
'/spark/app/add' })">
- <PlusOutlined />
- {{ t('common.add') }}
- </Button>
+ <div class="flex-1 bg-white mt-15px">
+ <BasicTable
+ @register="registerTable"
+ :columns="getAppColumns"
+ @resize-column="onTableColumnResize"
+ class="app_list !px-0 table-searchbar flex-1 !px-0"
+ >
+ <template #tableTitle>
+ <div class="flex justify-between" style="width: 100%">
+ <Form name="appTableForm" :model="searchRef" layout="inline"
class="flex-1 search-bar">
+ <Row :gutter="4" class="w-full">
+ <Col :span="5">
+ <Form.Item>
+ <Input
+ :placeholder="t('spark.app.searchName')"
+ allow-clear
+ v-model:value="searchRef.appName"
+ @change="() => handleResetReload()"
+ @search="() => handleResetReload()"
+ />
+ </Form.Item>
+ </Col>
+ <Col :span="4">
+ <Form.Item>
+ <Select
+ :placeholder="t('spark.app.tags')"
+ show-search
+ allow-clear
+ v-model:value="searchRef.tags"
+ @change="() => handleResetReload()"
+ :options="
+ (tagsOptions || []).map((t: Recordable) => ({ label:
t, value: t }))
+ "
+ />
+ </Form.Item>
+ </Col>
+ <Col :span="4">
+ <Form.Item>
+ <Select
+ :placeholder="t('spark.app.jobType')"
+ show-search
+ allow-clear
+ v-model:value="searchRef.jobType"
+ @change="() => handleResetReload()"
+ :options="[
+ { label: 'JAR', value: JobTypeEnum.JAR },
+ { label: 'SQL', value: JobTypeEnum.SQL },
+ ]"
+ />
+ </Form.Item>
+ </Col>
+ <Col :span="4">
+ <Form.Item>
+ <Select
+ :placeholder="t('spark.app.owner')"
+ show-search
+ allow-clear
+ v-model:value="searchRef.userId"
+ @change="() => handleResetReload()"
+ :options="
+ (users || []).map((u: Recordable) => ({
+ label: u.nickName || u.username,
+ value: u.userId,
+ }))
+ "
+ />
+ </Form.Item>
+ </Col>
+ </Row>
+ </Form>
+ <div v-auth="'app:create'">
+ <Button type="primary" @click="() => router.push({ path:
'/spark/app/add' })">
+ <PlusOutlined />
+ {{ t('common.add') }}
+ </Button>
+ </div>
</div>
- </div>
- </template>
- <template #bodyCell="{ column, record }">
- <template v-if="column.dataIndex === 'appName'">
- <span class="app_type app_jar" v-if="record['jobType'] ==
JobTypeEnum.JAR">
- Spark JAR
- </span>
- <span class="app_type app_sql" v-if="record['jobType'] ==
JobTypeEnum.SQL">
- Spark SQL
- </span>
- <span class="app_type app_py" v-if="record['jobType'] ==
JobTypeEnum.PYSPARK">
- PySpark
- </span>
- <span
- class="link"
- :class="{
- 'cursor-pointer': [AppStateEnum.RUNNING].includes(record.state),
- }"
- @click="handleJobView(record)"
- >
- <Popover :title="t('common.detailText')">
- <template #content>
- <div class="flex">
- <span class="pr-6px font-bold">{{ t('flink.app.appName')
}}:</span>
- <div class="max-w-300px break-words">{{ record.appName
}}</div>
- </div>
- <div class="pt-2px">
- <span class="pr-6px font-bold">{{ t('flink.app.jobType')
}}:</span>
- <Tag color="blue">
- <span v-if="record['jobType'] == JobTypeEnum.JAR"> Spark
JAR </span>
- <span v-if="record['jobType'] == JobTypeEnum.SQL"> Spark
SQL </span>
- <span v-if="record['jobType'] == JobTypeEnum.PYSPARK">
PySpark </span>
- </Tag>
- </div>
- <div class="pt-2px flex">
- <span class="pr-6px font-bold">{{ t('common.description')
}}:</span>
- <div class="max-w-300px break-words">{{ record.description
}}</div>
- </div>
- </template>
- {{ record.appName }}
- </Popover>
- </span>
-
- <template v-if="record['jobType'] == JobTypeEnum.JAR">
- <Badge
- v-if="record.release === ReleaseStateEnum.NEED_CHECK"
- class="build-badge"
- count="NEW"
- :title="t('flink.app.view.recheck')"
- />
- <Badge
- v-else-if="record.release >= ReleaseStateEnum.RELEASING"
- class="build-badge"
- count="NEW"
- :title="t('flink.app.view.changed')"
- />
- </template>
</template>
- <template v-if="column.dataIndex === 'tags'">
- <Tooltip v-if="record.tags" :title="record.tags">
+ <template #bodyCell="{ column, record }">
+ <template v-if="column.dataIndex === 'appName'">
+ <span class="app_type app_jar" v-if="record['jobType'] ==
JobTypeEnum.JAR">
+ Spark JAR
+ </span>
+ <span class="app_type app_sql" v-if="record['jobType'] ==
JobTypeEnum.SQL">
+ Spark SQL
+ </span>
+ <span class="app_type app_py" v-if="record['jobType'] ==
JobTypeEnum.PYSPARK">
+ PySpark
+ </span>
<span
- v-for="(tag, index) in record.tags.split(',')"
- :key="'tag-'.concat(index.toString())"
- class="pl-4px"
+ class="link"
+ :class="{
+ 'cursor-pointer':
[AppStateEnum.RUNNING].includes(record.state),
+ }"
+ @click="handleJobView(record)"
>
- <Tag color="blue">{{ tag }}</Tag>
+ <Popover :title="t('common.detailText')">
+ <template #content>
+ <div class="flex">
+ <span class="pr-6px font-bold">{{ t('flink.app.appName')
}}:</span>
+ <div class="max-w-300px break-words">{{ record.appName
}}</div>
+ </div>
+ <div class="pt-2px">
+ <span class="pr-6px font-bold">{{ t('flink.app.jobType')
}}:</span>
+ <Tag color="blue">
+ <span v-if="record['jobType'] == JobTypeEnum.JAR"> Spark
JAR </span>
+ <span v-if="record['jobType'] == JobTypeEnum.SQL"> Spark
SQL </span>
+ <span v-if="record['jobType'] == JobTypeEnum.PYSPARK">
PySpark </span>
+ </Tag>
+ </div>
+ <div class="pt-2px flex">
+ <span class="pr-6px font-bold">{{ t('common.description')
}}:</span>
+ <div class="max-w-300px break-words">{{ record.description
}}</div>
+ </div>
+ </template>
+ {{ record.appName }}
+ </Popover>
</span>
- </Tooltip>
- </template>
- <template v-if="column.dataIndex === 'task'">
- <State option="task" :data="record" />
- </template>
- <template v-if="column.dataIndex === 'state'">
- <State option="state" :data="record"
:maxTitle="titleLenRef.maxState" />
+
+ <template v-if="record['jobType'] == JobTypeEnum.JAR">
+ <Badge
+ v-if="record.release === ReleaseStateEnum.NEED_CHECK"
+ class="build-badge"
+ count="NEW"
+ :title="t('flink.app.view.recheck')"
+ />
+ <Badge
+ v-else-if="record.release >= ReleaseStateEnum.RELEASING"
+ class="build-badge"
+ count="NEW"
+ :title="t('flink.app.view.changed')"
+ />
+ </template>
+ </template>
+ <template v-if="column.dataIndex === 'tags'">
+ <Tooltip v-if="record.tags" :title="record.tags">
+ <span
+ v-for="(tag, index) in record.tags.split(',')"
+ :key="'tag-'.concat(index.toString())"
+ class="pl-4px"
+ >
+ <Tag color="blue">{{ tag }}</Tag>
+ </span>
+ </Tooltip>
+ </template>
+ <template v-if="column.dataIndex === 'task'">
+ <State option="task" :data="record" />
+ </template>
+ <template v-if="column.dataIndex === 'state'">
+ <State option="state" :data="record"
:maxTitle="titleLenRef.maxState" />
+ </template>
+ <template v-if="column.dataIndex === 'release'">
+ <State
+ option="release"
+ :maxTitle="titleLenRef.maxRelease"
+ :title="releaseTitleMap[record.release] || ''"
+ :data="record"
+ />
+ </template>
+ <template v-if="column.dataIndex === 'operation'">
+ <TableAction v-bind="getTableActions(record, currentTablePage)" />
+ </template>
</template>
- <template v-if="column.dataIndex === 'release'">
- <State
- option="release"
- :maxTitle="titleLenRef.maxRelease"
- :title="releaseTitleMap[record.release] || ''"
- :data="record"
+ <template #insertTable="{ tableContainer }">
+ <AppTableResize
+ :table-container="tableContainer"
+ :resize-min="100"
+ v-if="getDataSource()?.length > 0"
+ v-model:left="tableColumnWidth.appName"
/>
</template>
- <template v-if="column.dataIndex === 'operation'">
- <TableAction v-bind="getTableActions(record, currentTablePage)" />
- </template>
- </template>
- <template #insertTable="{ tableContainer }">
- <AppTableResize
- :table-container="tableContainer"
- :resize-min="100"
- v-if="getDataSource()?.length > 0"
- v-model:left="tableColumnWidth.appName"
- />
- </template>
- </BasicTable>
+ </BasicTable>
+ </div>
<!-- <AppStartModal @register="registerStartModal"
@update-option="handleOptionApp" /> -->
<!-- <AppStopModal @register="registerStopModal"
@update-option="handleOptionApp" /> -->
<AppBuildDrawer @register="registerBuildDrawer" />
diff --git a/streampark-e2e/pom.xml b/streampark-e2e/pom.xml
index be8077cf4..6e601d388 100644
--- a/streampark-e2e/pom.xml
+++ b/streampark-e2e/pom.xml
@@ -15,8 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
@@ -56,16 +55,16 @@
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junit.version}</version>
- <scope>import</scope>
<type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>1.19.8</version>
- <scope>import</scope>
<type>pom</type>
+ <scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
diff --git
a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/flink/applications/ApplicationsPage.java
b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/flink/applications/ApplicationsPage.java
index 6f74c463b..af08c1a96 100644
---
a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/flink/applications/ApplicationsPage.java
+++
b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/flink/applications/ApplicationsPage.java
@@ -45,16 +45,10 @@ public class ApplicationsPage extends NavBarPage implements
ApacheFlinkPage.Tab
@FindBy(className = "ant-form-item-explain-error")
public List<WebElement> errorMessageList;
- /*
- * @FindBy(className = "e2e-flinkapp-delete-btn") public WebElement
deleteButton;
- *
- * @FindBy(className = "e2e-flinkapp-delete-confirm") public WebElement
deleteConfirmButton;
- */
-
- @FindBy(xpath = "//div[contains(@class,
'ant-dropdown-content')]//span[contains(text(), 'Delete')]")
+ @FindBy(className = "e2e-flinkapp-delete-btn")
public WebElement deleteButton;
- @FindBy(xpath = "//button[contains(@class, 'ant-btn')]/span[contains(.,
'OK')]")
+ @FindBy(className = "e2e-flinkapp-delete-confirm")
public WebElement deleteConfirmButton;
public ApplicationsPage(RemoteWebDriver driver) {
