diff --git a/dlink-admin/src/main/java/com/dlink/job/Job2MysqlHandler.java b/dlink-admin/src/main/java/com/dlink/job/Job2MysqlHandler.java
index 9757b42619..c057c49ec9 100644
--- a/dlink-admin/src/main/java/com/dlink/job/Job2MysqlHandler.java
+++ b/dlink-admin/src/main/java/com/dlink/job/Job2MysqlHandler.java
@@ -63,7 +63,8 @@ public class Job2MysqlHandler implements JobHandler {
     static {
         historyService = SpringContextUtils.getBean("historyServiceImpl", HistoryService.class);
         clusterService = SpringContextUtils.getBean("clusterServiceImpl", ClusterService.class);
-        clusterConfigurationService = SpringContextUtils.getBean("clusterConfigurationServiceImpl", ClusterConfigurationService.class);
+        clusterConfigurationService = SpringContextUtils.getBean("clusterConfigurationServiceImpl",
+                ClusterConfigurationService.class);
         jarService = SpringContextUtils.getBean("jarServiceImpl", JarService.class);
         jobInstanceService = SpringContextUtils.getBean("jobInstanceServiceImpl", JobInstanceService.class);
         jobHistoryService = SpringContextUtils.getBean("jobHistoryServiceImpl", JobHistoryService.class);
@@ -132,12 +133,12 @@ public boolean success() {
         final Integer clusterConfigurationId = job.getJobConfig().getClusterConfigurationId();
         if (job.isUseGateway()) {
             cluster = clusterService.registersCluster(Cluster.autoRegistersCluster(
-                job.getJobManagerAddress(),
-                job.getJobId(),
-                job.getJobConfig().getJobName() + LocalDateTime.now(),
-                job.getType().getLongValue(),
-                clusterConfigurationId,
-                taskId));
+                    job.getJobManagerAddress(),
+                    job.getJobId(),
+                    job.getJobConfig().getJobName() + LocalDateTime.now(),
+                    job.getType().getLongValue(),
+                    clusterConfigurationId,
+                    taskId));
             if (Asserts.isNotNull(cluster)) {
                 clusterId = cluster.getId();
             }
@@ -174,11 +175,12 @@ public boolean success() {
         jobHistory.setClusterJson(JSONUtil.toJsonString(cluster));
 
         jobHistory.setJarJson(Asserts.isNotNull(job.getJobConfig().getJarId())
-            ? JSONUtil.toJsonString(jarService.getById(job.getJobConfig().getJarId())) : null);
+                ? JSONUtil.toJsonString(jarService.getById(job.getJobConfig().getJarId()))
+                : null);
 
         jobHistory.setClusterConfigurationJson(Asserts.isNotNull(clusterConfigurationId)
-            ? JSONUtil.toJsonString(clusterConfigurationService.getClusterConfigById(clusterConfigurationId))
-            : null);
+                ? JSONUtil.toJsonString(clusterConfigurationService.getClusterConfigById(clusterConfigurationId))
+                : null);
         jobHistoryService.save(jobHistory);
 
         DaemonFactory.addTask(DaemonTaskConfig.build(FlinkJobTask.TYPE, jobInstance.getId()));
diff --git a/dlink-admin/src/main/java/com/dlink/mapper/JobHistoryMapper.java b/dlink-admin/src/main/java/com/dlink/mapper/JobHistoryMapper.java
index 4a1f36393c..2742527d24 100644
--- a/dlink-admin/src/main/java/com/dlink/mapper/JobHistoryMapper.java
+++ b/dlink-admin/src/main/java/com/dlink/mapper/JobHistoryMapper.java
@@ -37,7 +37,4 @@ public interface JobHistoryMapper extends SuperMapper<JobHistory> {
 
     @InterceptorIgnore(tenantLine = "true")
     JobHistory getByIdWithoutTenant(Integer id);
-
-    int insert(JobHistory jobHistory);
-
 }
diff --git a/dlink-admin/src/main/java/com/dlink/mapper/JobInstanceMapper.java b/dlink-admin/src/main/java/com/dlink/mapper/JobInstanceMapper.java
index afd031f04e..f934095acc 100644
--- a/dlink-admin/src/main/java/com/dlink/mapper/JobInstanceMapper.java
+++ b/dlink-admin/src/main/java/com/dlink/mapper/JobInstanceMapper.java
@@ -45,6 +45,7 @@ public interface JobInstanceMapper extends SuperMapper<JobInstance> {
 
     List<JobInstanceCount> countHistoryStatus();
 
+    @InterceptorIgnore(tenantLine = "true")
     List<JobInstance> listJobInstanceActive();
 
     JobInstance getJobInstanceByTaskId(Integer id);
diff --git a/dlink-admin/src/main/java/com/dlink/service/impl/JobHistoryServiceImpl.java b/dlink-admin/src/main/java/com/dlink/service/impl/JobHistoryServiceImpl.java
index a12f04c485..047e15e985 100644
--- a/dlink-admin/src/main/java/com/dlink/service/impl/JobHistoryServiceImpl.java
+++ b/dlink-admin/src/main/java/com/dlink/service/impl/JobHistoryServiceImpl.java
@@ -45,6 +45,8 @@
 @Service
 public class JobHistoryServiceImpl extends SuperServiceImpl<JobHistoryMapper, JobHistory> implements JobHistoryService {
 
+    private static final Logger log = LoggerFactory.getLogger(JobHistoryServiceImpl.class);
+
     @Override
     public JobHistory getByIdWithoutTenant(Integer id) {
         return baseMapper.getByIdWithoutTenant(id);
@@ -52,11 +54,9 @@ public JobHistory getByIdWithoutTenant(Integer id) {
 
     @Override
     public JobHistory getJobHistory(Integer id) {
-        return getJobHistoryInfo(getById(id));
+        return getJobHistoryInfo(baseMapper.getByIdWithoutTenant(id));
     }
 
-    private static final Logger log = LoggerFactory.getLogger(JobHistoryServiceImpl.class);
-
     @Override
     public JobHistory getJobHistoryInfo(JobHistory jobHistory) {
         if (Asserts.isNotNull(jobHistory)) {
diff --git a/dlink-admin/src/main/java/com/dlink/service/impl/StudioServiceImpl.java b/dlink-admin/src/main/java/com/dlink/service/impl/StudioServiceImpl.java
index e7334f556a..b66f98447a 100644
--- a/dlink-admin/src/main/java/com/dlink/service/impl/StudioServiceImpl.java
+++ b/dlink-admin/src/main/java/com/dlink/service/impl/StudioServiceImpl.java
@@ -103,12 +103,12 @@ public class StudioServiceImpl implements StudioService {
     private final UDFService udfService;
 
     public StudioServiceImpl(ClusterService clusterService,
-                             ClusterConfigurationService clusterConfigurationService,
-                             SavepointsService savepointsService,
-                             DataBaseService dataBaseService,
-                             TaskService taskService,
-                             FragmentVariableService fragmentVariableService,
-                             UDFService udfService) {
+            ClusterConfigurationService clusterConfigurationService,
+            SavepointsService savepointsService,
+            DataBaseService dataBaseService,
+            TaskService taskService,
+            FragmentVariableService fragmentVariableService,
+            UDFService udfService) {
         this.clusterService = clusterService;
         this.clusterConfigurationService = clusterConfigurationService;
         this.savepointsService = savepointsService;
@@ -120,17 +120,17 @@ public StudioServiceImpl(ClusterService clusterService,
 
     private void addFlinkSQLEnv(AbstractStatementDTO statementDTO) {
         ProcessEntity process = ProcessContextHolder.getProcess();
-        process.info("Start Initialize FlinkSQLEnv:");
+        process.info("Start initialize FlinkSQLEnv:");
         if (statementDTO.isFragment()) {
             process.config("Variable opened.");
 
             // initialize global variables
-            process.info("Initializing Global Variables...");
+            process.info("Initializing global variables...");
             statementDTO.setVariables(fragmentVariableService.listEnabledVariables());
             process.infoSuccess();
 
             // initialize database variables
-            process.info("Initializing Database Variables...");
+            process.info("Initializing database variables...");
             String flinkWithSql = dataBaseService.getEnabledFlinkWithSql();
             if (Asserts.isNotNullString(flinkWithSql)) {
                 statementDTO.setStatement(flinkWithSql + "\n" + statementDTO.getStatement());
@@ -152,7 +152,7 @@ private void addFlinkSQLEnv(AbstractStatementDTO statementDTO) {
                 process.info("No FlinkSQLEnv are loaded.");
             }
         }
-        process.info("Finish Initialize FlinkSQLEnv.");
+        process.info("Finish initialize FlinkSQLEnv.");
     }
 
     private void buildSession(JobConfig config) {
@@ -178,16 +178,15 @@ private JobResult executeFlinkSql(StudioExecuteDTO studioExecuteDTO) {
         ProcessEntity process = ProcessContextHolder.registerProcess(
                 ProcessEntity.init(ProcessType.FLINKEXECUTE, StpUtil.getLoginIdAsInt()));
         addFlinkSQLEnv(studioExecuteDTO);
-        process.info("Initializing Flink Job Config...");
+        process.info("Initializing Flink job config...");
         JobConfig config = studioExecuteDTO.getJobConfig();
         buildSession(config);
         // init UDF
         udfService.init(studioExecuteDTO.getStatement(), config);
         JobManager jobManager = JobManager.build(config);
-        process.infoSuccess();
         process.start();
         JobResult jobResult = jobManager.executeSql(studioExecuteDTO.getStatement());
-        process.finish();
+        process.finish("Execute Flink SQL succeed.");
         RunTimeUtil.recovery(jobManager);
         return jobResult;
     }
@@ -208,7 +207,7 @@ public JobResult executeCommonSql(SqlDTO sqlDTO) {
         JobResult result = new JobResult();
         result.setStatement(sqlDTO.getStatement());
         result.setStartTimeNow();
-        process.info("Initializing Database Connection...");
+        process.info("Initializing database connection...");
         if (Asserts.isNull(sqlDTO.getDatabaseId())) {
             result.setSuccess(false);
             result.setError("请指定数据源");
@@ -229,7 +228,7 @@ public JobResult executeCommonSql(SqlDTO sqlDTO) {
             process.start();
             selectResult = driver.executeSql(sqlDTO.getStatement(), sqlDTO.getMaxRowNum());
         }
-        process.finish();
+        process.finish("Execute sql succeed.");
         result.setResult(selectResult);
         if (selectResult.isSuccess()) {
             result.setSuccess(true);
@@ -265,7 +264,7 @@ private List<SqlExplainResult> explainFlinkSql(StudioExecuteDTO studioExecuteDTO
         ProcessEntity process = ProcessContextHolder.registerProcess(
                 ProcessEntity.init(ProcessType.FLINKEXPLAIN, StpUtil.getLoginIdAsInt()));
         addFlinkSQLEnv(studioExecuteDTO);
-        process.info("Initializing Flink Job Config...");
+        process.info("Initializing Flink job config...");
         JobConfig config = studioExecuteDTO.getJobConfig();
         // If you are using explainSql | getStreamGraph | getJobPlan, make the dialect change to local.
         config.buildLocal();
@@ -273,10 +272,9 @@ private List<SqlExplainResult> explainFlinkSql(StudioExecuteDTO studioExecuteDTO
         // init UDF
         udfService.init(studioExecuteDTO.getStatement(), config);
         JobManager jobManager = JobManager.build(config);
-        process.infoSuccess();
         process.start();
-        List<SqlExplainResult> sqlExplainResults =
-                jobManager.explainSql(studioExecuteDTO.getStatement()).getSqlExplainResults();
+        List<SqlExplainResult> sqlExplainResults = jobManager.explainSql(studioExecuteDTO.getStatement())
+                .getSqlExplainResults();
         process.finish();
         return sqlExplainResults;
     }
@@ -284,7 +282,7 @@ private List<SqlExplainResult> explainFlinkSql(StudioExecuteDTO studioExecuteDTO
     private List<SqlExplainResult> explainCommonSql(StudioExecuteDTO studioExecuteDTO) {
         ProcessEntity process = ProcessContextHolder.registerProcess(
                 ProcessEntity.init(ProcessType.SQLEXPLAIN, StpUtil.getLoginIdAsInt()));
-        process.info("Initializing Flink Job Config...");
+        process.info("Initializing database connection...");
         if (Asserts.isNull(studioExecuteDTO.getDatabaseId())) {
             process.error("The database does not exist.");
             return Collections.singletonList(
@@ -417,8 +415,8 @@ public boolean cancel(Integer clusterId, String jobId) {
         JobConfig jobConfig = new JobConfig();
         jobConfig.setAddress(cluster.getJobManagerHost());
         if (Asserts.isNotNull(cluster.getClusterConfigurationId())) {
-            Map<String, Object> gatewayConfig =
-                    clusterConfigurationService.getGatewayConfig(cluster.getClusterConfigurationId());
+            Map<String, Object> gatewayConfig = clusterConfigurationService
+                    .getGatewayConfig(cluster.getClusterConfigurationId());
             jobConfig.buildGatewayConfig(gatewayConfig);
         }
         JobManager jobManager = JobManager.build(jobConfig);
@@ -436,8 +434,8 @@ public boolean savepoint(Integer taskId, Integer clusterId, String jobId, String
         jobConfig.setType(cluster.getType());
         if (Asserts.isNotNull(cluster.getClusterConfigurationId())) {
             // 如果用户选择用dlink平台来托管集群信息 说明任务一定是从dlink发起提交的
-            Map<String, Object> gatewayConfig =
-                    clusterConfigurationService.getGatewayConfig(cluster.getClusterConfigurationId());
+            Map<String, Object> gatewayConfig = clusterConfigurationService
+                    .getGatewayConfig(cluster.getClusterConfigurationId());
             jobConfig.buildGatewayConfig(gatewayConfig);
             jobConfig.getGatewayConfig().getClusterConfig().setAppId(cluster.getName());
             jobConfig.setTaskId(cluster.getTaskId());
diff --git a/dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java b/dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java
index 6c7ba081e5..48df1e28d7 100644
--- a/dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java
+++ b/dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java
@@ -79,6 +79,9 @@
 import com.dlink.model.TaskOperatingStatus;
 import com.dlink.model.TaskVersion;
 import com.dlink.model.UDFTemplate;
+import com.dlink.process.context.ProcessContextHolder;
+import com.dlink.process.model.ProcessEntity;
+import com.dlink.process.model.ProcessType;
 import com.dlink.result.SqlExplainResult;
 import com.dlink.result.TaskOperatingResult;
 import com.dlink.service.AlertGroupService;
@@ -137,6 +140,7 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
@@ -211,15 +215,22 @@ public JobResult submitTask(Integer id) {
             return executeCommonSql(SqlDTO.build(task.getStatement(),
                     task.getDatabaseId(), null));
         }
+        ProcessEntity process = ProcessContextHolder.registerProcess(
+                ProcessEntity.init(ProcessType.FLINKSUBMIT, StpUtil.getLoginIdAsInt()));
+        process.info("Initializing Flink job config...");
         JobConfig config = buildJobConfig(task);
         // init UDF
         udfService.init(task.getStatement(), config);
         JobManager jobManager = JobManager.build(config);
-
+        process.start();
         if (!config.isJarTask()) {
-            return jobManager.executeSql(task.getStatement());
+            JobResult jobResult = jobManager.executeSql(task.getStatement());
+            process.finish("Submit Flink SQL succeed.");
+            return jobResult;
         } else {
-            return jobManager.executeJar();
+            JobResult jobResult = jobManager.executeJar();
+            process.finish("Submit Flink Jar succeed.");
+            return jobResult;
         }
     }
 
@@ -492,8 +503,8 @@ public Task getTaskByNameAndTenantId(String name, Integer tenantId) {
     @Override
     public JobStatus checkJobStatus(JobInfoDetail jobInfoDetail) {
         JobConfig jobConfig = new JobConfig();
-        Map<String, Object> gatewayConfigMap =
-                clusterConfigurationService.getGatewayConfig(jobInfoDetail.getClusterConfiguration().getId());
+        Map<String, Object> gatewayConfigMap = clusterConfigurationService
+                .getGatewayConfig(jobInfoDetail.getClusterConfiguration().getId());
         jobConfig.buildGatewayConfig(gatewayConfigMap);
         GatewayConfig gatewayConfig = jobConfig.getGatewayConfig();
         gatewayConfig.setType(GatewayType.get(jobInfoDetail.getCluster().getType()));
@@ -530,9 +541,8 @@ public Task getUDFByClassName(String className) {
 
     @Override
     public List<Task> getAllUDF() {
-        List<Task> tasks =
-                list(new QueryWrapper<Task>().in("dialect", Dialect.JAVA, Dialect.SCALA, Dialect.PYTHON)
-                        .eq("enabled", 1).isNotNull("save_point_path"));
+        List<Task> tasks = list(new QueryWrapper<Task>().in("dialect", Dialect.JAVA, Dialect.SCALA, Dialect.PYTHON)
+                .eq("enabled", 1).isNotNull("save_point_path"));
         return tasks.stream().peek(task -> {
             Assert.check(task);
             task.setStatement(statementService.getById(task.getId()).getStatement());
@@ -568,8 +578,8 @@ public Result releaseTask(Integer id) {
     public Task createTaskVersionSnapshot(Task task) {
         List<TaskVersion> taskVersions = taskVersionService.getTaskVersionByTaskId(task.getId());
         List<Integer> versionIds = taskVersions.stream().map(TaskVersion::getVersionId).collect(Collectors.toList());
-        Map<Integer, TaskVersion> versionMap =
-                taskVersions.stream().collect(Collectors.toMap(TaskVersion::getVersionId, t -> t));
+        Map<Integer, TaskVersion> versionMap = taskVersions.stream()
+                .collect(Collectors.toMap(TaskVersion::getVersionId, t -> t));
 
         TaskVersion taskVersion = new TaskVersion();
         BeanUtil.copyProperties(task, taskVersion);
@@ -755,13 +765,13 @@ private boolean savepointJobInstance(Integer jobInstanceId, String savePointType
         Task task = this.getTaskInfoById(cluster.getTaskId());
 
         if (Asserts.isNotNull(cluster.getClusterConfigurationId())) {
-            Map<String, Object> gatewayConfig =
-                    clusterConfigurationService.getGatewayConfig(cluster.getClusterConfigurationId());
+            Map<String, Object> gatewayConfig = clusterConfigurationService
+                    .getGatewayConfig(cluster.getClusterConfigurationId());
             // 如果是k8s application 模式,且不是sql任务，则需要补齐statement 内的自定义配置
             if (Dialect.KUBERNETES_APPLICATION.equalsVal(task.getDialect())) {
                 Statement statement = statementService.getById(cluster.getTaskId());
-                Map<String, Object> statementConfig =
-                        JSONUtil.toMap(statement.getStatement(), String.class, Object.class);
+                Map<String, Object> statementConfig = JSONUtil.toMap(statement.getStatement(), String.class,
+                        Object.class);
                 gatewayConfig.putAll(statementConfig);
             }
             jobConfig.buildGatewayConfig(gatewayConfig);
@@ -821,14 +831,14 @@ private JobConfig buildJobConfig(Task task) {
         else if (Dialect.KUBERNETES_APPLICATION.equalsVal(task.getDialect())
                 && GatewayType.KUBERNETES_APPLICATION.equalsValue(config.getType())) {
             Map<String, Object> taskConfig = JSONUtil.toMap(task.getStatement(), String.class, Object.class);
-            Map<String, Object> clusterConfiguration =
-                    clusterConfigurationService.getGatewayConfig(task.getClusterConfigurationId());
+            Map<String, Object> clusterConfiguration = clusterConfigurationService
+                    .getGatewayConfig(task.getClusterConfigurationId());
             clusterConfiguration.putAll((Map<String, Object>) taskConfig.get("appConfig"));
             clusterConfiguration.put("taskCustomConfig", taskConfig);
             config.buildGatewayConfig(clusterConfiguration);
         } else {
-            Map<String, Object> gatewayConfig =
-                    clusterConfigurationService.getGatewayConfig(task.getClusterConfigurationId());
+            Map<String, Object> gatewayConfig = clusterConfigurationService
+                    .getGatewayConfig(task.getClusterConfigurationId());
             // submit application type with clusterConfiguration
             if (GatewayType.YARN_APPLICATION.equalsValue(config.getType())
                     || GatewayType.KUBERNETES_APPLICATION.equalsValue(config.getType())) {
@@ -903,9 +913,9 @@ public JobInstance refreshJobInstance(Integer id, boolean isCoercive) {
         if (!isCoercive && !inRefreshPlan(jobInfoDetail.getInstance())) {
             return jobInfoDetail.getInstance();
         }
-        JobHistory jobHistoryJson =
-                jobHistoryService.refreshJobHistory(id, jobInfoDetail.getCluster().getJobManagerHost(),
-                        jobInfoDetail.getInstance().getJid(), jobInfoDetail.isNeedSave());
+        JobHistory jobHistoryJson = jobHistoryService.refreshJobHistory(id,
+                jobInfoDetail.getCluster().getJobManagerHost(),
+                jobInfoDetail.getInstance().getJid(), jobInfoDetail.isNeedSave());
         JobHistory jobHistory = jobHistoryService.getJobHistoryInfo(jobHistoryJson);
         jobInfoDetail.setJobHistory(jobHistory);
         JobStatus checkStatus = null;
@@ -977,7 +987,6 @@ public String getTaskAPIAddress() {
 
     @Override
     public Integer queryAllSizeByName(String name) {
-
         return baseMapper.queryAllSizeByName(name);
     }
 
@@ -996,8 +1005,8 @@ public String exportJsonByTaskId(Integer taskId) {
         ((ObjectNode) jsonNode).put("path", getTaskPathByTaskId(taskId));
         // clusterConfigurationName
         if (Asserts.isNotNull(task.getClusterConfigurationId())) {
-            ClusterConfiguration clusterConfiguration =
-                    clusterConfigurationService.getById(task.getClusterConfigurationId());
+            ClusterConfiguration clusterConfiguration = clusterConfigurationService
+                    .getById(task.getClusterConfigurationId());
             ((ObjectNode) jsonNode).put("clusterConfigurationName",
                     Asserts.isNotNull(clusterConfiguration) ? clusterConfiguration.getName() : null);
         }
@@ -1082,8 +1091,8 @@ public Result buildTaskByJsonNode(JsonNode jsonNode, ObjectMapper mapper) throws
                 }
             }
             if (Asserts.isNotNull(task.getDatabaseName())) {
-                DataBase dataBase =
-                        dataBaseService.getOne(new QueryWrapper<DataBase>().eq("name", task.getDatabaseName()));
+                DataBase dataBase = dataBaseService
+                        .getOne(new QueryWrapper<DataBase>().eq("name", task.getDatabaseName()));
                 if (Asserts.isNotNull(dataBase)) {
                     task.setDatabaseId(dataBase.getId());
                 }
@@ -1099,8 +1108,8 @@ public Result buildTaskByJsonNode(JsonNode jsonNode, ObjectMapper mapper) throws
              * task.getEnvName())); if(Asserts.isNotNull(task1)){ task.setEnvId(task1.getId()); } }
              */
             if (Asserts.isNotNull(task.getAlertGroupName())) {
-                AlertGroup alertGroup =
-                        alertGroupService.getOne(new QueryWrapper<AlertGroup>().eq("name", task.getAlertGroupName()));
+                AlertGroup alertGroup = alertGroupService
+                        .getOne(new QueryWrapper<AlertGroup>().eq("name", task.getAlertGroupName()));
                 if (Asserts.isNotNull(alertGroup)) {
                     task.setAlertGroupId(alertGroup.getId());
                 }
@@ -1205,7 +1214,7 @@ public void handleJobDone(JobInstance jobInstance) {
             return;
         }
         Integer jobInstanceId = jobInstance.getId();
-        JobHistory jobHistory = jobHistoryService.getById(jobInstanceId); // 获取任务历史信息
+        JobHistory jobHistory = jobHistoryService.getJobHistory(jobInstanceId); // 获取任务历史信息
         String jobJson = jobHistory.getJobJson(); // 获取任务历史信息的jobJson
         ObjectNode jsonNodes = JSONUtil.parseObject(jobJson);
         if (jsonNodes.has("errors")) {
@@ -1313,7 +1322,7 @@ private List<TreeNode<Integer>> dealWithCatalogue(List<Catalogue> catalogueList)
 
     @Override
     public Result<List<Task>> queryOnLineTaskByDoneStatus(List<JobLifeCycle> jobLifeCycle, List<JobStatus> jobStatuses,
-                                                          boolean includeNull, Integer catalogueId) {
+            boolean includeNull, Integer catalogueId) {
         final Tree<Integer> node = ((Tree<Integer>) queryAllCatalogue().getDatas())
                 .getNode(Objects.isNull(catalogueId) ? 0 : catalogueId);
         final List<Integer> parentIds = new ArrayList<>(0);
@@ -1324,7 +1333,7 @@ public Result<List<Task>> queryOnLineTaskByDoneStatus(List<JobLifeCycle> jobLife
     }
 
     private List<Task> getTasks(List<JobLifeCycle> jobLifeCycle, List<JobStatus> jobStatuses, boolean includeNull,
-                                List<Integer> parentIds) {
+            List<Integer> parentIds) {
         return this.baseMapper.queryOnLineTaskByDoneStatus(parentIds,
                 jobLifeCycle.stream().filter(Objects::nonNull).map(JobLifeCycle::getValue).collect(Collectors.toList()),
                 includeNull, jobStatuses.stream().map(JobStatus::name).collect(Collectors.toList()));
@@ -1346,8 +1355,8 @@ private void childrenNodeParse(Tree<Integer> node, List<Integer> parentIds) {
 
     @Override
     public void selectSavepointOnLineTask(TaskOperatingResult taskOperatingResult) {
-        final JobInstance jobInstanceByTaskId =
-                jobInstanceService.getJobInstanceByTaskId(taskOperatingResult.getTask().getId());
+        final JobInstance jobInstanceByTaskId = jobInstanceService
+                .getJobInstanceByTaskId(taskOperatingResult.getTask().getId());
         if (jobInstanceByTaskId == null) {
             startGoingLiveTask(taskOperatingResult, null);
             return;
@@ -1364,11 +1373,8 @@ public void selectSavepointOnLineTask(TaskOperatingResult taskOperatingResult) {
     }
 
     private void findTheConditionSavePointToOnline(TaskOperatingResult taskOperatingResult,
-                                                   JobInstance jobInstanceByTaskId) {
-        final LambdaQueryWrapper<JobHistory> queryWrapper = new LambdaQueryWrapper<JobHistory>()
-                .select(JobHistory::getId, JobHistory::getCheckpointsJson)
-                .eq(JobHistory::getId, jobInstanceByTaskId.getId());
-        final JobHistory jobHistory = jobHistoryService.getOne(queryWrapper);
+            JobInstance jobInstanceByTaskId) {
+        final JobHistory jobHistory = jobHistoryService.getJobHistory(jobInstanceByTaskId.getId());
         if (jobHistory != null && StringUtils.isNotBlank(jobHistory.getCheckpointsJson())) {
             final ObjectNode jsonNodes = JSONUtil.parseObject(jobHistory.getCheckpointsJson());
             final ArrayNode history = jsonNodes.withArray("history");
diff --git a/dlink-admin/src/main/java/com/dlink/utils/UDFUtils.java b/dlink-admin/src/main/java/com/dlink/utils/UDFUtils.java
index 61580f680c..b594b3908a 100644
--- a/dlink-admin/src/main/java/com/dlink/utils/UDFUtils.java
+++ b/dlink-admin/src/main/java/com/dlink/utils/UDFUtils.java
@@ -43,8 +43,7 @@
  */
 public class UDFUtils extends UDFUtil {
 
-    private static final String FUNCTION_SQL_REGEX =
-            "create\\s+.*function\\s+(.*)\\s+as\\s+'(.*)'(\\s+language (.*))?;";
+    private static final String FUNCTION_SQL_REGEX = "create\\s+.*function\\s+(.*)\\s+as\\s+'(.*)'(\\s+language (.*))?;";
 
     public static List<UDF> getUDF(String statement) {
         ProcessEntity process = ProcessContextHolder.getProcess();
@@ -65,7 +64,9 @@ public static List<UDF> getUDF(String statement) {
                     .build();
         }).collect(Collectors.toList());
         List<String> classNameList = udfList.stream().map(UDF::getClassName).collect(Collectors.toList());
-        process.info(StringUtils.join(",", classNameList));
+        if (classNameList.size() > 0) {
+            process.info(StringUtils.join(classNameList, ","));
+        }
         process.info(CharSequenceUtil.format("A total of {} UDF have been Parsed.", classNameList.size()));
         return udfList;
     }
diff --git a/dlink-admin/src/main/resources/mapper/JobHistoryMapper.xml b/dlink-admin/src/main/resources/mapper/JobHistoryMapper.xml
index 4133fad3f9..1c407eb6d1 100644
--- a/dlink-admin/src/main/resources/mapper/JobHistoryMapper.xml
+++ b/dlink-admin/src/main/resources/mapper/JobHistoryMapper.xml
@@ -9,13 +9,6 @@
         limit 1
     </select>
 
-    <insert id="insert">
-        insert into dlink_job_history (id,job_json,exceptions_json,checkpoints_json,checkpoints_config_json,config_json,
-                                       jar_json,cluster_json,cluster_configuration_json,update_time)
-        values (#{id},#{jobJson},#{exceptionsJson},#{checkpointsJson},#{checkpointsConfigJson},#{configJson},
-                #{jarJson},#{clusterJson},#{clusterConfigurationJson},#{updateTime})
-    </insert>
-
     <select id="selectForProTable" resultType="com.dlink.model.JobHistory">
         select
         a.*
diff --git a/dlink-app/dlink-app-1.11/pom.xml b/dlink-app/dlink-app-1.11/pom.xml
index 930eff6358..77a1e80f68 100644
--- a/dlink-app/dlink-app-1.11/pom.xml
+++ b/dlink-app/dlink-app-1.11/pom.xml
@@ -15,16 +15,14 @@
   ~ 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>
     <parent>
-        <artifactId>dlink-app</artifactId>
         <groupId>com.dlink</groupId>
+        <artifactId>dlink-app</artifactId>
         <version>0.7.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dlink-app-1.11</artifactId>
 
@@ -72,21 +70,7 @@
                 </includes>
             </resource>
         </resources>
-
         <plugins>
-            <!-- 编译插件 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${target.java.version}</source>
-                    <target>${target.java.version}</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-
-            <!-- 打jar包插件(会包含所有依赖) -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -101,18 +85,18 @@
                             <mainClass>com.dlink.app.MainApp</mainClass>
                         </manifest>
                     </archive>
+                    <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
                 </configuration>
                 <executions>
                     <execution>
                         <id>make-assembly</id>
-                        <phase>package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
+                        <phase>package</phase>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
-
-</project>
\ No newline at end of file
+</project>
diff --git a/dlink-app/dlink-app-1.11/pom.xml.versionsBackup b/dlink-app/dlink-app-1.11/pom.xml.versionsBackup
deleted file mode 100644
index 16cb2486c9..0000000000
--- a/dlink-app/dlink-app-1.11/pom.xml.versionsBackup
+++ /dev/null
@@ -1,118 +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">
-    <parent>
-        <artifactId>dlink-app</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-app-1.11</artifactId>
-
-    <properties>
-        <mainClass>com.dlink.app.MainApp</mainClass>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-app-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-client-1.11</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-flink-1.11</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-client-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-executor</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>*.properties</include>
-                </includes>
-            </resource>
-        </resources>
-
-        <plugins>
-            <!-- 编译插件 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${target.java.version}</source>
-                    <target>${target.java.version}</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-
-            <!-- 打jar包插件(会包含所有依赖) -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>${maven-assembly-plugin.version}</version>
-                <configuration>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                    <archive>
-                        <manifest>
-                            <!-- 可以设置jar包的入口类(可选) -->
-                            <mainClass>com.dlink.app.MainApp</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/dlink-app/dlink-app-1.12/pom.xml b/dlink-app/dlink-app-1.12/pom.xml
index 02e1c6561b..86419e2339 100644
--- a/dlink-app/dlink-app-1.12/pom.xml
+++ b/dlink-app/dlink-app-1.12/pom.xml
@@ -15,16 +15,14 @@
   ~ 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>
     <parent>
-        <artifactId>dlink-app</artifactId>
         <groupId>com.dlink</groupId>
+        <artifactId>dlink-app</artifactId>
         <version>0.7.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dlink-app-1.12</artifactId>
 
@@ -74,19 +72,6 @@
         </resources>
 
         <plugins>
-            <!-- 编译插件 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${target.java.version}</source>
-                    <target>${target.java.version}</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-
-            <!-- 打jar包插件(会包含所有依赖) -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -101,18 +86,19 @@
                             <mainClass>com.dlink.app.MainApp</mainClass>
                         </manifest>
                     </archive>
+                    <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
                 </configuration>
                 <executions>
                     <execution>
                         <id>make-assembly</id>
-                        <phase>package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
+                        <phase>package</phase>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/dlink-app/dlink-app-1.12/pom.xml.versionsBackup b/dlink-app/dlink-app-1.12/pom.xml.versionsBackup
deleted file mode 100644
index 44d2402d7a..0000000000
--- a/dlink-app/dlink-app-1.12/pom.xml.versionsBackup
+++ /dev/null
@@ -1,118 +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">
-    <parent>
-        <artifactId>dlink-app</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-app-1.12</artifactId>
-
-    <properties>
-        <mainClass>com.dlink.app.MainApp</mainClass>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-app-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-client-1.12</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-flink-1.12</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-client-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-executor</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>*.properties</include>
-                </includes>
-            </resource>
-        </resources>
-
-        <plugins>
-            <!-- 编译插件 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${target.java.version}</source>
-                    <target>${target.java.version}</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-
-            <!-- 打jar包插件(会包含所有依赖) -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>${maven-assembly-plugin.version}</version>
-                <configuration>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                    <archive>
-                        <manifest>
-                            <!-- 可以设置jar包的入口类(可选) -->
-                            <mainClass>com.dlink.app.MainApp</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/dlink-app/dlink-app-1.13/pom.xml b/dlink-app/dlink-app-1.13/pom.xml
index db9ac5718f..f396fbb1db 100644
--- a/dlink-app/dlink-app-1.13/pom.xml
+++ b/dlink-app/dlink-app-1.13/pom.xml
@@ -15,16 +15,14 @@
   ~ 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>
     <parent>
-        <artifactId>dlink-app</artifactId>
         <groupId>com.dlink</groupId>
+        <artifactId>dlink-app</artifactId>
         <version>0.7.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dlink-app-1.13</artifactId>
 
@@ -74,19 +72,6 @@
         </resources>
 
         <plugins>
-            <!-- 编译插件 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${target.java.version}</source>
-                    <target>${target.java.version}</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-
-            <!-- 打jar包插件(会包含所有依赖) -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -101,18 +86,18 @@
                             <mainClass>com.dlink.app.MainApp</mainClass>
                         </manifest>
                     </archive>
+                    <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
                 </configuration>
                 <executions>
                     <execution>
                         <id>make-assembly</id>
-                        <phase>package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
+                        <phase>package</phase>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
-
-</project>
\ No newline at end of file
+</project>
diff --git a/dlink-app/dlink-app-1.13/pom.xml.versionsBackup b/dlink-app/dlink-app-1.13/pom.xml.versionsBackup
deleted file mode 100644
index 472d6c7c22..0000000000
--- a/dlink-app/dlink-app-1.13/pom.xml.versionsBackup
+++ /dev/null
@@ -1,118 +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">
-    <parent>
-        <artifactId>dlink-app</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-app-1.13</artifactId>
-
-    <properties>
-        <mainClass>com.dlink.app.MainApp</mainClass>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-app-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-client-1.13</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-flink-1.13</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-client-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-executor</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>*.properties</include>
-                </includes>
-            </resource>
-        </resources>
-
-        <plugins>
-            <!-- 编译插件 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${target.java.version}</source>
-                    <target>${target.java.version}</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-
-            <!-- 打jar包插件(会包含所有依赖) -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>${maven-assembly-plugin.version}</version>
-                <configuration>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                    <archive>
-                        <manifest>
-                            <!-- 可以设置jar包的入口类(可选) -->
-                            <mainClass>com.dlink.app.MainApp</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/dlink-app/dlink-app-1.14/pom.xml b/dlink-app/dlink-app-1.14/pom.xml
index edf9cb1d72..8ea9934641 100644
--- a/dlink-app/dlink-app-1.14/pom.xml
+++ b/dlink-app/dlink-app-1.14/pom.xml
@@ -75,19 +75,6 @@
         </resources>
 
         <plugins>
-            <!-- 编译插件 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.0</version>
-                <configuration>
-                    <source>${target.java.version}</source>
-                    <target>${target.java.version}</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-
-            <!-- 打jar包插件(会包含所有依赖) -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -102,6 +89,7 @@
                             <mainClass>com.dlink.app.MainApp</mainClass>
                         </manifest>
                     </archive>
+                    <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/dlink-app/dlink-app-1.15/pom.xml b/dlink-app/dlink-app-1.15/pom.xml
index a3bc576203..f99cfc32b4 100644
--- a/dlink-app/dlink-app-1.15/pom.xml
+++ b/dlink-app/dlink-app-1.15/pom.xml
@@ -15,16 +15,14 @@
   ~ 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>
     <parent>
-        <artifactId>dlink-app</artifactId>
         <groupId>com.dlink</groupId>
+        <artifactId>dlink-app</artifactId>
         <version>0.7.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dlink-app-1.15</artifactId>
 
@@ -74,19 +72,6 @@
         </resources>
 
         <plugins>
-            <!-- 编译插件 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${target.java.version}</source>
-                    <target>${target.java.version}</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-
-            <!-- 打jar包插件(会包含所有依赖) -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -101,18 +86,19 @@
                             <mainClass>com.dlink.app.MainApp</mainClass>
                         </manifest>
                     </archive>
+                    <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
                 </configuration>
                 <executions>
                     <execution>
                         <id>make-assembly</id>
-                        <phase>package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
+                        <phase>package</phase>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/dlink-app/dlink-app-1.15/pom.xml.versionsBackup b/dlink-app/dlink-app-1.15/pom.xml.versionsBackup
deleted file mode 100644
index d889110efb..0000000000
--- a/dlink-app/dlink-app-1.15/pom.xml.versionsBackup
+++ /dev/null
@@ -1,118 +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">
-    <parent>
-        <artifactId>dlink-app</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-app-1.15</artifactId>
-
-    <properties>
-        <mainClass>com.dlink.app.MainApp</mainClass>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-app-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-client-1.15</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-flink-1.15</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-client-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-executor</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>*.properties</include>
-                </includes>
-            </resource>
-        </resources>
-
-        <plugins>
-            <!-- 编译插件 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${target.java.version}</source>
-                    <target>${target.java.version}</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-
-            <!-- 打jar包插件(会包含所有依赖) -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>${maven-assembly-plugin.version}</version>
-                <configuration>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                    <archive>
-                        <manifest>
-                            <!-- 可以设置jar包的入口类(可选) -->
-                            <mainClass>com.dlink.app.MainApp</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/dlink-app/dlink-app-1.16/pom.xml b/dlink-app/dlink-app-1.16/pom.xml
index 1831a1e75d..0b4b176092 100644
--- a/dlink-app/dlink-app-1.16/pom.xml
+++ b/dlink-app/dlink-app-1.16/pom.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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>
     <parent>
-        <artifactId>dlink-app</artifactId>
         <groupId>com.dlink</groupId>
+        <artifactId>dlink-app</artifactId>
         <version>0.7.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dlink-app-1.16</artifactId>
 
@@ -57,19 +56,6 @@
         </resources>
 
         <plugins>
-            <!-- 编译插件 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${target.java.version}</source>
-                    <target>${target.java.version}</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-
-            <!-- 打jar包插件(会包含所有依赖) -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -84,17 +70,18 @@
                             <mainClass>com.dlink.app.MainApp</mainClass>
                         </manifest>
                     </archive>
+                    <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
                 </configuration>
                 <executions>
                     <execution>
                         <id>make-assembly</id>
-                        <phase>package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
+                        <phase>package</phase>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/dlink-app/dlink-app-1.16/pom.xml.versionsBackup b/dlink-app/dlink-app-1.16/pom.xml.versionsBackup
deleted file mode 100644
index e964e2ff15..0000000000
--- a/dlink-app/dlink-app-1.16/pom.xml.versionsBackup
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <parent>
-        <artifactId>dlink-app</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-app-1.16</artifactId>
-
-    <properties>
-        <mainClass>com.dlink.app.MainApp</mainClass>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-app-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-client-1.16</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-flink-1.16</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-client-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-executor</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>*.properties</include>
-                </includes>
-            </resource>
-        </resources>
-
-        <plugins>
-            <!-- 编译插件 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${target.java.version}</source>
-                    <target>${target.java.version}</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-
-            <!-- 打jar包插件(会包含所有依赖) -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>${maven-assembly-plugin.version}</version>
-                <configuration>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                    <archive>
-                        <manifest>
-                            <!-- 可以设置jar包的入口类(可选) -->
-                            <mainClass>com.dlink.app.MainApp</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/dlink-app/dlink-app-base/src/main/java/com/dlink/app/flinksql/Submiter.java b/dlink-app/dlink-app-base/src/main/java/com/dlink/app/flinksql/Submiter.java
index 8722b0926c..d50158cb87 100644
--- a/dlink-app/dlink-app-base/src/main/java/com/dlink/app/flinksql/Submiter.java
+++ b/dlink-app/dlink-app-base/src/main/java/com/dlink/app/flinksql/Submiter.java
@@ -98,10 +98,19 @@ public static List<String> getStatements(String sql) {
         return Arrays.asList(SqlUtil.getStatements(sql));
     }
 
-    public static String getDbSourceSqlStatements(DBConfig dbConfig) {
+    public static String getDbSourceSqlStatements(DBConfig dbConfig, Integer id) {
         String sql = "select name,flink_config from dlink_database where enabled = 1";
+        String sqlCheck = "select fragment from dlink_task where id = " + id;
         try {
-            return DBUtil.getDbSourceSQLStatement(sql, dbConfig);
+            // 首先判断是否开启了全局变量
+            String fragment = DBUtil.getOneByID(sqlCheck, dbConfig);
+            if (fragment.equals("1")) {
+                return DBUtil.getDbSourceSQLStatement(sql, dbConfig);
+            } else {
+                // 全局变量未开启，返回空字符串
+                logger.info("任务 {} 未开启全局变量，不进行变量加载。");
+                return "";
+            }
         } catch (IOException | SQLException e) {
             logger.error("{} --> 获取 数据源信息异常，请检查数据库连接，连接信息为：{} ,异常信息为：{}", LocalDateTime.now(),
                     dbConfig.toString(), e.getMessage(), e);
@@ -122,7 +131,7 @@ public static void submit(Integer id, DBConfig dbConfig) {
             sb.append("\n");
         }
         // 添加数据源全局变量
-        sb.append(getDbSourceSqlStatements(dbConfig));
+        sb.append(getDbSourceSqlStatements(dbConfig, id));
         // 添加自定义全局变量信息
         sb.append(getFlinkSQLStatement(id, dbConfig));
         List<String> statements = Submiter.getStatements(sb.toString());
diff --git a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.13/pom.xml.versionsBackup b/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.13/pom.xml.versionsBackup
deleted file mode 100644
index 95ca46ef00..0000000000
--- a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.13/pom.xml.versionsBackup
+++ /dev/null
@@ -1,65 +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">
-    <parent>
-        <artifactId>dlink-catalog-mysql</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-catalog-mysql-1.13</artifactId>
-
-    <properties>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-flink-1.13</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <!-- 指定打包的jar包输出路径 -->
-                    <outputDirectory>${project.parent.parent.parent.basedir}/build/extends</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.15/pom.xml.versionsBackup b/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.15/pom.xml.versionsBackup
deleted file mode 100644
index a17d970993..0000000000
--- a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.15/pom.xml.versionsBackup
+++ /dev/null
@@ -1,65 +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">
-    <parent>
-        <artifactId>dlink-catalog-mysql</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-catalog-mysql-1.15</artifactId>
-
-    <properties>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-flink-1.15</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <!-- 指定打包的jar包输出路径 -->
-                    <outputDirectory>${project.parent.parent.parent.basedir}/build/extends</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.16/pom.xml.versionsBackup b/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.16/pom.xml.versionsBackup
deleted file mode 100644
index 28bb572c2a..0000000000
--- a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.16/pom.xml.versionsBackup
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <parent>
-        <artifactId>dlink-catalog-mysql</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-catalog-mysql-1.16</artifactId>
-
-    <properties>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-flink-1.16</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <!-- 指定打包的jar包输出路径 -->
-                    <outputDirectory>${project.parent.parent.parent.basedir}/build/extends</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/dlink-client/dlink-client-1.11/pom.xml.versionsBackup b/dlink-client/dlink-client-1.11/pom.xml.versionsBackup
deleted file mode 100644
index 0ae74f4a23..0000000000
--- a/dlink-client/dlink-client-1.11/pom.xml.versionsBackup
+++ /dev/null
@@ -1,64 +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">
-    <parent>
-        <artifactId>dlink-client</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-client-1.11</artifactId>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-client-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-flink-1.11</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <!-- 指定打包的jar包输出路径 -->
-                    <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/dlink-client/dlink-client-1.11/src/main/java/com/dlink/utils/LineageContext.java b/dlink-client/dlink-client-1.11/src/main/java/com/dlink/utils/LineageContext.java
index 87a07eb694..40e4afcc53 100644
--- a/dlink-client/dlink-client-1.11/src/main/java/com/dlink/utils/LineageContext.java
+++ b/dlink-client/dlink-client-1.11/src/main/java/com/dlink/utils/LineageContext.java
@@ -25,7 +25,6 @@
 
 import org.apache.calcite.plan.RelOptTable;
 import org.apache.calcite.rel.RelNode;
-import org.apache.calcite.rel.core.Snapshot;
 import org.apache.calcite.rel.metadata.RelColumnOrigin;
 import org.apache.calcite.rel.metadata.RelMetadataQuery;
 import org.apache.calcite.rel.type.RelDataType;
@@ -56,11 +55,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.CtMethod;
-import javassist.Modifier;
-
 /**
  * LineageContext
  *
@@ -77,33 +71,6 @@ public LineageContext(FlinkChainedProgram flinkChainedProgram, TableEnvironmentI
         this.tableEnv = tableEnv;
     }
 
-    /**
-     * Dynamic add getColumnOrigins method to class RelMdColumnOrigins by javassist:
-     *
-     * public Set<RelColumnOrigin> getColumnOrigins(Snapshot rel,RelMetadataQuery mq, int iOutputColumn) {
-     *      return mq.getColumnOrigins(rel.getInput(), iOutputColumn);
-     * }
-     */
-    static {
-        try {
-            ClassPool classPool = ClassPool.getDefault();
-            CtClass ctClass = classPool.getCtClass("org.apache.calcite.rel.metadata.RelMdColumnOrigins");
-
-            CtClass[] parameters = new CtClass[]{classPool.get(Snapshot.class.getName()),
-                    classPool.get(RelMetadataQuery.class.getName()), CtClass.intType
-            };
-            // add method
-            CtMethod ctMethod = new CtMethod(classPool.get("java.util.Set"), "getColumnOrigins", parameters, ctClass);
-            ctMethod.setModifiers(Modifier.PUBLIC);
-            ctMethod.setBody("{return $2.getColumnOrigins($1.getInput(), $3);}");
-            ctClass.addMethod(ctMethod);
-            // load the class
-            ctClass.toClass();
-        } catch (Exception e) {
-            throw new TableException("Dynamic add getColumnOrigins() method exception.", e);
-        }
-    }
-
     public List<LineageRel> getLineage(String statement) {
         // 1. Generate original relNode tree
         Tuple2<String, RelNode> parsed = parseStatement(statement);
@@ -178,9 +145,9 @@ public SqlExprToRexConverter create(RelDataType relDataType) {
 
             @Override
             public <C> C unwrap(Class<C> clazz) {
-                if(clazz.isInterface()){
+                if (clazz.isInterface()) {
                     return clazz.cast(this);
-                }else{
+                } else {
                     return null;
                 }
             }
diff --git a/dlink-client/dlink-client-1.12/pom.xml.versionsBackup b/dlink-client/dlink-client-1.12/pom.xml.versionsBackup
deleted file mode 100644
index ff324f525c..0000000000
--- a/dlink-client/dlink-client-1.12/pom.xml.versionsBackup
+++ /dev/null
@@ -1,65 +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">
-    <parent>
-        <artifactId>dlink-client</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-client-1.12</artifactId>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-client-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-flink-1.12</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <!-- 指定打包的jar包输出路径 -->
-                    <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/dlink-client/dlink-client-1.12/src/main/java/com/dlink/utils/LineageContext.java b/dlink-client/dlink-client-1.12/src/main/java/com/dlink/utils/LineageContext.java
index 838dddd749..40e4afcc53 100644
--- a/dlink-client/dlink-client-1.12/src/main/java/com/dlink/utils/LineageContext.java
+++ b/dlink-client/dlink-client-1.12/src/main/java/com/dlink/utils/LineageContext.java
@@ -25,7 +25,6 @@
 
 import org.apache.calcite.plan.RelOptTable;
 import org.apache.calcite.rel.RelNode;
-import org.apache.calcite.rel.core.Snapshot;
 import org.apache.calcite.rel.metadata.RelColumnOrigin;
 import org.apache.calcite.rel.metadata.RelMetadataQuery;
 import org.apache.calcite.rel.type.RelDataType;
@@ -56,11 +55,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.CtMethod;
-import javassist.Modifier;
-
 /**
  * LineageContext
  *
@@ -77,33 +71,6 @@ public LineageContext(FlinkChainedProgram flinkChainedProgram, TableEnvironmentI
         this.tableEnv = tableEnv;
     }
 
-    /**
-     * Dynamic add getColumnOrigins method to class RelMdColumnOrigins by javassist:
-     *
-     * public Set<RelColumnOrigin> getColumnOrigins(Snapshot rel,RelMetadataQuery mq, int iOutputColumn) {
-     *      return mq.getColumnOrigins(rel.getInput(), iOutputColumn);
-     * }
-     */
-    static {
-        try {
-            ClassPool classPool = ClassPool.getDefault();
-            CtClass ctClass = classPool.getCtClass("org.apache.calcite.rel.metadata.RelMdColumnOrigins");
-
-            CtClass[] parameters = new CtClass[]{classPool.get(Snapshot.class.getName()),
-                    classPool.get(RelMetadataQuery.class.getName()), CtClass.intType
-            };
-            // add method
-            CtMethod ctMethod = new CtMethod(classPool.get("java.util.Set"), "getColumnOrigins", parameters, ctClass);
-            ctMethod.setModifiers(Modifier.PUBLIC);
-            ctMethod.setBody("{return $2.getColumnOrigins($1.getInput(), $3);}");
-            ctClass.addMethod(ctMethod);
-            // load the class
-            ctClass.toClass();
-        } catch (Exception e) {
-            throw new TableException("Dynamic add getColumnOrigins() method exception.", e);
-        }
-    }
-
     public List<LineageRel> getLineage(String statement) {
         // 1. Generate original relNode tree
         Tuple2<String, RelNode> parsed = parseStatement(statement);
diff --git a/dlink-client/dlink-client-1.13/pom.xml.versionsBackup b/dlink-client/dlink-client-1.13/pom.xml.versionsBackup
deleted file mode 100644
index ef954f019d..0000000000
--- a/dlink-client/dlink-client-1.13/pom.xml.versionsBackup
+++ /dev/null
@@ -1,65 +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">
-    <parent>
-        <artifactId>dlink-client</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-client-1.13</artifactId>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-client-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-flink-1.13</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <!-- 指定打包的jar包输出路径 -->
-                    <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/dlink-client/dlink-client-1.13/src/main/java/com/dlink/executor/CustomTableEnvironmentImpl.java b/dlink-client/dlink-client-1.13/src/main/java/com/dlink/executor/CustomTableEnvironmentImpl.java
index 02e03fb58b..e65357a963 100644
--- a/dlink-client/dlink-client-1.13/src/main/java/com/dlink/executor/CustomTableEnvironmentImpl.java
+++ b/dlink-client/dlink-client-1.13/src/main/java/com/dlink/executor/CustomTableEnvironmentImpl.java
@@ -22,6 +22,8 @@
 import com.dlink.assertion.Asserts;
 import com.dlink.model.LineageRel;
 import com.dlink.result.SqlExplainResult;
+import com.dlink.utils.FlinkStreamProgramWithoutPhysical;
+import com.dlink.utils.LineageContext;
 
 import org.apache.flink.api.common.RuntimeExecutionMode;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
@@ -75,8 +77,6 @@
 import java.util.Map;
 import java.util.Optional;
 
-import com.dlink.utils.FlinkStreamProgramWithoutPhysical;
-import com.dlink.utils.LineageContext;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -90,27 +90,28 @@
 public class CustomTableEnvironmentImpl extends TableEnvironmentImpl implements CustomTableEnvironment {
 
     private final StreamExecutionEnvironment executionEnvironment;
+
     private final FlinkChainedProgram flinkChainedProgram;
 
     public CustomTableEnvironmentImpl(
-        CatalogManager catalogManager,
-        ModuleManager moduleManager,
-        FunctionCatalog functionCatalog,
-        TableConfig tableConfig,
-        StreamExecutionEnvironment executionEnvironment,
-        Planner planner,
-        Executor executor,
-        boolean isStreamingMode,
-        ClassLoader userClassLoader) {
+            CatalogManager catalogManager,
+            ModuleManager moduleManager,
+            FunctionCatalog functionCatalog,
+            TableConfig tableConfig,
+            StreamExecutionEnvironment executionEnvironment,
+            Planner planner,
+            Executor executor,
+            boolean isStreamingMode,
+            ClassLoader userClassLoader) {
         super(
-            catalogManager,
-            moduleManager,
-            tableConfig,
-            executor,
-            functionCatalog,
-            planner,
-            isStreamingMode,
-            userClassLoader);
+                catalogManager,
+                moduleManager,
+                tableConfig,
+                executor,
+                functionCatalog,
+                planner,
+                isStreamingMode,
+                userClassLoader);
         this.executionEnvironment = executionEnvironment;
         this.flinkChainedProgram = FlinkStreamProgramWithoutPhysical.buildProgram(tableConfig.getConfiguration());
     }
@@ -124,33 +125,33 @@ public static CustomTableEnvironmentImpl createBatch(StreamExecutionEnvironment
         configuration.set(ExecutionOptions.RUNTIME_MODE, RuntimeExecutionMode.BATCH);
         TableConfig tableConfig = new TableConfig();
         tableConfig.addConfiguration(configuration);
-        return create(executionEnvironment, EnvironmentSettings.newInstance().useBlinkPlanner().inBatchMode().build(), tableConfig);
+        return create(executionEnvironment, EnvironmentSettings.newInstance().useBlinkPlanner().inBatchMode().build(),
+                tableConfig);
     }
 
     public static CustomTableEnvironmentImpl create(
-        StreamExecutionEnvironment executionEnvironment,
-        EnvironmentSettings settings) {
+            StreamExecutionEnvironment executionEnvironment,
+            EnvironmentSettings settings) {
         return create(executionEnvironment, settings, new TableConfig());
     }
 
     public static CustomTableEnvironmentImpl create(
-        StreamExecutionEnvironment executionEnvironment,
-        EnvironmentSettings settings,
-        TableConfig tableConfig) {
+            StreamExecutionEnvironment executionEnvironment,
+            EnvironmentSettings settings,
+            TableConfig tableConfig) {
 
         ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
 
         ModuleManager moduleManager = new ModuleManager();
 
-        CatalogManager catalogManager =
-            CatalogManager.newBuilder()
+        CatalogManager catalogManager = CatalogManager.newBuilder()
                 .classLoader(classLoader)
                 .config(tableConfig.getConfiguration())
                 .defaultCatalog(
-                    settings.getBuiltInCatalogName(),
-                    new GenericInMemoryCatalog(
                         settings.getBuiltInCatalogName(),
-                        settings.getBuiltInDatabaseName()))
+                        new GenericInMemoryCatalog(
+                                settings.getBuiltInCatalogName(),
+                                settings.getBuiltInDatabaseName()))
                 .executionConfig(executionEnvironment.getConfig())
                 .build();
 
@@ -160,44 +161,40 @@ public static CustomTableEnvironmentImpl create(
         Executor executor = lookupExecutor(executorProperties, executionEnvironment);
 
         Map<String, String> plannerProperties = settings.toPlannerProperties();
-        Planner planner =
-            ComponentFactoryService.find(PlannerFactory.class, plannerProperties)
+        Planner planner = ComponentFactoryService.find(PlannerFactory.class, plannerProperties)
                 .create(
-                    plannerProperties,
-                    executor,
-                    tableConfig,
-                    functionCatalog,
-                    catalogManager);
+                        plannerProperties,
+                        executor,
+                        tableConfig,
+                        functionCatalog,
+                        catalogManager);
 
         return new CustomTableEnvironmentImpl(
-            catalogManager,
-            moduleManager,
-            functionCatalog,
-            tableConfig,
-            executionEnvironment,
-            planner,
-            executor,
-            settings.isStreamingMode(),
-            classLoader);
+                catalogManager,
+                moduleManager,
+                functionCatalog,
+                tableConfig,
+                executionEnvironment,
+                planner,
+                executor,
+                settings.isStreamingMode(),
+                classLoader);
     }
 
     private static Executor lookupExecutor(
-        Map<String, String> executorProperties,
-        StreamExecutionEnvironment executionEnvironment) {
+            Map<String, String> executorProperties,
+            StreamExecutionEnvironment executionEnvironment) {
         try {
-            ExecutorFactory executorFactory =
-                ComponentFactoryService.find(ExecutorFactory.class, executorProperties);
-            Method createMethod =
-                executorFactory
+            ExecutorFactory executorFactory = ComponentFactoryService.find(ExecutorFactory.class, executorProperties);
+            Method createMethod = executorFactory
                     .getClass()
                     .getMethod("create", Map.class, StreamExecutionEnvironment.class);
 
-            return (Executor)
-                createMethod.invoke(executorFactory, executorProperties, executionEnvironment);
+            return (Executor) createMethod.invoke(executorFactory, executorProperties, executionEnvironment);
         } catch (Exception e) {
             throw new TableException(
-                "Could not instantiate the executor. Make sure a planner module is on the classpath",
-                e);
+                    "Could not instantiate the executor. Make sure a planner module is on the classpath",
+                    e);
         }
     }
 
@@ -215,7 +212,8 @@ public ObjectNode getStreamGraph(String statement) {
             }
             List<Transformation<?>> trans = getPlanner().translate(modifyOperations);
             if (execEnv instanceof ExecutorBase) {
-                StreamGraph streamGraph = ExecutorUtils.generateStreamGraph(((ExecutorBase) execEnv).getExecutionEnvironment(), trans);
+                StreamGraph streamGraph = ExecutorUtils
+                        .generateStreamGraph(((ExecutorBase) execEnv).getExecutionEnvironment(), trans);
                 JSONGenerator jsonGenerator = new JSONGenerator(streamGraph);
                 String json = jsonGenerator.getJSON();
                 ObjectMapper mapper = new ObjectMapper();
@@ -256,7 +254,8 @@ public StreamGraph getStreamGraphFromInserts(List<String> statements) {
         }
         List<Transformation<?>> trans = getPlanner().translate(modifyOperations);
         if (execEnv instanceof ExecutorBase) {
-            StreamGraph streamGraph = ExecutorUtils.generateStreamGraph(((ExecutorBase) execEnv).getExecutionEnvironment(), trans);
+            StreamGraph streamGraph = ExecutorUtils
+                    .generateStreamGraph(((ExecutorBase) execEnv).getExecutionEnvironment(), trans);
             if (tableConfig.getConfiguration().containsKey(PipelineOptions.NAME.key())) {
                 streamGraph.setJobName(tableConfig.getConfiguration().getString(PipelineOptions.NAME));
             }
@@ -278,7 +277,7 @@ public SqlExplainResult explainSqlRecord(String statement, ExplainDetail... extr
         record.setParseTrue(true);
         if (operations.size() != 1) {
             throw new TableException(
-                "Unsupported SQL query! explainSql() only accepts a single SQL query.");
+                    "Unsupported SQL query! explainSql() only accepts a single SQL query.");
         }
         Operation operation = operations.get(0);
         if (operation instanceof ModifyOperation) {
@@ -293,7 +292,7 @@ public SqlExplainResult explainSqlRecord(String statement, ExplainDetail... extr
         }
         record.setExplainTrue(true);
         if ("DDL".equals(record.getType())) {
-            //record.setExplain("DDL语句不进行解释。");
+            // record.setExplain("DDL语句不进行解释。");
             return record;
         }
         record.setExplain(planner.explain(operations, extraDetails));
@@ -301,7 +300,8 @@ public SqlExplainResult explainSqlRecord(String statement, ExplainDetail... extr
     }
 
     @Override
-    public boolean parseAndLoadConfiguration(String statement, StreamExecutionEnvironment environment, Map<String, Object> setMap) {
+    public boolean parseAndLoadConfiguration(String statement, StreamExecutionEnvironment environment,
+            Map<String, Object> setMap) {
         List<Operation> operations = getParser().parse(statement);
         for (Operation operation : operations) {
             if (operation instanceof SetOperation) {
@@ -315,7 +315,8 @@ public boolean parseAndLoadConfiguration(String statement, StreamExecutionEnviro
         return false;
     }
 
-    private void callSet(SetOperation setOperation, StreamExecutionEnvironment environment, Map<String, Object> setMap) {
+    private void callSet(SetOperation setOperation, StreamExecutionEnvironment environment,
+            Map<String, Object> setMap) {
         if (setOperation.getKey().isPresent() && setOperation.getValue().isPresent()) {
             String key = setOperation.getKey().get().trim();
             String value = setOperation.getValue().get().trim();
@@ -331,7 +332,8 @@ private void callSet(SetOperation setOperation, StreamExecutionEnvironment envir
         }
     }
 
-    private void callReset(ResetOperation resetOperation, StreamExecutionEnvironment environment, Map<String, Object> setMap) {
+    private void callReset(ResetOperation resetOperation, StreamExecutionEnvironment environment,
+            Map<String, Object> setMap) {
         if (resetOperation.getKey().isPresent()) {
             String key = resetOperation.getKey().get().trim();
             if (Asserts.isNullString(key)) {
@@ -354,7 +356,8 @@ public <T> Table fromDataStream(DataStream<T> dataStream, String fields) {
     }
 
     public <T> Table fromDataStream(DataStream<T> dataStream, Expression... fields) {
-        JavaDataStreamQueryOperation<T> queryOperation = this.asQueryOperation(dataStream, Optional.of(Arrays.asList(fields)));
+        JavaDataStreamQueryOperation<T> queryOperation = this.asQueryOperation(dataStream,
+                Optional.of(Arrays.asList(fields)));
         return this.createTable(queryOperation);
     }
 
@@ -374,22 +377,28 @@ public <T> void createTemporaryView(String path, DataStream<T> dataStream, Expre
         this.createTemporaryView(path, this.fromDataStream(dataStream, fields));
     }
 
-    private <T> JavaDataStreamQueryOperation<T> asQueryOperation(DataStream<T> dataStream, Optional<List<Expression>> fields) {
+    private <T> JavaDataStreamQueryOperation<T> asQueryOperation(DataStream<T> dataStream,
+            Optional<List<Expression>> fields) {
         TypeInformation<T> streamType = dataStream.getType();
         FieldInfoUtils.TypeInfoSchema typeInfoSchema = (FieldInfoUtils.TypeInfoSchema) fields.map((f) -> {
-            FieldInfoUtils.TypeInfoSchema fieldsInfo = FieldInfoUtils.getFieldsInfo(streamType, (Expression[]) f.toArray(new Expression[0]));
+            FieldInfoUtils.TypeInfoSchema fieldsInfo = FieldInfoUtils.getFieldsInfo(streamType,
+                    (Expression[]) f.toArray(new Expression[0]));
             this.validateTimeCharacteristic(fieldsInfo.isRowtimeDefined());
             return fieldsInfo;
         }).orElseGet(() -> {
             return FieldInfoUtils.getFieldsInfo(streamType);
         });
-        return new JavaDataStreamQueryOperation(dataStream, typeInfoSchema.getIndices(), typeInfoSchema.toResolvedSchema());
+        return new JavaDataStreamQueryOperation(dataStream, typeInfoSchema.getIndices(),
+                typeInfoSchema.toResolvedSchema());
     }
 
     private void validateTimeCharacteristic(boolean isRowtimeDefined) {
-        if (isRowtimeDefined && this.executionEnvironment.getStreamTimeCharacteristic() != TimeCharacteristic.EventTime) {
+        if (isRowtimeDefined
+                && this.executionEnvironment.getStreamTimeCharacteristic() != TimeCharacteristic.EventTime) {
             throw new ValidationException(
-                String.format("A rowtime attribute requires an EventTime time characteristic in stream environment. But is: %s", this.executionEnvironment.getStreamTimeCharacteristic()));
+                    String.format(
+                            "A rowtime attribute requires an EventTime time characteristic in stream environment. But is: %s",
+                            this.executionEnvironment.getStreamTimeCharacteristic()));
         }
     }
 }
diff --git a/dlink-client/dlink-client-1.13/src/main/java/com/dlink/executor/CustomTableResultImpl.java b/dlink-client/dlink-client-1.13/src/main/java/com/dlink/executor/CustomTableResultImpl.java
index 45cba82922..db95437b39 100644
--- a/dlink-client/dlink-client-1.13/src/main/java/com/dlink/executor/CustomTableResultImpl.java
+++ b/dlink-client/dlink-client-1.13/src/main/java/com/dlink/executor/CustomTableResultImpl.java
@@ -60,19 +60,20 @@
  **/
 @Internal
 public class CustomTableResultImpl implements TableResult {
+
     protected static final Logger logger = LoggerFactory.getLogger(CustomTableResultImpl.class);
-    public static final TableResult TABLE_RESULT_OK =
-            CustomTableResultImpl.builder()
-                    .resultKind(ResultKind.SUCCESS)
-                    .schema(ResolvedSchema.of(Column.physical("result", DataTypes.STRING())))
-                    .data(Collections.singletonList(Row.of("OK")))
-                    .build();
+    public static final TableResult TABLE_RESULT_OK = CustomTableResultImpl.builder()
+            .resultKind(ResultKind.SUCCESS)
+            .schema(ResolvedSchema.of(Column.physical("result", DataTypes.STRING())))
+            .data(Collections.singletonList(Row.of("OK")))
+            .build();
 
     private final JobClient jobClient;
     private final ResolvedSchema resolvedSchema;
     private final ResultKind resultKind;
     private final CloseableRowIteratorWrapper data;
     private final PrintStyle printStyle;
+
     private final ZoneId sessionTimeZone;
 
     private CustomTableResultImpl(
@@ -83,14 +84,12 @@ private CustomTableResultImpl(
             PrintStyle printStyle,
             ZoneId sessionTimeZone) {
         this.jobClient = jobClient;
-        this.resolvedSchema =
-                Preconditions.checkNotNull(resolvedSchema, "resolvedSchema should not be null");
+        this.resolvedSchema = Preconditions.checkNotNull(resolvedSchema, "resolvedSchema should not be null");
         this.resultKind = Preconditions.checkNotNull(resultKind, "resultKind should not be null");
         Preconditions.checkNotNull(data, "data should not be null");
         this.data = new CloseableRowIteratorWrapper(data);
         this.printStyle = Preconditions.checkNotNull(printStyle, "printStyle should not be null");
-        this.sessionTimeZone =
-                Preconditions.checkNotNull(sessionTimeZone, "sessionTimeZone should not be null");
+        this.sessionTimeZone = Preconditions.checkNotNull(sessionTimeZone, "sessionTimeZone should not be null");
     }
 
     public static TableResult buildTableResult(List<TableSchemaField> fields, List<Row> rows) {
@@ -122,32 +121,29 @@ public void await() throws InterruptedException, ExecutionException {
     }
 
     @Override
-    public void await(long timeout, TimeUnit unit)
-            throws InterruptedException, ExecutionException, TimeoutException {
+    public void await(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
         awaitInternal(timeout, unit);
     }
 
-    private void awaitInternal(long timeout, TimeUnit unit)
-            throws InterruptedException, ExecutionException, TimeoutException {
+    private void awaitInternal(long timeout,
+            TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
         if (jobClient == null) {
             return;
         }
 
-        ExecutorService executor =
-                Executors.newFixedThreadPool(1, r -> new Thread(r, "TableResult-await-thread"));
+        ExecutorService executor = Executors.newFixedThreadPool(1, r -> new Thread(r, "TableResult-await-thread"));
         try {
-            CompletableFuture<Void> future =
-                    CompletableFuture.runAsync(
-                            () -> {
-                                while (!data.isFirstRowReady()) {
-                                    try {
-                                        Thread.sleep(100);
-                                    } catch (InterruptedException e) {
-                                        throw new TableException("Thread is interrupted");
-                                    }
-                                }
-                            },
-                            executor);
+            CompletableFuture<Void> future = CompletableFuture.runAsync(
+                    () -> {
+                        while (!data.isFirstRowReady()) {
+                            try {
+                                Thread.sleep(100);
+                            } catch (InterruptedException e) {
+                                throw new TableException("Thread is interrupted");
+                            }
+                        }
+                    },
+                    executor);
 
             if (timeout >= 0) {
                 future.get(timeout, unit);
@@ -180,8 +176,7 @@ public void print() {
         if (printStyle instanceof TableauStyle) {
             int maxColumnWidth = ((TableauStyle) printStyle).getMaxColumnWidth();
             String nullColumn = ((TableauStyle) printStyle).getNullColumn();
-            boolean deriveColumnWidthByType =
-                    ((TableauStyle) printStyle).isDeriveColumnWidthByType();
+            boolean deriveColumnWidthByType = ((TableauStyle) printStyle).isDeriveColumnWidthByType();
             boolean printRowKind = ((TableauStyle) printStyle).isPrintRowKind();
             PrintUtils.printAsTableauForm(
                     getResolvedSchema(),
@@ -213,12 +208,12 @@ public static Builder builder() {
      * Builder for creating a {@link CustomTableResultImpl}.
      */
     public static class Builder {
+
         private JobClient jobClient = null;
         private ResolvedSchema resolvedSchema = null;
         private ResultKind resultKind = null;
         private CloseableIterator<Row> data = null;
-        private PrintStyle printStyle =
-                PrintStyle.tableau(Integer.MAX_VALUE, PrintUtils.NULL_COLUMN, false, false);
+        private PrintStyle printStyle = PrintStyle.tableau(Integer.MAX_VALUE, PrintUtils.NULL_COLUMN, false, false);
         private ZoneId sessionTimeZone = ZoneId.of("UTC");
 
         private Builder() {
@@ -309,6 +304,7 @@ public TableResult build() {
      * Root interface for all print styles.
      */
     public interface PrintStyle {
+
         /**
          * Create a tableau print style with given max column width, null column, change mode
          * indicator and a flag to indicate whether the column width is derived from type (true) or
@@ -339,6 +335,7 @@ static PrintStyle rawContent() {
      * print the result schema and content as tableau form.
      */
     private static final class TableauStyle implements PrintStyle {
+
         /**
          * A flag to indicate whether the column width is derived from type (true) or content
          * (false).
@@ -395,6 +392,7 @@ private static final class RawContentStyle implements PrintStyle {
      * (or accessed).
      */
     private static final class CloseableRowIteratorWrapper implements CloseableIterator<Row> {
+
         private final CloseableIterator<Row> iterator;
         private boolean isFirstRowReady = false;
 
diff --git a/dlink-client/dlink-client-1.13/src/main/java/com/dlink/utils/LineageContext.java b/dlink-client/dlink-client-1.13/src/main/java/com/dlink/utils/LineageContext.java
index 8f8b1bdfe9..d67b08305c 100644
--- a/dlink-client/dlink-client-1.13/src/main/java/com/dlink/utils/LineageContext.java
+++ b/dlink-client/dlink-client-1.13/src/main/java/com/dlink/utils/LineageContext.java
@@ -23,7 +23,6 @@
 
 import org.apache.calcite.plan.RelOptTable;
 import org.apache.calcite.rel.RelNode;
-import org.apache.calcite.rel.core.Snapshot;
 import org.apache.calcite.rel.metadata.RelColumnOrigin;
 import org.apache.calcite.rel.metadata.RelMetadataQuery;
 import org.apache.calcite.rex.RexBuilder;
@@ -48,11 +47,6 @@
 import java.util.List;
 import java.util.Set;
 
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.CtMethod;
-import javassist.Modifier;
-
 /**
  * LineageContext
  *
@@ -69,33 +63,6 @@ public LineageContext(FlinkChainedProgram flinkChainedProgram, TableEnvironmentI
         this.tableEnv = tableEnv;
     }
 
-    /**
-     * Dynamic add getColumnOrigins method to class RelMdColumnOrigins by javassist:
-     *
-     * public Set<RelColumnOrigin> getColumnOrigins(Snapshot rel,RelMetadataQuery mq, int iOutputColumn) {
-     *      return mq.getColumnOrigins(rel.getInput(), iOutputColumn);
-     * }
-     */
-    static {
-        try {
-            ClassPool classPool = ClassPool.getDefault();
-            CtClass ctClass = classPool.getCtClass("org.apache.calcite.rel.metadata.RelMdColumnOrigins");
-
-            CtClass[] parameters = new CtClass[]{classPool.get(Snapshot.class.getName()),
-                    classPool.get(RelMetadataQuery.class.getName()), CtClass.intType
-            };
-            // add method
-            CtMethod ctMethod = new CtMethod(classPool.get("java.util.Set"), "getColumnOrigins", parameters, ctClass);
-            ctMethod.setModifiers(Modifier.PUBLIC);
-            ctMethod.setBody("{return $2.getColumnOrigins($1.getInput(), $3);}");
-            ctClass.addMethod(ctMethod);
-            // load the class
-            ctClass.toClass();
-        } catch (Exception e) {
-            throw new TableException("Dynamic add getColumnOrigins() method exception.", e);
-        }
-    }
-
     public List<LineageRel> getLineage(String statement) {
         // 1. Generate original relNode tree
         Tuple2<String, RelNode> parsed = parseStatement(statement);
diff --git a/dlink-client/dlink-client-1.14/src/main/java/com/dlink/utils/LineageContext.java b/dlink-client/dlink-client-1.14/src/main/java/com/dlink/utils/LineageContext.java
index ab527e5ebd..a9a9259961 100644
--- a/dlink-client/dlink-client-1.14/src/main/java/com/dlink/utils/LineageContext.java
+++ b/dlink-client/dlink-client-1.14/src/main/java/com/dlink/utils/LineageContext.java
@@ -23,7 +23,6 @@
 
 import org.apache.calcite.plan.RelOptTable;
 import org.apache.calcite.rel.RelNode;
-import org.apache.calcite.rel.core.Snapshot;
 import org.apache.calcite.rel.metadata.RelColumnOrigin;
 import org.apache.calcite.rel.metadata.RelMetadataQuery;
 import org.apache.commons.collections.CollectionUtils;
@@ -48,11 +47,6 @@
 import java.util.List;
 import java.util.Set;
 
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.CtMethod;
-import javassist.Modifier;
-
 /**
  * LineageContext
  *
@@ -69,33 +63,6 @@ public LineageContext(FlinkChainedProgram flinkChainedProgram, TableEnvironmentI
         this.tableEnv = tableEnv;
     }
 
-    /**
-     * Dynamic add getColumnOrigins method to class RelMdColumnOrigins by javassist:
-     *
-     * public Set<RelColumnOrigin> getColumnOrigins(Snapshot rel,RelMetadataQuery mq, int iOutputColumn) {
-     *      return mq.getColumnOrigins(rel.getInput(), iOutputColumn);
-     * }
-     */
-    static {
-        try {
-            ClassPool classPool = ClassPool.getDefault();
-            CtClass ctClass = classPool.getCtClass("org.apache.calcite.rel.metadata.RelMdColumnOrigins");
-
-            CtClass[] parameters = new CtClass[]{classPool.get(Snapshot.class.getName()),
-                    classPool.get(RelMetadataQuery.class.getName()), CtClass.intType
-            };
-            // add method
-            CtMethod ctMethod = new CtMethod(classPool.get("java.util.Set"), "getColumnOrigins", parameters, ctClass);
-            ctMethod.setModifiers(Modifier.PUBLIC);
-            ctMethod.setBody("{return $2.getColumnOrigins($1.getInput(), $3);}");
-            ctClass.addMethod(ctMethod);
-            // load the class
-            ctClass.toClass();
-        } catch (Exception e) {
-            throw new TableException("Dynamic add getColumnOrigins() method exception.", e);
-        }
-    }
-
     public List<LineageRel> getLineage(String statement) {
         // 1. Generate original relNode tree
         Tuple2<String, RelNode> parsed = parseStatement(statement);
diff --git a/dlink-client/dlink-client-1.15/pom.xml.versionsBackup b/dlink-client/dlink-client-1.15/pom.xml.versionsBackup
deleted file mode 100644
index 77aabf9a47..0000000000
--- a/dlink-client/dlink-client-1.15/pom.xml.versionsBackup
+++ /dev/null
@@ -1,88 +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">
-    <parent>
-        <artifactId>dlink-client</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-client-1.15</artifactId>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-client-base</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-flink-1.15</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <!-- 指定打包的jar包输出路径 -->
-                    <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/dlink-client/dlink-client-1.15/src/main/java/com/dlink/utils/LineageContext.java b/dlink-client/dlink-client-1.15/src/main/java/com/dlink/utils/LineageContext.java
index 4cf5acb46f..9a6db937bb 100644
--- a/dlink-client/dlink-client-1.15/src/main/java/com/dlink/utils/LineageContext.java
+++ b/dlink-client/dlink-client-1.15/src/main/java/com/dlink/utils/LineageContext.java
@@ -23,7 +23,6 @@
 
 import org.apache.calcite.plan.RelOptTable;
 import org.apache.calcite.rel.RelNode;
-import org.apache.calcite.rel.core.Snapshot;
 import org.apache.calcite.rel.metadata.RelColumnOrigin;
 import org.apache.calcite.rel.metadata.RelMetadataQuery;
 import org.apache.commons.collections.CollectionUtils;
@@ -49,11 +48,6 @@
 import java.util.List;
 import java.util.Set;
 
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.CtMethod;
-import javassist.Modifier;
-
 /**
  * LineageContext
  *
@@ -70,33 +64,6 @@ public LineageContext(FlinkChainedProgram flinkChainedProgram, TableEnvironmentI
         this.tableEnv = tableEnv;
     }
 
-    /**
-     * Dynamic add getColumnOrigins method to class RelMdColumnOrigins by javassist:
-     *
-     * public Set<RelColumnOrigin> getColumnOrigins(Snapshot rel,RelMetadataQuery mq, int iOutputColumn) {
-     *      return mq.getColumnOrigins(rel.getInput(), iOutputColumn);
-     * }
-     */
-    static {
-        try {
-            ClassPool classPool = ClassPool.getDefault();
-            CtClass ctClass = classPool.getCtClass("org.apache.calcite.rel.metadata.RelMdColumnOrigins");
-
-            CtClass[] parameters = new CtClass[]{classPool.get(Snapshot.class.getName()),
-                    classPool.get(RelMetadataQuery.class.getName()), CtClass.intType
-            };
-            // add method
-            CtMethod ctMethod = new CtMethod(classPool.get("java.util.Set"), "getColumnOrigins", parameters, ctClass);
-            ctMethod.setModifiers(Modifier.PUBLIC);
-            ctMethod.setBody("{return $2.getColumnOrigins($1.getInput(), $3);}");
-            ctClass.addMethod(ctMethod);
-            // load the class
-            ctClass.toClass();
-        } catch (Exception e) {
-            throw new TableException("Dynamic add getColumnOrigins() method exception.", e);
-        }
-    }
-
     public List<LineageRel> getLineage(String statement) {
         // 1. Generate original relNode tree
         Tuple2<String, RelNode> parsed = parseStatement(statement);
diff --git a/dlink-client/dlink-client-1.16/pom.xml.versionsBackup b/dlink-client/dlink-client-1.16/pom.xml.versionsBackup
deleted file mode 100644
index 8c47ca7cff..0000000000
--- a/dlink-client/dlink-client-1.16/pom.xml.versionsBackup
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>com.dlink</groupId>
-        <artifactId>dlink-client</artifactId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>dlink-client-1.16</artifactId>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-client-base</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-flink-1.16</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>${maven-jar-plugin.version}</version>
-                <configuration>
-                    <!-- 指定打包的jar包输出路径 -->
-                    <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/dlink-client/dlink-client-1.16/src/main/java/com/dlink/utils/LineageContext.java b/dlink-client/dlink-client-1.16/src/main/java/com/dlink/utils/LineageContext.java
index 80aaa4bb57..67f5b81153 100644
--- a/dlink-client/dlink-client-1.16/src/main/java/com/dlink/utils/LineageContext.java
+++ b/dlink-client/dlink-client-1.16/src/main/java/com/dlink/utils/LineageContext.java
@@ -23,7 +23,6 @@
 
 import org.apache.calcite.plan.RelOptTable;
 import org.apache.calcite.rel.RelNode;
-import org.apache.calcite.rel.core.Snapshot;
 import org.apache.calcite.rel.metadata.RelColumnOrigin;
 import org.apache.calcite.rel.metadata.RelMetadataQuery;
 import org.apache.commons.collections.CollectionUtils;
@@ -49,11 +48,6 @@
 import java.util.List;
 import java.util.Set;
 
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.CtMethod;
-import javassist.Modifier;
-
 /**
  * LineageContext
  *
@@ -70,33 +64,6 @@ public LineageContext(FlinkChainedProgram flinkChainedProgram, TableEnvironmentI
         this.tableEnv = tableEnv;
     }
 
-    /**
-     * Dynamic add getColumnOrigins method to class RelMdColumnOrigins by javassist:
-     *
-     * public Set<RelColumnOrigin> getColumnOrigins(Snapshot rel,RelMetadataQuery mq, int iOutputColumn) {
-     *      return mq.getColumnOrigins(rel.getInput(), iOutputColumn);
-     * }
-     */
-    static {
-        try {
-            ClassPool classPool = ClassPool.getDefault();
-            CtClass ctClass = classPool.getCtClass("org.apache.calcite.rel.metadata.RelMdColumnOrigins");
-
-            CtClass[] parameters = new CtClass[]{classPool.get(Snapshot.class.getName()),
-                    classPool.get(RelMetadataQuery.class.getName()), CtClass.intType
-            };
-            // add method
-            CtMethod ctMethod = new CtMethod(classPool.get("java.util.Set"), "getColumnOrigins", parameters, ctClass);
-            ctMethod.setModifiers(Modifier.PUBLIC);
-            ctMethod.setBody("{return $2.getColumnOrigins($1.getInput(), $3);}");
-            ctClass.addMethod(ctMethod);
-            // load the class
-            ctClass.toClass();
-        } catch (Exception e) {
-            throw new TableException("Dynamic add getColumnOrigins() method exception.", e);
-        }
-    }
-
     public List<LineageRel> getLineage(String statement) {
         // 1. Generate original relNode tree
         Tuple2<String, RelNode> parsed = parseStatement(statement);
diff --git a/dlink-client/dlink-client-base/src/main/java/org/apache/calcite/rel/metadata/RelMdColumnOrigins.java b/dlink-client/dlink-client-base/src/main/java/org/apache/calcite/rel/metadata/RelMdColumnOrigins.java
new file mode 100644
index 0000000000..9a25fc5db3
--- /dev/null
+++ b/dlink-client/dlink-client-base/src/main/java/org/apache/calcite/rel/metadata/RelMdColumnOrigins.java
@@ -0,0 +1,357 @@
+/*
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package org.apache.calcite.rel.metadata;
+
+import org.apache.calcite.plan.RelOptTable;
+import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.SingleRel;
+import org.apache.calcite.rel.core.Aggregate;
+import org.apache.calcite.rel.core.AggregateCall;
+import org.apache.calcite.rel.core.Calc;
+import org.apache.calcite.rel.core.Correlate;
+import org.apache.calcite.rel.core.Exchange;
+import org.apache.calcite.rel.core.Filter;
+import org.apache.calcite.rel.core.Join;
+import org.apache.calcite.rel.core.Project;
+import org.apache.calcite.rel.core.SetOp;
+import org.apache.calcite.rel.core.Snapshot;
+import org.apache.calcite.rel.core.Sort;
+import org.apache.calcite.rel.core.TableFunctionScan;
+import org.apache.calcite.rel.core.TableModify;
+import org.apache.calcite.rel.type.RelDataTypeField;
+import org.apache.calcite.rex.RexCall;
+import org.apache.calcite.rex.RexFieldAccess;
+import org.apache.calcite.rex.RexInputRef;
+import org.apache.calcite.rex.RexLocalRef;
+import org.apache.calcite.rex.RexNode;
+import org.apache.calcite.rex.RexShuttle;
+import org.apache.calcite.rex.RexVisitor;
+import org.apache.calcite.rex.RexVisitorImpl;
+import org.apache.calcite.util.BuiltInMethod;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Modified based on calcite's source code org.apache.calcite.rel.metadata.RelMdColumnOrigins
+ *
+ * Modification point:
+ * 1. Support lookup join, add method getColumnOrigins(Snapshot rel, RelMetadataQuery mq, int iOutputColumn)
+ * 2. Support watermark, add method getColumnOrigins(SingleRel rel,RelMetadataQuery mq, int iOutputColumn)
+ * 3. Support table function, add method getColumnOrigins(Correlate rel, RelMetadataQuery mq, int iOutputColumn)
+ *
+ *
+ * @description: RelMdColumnOrigins supplies a default implementation of {@link
+ * RelMetadataQuery#getColumnOrigins} for the standard logical algebra.
+ * @author: baisong
+ * @version: 1.0.0
+ * @date: 2022/11/24 7:47 PM
+ */
+public class RelMdColumnOrigins implements MetadataHandler<BuiltInMetadata.ColumnOrigin> {
+
+    public static final RelMetadataProvider SOURCE = ReflectiveRelMetadataProvider.reflectiveSource(
+            BuiltInMethod.COLUMN_ORIGIN.method, new RelMdColumnOrigins());
+
+    // ~ Constructors -----------------------------------------------------------
+
+    private RelMdColumnOrigins() {
+    }
+
+    // ~ Methods ----------------------------------------------------------------
+
+    public MetadataDef<BuiltInMetadata.ColumnOrigin> getDef() {
+        return BuiltInMetadata.ColumnOrigin.DEF;
+    }
+
+    public Set<RelColumnOrigin> getColumnOrigins(Aggregate rel,
+            RelMetadataQuery mq, int iOutputColumn) {
+        if (iOutputColumn < rel.getGroupCount()) {
+            // get actual index of Group columns.
+            return mq.getColumnOrigins(rel.getInput(), rel.getGroupSet().asList().get(iOutputColumn));
+        }
+
+        // Aggregate columns are derived from input columns
+        AggregateCall call = rel.getAggCallList().get(iOutputColumn
+                - rel.getGroupCount());
+
+        final Set<RelColumnOrigin> set = new HashSet<>();
+        for (Integer iInput : call.getArgList()) {
+            Set<RelColumnOrigin> inputSet = mq.getColumnOrigins(rel.getInput(), iInput);
+            inputSet = createDerivedColumnOrigins(inputSet);
+            if (inputSet != null) {
+                set.addAll(inputSet);
+            }
+        }
+        return set;
+    }
+
+    public Set<RelColumnOrigin> getColumnOrigins(Join rel, RelMetadataQuery mq,
+            int iOutputColumn) {
+        int nLeftColumns = rel.getLeft().getRowType().getFieldList().size();
+        Set<RelColumnOrigin> set;
+        boolean derived = false;
+        if (iOutputColumn < nLeftColumns) {
+            set = mq.getColumnOrigins(rel.getLeft(), iOutputColumn);
+            if (rel.getJoinType().generatesNullsOnLeft()) {
+                derived = true;
+            }
+        } else {
+            set = mq.getColumnOrigins(rel.getRight(), iOutputColumn - nLeftColumns);
+            if (rel.getJoinType().generatesNullsOnRight()) {
+                derived = true;
+            }
+        }
+        if (derived) {
+            // nulls are generated due to outer join; that counts
+            // as derivation
+            set = createDerivedColumnOrigins(set);
+        }
+        return set;
+    }
+
+    /**
+     * Support the field blood relationship of table function
+     */
+    public Set<RelColumnOrigin> getColumnOrigins(Correlate rel, RelMetadataQuery mq, int iOutputColumn) {
+
+        List<RelDataTypeField> leftFieldList = rel.getLeft().getRowType().getFieldList();
+
+        int nLeftColumns = leftFieldList.size();
+        Set<RelColumnOrigin> set;
+        if (iOutputColumn < nLeftColumns) {
+            set = mq.getColumnOrigins(rel.getLeft(), iOutputColumn);
+        } else {
+            // get the field name of the left table configured in the Table Function on the right
+            TableFunctionScan tableFunctionScan = (TableFunctionScan) rel.getRight();
+            RexCall rexCall = (RexCall) tableFunctionScan.getCall();
+            // support only one field in table function
+            RexFieldAccess rexFieldAccess = (RexFieldAccess) rexCall.operands.get(0);
+            String fieldName = rexFieldAccess.getField().getName();
+
+            int leftFieldIndex = 0;
+            for (int i = 0; i < nLeftColumns; i++) {
+                if (leftFieldList.get(i).getName().equalsIgnoreCase(fieldName)) {
+                    leftFieldIndex = i;
+                    break;
+                }
+            }
+            /**
+             * Get the fields from the left table, don't go to
+             * getColumnOrigins(TableFunctionScan rel,RelMetadataQuery mq, int iOutputColumn),
+             * otherwise the return is null, and the UDTF field origin cannot be parsed
+             */
+            set = mq.getColumnOrigins(rel.getLeft(), leftFieldIndex);
+        }
+        return set;
+    }
+
+    public Set<RelColumnOrigin> getColumnOrigins(SetOp rel,
+            RelMetadataQuery mq, int iOutputColumn) {
+        final Set<RelColumnOrigin> set = new HashSet<>();
+        for (RelNode input : rel.getInputs()) {
+            Set<RelColumnOrigin> inputSet = mq.getColumnOrigins(input, iOutputColumn);
+            if (inputSet == null) {
+                return null;
+            }
+            set.addAll(inputSet);
+        }
+        return set;
+    }
+
+    /**
+     * Support the field blood relationship of lookup join
+     */
+    public Set<RelColumnOrigin> getColumnOrigins(Snapshot rel,
+            RelMetadataQuery mq, int iOutputColumn) {
+        return mq.getColumnOrigins(rel.getInput(), iOutputColumn);
+    }
+
+    /**
+     * Support the field blood relationship of watermark
+     */
+    public Set<RelColumnOrigin> getColumnOrigins(SingleRel rel,
+            RelMetadataQuery mq, int iOutputColumn) {
+        return mq.getColumnOrigins(rel.getInput(), iOutputColumn);
+    }
+
+    public Set<RelColumnOrigin> getColumnOrigins(Project rel,
+            final RelMetadataQuery mq, int iOutputColumn) {
+        final RelNode input = rel.getInput();
+        RexNode rexNode = rel.getProjects().get(iOutputColumn);
+
+        if (rexNode instanceof RexInputRef) {
+            // Direct reference: no derivation added.
+            RexInputRef inputRef = (RexInputRef) rexNode;
+            return mq.getColumnOrigins(input, inputRef.getIndex());
+        }
+        // Anything else is a derivation, possibly from multiple columns.
+        final Set<RelColumnOrigin> set = getMultipleColumns(rexNode, input, mq);
+        return createDerivedColumnOrigins(set);
+    }
+
+    public Set<RelColumnOrigin> getColumnOrigins(Calc rel,
+            final RelMetadataQuery mq, int iOutputColumn) {
+        final RelNode input = rel.getInput();
+        final RexShuttle rexShuttle = new RexShuttle() {
+
+            @Override
+            public RexNode visitLocalRef(RexLocalRef localRef) {
+                return rel.getProgram().expandLocalRef(localRef);
+            }
+        };
+        final List<RexNode> projects = new ArrayList<>();
+        for (RexNode rex : rexShuttle.apply(rel.getProgram().getProjectList())) {
+            projects.add(rex);
+        }
+        final RexNode rexNode = projects.get(iOutputColumn);
+        if (rexNode instanceof RexInputRef) {
+            // Direct reference: no derivation added.
+            RexInputRef inputRef = (RexInputRef) rexNode;
+            return mq.getColumnOrigins(input, inputRef.getIndex());
+        }
+        // Anything else is a derivation, possibly from multiple columns.
+        final Set<RelColumnOrigin> set = getMultipleColumns(rexNode, input, mq);
+        return createDerivedColumnOrigins(set);
+    }
+
+    public Set<RelColumnOrigin> getColumnOrigins(Filter rel,
+            RelMetadataQuery mq, int iOutputColumn) {
+        return mq.getColumnOrigins(rel.getInput(), iOutputColumn);
+    }
+
+    public Set<RelColumnOrigin> getColumnOrigins(Sort rel, RelMetadataQuery mq,
+            int iOutputColumn) {
+        return mq.getColumnOrigins(rel.getInput(), iOutputColumn);
+    }
+
+    public Set<RelColumnOrigin> getColumnOrigins(TableModify rel, RelMetadataQuery mq,
+            int iOutputColumn) {
+        return mq.getColumnOrigins(rel.getInput(), iOutputColumn);
+    }
+
+    public Set<RelColumnOrigin> getColumnOrigins(Exchange rel,
+            RelMetadataQuery mq, int iOutputColumn) {
+        return mq.getColumnOrigins(rel.getInput(), iOutputColumn);
+    }
+
+    public Set<RelColumnOrigin> getColumnOrigins(TableFunctionScan rel,
+            RelMetadataQuery mq, int iOutputColumn) {
+        final Set<RelColumnOrigin> set = new HashSet<>();
+        Set<RelColumnMapping> mappings = rel.getColumnMappings();
+        if (mappings == null) {
+            if (rel.getInputs().size() > 0) {
+                // This is a non-leaf transformation: say we don't
+                // know about origins, because there are probably
+                // columns below.
+                return null;
+            } else {
+                // This is a leaf transformation: say there are fer sure no
+                // column origins.
+                return set;
+            }
+        }
+        for (RelColumnMapping mapping : mappings) {
+            if (mapping.iOutputColumn != iOutputColumn) {
+                continue;
+            }
+            final RelNode input = rel.getInputs().get(mapping.iInputRel);
+            final int column = mapping.iInputColumn;
+            Set<RelColumnOrigin> origins = mq.getColumnOrigins(input, column);
+            if (origins == null) {
+                return null;
+            }
+            if (mapping.derived) {
+                origins = createDerivedColumnOrigins(origins);
+            }
+            set.addAll(origins);
+        }
+        return set;
+    }
+
+    // Catch-all rule when none of the others apply.
+    public Set<RelColumnOrigin> getColumnOrigins(RelNode rel,
+            RelMetadataQuery mq, int iOutputColumn) {
+        // NOTE jvs 28-Mar-2006: We may get this wrong for a physical table
+        // expression which supports projections. In that case,
+        // it's up to the plugin writer to override with the
+        // correct information.
+
+        if (rel.getInputs().size() > 0) {
+            // No generic logic available for non-leaf rels.
+            return null;
+        }
+
+        final Set<RelColumnOrigin> set = new HashSet<>();
+
+        RelOptTable table = rel.getTable();
+        if (table == null) {
+            // Somebody is making column values up out of thin air, like a
+            // VALUES clause, so we return an empty set.
+            return set;
+        }
+
+        // Detect the case where a physical table expression is performing
+        // projection, and say we don't know instead of making any assumptions.
+        // (Theoretically we could try to map the projection using column
+        // names.) This detection assumes the table expression doesn't handle
+        // rename as well.
+        if (table.getRowType() != rel.getRowType()) {
+            return null;
+        }
+
+        set.add(new RelColumnOrigin(table, iOutputColumn, false));
+        return set;
+    }
+
+    private Set<RelColumnOrigin> createDerivedColumnOrigins(
+            Set<RelColumnOrigin> inputSet) {
+        if (inputSet == null) {
+            return null;
+        }
+        final Set<RelColumnOrigin> set = new HashSet<>();
+        for (RelColumnOrigin rco : inputSet) {
+            RelColumnOrigin derived = new RelColumnOrigin(
+                    rco.getOriginTable(),
+                    rco.getOriginColumnOrdinal(),
+                    true);
+            set.add(derived);
+        }
+        return set;
+    }
+
+    private Set<RelColumnOrigin> getMultipleColumns(RexNode rexNode, RelNode input,
+            final RelMetadataQuery mq) {
+        final Set<RelColumnOrigin> set = new HashSet<>();
+        final RexVisitor<Void> visitor = new RexVisitorImpl<Void>(true) {
+
+            public Void visitInputRef(RexInputRef inputRef) {
+                Set<RelColumnOrigin> inputSet = mq.getColumnOrigins(input, inputRef.getIndex());
+                if (inputSet != null) {
+                    set.addAll(inputSet);
+                }
+                return null;
+            }
+        };
+        rexNode.accept(visitor);
+        return set;
+    }
+}
diff --git a/dlink-connectors/dlink-connector-doris-1.13/pom.xml.versionsBackup b/dlink-connectors/dlink-connector-doris-1.13/pom.xml.versionsBackup
deleted file mode 100644
index 1cf232f7dc..0000000000
--- a/dlink-connectors/dlink-connector-doris-1.13/pom.xml.versionsBackup
+++ /dev/null
@@ -1,79 +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">
-    <parent>
-        <artifactId>dlink-connectors</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-connector-doris-1.13</artifactId>
-
-    <properties>
-
-        <flink.version>1.13.6</flink.version>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.doris</groupId>
-            <artifactId>flink-doris-connector-1.13_${scala.binary.version}</artifactId>
-            <version>1.0.3</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.0</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <!-- 指定打包的jar包输出路径 -->
-                    <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/dlink-connectors/dlink-connector-jdbc-1.11/pom.xml.versionsBackup b/dlink-connectors/dlink-connector-jdbc-1.11/pom.xml.versionsBackup
deleted file mode 100644
index bfe0a0c958..0000000000
--- a/dlink-connectors/dlink-connector-jdbc-1.11/pom.xml.versionsBackup
+++ /dev/null
@@ -1,130 +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">
-    <parent>
-        <artifactId>dlink-connectors</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-connector-jdbc-1.11</artifactId>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <flink.version>1.11.6</flink.version>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-        <junit.version>4.12</junit.version>
-        <postgres.version>42.2.10</postgres.version>
-        <otj-pg-embedded.version>0.13.3</otj-pg-embedded.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-flink-1.11</artifactId>
-            <scope>${scope.runtime}</scope>
-        </dependency>
-        <!-- Postgres dependencies -->
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>${postgres.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- Postgres test dependencies -->
-
-        <dependency>
-            <groupId>com.opentable.components</groupId>
-            <artifactId>otj-pg-embedded</artifactId>
-            <version>${otj-pg-embedded.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- MySQL test dependencies -->
-        <dependency>
-            <groupId>ch.vorburger.mariaDB4j</groupId>
-            <artifactId>mariaDB4j</artifactId>
-            <version>2.4.0</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- ch.vorburger.mariaDB4j:mariaDB4j has a dependency of mariadb-java-client:2.3.0,
-         but we want to bump mariadb-java-client to 2.5.4 which fix a few notable bugs,
-         see: https://mariadb.com/kb/en/mariadb-connector-j-release-notes/
-         and the lower version may cause the test stability issue FLINK-18082.-->
-        <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-            <version>2.5.4</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Derby test dependencies -->
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.14.2.0</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Oracle test dependencies -->
-        <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <!-- SQLServer test dependencies -->
-        <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
-            <version>8.2.2.jre8</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <!-- 指定打包的jar包输出路径 -->
-                    <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/dlink-connectors/dlink-connector-jdbc-1.12/pom.xml.versionsBackup b/dlink-connectors/dlink-connector-jdbc-1.12/pom.xml.versionsBackup
deleted file mode 100644
index 0c03d0b086..0000000000
--- a/dlink-connectors/dlink-connector-jdbc-1.12/pom.xml.versionsBackup
+++ /dev/null
@@ -1,124 +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">
-    <parent>
-        <artifactId>dlink-connectors</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-connector-jdbc-1.12</artifactId>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <flink.version>1.12.7</flink.version>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-        <junit.version>4.12</junit.version>
-        <postgres.version>42.2.10</postgres.version>
-        <otj-pg-embedded.version>0.13.3</otj-pg-embedded.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-flink-1.12</artifactId>
-            <scope>${scope.runtime}</scope>
-        </dependency>
-        <!-- Postgres dependencies -->
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>${postgres.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Postgres test dependencies -->
-
-        <dependency>
-            <groupId>com.opentable.components</groupId>
-            <artifactId>otj-pg-embedded</artifactId>
-            <version>${otj-pg-embedded.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- MySQL test dependencies -->
-        <dependency>
-            <groupId>ch.vorburger.mariaDB4j</groupId>
-            <artifactId>mariaDB4j</artifactId>
-            <version>2.4.0</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- ch.vorburger.mariaDB4j:mariaDB4j has a dependency of mariadb-java-client:2.3.0,
-         but we want to bump mariadb-java-client to 2.5.4 which fix a few notable bugs,
-         see: https://mariadb.com/kb/en/mariadb-connector-j-release-notes/
-         and the lower version may cause the test stability issue FLINK-18082.-->
-        <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-            <version>2.5.4</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Derby test dependencies -->
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.14.2.0</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Oracle test dependencies -->
-        <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <!-- SQLServer test dependencies -->
-        <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
-            <version>8.2.2.jre8</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>${maven-jar-plugin.version}</version>
-                <configuration>
-                    <!-- 指定打包的jar包输出路径 -->
-                    <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/dlink-connectors/dlink-connector-jdbc-1.13/pom.xml.versionsBackup b/dlink-connectors/dlink-connector-jdbc-1.13/pom.xml.versionsBackup
deleted file mode 100644
index 4f81884a5c..0000000000
--- a/dlink-connectors/dlink-connector-jdbc-1.13/pom.xml.versionsBackup
+++ /dev/null
@@ -1,125 +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">
-    <parent>
-        <artifactId>dlink-connectors</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-connector-jdbc-1.13</artifactId>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <flink.version>1.13.6</flink.version>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-        <junit.version>4.12</junit.version>
-        <postgres.version>42.2.10</postgres.version>
-        <otj-pg-embedded.version>0.13.3</otj-pg-embedded.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-flink-1.13</artifactId>
-            <scope>${scope.runtime}</scope>
-        </dependency>
-
-        <!-- Postgres dependencies -->
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>${postgres.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Postgres test dependencies -->
-
-        <dependency>
-            <groupId>com.opentable.components</groupId>
-            <artifactId>otj-pg-embedded</artifactId>
-            <version>${otj-pg-embedded.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- MySQL test dependencies -->
-        <dependency>
-            <groupId>ch.vorburger.mariaDB4j</groupId>
-            <artifactId>mariaDB4j</artifactId>
-            <version>2.4.0</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- ch.vorburger.mariaDB4j:mariaDB4j has a dependency of mariadb-java-client:2.3.0,
-         but we want to bump mariadb-java-client to 2.5.4 which fix a few notable bugs,
-         see: https://mariadb.com/kb/en/mariadb-connector-j-release-notes/
-         and the lower version may cause the test stability issue FLINK-18082.-->
-        <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-            <version>2.5.4</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Derby test dependencies -->
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.14.2.0</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Oracle test dependencies -->
-        <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- SQLServer test dependencies -->
-        <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
-            <version>8.2.2.jre8</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <!-- 指定打包的jar包输出路径 -->
-                    <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/dlink-connectors/dlink-connector-phoenix-1.13/pom.xml.versionsBackup b/dlink-connectors/dlink-connector-phoenix-1.13/pom.xml.versionsBackup
deleted file mode 100644
index 339e7a411c..0000000000
--- a/dlink-connectors/dlink-connector-phoenix-1.13/pom.xml.versionsBackup
+++ /dev/null
@@ -1,70 +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">
-    <parent>
-        <artifactId>dlink-connectors</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-connector-phoenix-1.13</artifactId>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <flink.version>1.13.6</flink.version>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-        <junit.version>4.12</junit.version>
-       <!-- <scope.runtime>compile</scope.runtime>-->
-        <phoenix.scope.runtime>provided</phoenix.scope.runtime>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.dlink</groupId>
-            <artifactId>dlink-flink-1.13</artifactId>
-            <scope>${scope.runtime}</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.phoenix</groupId>
-            <artifactId>phoenix-core</artifactId>
-            <version>4.14.2-HBase-1.4</version>
-            <!--            <scope>test</scope>-->
-            <!--<scope>${scope.runtime}</scope>-->
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>${maven-jar-plugin.version}</version>
-                <configuration>
-                    <!-- 指定打包的jar包输出路径 -->
-                    <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/dlink-core/src/main/java/com/dlink/job/JobManager.java b/dlink-core/src/main/java/com/dlink/job/JobManager.java
index 29dc9e5e6e..0d60e6c8ea 100644
--- a/dlink-core/src/main/java/com/dlink/job/JobManager.java
+++ b/dlink-core/src/main/java/com/dlink/job/JobManager.java
@@ -300,6 +300,7 @@ public boolean close() {
     }
 
     public JobResult executeSql(String statement) {
+        ProcessEntity process = ProcessContextHolder.getProcess();
         Job job = Job.init(runMode, config, executorSetting, executor, statement, useGateway);
         if (!useGateway) {
             job.setJobManagerAddress(environmentSetting.getAddress());
@@ -352,11 +353,10 @@ public JobResult executeSql(String statement) {
                         }
                         if (config.isUseResult()) {
                             // Build insert result.
-                            IResult result =
-                                    ResultBuilder
-                                            .build(SqlType.INSERT, config.getMaxRowNum(), config.isUseChangeLog(),
-                                                    config.isUseAutoCancel(), executor.getTimeZone())
-                                            .getResult(tableResult);
+                            IResult result = ResultBuilder
+                                    .build(SqlType.INSERT, config.getMaxRowNum(), config.isUseChangeLog(),
+                                            config.isUseAutoCancel(), executor.getTimeZone())
+                                    .getResult(tableResult);
                             job.setResult(result);
                         }
                     }
@@ -376,8 +376,8 @@ public JobResult executeSql(String statement) {
                 } else {
                     for (StatementParam item : jobParam.getTrans()) {
                         currentSql = item.getValue();
-                        FlinkInterceptorResult flinkInterceptorResult =
-                                FlinkInterceptor.build(executor, item.getValue());
+                        FlinkInterceptorResult flinkInterceptorResult = FlinkInterceptor.build(executor,
+                                item.getValue());
                         if (Asserts.isNotNull(flinkInterceptorResult.getTableResult())) {
                             if (config.isUseResult()) {
                                 IResult result = ResultBuilder
@@ -399,10 +399,9 @@ public JobResult executeSql(String statement) {
                                     });
                                 }
                                 if (config.isUseResult()) {
-                                    IResult result =
-                                            ResultBuilder.build(item.getType(), config.getMaxRowNum(),
-                                                    config.isUseChangeLog(), config.isUseAutoCancel(),
-                                                    executor.getTimeZone()).getResult(tableResult);
+                                    IResult result = ResultBuilder.build(item.getType(), config.getMaxRowNum(),
+                                            config.isUseChangeLog(), config.isUseAutoCancel(),
+                                            executor.getTimeZone()).getResult(tableResult);
                                     job.setResult(result);
                                 }
                             }
@@ -456,9 +455,10 @@ public JobResult executeSql(String statement) {
                         });
                     }
                     if (config.isUseResult()) {
-                        IResult result =
-                                ResultBuilder.build(SqlType.EXECUTE, config.getMaxRowNum(), config.isUseChangeLog(),
-                                        config.isUseAutoCancel(), executor.getTimeZone()).getResult(null);
+                        IResult result = ResultBuilder
+                                .build(SqlType.EXECUTE, config.getMaxRowNum(), config.isUseChangeLog(),
+                                        config.isUseAutoCancel(), executor.getTimeZone())
+                                .getResult(null);
                         job.setResult(result);
                     }
                 }
@@ -471,10 +471,11 @@ public JobResult executeSql(String statement) {
             job.setEndTime(LocalDateTime.now());
             job.setStatus(Job.JobStatus.FAILED);
             job.setError(error);
+            process.error(error);
             failed();
+        } finally {
             close();
         }
-        close();
         return job.getJobResult();
     }
 
@@ -548,8 +549,8 @@ public static SessionInfo createSession(String session, SessionConfig sessionCon
         } else {
             sessionExecutor = Executor.buildLocalExecutor(sessionConfig.getExecutorSetting());
         }
-        ExecutorEntity executorEntity =
-                new ExecutorEntity(session, sessionConfig, createUser, LocalDateTime.now(), sessionExecutor);
+        ExecutorEntity executorEntity = new ExecutorEntity(session, sessionConfig, createUser, LocalDateTime.now(),
+                sessionExecutor);
         SessionPool.push(executorEntity);
         return SessionInfo.build(executorEntity);
     }
@@ -597,6 +598,7 @@ public SavePointResult savepoint(String jobId, String savePointType, String save
     }
 
     public JobResult executeJar() {
+        ProcessEntity process = ProcessContextHolder.getProcess();
         Job job = Job.init(runMode, config, executorSetting, executor, null, useGateway);
         JobContextHolder.setJob(job);
         ready();
@@ -616,9 +618,10 @@ public JobResult executeJar() {
             job.setStatus(Job.JobStatus.FAILED);
             job.setError(error);
             failed();
+            process.error(error);
+        } finally {
             close();
         }
-        close();
         return job.getJobResult();
     }
 
diff --git a/dlink-core/src/main/java/com/dlink/result/ResultRunnable.java b/dlink-core/src/main/java/com/dlink/result/ResultRunnable.java
index b8d21d24cc..1b1d5b5d8a 100644
--- a/dlink-core/src/main/java/com/dlink/result/ResultRunnable.java
+++ b/dlink-core/src/main/java/com/dlink/result/ResultRunnable.java
@@ -39,7 +39,6 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-
 /**
  * ResultRunnable
  *
@@ -56,7 +55,8 @@ public class ResultRunnable implements Runnable {
     private final boolean isAutoCancel;
     private final String timeZone;
 
-    public ResultRunnable(TableResult tableResult, Integer maxRowNum, boolean isChangeLog, boolean isAutoCancel, String timeZone) {
+    public ResultRunnable(TableResult tableResult, Integer maxRowNum, boolean isChangeLog, boolean isAutoCancel,
+            String timeZone) {
         this.tableResult = tableResult;
         this.maxRowNum = maxRowNum;
         this.isChangeLog = isChangeLog;
@@ -66,22 +66,26 @@ public ResultRunnable(TableResult tableResult, Integer maxRowNum, boolean isChan
 
     @Override
     public void run() {
-        tableResult.getJobClient().ifPresent(jobClient -> {
-            String jobId = jobClient.getJobID().toHexString();
-            if (!ResultPool.containsKey(jobId)) {
-                ResultPool.put(new SelectResult(jobId, new ArrayList<>(), new LinkedHashSet<>()));
-            }
+        try {
+            tableResult.getJobClient().ifPresent(jobClient -> {
+                String jobId = jobClient.getJobID().toHexString();
+                if (!ResultPool.containsKey(jobId)) {
+                    ResultPool.put(new SelectResult(jobId, new ArrayList<>(), new LinkedHashSet<>()));
+                }
 
-            try {
-                if (isChangeLog) {
-                    catchChangLog(ResultPool.get(jobId));
-                } else {
-                    catchData(ResultPool.get(jobId));
+                try {
+                    if (isChangeLog) {
+                        catchChangLog(ResultPool.get(jobId));
+                    } else {
+                        catchData(ResultPool.get(jobId));
+                    }
+                } catch (Exception e) {
+                    log.error(String.format(e.toString()));
                 }
-            } catch (Exception e) {
-                log.error(String.format(e.toString()));
-            }
-        });
+            });
+        } catch (Exception e) {
+            // Nothing to do
+        }
     }
 
     private void catchChangLog(SelectResult selectResult) {
diff --git a/dlink-flink/dlink-flink-1.11/pom.xml.versionsBackup b/dlink-flink/dlink-flink-1.11/pom.xml.versionsBackup
deleted file mode 100644
index bf48ed0533..0000000000
--- a/dlink-flink/dlink-flink-1.11/pom.xml.versionsBackup
+++ /dev/null
@@ -1,139 +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">
-    <parent>
-        <artifactId>dlink-flink</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-flink-1.11</artifactId>
-
-    <properties>
-        <flink.version>1.11.6</flink.version>
-        <flinkcdc.version>1.1.1</flinkcdc.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-        <junit.version>4.12</junit.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-python_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-common</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-planner-blink_${scala.binary.version}</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-clients_${scala.binary.version}</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-yarn_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-yarn-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-hdfs</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-yarn-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-mapreduce-client-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-kubernetes_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-connector-kafka_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.ververica</groupId>
-            <artifactId>flink-sql-connector-mysql-cdc</artifactId>
-            <version>${flinkcdc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.doris</groupId>
-            <artifactId>flink-doris-connector-1.11_${scala.binary.version}</artifactId>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-connector-jdbc_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-    </dependencies>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.kafka</groupId>
-                <artifactId>kafka-clients</artifactId>
-                <version>2.4.1</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
\ No newline at end of file
diff --git a/dlink-flink/dlink-flink-1.12/pom.xml.versionsBackup b/dlink-flink/dlink-flink-1.12/pom.xml.versionsBackup
deleted file mode 100644
index 7180188ed3..0000000000
--- a/dlink-flink/dlink-flink-1.12/pom.xml.versionsBackup
+++ /dev/null
@@ -1,131 +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">
-    <parent>
-        <artifactId>dlink-flink</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-flink-1.12</artifactId>
-
-    <properties>
-        <flink.version>1.12.7</flink.version>
-        <flinkcdc.version>1.3.0</flinkcdc.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-        <junit.version>4.12</junit.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-python_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-common</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-planner-blink_${scala.binary.version}</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-clients_${scala.binary.version}</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-yarn_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-yarn-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-hdfs</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-yarn-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-mapreduce-client-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-kubernetes_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-connector-kafka_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.ververica</groupId>
-            <artifactId>flink-connector-mysql-cdc</artifactId>
-            <version>${flinkcdc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.doris</groupId>
-            <artifactId>flink-doris-connector-1.12_${scala.binary.version}</artifactId>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-connector-jdbc_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-    </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/dlink-flink/dlink-flink-1.13/pom.xml.versionsBackup b/dlink-flink/dlink-flink-1.13/pom.xml.versionsBackup
deleted file mode 100644
index 7c23b2439f..0000000000
--- a/dlink-flink/dlink-flink-1.13/pom.xml.versionsBackup
+++ /dev/null
@@ -1,158 +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>com.dlink</groupId>
-        <artifactId>dlink-flink</artifactId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>dlink-flink-1.13</artifactId>
-
-    <properties>
-        <flink.version>1.13.6</flink.version>
-        <flinkcdc.version>2.3.0</flinkcdc.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-        <junit.version>4.12</junit.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-python_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-planner-blink_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-clients_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-yarn_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-yarn-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-hdfs</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-yarn-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-mapreduce-client-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-kubernetes_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-connector-kafka_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.ververica</groupId>
-            <artifactId>flink-connector-mysql-cdc</artifactId>
-            <version>${flinkcdc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.ververica</groupId>
-            <artifactId>flink-connector-oracle-cdc</artifactId>
-            <version>${flinkcdc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-connector-jdbc_${scala.binary.version}</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.doris</groupId>
-            <artifactId>flink-doris-connector-1.13_${scala.binary.version}</artifactId>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hudi</groupId>
-            <artifactId>hudi-flink_${scala.binary.version}</artifactId>
-            <version>0.10.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.starrocks</groupId>
-            <artifactId>flink-connector-starrocks</artifactId>
-            <version>1.2.3_flink-1.13_${scala.binary.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-shaded-guava</artifactId>
-            <version>18.0-13.0</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/dlink-flink/dlink-flink-1.15/pom.xml.versionsBackup b/dlink-flink/dlink-flink-1.15/pom.xml.versionsBackup
deleted file mode 100644
index 9fe6cbb324..0000000000
--- a/dlink-flink/dlink-flink-1.15/pom.xml.versionsBackup
+++ /dev/null
@@ -1,168 +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>com.dlink</groupId>
-        <artifactId>dlink-flink</artifactId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>dlink-flink-1.15</artifactId>
-
-    <properties>
-        <flink.version>1.15.2</flink.version>
-        <flink.guava.version>15.0</flink.guava.version>
-        <flinkcdc.version>2.3.0</flinkcdc.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <commons.version>1.3.1</commons.version>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-        <junit.version>4.12</junit.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-python_2.12</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-api-java-bridge</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-api-scala-bridge_2.12</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-runtime</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-planner_2.12</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <!-- You need to add this dependency before completing the dlink-connector-jdbc-1.15 module to prevent running exceptions when using version flink-1.15,
-        and you need to put the flink-connector-jdbc-1.15.*.jar in the /dlink/lib/ directory to replace dlink-connector-jdbc-1.13-0.6.6-SNAPSHOT.jar during deployment-->
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-connector-jdbc</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <!-- end-->
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-core</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-common</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-api-java</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-clients</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-yarn</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-yarn-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-hdfs</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-yarn-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-mapreduce-client-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-kubernetes</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-connector-kafka</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-shaded-guava</artifactId>
-            <version>30.1.1-jre-${flink.guava.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.ververica</groupId>
-            <artifactId>flink-sql-connector-mysql-cdc</artifactId>
-            <version>${flinkcdc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.ververica</groupId>
-            <artifactId>flink-sql-connector-oracle-cdc</artifactId>
-            <version>${flinkcdc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>${commons.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.doris</groupId>
-            <artifactId>flink-doris-connector-1.14_2.12</artifactId>
-            <version>1.1.0</version>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/dlink-flink/dlink-flink-1.16/pom.xml.versionsBackup b/dlink-flink/dlink-flink-1.16/pom.xml.versionsBackup
deleted file mode 100644
index 92ab444a75..0000000000
--- a/dlink-flink/dlink-flink-1.16/pom.xml.versionsBackup
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <parent>
-        <artifactId>dlink-flink</artifactId>
-        <groupId>com.dlink</groupId>
-        <version>0.6.8-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dlink-flink-1.16</artifactId>
-
-    <properties>
-        <flink.version>1.16.0</flink.version>
-        <flink.guava.version>16.0</flink.guava.version>
-        <flinkcdc.version>2.3.0</flinkcdc.version>
-        <commons.version>1.3.1</commons.version>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-python</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-planner_2.12</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-runtime</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-connector-jdbc</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-api-java-bridge</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-api-scala-bridge_2.12</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-core</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-common</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-api-java</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-clients</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-yarn</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-yarn-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-hdfs</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-yarn-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-mapreduce-client-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-kubernetes</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-connector-kafka</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-shaded-guava</artifactId>
-            <version>30.1.1-jre-${flink.guava.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.ververica</groupId>
-            <artifactId>flink-sql-connector-mysql-cdc</artifactId>
-            <version>${flinkcdc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.ververica</groupId>
-            <artifactId>flink-sql-connector-oracle-cdc</artifactId>
-            <version>${flinkcdc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>${commons.version}</version>
-        </dependency>
-    </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/dlink-metadata/dlink-metadata-base/pom.xml b/dlink-metadata/dlink-metadata-base/pom.xml
index c428689cbf..f10ba77dab 100644
--- a/dlink-metadata/dlink-metadata-base/pom.xml
+++ b/dlink-metadata/dlink-metadata-base/pom.xml
@@ -31,6 +31,10 @@
             <groupId>com.dlink</groupId>
             <artifactId>dlink-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.dlink</groupId>
+            <artifactId>dlink-process</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
diff --git a/dlink-metadata/dlink-metadata-base/src/main/java/com/dlink/metadata/driver/AbstractJdbcDriver.java b/dlink-metadata/dlink-metadata-base/src/main/java/com/dlink/metadata/driver/AbstractJdbcDriver.java
index 3cd9680f60..987b8096f2 100644
--- a/dlink-metadata/dlink-metadata-base/src/main/java/com/dlink/metadata/driver/AbstractJdbcDriver.java
+++ b/dlink-metadata/dlink-metadata-base/src/main/java/com/dlink/metadata/driver/AbstractJdbcDriver.java
@@ -32,6 +32,8 @@
 import com.dlink.model.Schema;
 import com.dlink.model.Table;
 import com.dlink.model.TableType;
+import com.dlink.process.context.ProcessContextHolder;
+import com.dlink.process.model.ProcessEntity;
 import com.dlink.result.SqlExplainResult;
 import com.dlink.utils.LogUtil;
 import com.dlink.utils.TextUtil;
@@ -65,6 +67,8 @@
 import com.alibaba.druid.sql.SQLUtils;
 import com.alibaba.druid.sql.ast.SQLStatement;
 
+import cn.hutool.core.text.CharSequenceUtil;
+
 /**
  * AbstractJdbcDriver
  *
@@ -550,6 +554,7 @@ public StringBuilder genQueryOption(QueryData queryData) {
 
     @Override
     public JdbcSelectResult query(String sql, Integer limit) {
+        ProcessEntity process = ProcessContextHolder.getProcess();
         if (Asserts.isNull(limit)) {
             limit = 100;
         }
@@ -596,6 +601,7 @@ public JdbcSelectResult query(String sql, Integer limit) {
         } catch (Exception e) {
             result.setError(LogUtil.getError(e));
             result.setSuccess(false);
+            process.error(e.getMessage());
         } finally {
             close(preparedStatement, results);
             result.setRowData(datas);
@@ -612,27 +618,35 @@ public JdbcSelectResult query(String sql, Integer limit) {
      */
     @Override
     public JdbcSelectResult executeSql(String sql, Integer limit) {
+        ProcessEntity process = ProcessContextHolder.getProcess();
+        process.info("Start parse sql...");
         List<SQLStatement> stmtList = SQLUtils.parseStatements(sql, config.getType().toLowerCase());
+        process.info(CharSequenceUtil.format("A total of {} statement have been Parsed.", stmtList.size()));
         List<Object> resList = new ArrayList<>();
         JdbcSelectResult result = JdbcSelectResult.buildResult();
+        process.info("Start execute sql...");
         for (SQLStatement item : stmtList) {
             String type = item.getClass().getSimpleName();
             if (type.toUpperCase().contains("SELECT") || type.toUpperCase().contains("SHOW")
                     || type.toUpperCase().contains("DESC") || type.toUpperCase().contains("SQLEXPLAINSTATEMENT")) {
+                process.info("Execute query.");
                 result = query(item.toString(), limit);
             } else if (type.toUpperCase().contains("INSERT") || type.toUpperCase().contains("UPDATE")
                     || type.toUpperCase().contains("DELETE")) {
                 try {
+                    process.info("Execute update.");
                     resList.add(executeUpdate(item.toString()));
                     result.setStatusList(resList);
                 } catch (Exception e) {
                     resList.add(0);
                     result.setStatusList(resList);
                     result.error(LogUtil.getError(e));
+                    process.error(e.getMessage());
                     return result;
                 }
             } else {
                 try {
+                    process.info("Execute DDL.");
                     execute(item.toString());
                     resList.add(1);
                     result.setStatusList(resList);
@@ -640,6 +654,7 @@ public JdbcSelectResult executeSql(String sql, Integer limit) {
                     resList.add(0);
                     result.setStatusList(resList);
                     result.error(LogUtil.getError(e));
+                    process.error(e.getMessage());
                     return result;
                 }
             }
@@ -650,8 +665,10 @@ public JdbcSelectResult executeSql(String sql, Integer limit) {
 
     @Override
     public List<SqlExplainResult> explain(String sql) {
+        ProcessEntity process = ProcessContextHolder.getProcess();
         List<SqlExplainResult> sqlExplainResults = new ArrayList<>();
         String current = null;
+        process.info("Start check sql...");
         try {
             List<SQLStatement> stmtList = SQLUtils.parseStatements(sql, config.getType().toLowerCase());
             for (SQLStatement item : stmtList) {
@@ -659,8 +676,10 @@ public List<SqlExplainResult> explain(String sql) {
                 String type = item.getClass().getSimpleName();
                 sqlExplainResults.add(SqlExplainResult.success(type, current, null));
             }
+            process.info("Sql is correct.");
         } catch (Exception e) {
             sqlExplainResults.add(SqlExplainResult.fail(current, LogUtil.getError(e)));
+            process.error(e.getMessage());
         } finally {
             return sqlExplainResults;
         }
@@ -675,9 +694,8 @@ public List<Map<String, String>> getSplitSchemaList() {
         PreparedStatement preparedStatement = null;
         ResultSet results = null;
         IDBQuery dbQuery = getDBQuery();
-        String sql =
-                "select DATA_LENGTH,TABLE_NAME AS `NAME`,TABLE_SCHEMA AS `Database`,TABLE_COMMENT AS COMMENT,TABLE_CATALOG AS `CATALOG`,TABLE_TYPE"
-                        + " AS `TYPE`,ENGINE AS `ENGINE`,CREATE_OPTIONS AS `OPTIONS`,TABLE_ROWS AS `ROWS`,CREATE_TIME,UPDATE_TIME from information_schema.tables WHERE TABLE_TYPE='BASE TABLE'";
+        String sql = "select DATA_LENGTH,TABLE_NAME AS `NAME`,TABLE_SCHEMA AS `Database`,TABLE_COMMENT AS COMMENT,TABLE_CATALOG AS `CATALOG`,TABLE_TYPE"
+                + " AS `TYPE`,ENGINE AS `ENGINE`,CREATE_OPTIONS AS `OPTIONS`,TABLE_ROWS AS `ROWS`,CREATE_TIME,UPDATE_TIME from information_schema.tables WHERE TABLE_TYPE='BASE TABLE'";
         List<Map<String, String>> schemas = null;
         try {
             preparedStatement = conn.get().prepareStatement(sql);
@@ -755,13 +773,12 @@ && contains(tableName, x.get(dbQuery.tableName())))
                         if (tableType != TableType.SINGLE_DATABASE_AND_TABLE) {
                             String currentSchemaName = getReValue(x.get(dbQuery.schemaName()), splitConfig) + "."
                                     + getReValue(x.get(dbQuery.tableName()), splitConfig);
-                            List<String> schemaTableNameList =
-                                    mapList.stream()
-                                            .filter(y -> (getReValue(y.get(dbQuery.schemaName()), splitConfig) + "."
-                                                    + getReValue(y.get(dbQuery.tableName()), splitConfig))
-                                                            .equals(currentSchemaName))
-                                            .map(y -> y.get(dbQuery.schemaName()) + "." + y.get(dbQuery.tableName()))
-                                            .collect(Collectors.toList());
+                            List<String> schemaTableNameList = mapList.stream()
+                                    .filter(y -> (getReValue(y.get(dbQuery.schemaName()), splitConfig) + "."
+                                            + getReValue(y.get(dbQuery.tableName()), splitConfig))
+                                                    .equals(currentSchemaName))
+                                    .map(y -> y.get(dbQuery.schemaName()) + "." + y.get(dbQuery.tableName()))
+                                    .collect(Collectors.toList());
                             tableInfo.setSchemaTableNameList(schemaTableNameList);
                         } else {
                             tableInfo.setSchemaTableNameList(Collections
diff --git a/dlink-metadata/dlink-metadata-doris/src/main/java/com/dlink/metadata/driver/DorisDriver.java b/dlink-metadata/dlink-metadata-doris/src/main/java/com/dlink/metadata/driver/DorisDriver.java
index 7747e92894..283efeaf16 100644
--- a/dlink-metadata/dlink-metadata-doris/src/main/java/com/dlink/metadata/driver/DorisDriver.java
+++ b/dlink-metadata/dlink-metadata-doris/src/main/java/com/dlink/metadata/driver/DorisDriver.java
@@ -24,6 +24,8 @@
 import com.dlink.metadata.query.DorisQuery;
 import com.dlink.metadata.query.IDBQuery;
 import com.dlink.metadata.result.JdbcSelectResult;
+import com.dlink.process.context.ProcessContextHolder;
+import com.dlink.process.model.ProcessEntity;
 import com.dlink.utils.LogUtil;
 import com.dlink.utils.SqlUtil;
 
@@ -32,7 +34,10 @@
 import java.util.List;
 import java.util.Map;
 
+import cn.hutool.core.text.CharSequenceUtil;
+
 public class DorisDriver extends AbstractJdbcDriver {
+
     @Override
     public IDBQuery getDBQuery() {
         return new DorisQuery();
@@ -60,37 +65,47 @@ public String getName() {
 
     @Override
     public JdbcSelectResult executeSql(String sql, Integer limit) {
+        ProcessEntity process = ProcessContextHolder.getProcess();
+        process.info("Start parse sql...");
         String[] statements = SqlUtil.getStatements(SqlUtil.removeNote(sql));
+        process.info(CharSequenceUtil.format("A total of {} statement have been Parsed.", statements.length));
         List<Object> resList = new ArrayList<>();
         JdbcSelectResult result = JdbcSelectResult.buildResult();
+        process.info("Start execute sql...");
         for (String item : statements) {
             String type = item.toUpperCase();
             if (type.startsWith("SELECT") || type.startsWith("SHOW") || type.startsWith("DESC")) {
+                process.info("Execute query.");
                 result = query(item, limit);
             } else if (type.startsWith("INSERT") || type.startsWith("UPDATE") || type.startsWith("DELETE")) {
                 try {
+                    process.info("Execute update.");
                     resList.add(executeUpdate(item));
                     result.setStatusList(resList);
+                    result.success();
                 } catch (Exception e) {
                     resList.add(0);
                     result.setStatusList(resList);
                     result.error(LogUtil.getError(e));
+                    process.error(e.getMessage());
                     return result;
                 }
             } else {
                 try {
+                    process.info("Execute DDL.");
                     execute(item);
                     resList.add(1);
                     result.setStatusList(resList);
+                    result.success();
                 } catch (Exception e) {
                     resList.add(0);
                     result.setStatusList(resList);
                     result.error(LogUtil.getError(e));
+                    process.error(e.getMessage());
                     return result;
                 }
             }
         }
-        result.success();
         return result;
     }
 
diff --git a/dlink-process/src/main/java/com/dlink/process/model/ProcessEntity.java b/dlink-process/src/main/java/com/dlink/process/model/ProcessEntity.java
index ce4cf8ff04..98cd34e529 100644
--- a/dlink-process/src/main/java/com/dlink/process/model/ProcessEntity.java
+++ b/dlink-process/src/main/java/com/dlink/process/model/ProcessEntity.java
@@ -63,8 +63,8 @@ public ProcessEntity(String pid, String name, Integer taskId, ProcessType type,
     }
 
     public ProcessEntity(String name, Integer taskId, ProcessType type, ProcessStatus status, LocalDateTime startTime,
-                         LocalDateTime endTime, long time,
-                         List<ProcessStep> steps, Integer userId) {
+            LocalDateTime endTime, long time,
+            List<ProcessStep> steps, Integer userId) {
         this.name = name;
         this.taskId = taskId;
         this.type = type;
@@ -114,6 +114,19 @@ public void finish() {
         setTime(getEndTime().compareTo(getStartTime()));
     }
 
+    public void finish(String str) {
+        if (isNullProcess()) {
+            return;
+        }
+        steps.get(stepIndex - 1).setEndTime(LocalDateTime.now());
+        String message = CharSequenceUtil.format("\n[{}] {} INFO: {}", type.getValue(), LocalDateTime.now(), str);
+        steps.get(stepIndex - 1).appendInfo(message);
+        setStatus(ProcessStatus.FINISHED);
+        setEndTime(LocalDateTime.now());
+        setTime(getEndTime().compareTo(getStartTime()));
+        ConsolePool.write(message, userId);
+    }
+
     public void config(String str) {
         if (isNullProcess()) {
             return;
diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js
index 77376b16bb..92dbbaa89b 100644
--- a/docs/docusaurus.config.js
+++ b/docs/docusaurus.config.js
@@ -26,257 +26,271 @@ const darkCodeTheme = require('prism-react-renderer/themes/dracula');
 
 /** @type {import('@docusaurus/types').Config} */
 const config = {
-  title: 'Dinky',  //网站标题 | Site title
-  tagline: 'Dinky 为 Apache Flink 而生，让 Flink SQL 纵享丝滑', // 网站标语 | Tagline for your website
-  url: 'http://www.dlink.top/', // 网站网址 | Your website's URL
-  baseUrl: '/', // 站点的相对路径 可将其视为是主机名后的路径 | Path to your website
-  staticDirectories: ['static/img','blog/blog_img'], // 静态文件目录 | Path to static files
-  // trailingSlash: true, //此选项允许您自定义 URL/链接后是否添加结尾斜杠 | Whether to append a trailing slash to the URL when rendering URLs
-  onBrokenLinks: 'ignore', // Docusaurus 在检测到无效链接时的行为 |  Docusaurus behavior when invalid links are detected    -> 类型：'ignore' | 'log' | 'warn' | 'error' | 'throw' |
-  onBrokenMarkdownLinks: 'warn', // Docusaurus 在检测到无效 Markdown 链接时的行为 | Docusaurus behavior when detecting invalid markdown links  -> 类型：'ignore' | 'log' | 'warn' | 'error' | 'throw'
-  onDuplicateRoutes: 'warn', // Docusaurus 在检测到重复的路由时的行为 |  Behavior of docusaurus when duplicate routes are detected  ->  类型：'ignore' | 'log' | 'warn' | 'error' | 'throw'
-  favicon: 'dinky_logo.svg', // 左侧logo  | left logo
-  organizationName: 'DataLinkDC', // 拥有此源的 GitHub 用户或组织。 用于部署命令。 |  The GitHub user or organization that owns this source. Command for deployment.
-  projectName: 'dlink', // GitHub 源的名称。 用于部署命令。 | The name of the GitHub repository. Command for deployment.
-  deploymentBranch: 'main', // GitHub Pages 的部署分支。 用于部署命令。 | The branch to deploy to GitHub Pages. Command for deployment.
-  customFields:{ // 自定义字段 | Custom fields
-    structTitle: 'Dinky',
-    structSubTitle: 'Dinky 为 Apache Flink 而生，让 Flink SQL 纵享丝滑',
-    // structDescription: custom_fields.structDesc(),
-    learningMore:'https://space.bilibili.com/366484959/video'
-  },
-  i18n: {
-    defaultLocale: 'zh-cn',
-    locales: ['zh-cn'],
-    // locales: ['zh-cn','en'],
-    localeConfigs: {
-     'zh-cn': {
-       label: "简体中文",
-       direction: 'ltr',
-     },
-    //  'en': {
-    //    label: "English",
-    //    direction: 'ltr',
-    //  },
+    title: 'Dinky',  //网站标题 | Site title
+    tagline: 'Dinky 为 Apache Flink 而生，让 Flink SQL 纵享丝滑', // 网站标语 | Tagline for your website
+    url: 'http://www.dlink.top/', // 网站网址 | Your website's URL
+    baseUrl: '/', // 站点的相对路径 可将其视为是主机名后的路径 | Path to your website
+    staticDirectories: ['static/img', 'blog/blog_img'], // 静态文件目录 | Path to static files
+    // trailingSlash: true, //此选项允许您自定义 URL/链接后是否添加结尾斜杠 | Whether to append a trailing slash to the URL when rendering URLs
+    onBrokenLinks: 'ignore', // Docusaurus 在检测到无效链接时的行为 |  Docusaurus behavior when invalid links are detected    -> 类型：'ignore' | 'log' | 'warn' | 'error' | 'throw' |
+    onBrokenMarkdownLinks: 'warn', // Docusaurus 在检测到无效 Markdown 链接时的行为 | Docusaurus behavior when detecting invalid markdown links  -> 类型：'ignore' | 'log' | 'warn' | 'error' | 'throw'
+    onDuplicateRoutes: 'warn', // Docusaurus 在检测到重复的路由时的行为 |  Behavior of docusaurus when duplicate routes are detected  ->  类型：'ignore' | 'log' | 'warn' | 'error' | 'throw'
+    favicon: 'dinky_logo.svg', // 左侧logo  | left logo
+    organizationName: 'DataLinkDC', // 拥有此源的 GitHub 用户或组织。 用于部署命令。 |  The GitHub user or organization that owns this source. Command for deployment.
+    projectName: 'dlink', // GitHub 源的名称。 用于部署命令。 | The name of the GitHub repository. Command for deployment.
+    deploymentBranch: 'main', // GitHub Pages 的部署分支。 用于部署命令。 | The branch to deploy to GitHub Pages. Command for deployment.
+    customFields: { // 自定义字段 | Custom fields
+        structTitle: 'Dinky',
+        structSubTitle: 'Dinky 为 Apache Flink 而生，让 Flink SQL 纵享丝滑',
+        // structDescription: custom_fields.structDesc(),
+        learningMore: 'https://space.bilibili.com/366484959/video'
     },
-  },
-  presets: [
-    [
-      'classic',
-      /** @type {import('@docusaurus/preset-classic').Options} */
-      ({
-        docs: {
-          sidebarPath: require.resolve('./sidebars.js'),
-          sidebarCollapsible: true,
-          // Please change this to your repo.
-          editUrl: ({locale, versionDocsDirPath, docPath}) => {
-            if (locale !== 'zh-cn') {
-              return `https://github.com/DataLinkDC/dlink/tree/master/docs/i18n/${locale}/${docPath}`;
-            }
-            return `https://github.com/DataLinkDC/dlink/tree/master/docs/${versionDocsDirPath}/${docPath}`;
-          },
-        },
-       blog: {
-         showReadingTime: true, // 展示阅读时间 | show read time
-         include: ['**/*.{md,mdx}'],
-         exclude: [
-           '**/_*.{js,jsx,ts,tsx,md,mdx}',
-           '**/_*/**',
-           '**/*.test.{js,jsx,ts,tsx}',
-           '**/__tests__/**',
-         ],
-         sortPosts:"descending", // 博客主页分页的排序规则(会根据时间排序) 降序: 'descending'  升序: 'ascending' | Governs the direction of blog post sorting.
-         postsPerPage: 20, // 博客主页的前{count}篇文章数 | the blog homepage show limit count
-         readingTime: ({content, frontMatter, defaultReadingTime}) =>
-             defaultReadingTime({content, options: {wordsPerMinute: 300}}), // 阅读时间 md文件中如果不写 date: 此属性 默认是当前时间
-         // Please change this to your repo.
-         // editUrl: ({locale, versionDocsDirPath, docPath}) => { // 博客页面修改编辑按钮
-         //   if (locale !== 'zh-cn') {
-         //     return `https://github.com/DataLinkDC/dlink/tree/master/docs/i18n/${locale}/${docPath}`;
-         //   }
-         //   return `https://github.com/DataLinkDC/dlink/tree/master/docs/${versionDocsDirPath}/${docPath}`;
-         // },
-       },
-        theme: {
-          customCss: require.resolve('./src/css/custom.css'), // 自定义css文件
+    i18n: {
+        defaultLocale: 'zh-cn',
+        locales: ['zh-cn'],
+        // locales: ['zh-cn','en'],
+        localeConfigs: {
+            'zh-cn': {
+                label: "简体中文",
+                direction: 'ltr',
+            },
+            //  'en': {
+            //    label: "English",
+            //    direction: 'ltr',
+            //  },
         },
-      }),
+    },
+    themes: [
+        [
+            require.resolve("@easyops-cn/docusaurus-search-local"),
+            /** @type {import("@easyops-cn/docusaurus-search-local").PluginOptions} */
+            ({
+                // config url is: https://github.com/easyops-cn/docusaurus-search-local#theme-options
+                hashed: true,
+                indexDocs: true,
+                indexPages: true,
+                highlightSearchTermsOnTargetPage: false, // Highlight search terms on target page.
+                explicitSearchResultPath: true,
+                searchBarPosition: "right",
+                language:["zh","en"],
+                hideSearchBarWithNoSearchContext: true,
+            }),
+        ],
+    ],
+    presets: [
+        [
+            'classic',
+            /** @type {import('@docusaurus/preset-classic').Options} */
+            ({
+                docs: {
+                    sidebarPath: require.resolve('./sidebars.js'),
+                    sidebarCollapsible: true,
+                    // Please change this to your repo.
+                    editUrl: ({locale, versionDocsDirPath, docPath}) => {
+                        if (locale !== 'zh-cn') {
+                            return `https://github.com/DataLinkDC/dlink/tree/master/docs/i18n/${locale}/${docPath}`;
+                        }
+                        return `https://github.com/DataLinkDC/dlink/tree/master/docs/${versionDocsDirPath}/${docPath}`;
+                    },
+                },
+                blog: {
+                    showReadingTime: true, // 展示阅读时间 | show read time
+                    include: ['**/*.{md,mdx}'],
+                    exclude: [
+                        '**/_*.{js,jsx,ts,tsx,md,mdx}',
+                        '**/_*/**',
+                        '**/*.test.{js,jsx,ts,tsx}',
+                        '**/__tests__/**',
+                    ],
+                    sortPosts: "descending", // 博客主页分页的排序规则(会根据时间排序) 降序: 'descending'  升序: 'ascending' | Governs the direction of blog post sorting.
+                    postsPerPage: 20, // 博客主页的前{count}篇文章数 | the blog homepage show limit count
+                    readingTime: ({content, frontMatter, defaultReadingTime}) =>
+                        defaultReadingTime({content, options: {wordsPerMinute: 300}}), // 阅读时间 md文件中如果不写 date: 此属性 默认是当前时间
+                    // Please change this to your repo.
+                    // editUrl: ({locale, versionDocsDirPath, docPath}) => { // 博客页面修改编辑按钮
+                    //   if (locale !== 'zh-cn') {
+                    //     return `https://github.com/DataLinkDC/dlink/tree/master/docs/i18n/${locale}/${docPath}`;
+                    //   }
+                    //   return `https://github.com/DataLinkDC/dlink/tree/master/docs/${versionDocsDirPath}/${docPath}`;
+                    // },
+                },
+                theme: {
+                    customCss: require.resolve('./src/css/custom.css'), // 自定义css文件
+                },
+            }),
+        ],
     ],
-  ],
 
-  themeConfig:
+    themeConfig:
     /** @type {import('@docusaurus/preset-classic').ThemeConfig} */
-    ({
-     announcementBar: {
-            id: 'announcementBar-2', // Increment on change
-            content: `⭐️ &nbsp; If you like Dinky , give it a star on <a target="_blank" rel="noopener noreferrer" href="https://github.com/DataLinkDC/dlink">GitHub</a>`,
-            backgroundColor: "#BBDFFF",
-            isCloseable: false,
-          },
-      hideOnScroll: false, // 滚动时是否隐藏 | Whether to hide the sidebar on scroll
-      hideableSidebar: true, // 是否隐藏侧边栏 | Whether to hide the sidebar in mobile
-      autoCollapseSidebarCategories: true, // 点击另一个分类时自动折叠当前分类 | Click another category will automatically collapse the current category
-      navbar: {
-        title: 'Dinky',
-        logo: {
-          alt: 'Dinky',
-          src: 'side_dinky.svg',
-        },
-       items: [
-          {
-            to: '/',
-            position: 'right',
-            label: '主页',
-            title: '主页',
-            activeBaseRegex: `^/$`,
-          },
-          {
-            position: 'right',
-            label: '文档',
-            to: "/docs/intro",
-            items: [
-              {
-                label: "Next",
-                to: "/docs/next/intro",
-              },
-             {
-               label: "0.6",
-               to: "/docs/intro",
-             },
-//              {
-//                  label: "0.6",
-//                  to: "/docs/0.6/intro",
-//                },
-              {
-                label: "All Versions",
-                to: "/versions",
-              },
-            ],
-          },
-          {
-            to: '/download/download',
-            position: 'right',
-            label: '下载',
-            activeBaseRegex: `/download/`,
-          },
-          {
-            label: '开发者指南',
-            to: '/docs/next/developer_guide/contribution/how_contribute',
-            position: 'right',
-            items: [
-              {
-                label: "如何参与",
-                to: "/docs/next/developer_guide/contribution/how_contribute",
-              },
-              {
-                label: "本地调试",
-                to: "/docs/next/developer_guide/local_debug",
-              },
-              {
-                label: "远程调试",
-                to: "/docs/next/developer_guide/remote_debug",
-              },
-            ],
-          },
-         {
-           to: '/blog',
-           position: 'right',
-           label: '博客',
-           // activeBaseRegex: `/*/`,
-         },
-          {
-            type: 'localeDropdown',
-            position: 'right',
-          },
-         // {
-         //   to: 'blog',
-         //   label: '博客',
-         //   position: 'right'
-         // },
-          {
-            href: 'https://github.com/DataLinkDC/dlink',
-            label: 'GitHub',
-            position: 'right',
-          },
-        ],
-      },
-      footer: {
-        style: 'dark',
-        links: [
-          {
-            title: 'Docs',
-            items: [
-              {
-                label: '文档首页',
-                to: '/docs/intro',
-              },
-              {
-                label: 'Open Api',
-                to: '/docs/administrator_guide/studio/openapi',
-              },
-            ],
-          },
-          {
-            title: 'Community',
-            items: [
-              {
-                label: 'Discussions',
-                href: 'https://github.com/DataLinkDC/dlink/discussions',
-              },
-              {
-                label: 'Issue',
-                href: 'https://github.com/DataLinkDC/dlink/issues',
-              },
-              {
-                label: 'Pull Request',
-                href: 'https://github.com/DataLinkDC/dlink/pulls',
-              },
-            ],
-          },
-          {
-            title: 'More',
-            items: [
-              {
-                label: 'GitHub',
-                href: 'https://github.com/DataLinkDC/dlink',
-              },
-              {
-                label: '博客',
-                to: '/blog',
-              },
-            ],
-          },
-        ],
-        logo: {
-          alt: 'Dinky',
-          src: 'side_dinky.svg',
-          width: 100,
-          height: 30,
-        },
-        copyright: `Copyright © ${new Date().getFullYear()} Dinky, Inc. DataLinkDC.`,
-      },
-      prism: {
-        theme: lightCodeTheme,
-        darkTheme: darkCodeTheme,
-      },
-    }),
+        ({
+            announcementBar: {
+                id: 'announcementBar-2', // Increment on change
+                content: `⭐️ &nbsp; If you like Dinky , give it a star on <a target="_blank" rel="noopener noreferrer" href="https://github.com/DataLinkDC/dlink">GitHub</a>`,
+                backgroundColor: "#BBDFFF",
+                isCloseable: false,
+            },
+            hideOnScroll: false, // 滚动时是否隐藏 | Whether to hide the sidebar on scroll
+            // hideableSidebar: true, // 是否隐藏侧边栏 | Whether to hide the sidebar in mobile
+            docs: {
+                sidebar: {
+                    hideable: true ,// 是否隐藏侧边栏 | Whether to hide the sidebar in mobile
+                    autoCollapseCategories: true , // 点击另一个分类时自动折叠当前分类 | Click another category will automatically collapse the current category
+
+                }
+            },
+            navbar: {
+                title: 'Dinky',
+                logo: {
+                    alt: 'Dinky',
+                    src: 'side_dinky.svg',
+                },
+                items: [
+                    {
+                        to: '/',
+                        position: 'right',
+                        label: '主页',
+                        title: '主页',
+                        activeBaseRegex: `^/$`,
+                    },
+                    {
+                        position: 'right',
+                        label: '文档',
+                        to: "/docs/intro",
+                        items: [
+                            {
+                                label: "Next",
+                                to: "/docs/next/intro",
+                            },
+                            {
+                                label: "0.6",
+                                to: "/docs/intro",
+                            },
+                            {
+                                label: "All Versions",
+                                to: "/versions",
+                            },
+                        ],
+                    },
+                    {
+                        to: '/download/download',
+                        position: 'right',
+                        label: '下载',
+                        activeBaseRegex: `/download/`,
+                    },
+                    {
+                        label: '开发者指南',
+                        to: '/docs/next/developer_guide/contribution/how_contribute',
+                        position: 'right',
+                        items: [
+                            {
+                                label: "如何参与",
+                                to: "/docs/next/developer_guide/contribution/how_contribute",
+                            },
+                            {
+                                label: "本地调试",
+                                to: "/docs/next/developer_guide/local_debug",
+                            },
+                            {
+                                label: "远程调试",
+                                to: "/docs/next/developer_guide/remote_debug",
+                            },
+                        ],
+                    },
+                    /*{
+                        to: '/blog',
+                        position: 'right',
+                        label: '博客',
+                        // activeBaseRegex: `/!*!/`,
+                    },*/
+                    {
+                        type: 'localeDropdown',
+                        position: 'right',
+                    },
+                    {
+                        href: 'https://github.com/DataLinkDC/dlink',
+                        label: 'GitHub',
+                        position: 'right',
+                    },
+                ],
+            },
+            footer: {
+                style: 'dark',
+                links: [
+                    {
+                        title: 'Docs',
+                        items: [
+                            {
+                                label: '文档首页',
+                                to: '/docs/intro',
+                            },
+                            {
+                                label: 'Open Api',
+                                to: '/docs/administrator_guide/studio/openapi',
+                            },
+                        ],
+                    },
+                    {
+                        title: 'Community',
+                        items: [
+                            {
+                                label: 'Discussions',
+                                href: 'https://github.com/DataLinkDC/dlink/discussions',
+                            },
+                            {
+                                label: 'Issue',
+                                href: 'https://github.com/DataLinkDC/dlink/issues',
+                            },
+                            {
+                                label: 'Pull Request',
+                                href: 'https://github.com/DataLinkDC/dlink/pulls',
+                            },
+                        ],
+                    },
+                    {
+                        title: 'More',
+                        items: [
+                            {
+                                label: 'GitHub',
+                                href: 'https://github.com/DataLinkDC/dlink',
+                            },
+                            {
+                                label: '博客',
+                                to: '/blog',
+                            },
+                        ],
+                    },
+                ],
+                logo: {
+                    alt: 'Dinky',
+                    src: 'side_dinky.svg',
+                    width: 100,
+                    height: 30,
+                },
+                copyright: `Copyright © ${new Date().getFullYear()} Dinky, Inc. DataLinkDC.`,
+            },
+            prism: {
+                theme: lightCodeTheme,
+                darkTheme: darkCodeTheme,
+            },
+        }),
     plugins: [
-      'docusaurus-plugin-less',
-      [
-        '@docusaurus/plugin-content-docs',
-        {
-          id: 'download',
-          path: 'download',
-          routeBasePath: 'download',
-          editUrl: ({locale, versionDocsDirPath, docPath}) => {
-            if (locale !== 'zh-cn') {
-              return `https://github.com/DataLinkDC/dlink/tree/master/docs/i18n/${locale}/${docPath}`;
-            }
-            return `https://github.com/DataLinkDC/dlink/tree/master/docs/${versionDocsDirPath}/${docPath}`;
+        'docusaurus-plugin-less',
+        [
+            '@docusaurus/plugin-content-docs',
+            {
+                id: 'download',
+                path: 'download',
+                routeBasePath: 'download',
+                editUrl: ({locale, versionDocsDirPath, docPath}) => {
+                    if (locale !== 'zh-cn') {
+                        return `https://github.com/DataLinkDC/dlink/tree/master/docs/i18n/${locale}/${docPath}`;
+                    }
+                    return `https://github.com/DataLinkDC/dlink/tree/master/docs/${versionDocsDirPath}/${docPath}`;
+                },
+                sidebarPath: require.resolve('./sidebars.js'),
             },
-          sidebarPath: require.resolve('./sidebars.js'),
-        },
-      ],
+        ],
     ]
 };
 
diff --git a/docs/package.json b/docs/package.json
index e73ef79a4f..3efd5f16b8 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -14,9 +14,10 @@
     "write-heading-ids": "docusaurus write-heading-ids"
   },
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.18",
-    "@docusaurus/plugin-content-docs": "2.0.0-beta.18",
-    "@docusaurus/preset-classic": "2.0.0-beta.18",
+    "@docusaurus/core": "^2.2.0",
+    "@docusaurus/plugin-content-docs": "^2.2.0",
+    "@docusaurus/preset-classic": "^2.2.0",
+    "@easyops-cn/docusaurus-search-local": "^0.33.5",
     "@mdx-js/react": "^1.6.22",
     "clsx": "^1.1.1",
     "docusaurus-plugin-less": "^2.0.2",
diff --git a/style/spotless_dlink_formatter.xml b/style/spotless_dlink_formatter.xml
index f9d7b0cd57..7033eb59e1 100644
--- a/style/spotless_dlink_formatter.xml
+++ b/style/spotless_dlink_formatter.xml
@@ -19,7 +19,7 @@
  */
 -->
 <profiles version="22">
-    <profile kind="CodeFormatterProfile" name="'DLink DataLinkDC Current'" version="13">
+    <profile kind="CodeFormatterProfile" name="'Dinky Current'" version="13">
         <setting id="org.eclipse.jdt.core.compiler.source" value="1.8" />
         <setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8" />
         <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8" />
@@ -34,19 +34,10 @@
         <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false" />
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert" />
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert" />
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="16" />
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert" />
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert" />
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80" />
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16" />
         <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1" />
         <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2" />
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="160" />
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="10" />
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="106" />
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="106" />
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="106" />
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call.count_dependent" value="16|5|80" />
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
     </profile>
 </profiles>