[fix][core]merge与修改包名带来的冲突

3 files changed, 5 insertions, 8 deletions

diff --git a/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdeBase/handler/AbstractMultipleKnowledgeBaseHandler.java b/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdeBase/handler/AbstractMultipleKnowledgeBaseHandler.java
index d65ec49..8259e2a 100644
--- a/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdeBase/handler/AbstractMultipleKnowledgeBaseHandler.java
+++ b/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdeBase/handler/AbstractMultipleKnowledgeBaseHandler.java
@@ -1,9 +1,8 @@
-package com.geedgenetworks.core.utils.KnowlegdeBase.Handler.cn;
+package com.geedgenetworks.core.udf.knowlegdeBase.handler;
 
 import com.alibaba.fastjson2.JSON;
 import com.geedgenetworks.common.config.KnowledgeBaseConfig;
 import com.geedgenetworks.core.pojo.KnowLedgeBaseFileMeta;
-import com.geedgenetworks.core.utils.KnowlegdeBase.Handler.AbstractKnowledgeBaseHandler;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.apache.http.HttpEntity;
diff --git a/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdeBase/handler/AbstractSingleKnowledgeBaseHandler.java b/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdeBase/handler/AbstractSingleKnowledgeBaseHandler.java
index 031de40..2675944 100644
--- a/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdeBase/handler/AbstractSingleKnowledgeBaseHandler.java
+++ b/groot-core/src/main/java/com/geedgenetworks/core/udf/knowlegdeBase/handler/AbstractSingleKnowledgeBaseHandler.java
@@ -1,9 +1,7 @@
-package com.geedgenetworks.core.utils.KnowlegdeBase.Handler.cn;
-
+package com.geedgenetworks.core.udf.knowlegdeBase.handler;
 import com.alibaba.fastjson2.JSON;
 import com.geedgenetworks.common.config.KnowledgeBaseConfig;
 import com.geedgenetworks.core.pojo.KnowLedgeBaseFileMeta;
-import com.geedgenetworks.core.utils.KnowlegdeBase.Handler.AbstractKnowledgeBaseHandler;
 import lombok.Data;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
diff --git a/groot-core/src/test/java/com/geedgenetworks/core/udf/cn/LookupTestUtils.java b/groot-core/src/test/java/com/geedgenetworks/core/udf/cn/LookupTestUtils.java
index 2dc0701..2c10ea3 100644
--- a/groot-core/src/test/java/com/geedgenetworks/core/udf/cn/LookupTestUtils.java
+++ b/groot-core/src/test/java/com/geedgenetworks/core/udf/cn/LookupTestUtils.java
@@ -5,9 +5,9 @@ import com.geedgenetworks.common.Constants;
 import com.geedgenetworks.common.config.CommonConfig;
 import com.geedgenetworks.common.config.KnowledgeBaseConfig;
 import com.geedgenetworks.core.pojo.KnowLedgeBaseFileMeta;
-import com.geedgenetworks.core.utils.KnowlegdeBase.Handler.AbstractKnowledgeBaseHandler;
-import com.geedgenetworks.core.utils.KnowlegdeBase.Handler.cn.AbstractMultipleKnowledgeBaseHandler;
-import com.geedgenetworks.core.utils.KnowlegdeBase.KnowledgeBaseUpdateJob;
+import com.geedgenetworks.core.udf.knowlegdeBase.handler.AbstractKnowledgeBaseHandler;
+import com.geedgenetworks.core.udf.knowlegdeBase.handler.AbstractMultipleKnowledgeBaseHandler;
+import com.geedgenetworks.core.udf.knowlegdeBase.KnowledgeBaseUpdateJob;
 import org.apache.flink.api.common.ExecutionConfig;
 import org.apache.flink.api.common.functions.RuntimeContext;
 import org.apache.flink.configuration.Configuration;