feat(all): 优化依赖

移除旧common包
2024-02-29 18:17:43 +08:00
parent 5a2e9fdfb8
commit 0338a0d579
118 changed files with 375 additions and 373 deletions
--- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/CheckCommand.java
+++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/CheckCommand.java
@@ -1,7 +1,7 @@
 package com.lanyuanxiaoyao.service.command.commands;

 import cn.hutool.core.util.StrUtil;
-import com.eshore.odcp.hudi.connector.entity.TableMeta;
+import com.lanyuanxiaoyao.service.common.entity.TableMeta;
 import com.lanyuanxiaoyao.service.configuration.ExecutorProvider;
 import com.lanyuanxiaoyao.service.forest.service.InfoService;
 import com.lanyuanxiaoyao.service.forest.service.PulsarService;
--- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/JobCommand.java
+++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/JobCommand.java
@@ -3,11 +3,11 @@ package com.lanyuanxiaoyao.service.command.commands;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.eshore.odcp.hudi.connector.entity.FlinkJob;
-import com.eshore.odcp.hudi.connector.entity.TableMeta;
 import com.lanyuanxiaoyao.service.command.commands.jobs.*;
 import com.lanyuanxiaoyao.service.command.provider.SearchTypeValueProvider;
 import com.lanyuanxiaoyao.service.command.utils.SearchUtils;
+import com.lanyuanxiaoyao.service.common.entity.FlinkJob;
+import com.lanyuanxiaoyao.service.common.entity.TableMeta;
 import com.lanyuanxiaoyao.service.configuration.entity.info.JobAndMetas;
 import com.lanyuanxiaoyao.service.forest.service.InfoService;
 import java.io.IOException;
--- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/YarnCommand.java
+++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/YarnCommand.java
@@ -3,12 +3,12 @@ package com.lanyuanxiaoyao.service.command.commands;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.eshore.odcp.hudi.connector.Constants;
-import com.eshore.odcp.hudi.connector.entity.RunMeta;
-import com.eshore.odcp.hudi.connector.utils.NameHelper;
 import com.lanyuanxiaoyao.service.command.entity.TableMetaJob;
 import com.lanyuanxiaoyao.service.command.utils.CommandLineUtils;
 import com.lanyuanxiaoyao.service.command.utils.ShellTableUtils;
+import com.lanyuanxiaoyao.service.common.Constants;
+import com.lanyuanxiaoyao.service.common.entity.RunMeta;
+import com.lanyuanxiaoyao.service.common.utils.NameHelper;
 import com.lanyuanxiaoyao.service.configuration.ExecutorProvider;
 import com.lanyuanxiaoyao.service.configuration.entity.yarn.YarnApplication;
 import com.lanyuanxiaoyao.service.configuration.entity.yarn.YarnClusters;
--- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AbstractAdder.java
+++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AbstractAdder.java
@@ -1,7 +1,7 @@
 package com.lanyuanxiaoyao.service.command.commands.jobs;

 import cn.hutool.core.lang.Snowflake;
-import com.eshore.odcp.hudi.connector.entity.FlinkJob;
+import com.lanyuanxiaoyao.service.common.entity.FlinkJob;
 import com.lanyuanxiaoyao.service.configuration.entity.info.TableMetaAdd;
 import com.lanyuanxiaoyao.service.forest.service.InfoService;
 import org.eclipse.collections.api.list.ImmutableList;
--- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AcctBigTableAdder.java
+++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AcctBigTableAdder.java
@@ -1,7 +1,7 @@
 package com.lanyuanxiaoyao.service.command.commands.jobs;

 import cn.hutool.core.util.StrUtil;
-import com.eshore.odcp.hudi.connector.entity.FlinkJob;
+import com.lanyuanxiaoyao.service.common.entity.FlinkJob;
 import com.lanyuanxiaoyao.service.forest.service.InfoService;
 import org.eclipse.collections.api.factory.Lists;
 import org.eclipse.collections.api.list.ImmutableList;
--- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AcctItemTableAdder.java
+++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AcctItemTableAdder.java
@@ -2,7 +2,7 @@ package com.lanyuanxiaoyao.service.command.commands.jobs;

 import cn.hutool.core.lang.Tuple;
 import cn.hutool.core.util.StrUtil;
-import com.eshore.odcp.hudi.connector.entity.FlinkJob;
+import com.lanyuanxiaoyao.service.common.entity.FlinkJob;
 import com.lanyuanxiaoyao.service.forest.service.InfoService;
 import org.eclipse.collections.api.factory.Lists;
 import org.eclipse.collections.api.list.ImmutableList;
--- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AcctSmallTableAdder.java
+++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AcctSmallTableAdder.java
@@ -1,7 +1,7 @@
 package com.lanyuanxiaoyao.service.command.commands.jobs;

 import cn.hutool.core.util.StrUtil;
-import com.eshore.odcp.hudi.connector.entity.FlinkJob;
+import com.lanyuanxiaoyao.service.common.entity.FlinkJob;
 import com.lanyuanxiaoyao.service.forest.service.InfoService;
 import org.eclipse.collections.api.factory.Lists;
 import org.eclipse.collections.api.list.ImmutableList;
--- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/BigTableAdder.java
+++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/BigTableAdder.java
@@ -1,8 +1,8 @@
 package com.lanyuanxiaoyao.service.command.commands.jobs;

 import cn.hutool.core.util.StrUtil;
-import com.eshore.odcp.hudi.connector.entity.FlinkJob;
 import com.lanyuanxiaoyao.service.command.commands.jobs.AbstractAdder;
+import com.lanyuanxiaoyao.service.common.entity.FlinkJob;
 import com.lanyuanxiaoyao.service.forest.service.InfoService;
 import org.eclipse.collections.api.factory.Lists;
 import org.eclipse.collections.api.list.ImmutableList;
--- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/SmallTableAdder.java
+++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/SmallTableAdder.java
@@ -1,7 +1,7 @@
 package com.lanyuanxiaoyao.service.command.commands.jobs;

 import cn.hutool.core.util.StrUtil;
-import com.eshore.odcp.hudi.connector.entity.FlinkJob;
+import com.lanyuanxiaoyao.service.common.entity.FlinkJob;
 import com.lanyuanxiaoyao.service.forest.service.InfoService;
 import org.eclipse.collections.api.factory.Lists;
 import org.eclipse.collections.api.list.ImmutableList;
--- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/configuration/SpringCloudDiscoveryInterceptor.java
+++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/configuration/SpringCloudDiscoveryInterceptor.java
@@ -4,26 +4,17 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.URLUtil;
-import cn.hutool.http.HttpResponse;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONUtil;
 import com.dtflys.forest.auth.BasicAuth;
 import com.dtflys.forest.http.ForestAddress;
 import com.dtflys.forest.http.ForestRequest;
 import com.dtflys.forest.interceptor.Interceptor;
-import com.eshore.odcp.hudi.connector.Constants;
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.github.benmanes.caffeine.cache.LoadingCache;
+import com.lanyuanxiaoyao.service.common.Constants;
 import java.net.URI;
 import java.net.URL;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
 import org.eclipse.collections.api.factory.Lists;
 import org.eclipse.collections.api.list.ImmutableList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.stereotype.Component;

--- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/entity/TableMetaJob.java
+++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/entity/TableMetaJob.java
@@ -1,7 +1,7 @@
 package com.lanyuanxiaoyao.service.command.entity;

 import cn.hutool.core.util.ObjectUtil;
-import com.eshore.odcp.hudi.connector.entity.TableMeta;
+import com.lanyuanxiaoyao.service.common.entity.TableMeta;
 import com.lanyuanxiaoyao.service.configuration.entity.yarn.YarnApplication;

 /**
--- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/utils/TableUtils.java
+++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/utils/TableUtils.java
@@ -1,6 +1,6 @@
 package com.lanyuanxiaoyao.service.command.utils;

-import com.eshore.odcp.hudi.connector.entity.TableMeta;
+import com.lanyuanxiaoyao.service.common.entity.TableMeta;
 import java.util.Comparator;
 import java.util.List;
 import java.util.function.Function;