diff --git a/docs/configuration/linkis-instance-label-client.md b/docs/configuration/linkis-instance-label-client.md
index b9938003e9..ca774e4317 100644
--- a/docs/configuration/linkis-instance-label-client.md
+++ b/docs/configuration/linkis-instance-label-client.md
@@ -1,5 +1,5 @@
-## linkis-instance-label-client 配置
+## linkis-pes-rpc-client 配置
-| 模块名(服务名) | 参数名 | 默认值 | 描述 |
-| -------- | -------- | ----- |----- |
-| linkis-instance-label-client |wds.linkis.instance.label.server.name|linkis-ps-publicservice|instance.label.server.name|
+| 模块名(服务名) | 参数名 | 默认值 | 描述 |
+|-----------------------| -------- | ----- |----- |
+| linkis-pes-rpc-client |wds.linkis.instance.label.server.name|linkis-ps-publicservice|instance.label.server.name|
diff --git a/docs/errorcode/linkis-bml-client.md b/docs/errorcode/linkis-bml-client.md
index ae2bf154c4..81630997d7 100644
--- a/docs/errorcode/linkis-bml-client.md
+++ b/docs/errorcode/linkis-bml-client.md
@@ -1,9 +1,9 @@
-## linkis-bml-client errorcode
+## linkis-pes-client errorcode
-| 模块名(服务名) | 错误码 | 描述 | enumeration name(枚举)| Exception Class(类名)|
-| -------- |-------| ----- |---------|---------|
-|linkis-bml-client| 20060 |the result returned by the repository client POST request does not match(物料库客户端POST请求返回的result不匹配)|POST_REQUEST_RESULT_NOT_MATCH|BmlClientErrorCodeSummary|
-|linkis-bml-client| 20061 |failed to copy inputStream and outputStream (inputStream和outputStream流copy失败)|BML_CLIENT_FAILED|BmlClientErrorCodeSummary|
-|linkis-bml-client| 20062 |serverUrl cannot be null(serverUrl 不能为空)|SERVER_URL_NOT_NULL|BmlClientErrorCodeSummary|
+| 模块名(服务名) | 错误码 | 描述 | enumeration name(枚举)| Exception Class(类名)|
+|-------------------|-------| ----- |---------|---------|
+| linkis-pes-client | 20060 |the result returned by the repository client POST request does not match(物料库客户端POST请求返回的result不匹配)|POST_REQUEST_RESULT_NOT_MATCH|BmlClientErrorCodeSummary|
+| linkis-pes-client | 20061 |failed to copy inputStream and outputStream (inputStream和outputStream流copy失败)|BML_CLIENT_FAILED|BmlClientErrorCodeSummary|
+| linkis-pes-client | 20062 |serverUrl cannot be null(serverUrl 不能为空)|SERVER_URL_NOT_NULL|BmlClientErrorCodeSummary|
diff --git a/docs/errorcode/linkis-cs-client-errorcode.md b/docs/errorcode/linkis-cs-client-errorcode.md
index e5f626fad8..eb3d66607b 100644
--- a/docs/errorcode/linkis-cs-client-errorcode.md
+++ b/docs/errorcode/linkis-cs-client-errorcode.md
@@ -1,16 +1,16 @@
-## linkis-cs-client errorcode
+## linkis-pes-client errorcode
-| module name(模块名) | error code(错误码) | describe(描述) |enumeration name(枚举)| Exception Class(类名)|
-| -------- | -------- | ----- |-----|-----|
-|linkis-cs-client |80015|create context failed(创建上下文失败)|CREATE_CONTEXT_FAILED|CsClientErrorCodeSummary|
-|linkis-cs-client |80015|get context value failed(获取上下文值失败)|GET_CONTEXT_VALUE_FAILED|CsClientErrorCodeSummary|
-|linkis-cs-client |80015|update context failed(更新上下文失败)|UPDATE_CONTEXT_FAILED|CsClientErrorCodeSummary|
-|linkis-cs-client |80015|reset context failed(重置上下文失败)|RESET_CONTEXT_FAILED|CsClientErrorCodeSummary|
-|linkis-cs-client |80015|remove context failed(刪除上下文失败)|REMOVE_CONTEXT_FAILED|CsClientErrorCodeSummary|
-|linkis-cs-client |80015|bind context id failed(绑定上下文 ID 失败)|BIND_CONTEXTID_FAILED|CsClientErrorCodeSummary|
-|linkis-cs-client |80015|search condition failed(搜索失败)|SEARCH_CONDITION_FAILED|CsClientErrorCodeSummary|
-|linkis-cs-client |80015|execute failed(执行失败)|EXECUTE_FALIED|CsClientErrorCodeSummary|
-|linkis-cs-client |80017|searchHAIDByTime failed(搜索HAIDByTime失败)|HAIDBYTIME_FAILED|CsClientErrorCodeSummary|
-|linkis-cs-client |80017|batch Clear Context By HAID failed(通过 HAID 批量清除上下文失败)|CLEAR_CONTEXT_HAID_FAILED|CsClientErrorCodeSummary|
+| module name(模块名) | error code(错误码) | describe(描述) |enumeration name(枚举)| Exception Class(类名)|
+|-------------------| -------- | ----- |-----|-----|
+| linkis-pes-client |80015|create context failed(创建上下文失败)|CREATE_CONTEXT_FAILED|CsClientErrorCodeSummary|
+| linkis-pes-client |80015|get context value failed(获取上下文值失败)|GET_CONTEXT_VALUE_FAILED|CsClientErrorCodeSummary|
+| linkis-pes-client |80015|update context failed(更新上下文失败)|UPDATE_CONTEXT_FAILED|CsClientErrorCodeSummary|
+| linkis-pes-client |80015|reset context failed(重置上下文失败)|RESET_CONTEXT_FAILED|CsClientErrorCodeSummary|
+| linkis-pes-client |80015|remove context failed(刪除上下文失败)|REMOVE_CONTEXT_FAILED|CsClientErrorCodeSummary|
+| linkis-pes-client |80015|bind context id failed(绑定上下文 ID 失败)|BIND_CONTEXTID_FAILED|CsClientErrorCodeSummary|
+| linkis-pes-client |80015|search condition failed(搜索失败)|SEARCH_CONDITION_FAILED|CsClientErrorCodeSummary|
+| linkis-pes-client |80015|execute failed(执行失败)|EXECUTE_FALIED|CsClientErrorCodeSummary|
+| linkis-pes-client |80017|searchHAIDByTime failed(搜索HAIDByTime失败)|HAIDBYTIME_FAILED|CsClientErrorCodeSummary|
+| linkis-pes-client |80017|batch Clear Context By HAID failed(通过 HAID 批量清除上下文失败)|CLEAR_CONTEXT_HAID_FAILED|CsClientErrorCodeSummary|
diff --git a/docs/errorcode/linkis-datasource-client-errorcode.md b/docs/errorcode/linkis-datasource-client-errorcode.md
index 7a298da0b3..e6766d25d9 100644
--- a/docs/errorcode/linkis-datasource-client-errorcode.md
+++ b/docs/errorcode/linkis-datasource-client-errorcode.md
@@ -1,16 +1,16 @@
-## linkis-datasource-client errorcode
+## linkis-pes-client errorcode
| module name(模块名) | error code(错误码) | describe(描述) |enumeration name(枚举)| Exception Class(类名)|
| -------- | -------- | ----- |-----|-----|
-|linkis-datasource-client |31000|serverUrl cannot be null.(serverUrl 不能为空.)|SERVERURL_CANNOT_NULL|DatasourceClientErrorCodeSummary|
-|linkis-datasource-client |31000|version is needed!(版本为空!)|VERSION_NEEDED|DatasourceClientErrorCodeSummary|
-|linkis-datasource-client |31000|version is needed!(需要版本ID!)"|VERSIONID_NEEDED|DatasourceClientErrorCodeSummary|
-|linkis-datasource-client |31000|dataSourceId is needed!(需要dataSourceId!)|DATASOURCEID_NEEDED|DatasourceClientErrorCodeSummary|
-|linkis-datasource-client |31000|dataSourceName is needed!(需要dataSourceName!)|DATASOURCENAME_NEEDED|DatasourceClientErrorCodeSummary|
-|linkis-datasource-client |31000|user is needed!(用户为空!)|USER_NEEDED|DatasourceClientErrorCodeSummary|
-|linkis-datasource-client |31000|system is needed!(系统为空!)|SYSTEM_NEEDED|DatasourceClientErrorCodeSummary|
-|linkis-datasource-client |31000|Cannot encode the name of data source:{0} for request(无法对请求的数据源名称进行编码:{0})|CANNOT_SOURCE|DatasourceClientErrorCodeSummary|
-|linkis-datasource-client |31000|database is needed!(数据库为空!)|DATABASE_NEEDED|DatasourceClientErrorCodeSummary|
-|linkis-datasource-client |31000|table is needed!(表为空!)|TABLE_NEEDED|DatasourceClientErrorCodeSummary|
+|linkis-pes-client |31000|serverUrl cannot be null.(serverUrl 不能为空.)|SERVERURL_CANNOT_NULL|DatasourceClientErrorCodeSummary|
+|linkis-pes-client |31000|version is needed!(版本为空!)|VERSION_NEEDED|DatasourceClientErrorCodeSummary|
+|linkis-pes-client |31000|version is needed!(需要版本ID!)"|VERSIONID_NEEDED|DatasourceClientErrorCodeSummary|
+|linkis-pes-client |31000|dataSourceId is needed!(需要dataSourceId!)|DATASOURCEID_NEEDED|DatasourceClientErrorCodeSummary|
+|linkis-pes-client |31000|dataSourceName is needed!(需要dataSourceName!)|DATASOURCENAME_NEEDED|DatasourceClientErrorCodeSummary|
+|linkis-pes-client |31000|user is needed!(用户为空!)|USER_NEEDED|DatasourceClientErrorCodeSummary|
+|linkis-pes-client |31000|system is needed!(系统为空!)|SYSTEM_NEEDED|DatasourceClientErrorCodeSummary|
+|linkis-pes-client |31000|Cannot encode the name of data source:{0} for request(无法对请求的数据源名称进行编码:{0})|CANNOT_SOURCE|DatasourceClientErrorCodeSummary|
+|linkis-pes-client |31000|database is needed!(数据库为空!)|DATABASE_NEEDED|DatasourceClientErrorCodeSummary|
+|linkis-pes-client |31000|table is needed!(表为空!)|TABLE_NEEDED|DatasourceClientErrorCodeSummary|
diff --git a/linkis-computation-governance/linkis-client/linkis-computation-client/pom.xml b/linkis-computation-governance/linkis-client/linkis-computation-client/pom.xml
index 612b9bd2a8..eeeda2249d 100644
--- a/linkis-computation-governance/linkis-client/linkis-computation-client/pom.xml
+++ b/linkis-computation-governance/linkis-client/linkis-computation-client/pom.xml
@@ -58,7 +58,7 @@
org.apache.linkis
- linkis-bml-client
+ linkis-pes-client
${project.version}
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/pom.xml b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/pom.xml
index cf560f270f..41022d30da 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/pom.xml
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/pom.xml
@@ -30,7 +30,7 @@
org.apache.linkis
- linkis-udf-client
+ linkis-pes-rpc-client
${project.version}
@@ -55,7 +55,7 @@
org.apache.linkis
- linkis-bml-client
+ linkis-pes-client
${project.version}
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/pom.xml b/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/pom.xml
index 89aeec71cd..020e094f81 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/pom.xml
+++ b/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/pom.xml
@@ -41,7 +41,7 @@
org.apache.linkis
- linkis-bml-client
+ linkis-pes-client
${project.version}
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/pom.xml b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/pom.xml
index 8d904174b8..af03762028 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/pom.xml
+++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/pom.xml
@@ -30,7 +30,7 @@
org.apache.linkis
- linkis-udf-client
+ linkis-pes-rpc-client
${project.version}
@@ -60,18 +60,6 @@
provided
-
- org.apache.linkis
- linkis-cs-client
- ${project.version}
-
-
- org.reflections
- reflections
-
-
-
-
org.apache.linkis
linkis-computation-governance-common
@@ -80,9 +68,13 @@
org.apache.linkis
- linkis-bml-client
+ linkis-pes-client
${project.version}
+
+ org.reflections
+ reflections
+
org.apache.httpcomponents
httpclient
diff --git a/linkis-computation-governance/linkis-entrance/pom.xml b/linkis-computation-governance/linkis-entrance/pom.xml
index b9ebec930e..dea4d1d4d7 100644
--- a/linkis-computation-governance/linkis-entrance/pom.xml
+++ b/linkis-computation-governance/linkis-entrance/pom.xml
@@ -62,13 +62,7 @@
org.apache.linkis
- linkis-cs-client
- ${project.version}
-
-
-
- org.apache.linkis
- linkis-error-code-client
+ linkis-pes-client
${project.version}
@@ -92,13 +86,7 @@
org.apache.linkis
- linkis-bml-client
- ${project.version}
-
-
-
- org.apache.linkis
- linkis-instance-label-client
+ linkis-pes-rpc-client
${project.version}
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml b/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml
index 1a5d5077d0..36076024f2 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml
@@ -47,7 +47,7 @@
org.apache.linkis
- linkis-bml-client
+ linkis-pes-client
${project.version}
diff --git a/linkis-engineconn-plugins/jdbc/pom.xml b/linkis-engineconn-plugins/jdbc/pom.xml
index 6b60b49953..ab06661b9d 100644
--- a/linkis-engineconn-plugins/jdbc/pom.xml
+++ b/linkis-engineconn-plugins/jdbc/pom.xml
@@ -188,7 +188,7 @@
org.apache.linkis
- linkis-datasource-client
+ linkis-pes-client
${project.version}
diff --git a/linkis-engineconn-plugins/spark/pom.xml b/linkis-engineconn-plugins/spark/pom.xml
index d98f6fcbd3..78232472ac 100644
--- a/linkis-engineconn-plugins/spark/pom.xml
+++ b/linkis-engineconn-plugins/spark/pom.xml
@@ -352,7 +352,7 @@
org.apache.linkis
- linkis-datasource-client
+ linkis-pes-client
${project.version}
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-common/pom.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-common/pom.xml
deleted file mode 100644
index cd0df3540d..0000000000
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-common/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.linkis
- linkis
- ${revision}
- ../../../pom.xml
-
-
- linkis-bml-common
-
-
-
-
- ${basedir}/src/main/resources
-
-
-
-
- net.alchim31.maven
- scala-maven-plugin
-
-
-
-
-
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml
index 9a68d4ec6f..0764146762 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml
@@ -34,7 +34,7 @@
org.apache.linkis
- linkis-bml-common
+ linkis-pes-common
${project.version}
diff --git a/linkis-public-enhancements/linkis-bml/pom.xml b/linkis-public-enhancements/linkis-bml/pom.xml
index 9601b1db49..6cbb16659a 100644
--- a/linkis-public-enhancements/linkis-bml/pom.xml
+++ b/linkis-public-enhancements/linkis-bml/pom.xml
@@ -28,9 +28,7 @@
pom
- linkis-bml-common
linkis-bml-server
- linkis-bml-client
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/pom.xml
deleted file mode 100644
index 40538fd875..0000000000
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.linkis
- linkis
- ${revision}
- ../../../pom.xml
-
-
- linkis-cs-common
-
-
-
- org.apache.linkis
- linkis-common
- ${project.version}
- provided
-
-
-
- com.google.code.gson
- gson
- provided
-
-
-
-
-
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml
deleted file mode 100644
index a6e2b00165..0000000000
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.linkis
- linkis
- ${revision}
- ../../../pom.xml
-
-
- linkis-cs-listener
-
-
-
- org.apache.linkis
- linkis-common
- ${project.version}
- provided
-
-
- org.apache.linkis
- linkis-cs-common
- ${project.version}
-
-
-
-
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
index 9d52ba6231..8e44eefd8b 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
@@ -29,7 +29,7 @@
org.apache.linkis
- linkis-cs-common
+ linkis-pes-common
${project.version}
@@ -41,13 +41,7 @@
org.apache.linkis
- linkis-cs-listener
- ${project.version}
-
-
-
- org.apache.linkis
- linkis-instance-label-client
+ linkis-pes-rpc-client
${project.version}
diff --git a/linkis-public-enhancements/linkis-context-service/pom.xml b/linkis-public-enhancements/linkis-context-service/pom.xml
index e9f41641f3..c2d73e4b7b 100644
--- a/linkis-public-enhancements/linkis-context-service/pom.xml
+++ b/linkis-public-enhancements/linkis-context-service/pom.xml
@@ -30,9 +30,6 @@
- linkis-cs-common
- linkis-cs-listener
- linkis-cs-client
linkis-cs-server
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml
deleted file mode 100644
index 0b29d69373..0000000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.linkis
- linkis
- ${revision}
- ../../../pom.xml
-
-
- linkis-datasource-client
-
-
-
- org.apache.linkis
- linkis-gateway-httpclient-support
- ${project.version}
-
-
-
- org.apache.linkis
- linkis-datasource-manager-common
- ${project.version}
-
-
-
- org.apache.linkis
- linkis-metadata-query-common
- ${project.version}
-
-
-
-
-
-
- net.alchim31.maven
- scala-maven-plugin
-
-
-
-
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/pom.xml
deleted file mode 100644
index 07e770bfb1..0000000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.linkis
- linkis
- ${revision}
- ../../../../pom.xml
-
-
- linkis-datasource-manager-common
-
-
-
-
- org.apache.linkis
- linkis-protocol
- ${project.version}
- provided
-
-
-
- org.apache.linkis
- linkis-module
- provided
-
-
- org.ow2.asm
- asm
-
-
-
-
-
- org.apache.commons
- commons-text
-
-
-
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml
index 0d09923dc0..5f4b2ed556 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml
@@ -41,7 +41,7 @@
org.apache.linkis
- linkis-datasource-manager-common
+ linkis-pes-common
${project.version}
@@ -59,7 +59,7 @@
org.apache.linkis
- linkis-bml-client
+ linkis-pes-client
${project.version}
@@ -94,7 +94,7 @@
org.apache.linkis
- linkis-metadata-query-common
+ linkis-pes-common
${project.version}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/pom.xml
deleted file mode 100644
index 88e6dea1f6..0000000000
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.linkis
- linkis
- ${revision}
- ../../../../pom.xml
-
-
- linkis-metadata-query-common
-
-
-
- org.apache.linkis
- linkis-common
- ${project.version}
- provided
-
-
- org.ow2.asm
- asm
-
-
-
-
-
- org.apache.linkis
- linkis-protocol
- ${project.version}
- provided
-
-
- org.apache.linkis
- linkis-datasource-manager-common
- ${project.version}
-
-
-
- jakarta.annotation
- jakarta.annotation-api
-
-
-
-
-
-
- net.alchim31.maven
- scala-maven-plugin
-
-
-
-
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/pom.xml
index ec0e6daea8..fa6e381384 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/pom.xml
@@ -33,7 +33,7 @@
org.apache.linkis
- linkis-metadata-query-common
+ linkis-pes-common
${project.version}
provided
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/pom.xml
index fc10752cf9..3e4bbd319c 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/pom.xml
@@ -29,7 +29,7 @@
org.apache.linkis
- linkis-metadata-query-common
+ linkis-pes-common
${project.version}
provided
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
index 29865be768..7b920dca82 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
@@ -32,7 +32,7 @@
org.apache.linkis
- linkis-metadata-query-common
+ linkis-pes-common
${project.version}
provided
@@ -45,7 +45,7 @@
org.apache.linkis
- linkis-bml-client
+ linkis-pes-client
${project.version}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/pom.xml
index 1449c4855a..135026cccc 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/pom.xml
@@ -34,7 +34,7 @@
org.apache.linkis
- linkis-metadata-query-common
+ linkis-pes-common
${project.version}
provided
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml
index 720e38129a..1cf433c847 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml
@@ -28,7 +28,7 @@
org.apache.linkis
- linkis-metadata-query-common
+ linkis-pes-common
${project.version}
provided
@@ -41,7 +41,7 @@
org.apache.linkis
- linkis-bml-client
+ linkis-pes-client
${project.version}
provided
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/pom.xml
index 6c4541969a..c11e0bc64d 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/pom.xml
@@ -29,7 +29,7 @@
org.apache.linkis
- linkis-metadata-query-common
+ linkis-pes-common
${project.version}
provided
diff --git a/linkis-public-enhancements/linkis-datasource/pom.xml b/linkis-public-enhancements/linkis-datasource/pom.xml
index 19f68d6773..c7d700a137 100644
--- a/linkis-public-enhancements/linkis-datasource/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/pom.xml
@@ -27,15 +27,12 @@
linkis-datasource
pom
- linkis-datasource-manager/common
linkis-datasource-manager/server
- linkis-metadata-query/common
linkis-metadata-query/service/elasticsearch
linkis-metadata-query/service/hive
linkis-metadata-query/service/kafka
linkis-metadata-query/service/jdbc
linkis-metadata-query/service/hdfs
linkis-metadata-query/service/mongodb
- linkis-datasource-client
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/pom.xml b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/pom.xml
deleted file mode 100644
index d532ca2464..0000000000
--- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.linkis
- linkis
- ${revision}
- ../../../pom.xml
-
-
- linkis-error-code-client
-
-
-
-
- org.apache.linkis
- linkis-error-code-common
- ${project.version}
-
-
-
- org.apache.linkis
- linkis-gateway-httpclient-support
- ${project.version}
-
-
-
- com.google.code.gson
- gson
-
-
-
-
-
-
-
- net.alchim31.maven
- scala-maven-plugin
-
-
-
-
-
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/pom.xml b/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/pom.xml
deleted file mode 100644
index f55fea97fb..0000000000
--- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.linkis
- linkis
- ${revision}
- ../../../pom.xml
-
-
- linkis-error-code-common
-
-
-
- org.apache.linkis
- linkis-common
- ${project.version}
-
-
-
-
-
-
- net.alchim31.maven
- scala-maven-plugin
-
-
-
-
-
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/pom.xml b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/pom.xml
index 8c17af97ad..85d8b017e5 100644
--- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/pom.xml
+++ b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/pom.xml
@@ -29,7 +29,7 @@
org.apache.linkis
- linkis-error-code-common
+ linkis-pes-common
${project.version}
diff --git a/linkis-public-enhancements/linkis-error-code/pom.xml b/linkis-public-enhancements/linkis-error-code/pom.xml
index bf346ac592..20d3f1b4a2 100644
--- a/linkis-public-enhancements/linkis-error-code/pom.xml
+++ b/linkis-public-enhancements/linkis-error-code/pom.xml
@@ -30,8 +30,6 @@
- linkis-error-code-client
- linkis-error-code-common
linkis-error-code-server
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/pom.xml b/linkis-public-enhancements/linkis-pes-client/pom.xml
similarity index 93%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/pom.xml
rename to linkis-public-enhancements/linkis-pes-client/pom.xml
index 4089111c31..f206b8b35d 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-client/pom.xml
+++ b/linkis-public-enhancements/linkis-pes-client/pom.xml
@@ -6,9 +6,9 @@
~ 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.
@@ -21,10 +21,10 @@
org.apache.linkis
linkis
${revision}
- ../../../pom.xml
+ ../../pom.xml
- linkis-bml-client
+ linkis-pes-client
4.4
@@ -33,7 +33,7 @@
org.apache.linkis
- linkis-bml-common
+ linkis-pes-common
${project.version}
@@ -53,7 +53,6 @@
linkis-gateway-httpclient-support
${project.version}
-
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/org/apache/linkis/bml/client/AbstractBmlClient.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/bml/client/AbstractBmlClient.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/org/apache/linkis/bml/client/AbstractBmlClient.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/bml/client/AbstractBmlClient.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/org/apache/linkis/bml/client/BmlClient.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/bml/client/BmlClient.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/org/apache/linkis/bml/client/BmlClient.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/bml/client/BmlClient.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/org/apache/linkis/bml/client/BmlClientFactory.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/bml/client/BmlClientFactory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/org/apache/linkis/bml/client/BmlClientFactory.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/bml/client/BmlClientFactory.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/org/apache/linkis/bml/client/errorcode/BmlClientErrorCodeSummary.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/bml/client/errorcode/BmlClientErrorCodeSummary.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/org/apache/linkis/bml/client/errorcode/BmlClientErrorCodeSummary.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/bml/client/errorcode/BmlClientErrorCodeSummary.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/AbstractContextClient.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/AbstractContextClient.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/AbstractContextClient.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/AbstractContextClient.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/Context.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/Context.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/Context.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/Context.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/ContextClient.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/ContextClient.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/ContextClient.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/ContextClient.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/LinkisContext.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/LinkisContext.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/LinkisContext.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/LinkisContext.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/LinkisWorkFlowContext.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/LinkisWorkFlowContext.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/LinkisWorkFlowContext.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/LinkisWorkFlowContext.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/builder/ContextClientConfig.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/builder/ContextClientConfig.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/builder/ContextClientConfig.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/builder/ContextClientConfig.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/builder/ContextClientFactory.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/builder/ContextClientFactory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/builder/ContextClientFactory.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/builder/ContextClientFactory.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/builder/HttpContextClientConfig.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/builder/HttpContextClientConfig.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/builder/HttpContextClientConfig.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/builder/HttpContextClientConfig.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/errorcode/CsClientErrorCodeSummary.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/errorcode/CsClientErrorCodeSummary.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/errorcode/CsClientErrorCodeSummary.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/errorcode/CsClientErrorCodeSummary.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/http/ContextPostActionBuilder.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/http/ContextPostActionBuilder.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/http/ContextPostActionBuilder.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/http/ContextPostActionBuilder.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/http/HttpContextClient.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/http/HttpContextClient.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/http/HttpContextClient.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/http/HttpContextClient.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/http/HttpHeartBeater.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/http/HttpHeartBeater.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/http/HttpHeartBeater.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/http/HttpHeartBeater.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientEvent.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientEvent.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientEvent.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientEvent.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListener.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListener.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerBus.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerBus.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerBus.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerBus.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerManager.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerManager.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerManager.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextIDListener.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextIDListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextIDListener.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextIDListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextKeyListener.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextKeyListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextKeyListener.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextKeyListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextUpdateEvent.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextUpdateEvent.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextUpdateEvent.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextUpdateEvent.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/HeartBeater.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/HeartBeater.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/HeartBeater.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/HeartBeater.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeService.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeServiceImpl.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeServiceImpl.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataService.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkService.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkServiceImpl.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkServiceImpl.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientService.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientServiceImpl.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientServiceImpl.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/DefaultSearchService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/DefaultSearchService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/DefaultSearchService.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/DefaultSearchService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataService.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/MetaDataService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/MetaDataService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/MetaDataService.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/MetaDataService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/ResourceService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/ResourceService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/ResourceService.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/ResourceService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/SearchService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/SearchService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/SearchService.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/SearchService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/TableService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/TableService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/TableService.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/TableService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/VariableService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/VariableService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/VariableService.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/VariableService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/utils/ContextServiceUtils.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/utils/ContextServiceUtils.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/utils/ContextServiceUtils.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/utils/ContextServiceUtils.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/utils/ExceptionHelper.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/utils/ExceptionHelper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/utils/ExceptionHelper.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/utils/ExceptionHelper.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/utils/SerializeHelper.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/utils/SerializeHelper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/utils/SerializeHelper.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/utils/SerializeHelper.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/java/org/apache/linkis/datasource/client/errorcode/DatasourceClientErrorCodeSummary.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/datasource/client/errorcode/DatasourceClientErrorCodeSummary.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/java/org/apache/linkis/datasource/client/errorcode/DatasourceClientErrorCodeSummary.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/datasource/client/errorcode/DatasourceClientErrorCodeSummary.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/ClientConfiguration.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/ClientConfiguration.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/ClientConfiguration.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/ClientConfiguration.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilder.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilder.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilder.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilder.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClient.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClient.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClient.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClient.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandler.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandler.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandler.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/ExceptionErrorCodeHandler.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/ExceptionErrorCodeHandler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/ExceptionErrorCodeHandler.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/ExceptionErrorCodeHandler.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeFactory.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeFactory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeFactory.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeFactory.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogErrorCodeHandler.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogErrorCodeHandler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogErrorCodeHandler.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogErrorCodeHandler.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogFileErrorCodeHandler.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogFileErrorCodeHandler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogFileErrorCodeHandler.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogFileErrorCodeHandler.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManager.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManager.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManager.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizer.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizer.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizer.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/utils/Test.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/utils/Test.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/utils/Test.java
rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/utils/Test.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/common/POSTActionFailException.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/common/POSTActionFailException.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/common/POSTActionFailException.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/common/POSTActionFailException.scala
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/conf/BmlConfiguration.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/conf/BmlConfiguration.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/conf/BmlConfiguration.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/conf/BmlConfiguration.scala
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/http/HttpConf.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/http/HttpConf.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/http/HttpConf.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/http/HttpConf.scala
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/request/BmlPOSTAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/request/BmlPOSTAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/request/BmlPOSTAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/request/BmlPOSTAction.scala
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/response/BmlResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/response/BmlResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/response/BmlResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/response/BmlResult.scala
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/http/ContextAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/http/ContextAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/http/ContextAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/http/ContextAction.scala
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/http/ContextResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/http/ContextResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/http/ContextResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/http/ContextResult.scala
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientConf.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientConf.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientConf.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientConf.scala
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientUtils.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientUtils.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientUtils.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientUtils.scala
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextServerHttpConf.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextServerHttpConf.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextServerHttpConf.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextServerHttpConf.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/AbstractRemoteClient.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/AbstractRemoteClient.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/AbstractRemoteClient.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/AbstractRemoteClient.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/DataSourceRemoteClient.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/DataSourceRemoteClient.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/DataSourceRemoteClient.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/DataSourceRemoteClient.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/MetaDataRemoteClient.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/MetaDataRemoteClient.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/MetaDataRemoteClient.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/MetaDataRemoteClient.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/RemoteClient.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/RemoteClient.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/RemoteClient.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/RemoteClient.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderException.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderException.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderException.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderException.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisDataSourceRemoteClient.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisDataSourceRemoteClient.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisDataSourceRemoteClient.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisDataSourceRemoteClient.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisMetaDataRemoteClient.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisMetaDataRemoteClient.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisMetaDataRemoteClient.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisMetaDataRemoteClient.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/CreateDataSourceAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/CreateDataSourceAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/CreateDataSourceAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/CreateDataSourceAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetAllDataSourceTypesAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetAllDataSourceTypesAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetAllDataSourceTypesAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetAllDataSourceTypesAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceNameAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceNameAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceNameAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceNameAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceIdAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceIdAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceIdAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceIdAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceNameAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceNameAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceNameAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceNameAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoPublishedByDataSourceNameAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoPublishedByDataSourceNameAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoPublishedByDataSourceNameAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoPublishedByDataSourceNameAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetKeyTypeDatasourceAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetKeyTypeDatasourceAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetKeyTypeDatasourceAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetKeyTypeDatasourceAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceEnvAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceEnvAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceEnvAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceEnvAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/CreateDataSourceResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/CreateDataSourceResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/CreateDataSourceResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/CreateDataSourceResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/DataSourceTestConnectResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/DataSourceTestConnectResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/DataSourceTestConnectResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/DataSourceTestConnectResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/DeleteDataSourceResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/DeleteDataSourceResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/DeleteDataSourceResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/DeleteDataSourceResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/ExpireDataSourceResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/ExpireDataSourceResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/ExpireDataSourceResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/ExpireDataSourceResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetAllDataSourceTypesResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetAllDataSourceTypesResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetAllDataSourceTypesResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetAllDataSourceTypesResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceNameResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceNameResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceNameResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceNameResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetDataSourceVersionsResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetDataSourceVersionsResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetDataSourceVersionsResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetDataSourceVersionsResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceIdResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceIdResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceIdResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceIdResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceNameResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceNameResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceNameResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceNameResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoPublishedByDataSourceNameResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoPublishedByDataSourceNameResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoPublishedByDataSourceNameResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoPublishedByDataSourceNameResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetKeyTypeDatasourceResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetKeyTypeDatasourceResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetKeyTypeDatasourceResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetKeyTypeDatasourceResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/PublishDataSourceVersionResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/PublishDataSourceVersionResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/PublishDataSourceVersionResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/PublishDataSourceVersionResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceEnvResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceEnvResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceEnvResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceEnvResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceParameterResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceParameterResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceParameterResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceParameterResult.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceResult.scala
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/action/ErrorCodeAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/errorcode/client/action/ErrorCodeAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/action/ErrorCodeAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/errorcode/client/action/ErrorCodeAction.scala
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/result/ErrorCodeResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/errorcode/client/result/ErrorCodeResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/result/ErrorCodeResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/errorcode/client/result/ErrorCodeResult.scala
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/utils/ErrorCodeMatcher.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/errorcode/client/utils/ErrorCodeMatcher.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/utils/ErrorCodeMatcher.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/errorcode/client/utils/ErrorCodeMatcher.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientFactory.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientFactory.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientFactory.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientFactory.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientImpl.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientImpl.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientImpl.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientImpl.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLAction.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/action/WorkspacePOSTAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/action/WorkspacePOSTAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/action/WorkspacePOSTAction.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/action/WorkspacePOSTAction.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConf.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConf.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConf.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConf.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceClient.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceClient.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceClient.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceClient.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceHttpConf.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceHttpConf.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceHttpConf.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceHttpConf.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponse.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponse.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponse.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponse.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/response/WorkspaceResponse.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/response/WorkspaceResponse.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/response/WorkspaceResponse.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/response/WorkspaceResponse.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/AbstractWorkspaceResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/result/AbstractWorkspaceResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/AbstractWorkspaceResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/result/AbstractWorkspaceResult.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptFromBMLResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptFromBMLResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptFromBMLResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptFromBMLResult.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptToBMLResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptToBMLResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptToBMLResult.scala
rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptToBMLResult.scala
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/test/java/org/apache/linkis/bml/client/errorcode/BmlClientErrorCodeSummaryTest.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/bml/client/errorcode/BmlClientErrorCodeSummaryTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/test/java/org/apache/linkis/bml/client/errorcode/BmlClientErrorCodeSummaryTest.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/bml/client/errorcode/BmlClientErrorCodeSummaryTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/builder/ContextClientFactoryTest.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/builder/ContextClientFactoryTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/builder/ContextClientFactoryTest.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/builder/ContextClientFactoryTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/builder/HttpContextClientConfigTest.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/builder/HttpContextClientConfigTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/builder/HttpContextClientConfigTest.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/builder/HttpContextClientConfigTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/errorcode/CsClientErrorCodeSummaryTest.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/errorcode/CsClientErrorCodeSummaryTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/errorcode/CsClientErrorCodeSummaryTest.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/errorcode/CsClientErrorCodeSummaryTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/Test.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/Test.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/Test.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/Test.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/bean/ClientTestContextKey.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/bean/ClientTestContextKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/bean/ClientTestContextKey.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/bean/ClientTestContextKey.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/bean/ClientTestContextValue.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/bean/ClientTestContextValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/bean/ClientTestContextValue.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/bean/ClientTestContextValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/bean/ResourceValueBean.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/bean/ResourceValueBean.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/bean/ResourceValueBean.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/bean/ResourceValueBean.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/listener/CommonContextKeyListener.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/listener/CommonContextKeyListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/listener/CommonContextKeyListener.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/listener/CommonContextKeyListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/no_context_search/TestClear.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/no_context_search/TestClear.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/no_context_search/TestClear.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/no_context_search/TestClear.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/restful/ListenerTest.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/restful/ListenerTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/restful/ListenerTest.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/restful/ListenerTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/restful/RestfulTest.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/restful/RestfulTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/restful/RestfulTest.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/restful/RestfulTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/service/TestInfo.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/service/TestInfo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/service/TestInfo.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/service/TestInfo.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/service/TestRemove.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/service/TestRemove.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/service/TestRemove.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/service/TestRemove.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/service/TestSearchService.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/service/TestSearchService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/service/TestSearchService.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/service/TestSearchService.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/test_multiuser/TestChangeContext.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/test_multiuser/TestChangeContext.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/test_multiuser/TestChangeContext.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/test_multiuser/TestChangeContext.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/test_multiuser/TestCreateContext.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/test_multiuser/TestCreateContext.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/test_multiuser/TestCreateContext.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/test/test_multiuser/TestCreateContext.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/utils/ContextClientConfTest.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/utils/ContextClientConfTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/utils/ContextClientConfTest.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/utils/ContextClientConfTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/utils/ContextServiceUtilsTest.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/utils/ContextServiceUtilsTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/utils/ContextServiceUtilsTest.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/utils/ContextServiceUtilsTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/utils/SerializeHelperTest.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/utils/SerializeHelperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/utils/SerializeHelperTest.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/cs/client/utils/SerializeHelperTest.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestHiveClient.scala b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/datasource/client/TestHiveClient.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestHiveClient.scala
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/datasource/client/TestHiveClient.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestMysqlClient.scala b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/datasource/client/TestMysqlClient.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestMysqlClient.scala
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/datasource/client/TestMysqlClient.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/config/DatasourceClientConfigTest.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/datasource/client/config/DatasourceClientConfigTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/config/DatasourceClientConfigTest.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/datasource/client/config/DatasourceClientConfigTest.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderExceptionTest.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderExceptionTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderExceptionTest.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderExceptionTest.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/imp/LinkisDataSourceRemoteClientTest.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/datasource/client/imp/LinkisDataSourceRemoteClientTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/imp/LinkisDataSourceRemoteClientTest.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/datasource/client/imp/LinkisDataSourceRemoteClientTest.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/ClientConfigurationTest.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/errorcode/client/ClientConfigurationTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/ClientConfigurationTest.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/errorcode/client/ClientConfigurationTest.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilderTest.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilderTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilderTest.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilderTest.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClientTest.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClientTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClientTest.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClientTest.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandlerTest.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandlerTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandlerTest.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandlerTest.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandlerTest.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandlerTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandlerTest.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandlerTest.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManagerTest.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManagerTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManagerTest.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManagerTest.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizerTest.java b/linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizerTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizerTest.java
rename to linkis-public-enhancements/linkis-pes-client/src/test/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizerTest.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/scala/org/apache/linkis/errorcode/client/action/ErrorCodeActionTest.scala b/linkis-public-enhancements/linkis-pes-client/src/test/scala/org/apache/linkis/errorcode/client/action/ErrorCodeActionTest.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/scala/org/apache/linkis/errorcode/client/action/ErrorCodeActionTest.scala
rename to linkis-public-enhancements/linkis-pes-client/src/test/scala/org/apache/linkis/errorcode/client/action/ErrorCodeActionTest.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/WorkspaceClientFactoryTest.scala b/linkis-public-enhancements/linkis-pes-client/src/test/scala/org/apache/linkis/filesystem/WorkspaceClientFactoryTest.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/WorkspaceClientFactoryTest.scala
rename to linkis-public-enhancements/linkis-pes-client/src/test/scala/org/apache/linkis/filesystem/WorkspaceClientFactoryTest.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/WorkspaceClientImplTest.scala b/linkis-public-enhancements/linkis-pes-client/src/test/scala/org/apache/linkis/filesystem/WorkspaceClientImplTest.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/WorkspaceClientImplTest.scala
rename to linkis-public-enhancements/linkis-pes-client/src/test/scala/org/apache/linkis/filesystem/WorkspaceClientImplTest.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLActionTest.scala b/linkis-public-enhancements/linkis-pes-client/src/test/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLActionTest.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLActionTest.scala
rename to linkis-public-enhancements/linkis-pes-client/src/test/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLActionTest.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConfTest.scala b/linkis-public-enhancements/linkis-pes-client/src/test/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConfTest.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConfTest.scala
rename to linkis-public-enhancements/linkis-pes-client/src/test/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConfTest.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponseTest.scala b/linkis-public-enhancements/linkis-pes-client/src/test/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponseTest.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponseTest.scala
rename to linkis-public-enhancements/linkis-pes-client/src/test/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponseTest.scala
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/pom.xml b/linkis-public-enhancements/linkis-pes-common/pom.xml
similarity index 80%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/pom.xml
rename to linkis-public-enhancements/linkis-pes-common/pom.xml
index 087d48a17b..264eb1fa67 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/pom.xml
+++ b/linkis-public-enhancements/linkis-pes-common/pom.xml
@@ -6,9 +6,9 @@
~ 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.
@@ -21,10 +21,10 @@
org.apache.linkis
linkis
${revision}
- ../../../pom.xml
+ ../../pom.xml
- linkis-cs-client
+ linkis-pes-common
@@ -34,22 +34,22 @@
provided
+
+ javax.validation
+ validation-api
+ 2.0.1.Final
+
+
org.apache.linkis
- linkis-gateway-httpclient-support
+ linkis-protocol
${project.version}
-
-
- org.apache.linkis
- linkis-storage
-
-
+ provided
- org.apache.linkis
- linkis-cs-listener
- ${project.version}
+ org.apache.commons
+ commons-text
@@ -57,7 +57,6 @@
gson
provided
-
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-common/src/main/java/org/apache/linkis/bml/model/AbstractAuditable.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/bml/model/AbstractAuditable.java
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-common/src/main/java/org/apache/linkis/bml/model/AbstractAuditable.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/bml/model/AbstractAuditable.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/annotation/KeywordMethod.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/annotation/KeywordMethod.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/annotation/KeywordMethod.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/annotation/KeywordMethod.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/data/CSResultData.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/data/CSResultData.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/data/CSResultData.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/data/CSResultData.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/data/Data.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/data/Data.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/data/Data.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/data/Data.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/data/JobData.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/data/JobData.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/data/JobData.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/data/JobData.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/data/LinkisJobData.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/data/LinkisJobData.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/data/LinkisJobData.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/data/LinkisJobData.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ContextScope.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ContextScope.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ContextScope.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ContextScope.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ContextType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ContextType.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ContextType.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ContextType.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/DBType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/DBType.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/DBType.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/DBType.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ExpireType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ExpireType.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ExpireType.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ExpireType.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/WorkType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/WorkType.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/WorkType.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/WorkType.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/env/Env.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/env/Env.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/env/Env.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/env/Env.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/env/OSEnv.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/env/OSEnv.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/env/OSEnv.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/env/OSEnv.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/env/SoftWareEnv.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/env/SoftWareEnv.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/env/SoftWareEnv.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/env/SoftWareEnv.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/env/SoftwareLibEnv.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/env/SoftwareLibEnv.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/env/SoftwareLibEnv.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/env/SoftwareLibEnv.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/AbstractContextHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/AbstractContextHistory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/AbstractContextHistory.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/AbstractContextHistory.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/CommonResourceHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/CommonResourceHistory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/CommonResourceHistory.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/CommonResourceHistory.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/ContextHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/ContextHistory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/ContextHistory.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/ContextHistory.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/ContextHistoryIndexer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/ContextHistoryIndexer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/ContextHistoryIndexer.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/ContextHistoryIndexer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/EnvContextHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/EnvContextHistory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/EnvContextHistory.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/EnvContextHistory.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/GlobalPropertyContextHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/GlobalPropertyContextHistory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/GlobalPropertyContextHistory.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/GlobalPropertyContextHistory.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/KeywordContextHistroy.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/KeywordContextHistroy.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/KeywordContextHistroy.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/KeywordContextHistroy.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/ResourceContextHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/ResourceContextHistory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/ResourceContextHistory.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/ResourceContextHistory.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/CSTableLineageHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/CSTableLineageHistory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/CSTableLineageHistory.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/CSTableLineageHistory.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/CSTableMetadataContextHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/CSTableMetadataContextHistory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/CSTableMetadataContextHistory.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/CSTableMetadataContextHistory.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/DBMetadataContextHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/DBMetadataContextHistory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/DBMetadataContextHistory.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/DBMetadataContextHistory.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/MetadataContextHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/MetadataContextHistory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/MetadataContextHistory.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/MetadataContextHistory.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/TableLineageHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/TableLineageHistory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/TableLineageHistory.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/TableLineageHistory.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/TableOperationType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/TableOperationType.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/TableOperationType.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/TableOperationType.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/CommonContextIDListenerDomain.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/CommonContextIDListenerDomain.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/CommonContextIDListenerDomain.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/CommonContextIDListenerDomain.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/CommonContextKeyListenerDomain.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/CommonContextKeyListenerDomain.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/CommonContextKeyListenerDomain.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/CommonContextKeyListenerDomain.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ContextIDListenerDomain.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ContextIDListenerDomain.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ContextIDListenerDomain.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ContextIDListenerDomain.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ContextKeyListenerDomain.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ContextKeyListenerDomain.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ContextKeyListenerDomain.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ContextKeyListenerDomain.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ListenerDomain.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ListenerDomain.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ListenerDomain.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ListenerDomain.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSColumn.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSColumn.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSColumn.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSColumn.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSDB.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSDB.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSDB.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSDB.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSPartition.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSPartition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSPartition.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSPartition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSTable.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSTable.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSTable.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSTable.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Column.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Column.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Column.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Column.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/DB.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/DB.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/DB.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/DB.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Partition.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Partition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Partition.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Partition.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Table.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Table.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Table.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Table.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSFlowInfos.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSFlowInfos.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSFlowInfos.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSFlowInfos.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSInfos.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSInfos.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSInfos.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSInfos.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSProperty.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSProperty.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSProperty.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSProperty.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CommonGlobalConfiguration.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CommonGlobalConfiguration.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CommonGlobalConfiguration.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CommonGlobalConfiguration.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CommonProperty.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CommonProperty.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CommonProperty.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CommonProperty.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/LinkisVariable.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/LinkisVariable.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/LinkisVariable.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/LinkisVariable.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/BMLResource.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/BMLResource.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/BMLResource.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/BMLResource.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/CommonFxResource.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/CommonFxResource.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/CommonFxResource.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/CommonFxResource.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/CommonUDFResource.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/CommonUDFResource.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/CommonUDFResource.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/CommonUDFResource.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/FxResource.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/FxResource.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/FxResource.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/FxResource.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/LinkisBMLResource.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/LinkisBMLResource.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/LinkisBMLResource.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/LinkisBMLResource.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/Resource.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/Resource.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/Resource.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/Resource.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/UDFResource.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/UDFResource.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/UDFResource.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/UDFResource.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CombinedNodeIDContextID.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CombinedNodeIDContextID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CombinedNodeIDContextID.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CombinedNodeIDContextID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextID.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextID.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextKey.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextKey.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextKey.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextKeyValue.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextKeyValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextKeyValue.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextKeyValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextValue.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextValue.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonHAContextID.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonHAContextID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonHAContextID.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonHAContextID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextID.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextID.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextIDParser.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextIDParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextIDParser.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextIDParser.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextKey.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextKey.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextKey.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextKeyValue.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextKeyValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextKeyValue.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextKeyValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextValue.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextValue.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CreatorContextKey.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CreatorContextKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CreatorContextKey.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CreatorContextKey.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/HAContextID.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/HAContextID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/HAContextID.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/HAContextID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/LinkisHAWorkFlowContextID.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/LinkisHAWorkFlowContextID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/LinkisHAWorkFlowContextID.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/LinkisHAWorkFlowContextID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/LinkisWorkflowContextID.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/LinkisWorkflowContextID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/LinkisWorkflowContextID.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/LinkisWorkflowContextID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/OrderContextKey.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/OrderContextKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/OrderContextKey.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/OrderContextKey.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/Source.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/Source.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/Source.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/Source.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/UserContextID.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/UserContextID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/UserContextID.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/UserContextID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ValueBean.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ValueBean.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ValueBean.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ValueBean.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/VersionContextKey.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/VersionContextKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/VersionContextKey.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/VersionContextKey.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/WorkflowContextID.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/WorkflowContextID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/WorkflowContextID.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/WorkflowContextID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/YMLContextKey.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/YMLContextKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/YMLContextKey.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/YMLContextKey.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/exception/CSErrorException.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/exception/CSErrorException.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/exception/CSErrorException.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/exception/CSErrorException.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/exception/CSWarnException.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/exception/CSWarnException.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/exception/CSWarnException.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/exception/CSWarnException.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/exception/ErrorCode.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/exception/ErrorCode.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/exception/ErrorCode.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/exception/ErrorCode.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/listener/ContextIDListener.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/listener/ContextIDListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/listener/ContextIDListener.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/listener/ContextIDListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/listener/ContextKeyListener.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/listener/ContextKeyListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/listener/ContextKeyListener.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/listener/ContextKeyListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextHTTPConstant.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextHTTPConstant.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextHTTPConstant.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextHTTPConstant.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextHistoryType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextHistoryType.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextHistoryType.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextHistoryType.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextIDType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextIDType.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextIDType.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextIDType.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextKeyType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextKeyType.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextKeyType.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextKeyType.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextKeyValueType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextKeyValueType.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextKeyValueType.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextKeyValueType.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextValueType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextValueType.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextValueType.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextValueType.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/search/ContextSearchConditionMapBuilder.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/search/ContextSearchConditionMapBuilder.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/search/ContextSearchConditionMapBuilder.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/search/ContextSearchConditionMapBuilder.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/AbstractSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/AbstractSerializer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/AbstractSerializer.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/AbstractSerializer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/ContextSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/ContextSerializer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/ContextSerializer.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/ContextSerializer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/AbstractSerializationHelper.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/AbstractSerializationHelper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/AbstractSerializationHelper.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/AbstractSerializationHelper.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelper.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelper.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelper.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/SerializationHelper.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/SerializationHelper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/SerializationHelper.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/SerializationHelper.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializer.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializer.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/ContextKeyValueSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/ContextKeyValueSerializer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/ContextKeyValueSerializer.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/ContextKeyValueSerializer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/ContextValueSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/ContextValueSerializer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/ContextValueSerializer.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/ContextValueSerializer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/LinkisHAWorkFlowContextIDSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/LinkisHAWorkFlowContextIDSerializer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/LinkisHAWorkFlowContextIDSerializer.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/LinkisHAWorkFlowContextIDSerializer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/CommonHistorySerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/CommonHistorySerializer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/CommonHistorySerializer.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/CommonHistorySerializer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/CommonResourceHistorySerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/CommonResourceHistorySerializer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/CommonResourceHistorySerializer.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/CommonResourceHistorySerializer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/metadata/CSTableLineageSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/metadata/CSTableLineageSerializer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/metadata/CSTableLineageSerializer.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/metadata/CSTableLineageSerializer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/metadata/CSTableMetadataHistorySerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/metadata/CSTableMetadataHistorySerializer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/metadata/CSTableMetadataHistorySerializer.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/metadata/CSTableMetadataHistorySerializer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializer.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializer.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializer.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializer.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializer.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/LinkisVariableSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/LinkisVariableSerializer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/LinkisVariableSerializer.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/LinkisVariableSerializer.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/utils/CSCommonUtils.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/utils/CSCommonUtils.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/utils/CSCommonUtils.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/utils/CSCommonUtils.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtils.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtils.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtils.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtils.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/CSIDListener.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/CSIDListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/CSIDListener.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/CSIDListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/CSKeyListener.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/CSKeyListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/CSKeyListener.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/CSKeyListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/ContextAsyncEventListener.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/ContextAsyncEventListener.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/ContextAsyncEventListener.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/ContextAsyncEventListener.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/CallbackEngine.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/CallbackEngine.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/CallbackEngine.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/CallbackEngine.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/ContextIDCallbackEngine.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/ContextIDCallbackEngine.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/ContextIDCallbackEngine.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/ContextIDCallbackEngine.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/ContextKeyCallbackEngine.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/ContextKeyCallbackEngine.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/ContextKeyCallbackEngine.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/ContextKeyCallbackEngine.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/imp/ContextKeyValueBean.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/ContextKeyValueBean.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/imp/ContextKeyValueBean.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/ContextKeyValueBean.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/conf/ContextListenerConf.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/conf/ContextListenerConf.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/conf/ContextListenerConf.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/conf/ContextListenerConf.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/ContextIDEvent.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/ContextIDEvent.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/ContextIDEvent.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/ContextIDEvent.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/ContextKeyEvent.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/ContextKeyEvent.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/ContextKeyEvent.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/ContextKeyEvent.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/enumeration/OperateType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/enumeration/OperateType.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/enumeration/OperateType.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/enumeration/OperateType.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextIDEvent.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextIDEvent.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextIDEvent.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextIDEvent.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextKeyEvent.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextKeyEvent.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextKeyEvent.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextKeyEvent.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/manager/ListenerManager.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/manager/ListenerManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/manager/ListenerManager.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/manager/ListenerManager.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/DataSources.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/DataSources.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/DataSources.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/DataSources.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/ServiceErrorCode.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/ServiceErrorCode.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/ServiceErrorCode.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/ServiceErrorCode.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/auth/AuthContext.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/auth/AuthContext.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/auth/AuthContext.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/auth/AuthContext.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSource.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSource.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSource.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSource.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceEnv.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceEnv.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceEnv.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceEnv.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceParamKeyDefinition.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceParamKeyDefinition.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceParamKeyDefinition.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceParamKeyDefinition.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceParameter.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceParameter.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceParameter.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceParameter.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceType.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceType.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceType.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DatasourceVersion.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DatasourceVersion.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DatasourceVersion.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DatasourceVersion.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/errorcode/LinkisDatasourceManagerErrorCodeSummary.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/errorcode/LinkisDatasourceManagerErrorCodeSummary.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/errorcode/LinkisDatasourceManagerErrorCodeSummary.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/errorcode/LinkisDatasourceManagerErrorCodeSummary.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/exception/JsonErrorException.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/exception/JsonErrorException.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/exception/JsonErrorException.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/exception/JsonErrorException.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoQueryRequest.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoQueryRequest.java
similarity index 98%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoQueryRequest.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoQueryRequest.java
index f0da052731..26d1a93ba0 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoQueryRequest.java
+++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoQueryRequest.java
@@ -19,7 +19,7 @@
import org.apache.linkis.protocol.message.RequestProtocol;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
public class DsInfoQueryRequest implements RequestProtocol {
private String id;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoResponse.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoResponse.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoResponse.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoResponse.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/CryptoUtils.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/util/CryptoUtils.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/CryptoUtils.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/util/CryptoUtils.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/PatternInjectUtils.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/util/PatternInjectUtils.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/PatternInjectUtils.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/util/PatternInjectUtils.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/json/Json.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/util/json/Json.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/json/Json.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/util/json/Json.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/java/org/apache/linkis/errorcode/common/CommonConf.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/errorcode/common/CommonConf.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/java/org/apache/linkis/errorcode/common/CommonConf.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/errorcode/common/CommonConf.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/MdmConfiguration.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/MdmConfiguration.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/MdmConfiguration.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/MdmConfiguration.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheConfiguration.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheConfiguration.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheConfiguration.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheConfiguration.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheManager.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheManager.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheManager.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManager.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManager.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManager.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/DataSourceTypeEnum.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/domain/DataSourceTypeEnum.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/DataSourceTypeEnum.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/domain/DataSourceTypeEnum.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/GenerateSqlInfo.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/domain/GenerateSqlInfo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/GenerateSqlInfo.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/domain/GenerateSqlInfo.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaColumnInfo.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaColumnInfo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaColumnInfo.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaColumnInfo.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaPartitionInfo.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaPartitionInfo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaPartitionInfo.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaPartitionInfo.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/errorcode/LinkisMetadataQueryErrorCodeSummary.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/errorcode/LinkisMetadataQueryErrorCodeSummary.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/errorcode/LinkisMetadataQueryErrorCodeSummary.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/errorcode/LinkisMetadataQueryErrorCodeSummary.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeException.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeException.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeException.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeException.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeException.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeException.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeException.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeException.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractCacheMetaService.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractCacheMetaService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractCacheMetaService.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractCacheMetaService.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractDbMetaService.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractDbMetaService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractDbMetaService.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractDbMetaService.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractFsMetaService.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractFsMetaService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractFsMetaService.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractFsMetaService.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/BaseMetadataService.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/BaseMetadataService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/BaseMetadataService.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/BaseMetadataService.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/GenerateSqlTemplate.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/GenerateSqlTemplate.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/GenerateSqlTemplate.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/GenerateSqlTemplate.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataConnection.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataConnection.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataConnection.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataConnection.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataDbService.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataDbService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataDbService.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataDbService.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataFsService.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataFsService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataFsService.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataFsService.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFInfo.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFInfo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFInfo.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFInfo.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFManager.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFManager.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFManager.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFTree.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFTree.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFTree.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFTree.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFVersion.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFVersion.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFVersion.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFVersion.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/excepiton/UDFException.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/excepiton/UDFException.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/excepiton/UDFException.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/excepiton/UDFException.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/utils/ConstantVar.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/utils/ConstantVar.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/utils/ConstantVar.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/utils/ConstantVar.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/DownloadVo.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/DownloadVo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/DownloadVo.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/DownloadVo.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFAddVo.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/UDFAddVo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFAddVo.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/UDFAddVo.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFInfoVo.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/UDFInfoVo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFInfoVo.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/UDFInfoVo.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFUpdateVo.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/UDFUpdateVo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFUpdateVo.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/UDFUpdateVo.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFVersionVo.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/UDFVersionVo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFVersionVo.java
rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/UDFVersionVo.java
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-common/src/main/scala/org/apache/linkis/bml/protocol/BmlProtocol.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/bml/protocol/BmlProtocol.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-bml/linkis-bml-common/src/main/scala/org/apache/linkis/bml/protocol/BmlProtocol.scala
rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/bml/protocol/BmlProtocol.scala
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/AbstractErrorCode.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/errorcode/common/AbstractErrorCode.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/AbstractErrorCode.scala
rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/errorcode/common/AbstractErrorCode.scala
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/ErrorCode.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/errorcode/common/ErrorCode.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/ErrorCode.scala
rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/errorcode/common/ErrorCode.scala
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/LinkisErrorCode.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/errorcode/common/LinkisErrorCode.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/LinkisErrorCode.scala
rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/errorcode/common/LinkisErrorCode.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataOperateProtocol.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataOperateProtocol.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataOperateProtocol.scala
rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataOperateProtocol.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataProtocol.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataProtocol.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataProtocol.scala
rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataProtocol.scala
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataQueryProtocol.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataQueryProtocol.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataQueryProtocol.scala
rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataQueryProtocol.scala
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfIds.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfIds.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfIds.scala
rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfIds.scala
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfTree.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfTree.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfTree.scala
rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfTree.scala
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfTree.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfTree.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfTree.scala
rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfTree.scala
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfs.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfs.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfs.scala
rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfs.scala
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextScopeTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextScopeTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextScopeTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextScopeTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextTypeTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextTypeTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextTypeTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextTypeTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/DBTypeTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/DBTypeTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/DBTypeTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/DBTypeTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ExpireTypeTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ExpireTypeTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ExpireTypeTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ExpireTypeTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/WorkTypeTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/WorkTypeTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/WorkTypeTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/WorkTypeTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextHistoryTypeTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextHistoryTypeTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextHistoryTypeTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextHistoryTypeTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextIDTypeTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextIDTypeTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextIDTypeTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextIDTypeTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyTypeTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyTypeTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyTypeTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyTypeTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyValueTypeTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyValueTypeTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyValueTypeTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyValueTypeTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextValueTypeTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextValueTypeTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextValueTypeTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextValueTypeTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelperTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelperTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelperTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializerTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializerTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializerTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializerTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializerTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializerTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializerTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializerTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializerTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializerTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializerTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializerTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializerTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializerTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializerTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializerTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializerTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializerTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializerTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializerTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializerTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializerTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializerTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializerTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializerTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializerTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializerTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializerTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/test/ContextSerializationHelperTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/test/ContextSerializationHelperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/test/ContextSerializationHelperTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/test/ContextSerializationHelperTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/utils/CSCommonUtilsTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/utils/CSCommonUtilsTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/utils/CSCommonUtilsTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/utils/CSCommonUtilsTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtilsTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtilsTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtilsTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtilsTest.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextID.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextID.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextID.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextID.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextKey.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextKey.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextKey.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextKeyValue.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextKeyValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextKeyValue.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextKeyValue.java
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextValue.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextValue.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextValue.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/test/java/org/apache/linkis/errorcode/common/CommonConfTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/errorcode/common/CommonConfTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/test/java/org/apache/linkis/errorcode/common/CommonConfTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/errorcode/common/CommonConfTest.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/MdmConfigurationTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/metadata/query/common/MdmConfigurationTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/MdmConfigurationTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/metadata/query/common/MdmConfigurationTest.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/cache/CacheConfigurationTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/metadata/query/common/cache/CacheConfigurationTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/cache/CacheConfigurationTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/metadata/query/common/cache/CacheConfigurationTest.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManagerTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManagerTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManagerTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManagerTest.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeExceptionTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeExceptionTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeExceptionTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeExceptionTest.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeExceptionTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeExceptionTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeExceptionTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeExceptionTest.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/test/java/org/apache/linkis/udf/excepiton/UDFExceptionTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/udf/excepiton/UDFExceptionTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/test/java/org/apache/linkis/udf/excepiton/UDFExceptionTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/udf/excepiton/UDFExceptionTest.java
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/test/java/org/apache/linkis/udf/utils/ConstantVarTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/udf/utils/ConstantVarTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/test/java/org/apache/linkis/udf/utils/ConstantVarTest.java
rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/udf/utils/ConstantVarTest.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/test/scala/org/apache/linkis/errorcode/common/LinkisErrorCodeTest.scala b/linkis-public-enhancements/linkis-pes-common/src/test/scala/org/apache/linkis/errorcode/common/LinkisErrorCodeTest.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/test/scala/org/apache/linkis/errorcode/common/LinkisErrorCodeTest.scala
rename to linkis-public-enhancements/linkis-pes-common/src/test/scala/org/apache/linkis/errorcode/common/LinkisErrorCodeTest.scala
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/pom.xml b/linkis-public-enhancements/linkis-pes-rpc-client/pom.xml
similarity index 86%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/pom.xml
rename to linkis-public-enhancements/linkis-pes-rpc-client/pom.xml
index 9c4add9a3c..2d9e98a58d 100644
--- a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/pom.xml
+++ b/linkis-public-enhancements/linkis-pes-rpc-client/pom.xml
@@ -6,9 +6,9 @@
~ 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.
@@ -21,12 +21,19 @@
org.apache.linkis
linkis
${revision}
- ../../../pom.xml
+ ../../pom.xml
- linkis-instance-label-client
+ linkis-pes-rpc-client
+
+
+ org.apache.linkis
+ linkis-pes-common
+ ${project.version}
+
+
org.apache.linkis
linkis-rpc
@@ -39,9 +46,7 @@
linkis-label-common
${project.version}
-
-
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/InstanceLabelClient.scala b/linkis-public-enhancements/linkis-pes-rpc-client/src/main/scala/org/apache/linkis/instance/label/client/InstanceLabelClient.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/InstanceLabelClient.scala
rename to linkis-public-enhancements/linkis-pes-rpc-client/src/main/scala/org/apache/linkis/instance/label/client/InstanceLabelClient.scala
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/SpringCloudInstanceLabelClient.scala b/linkis-public-enhancements/linkis-pes-rpc-client/src/main/scala/org/apache/linkis/instance/label/client/SpringCloudInstanceLabelClient.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/SpringCloudInstanceLabelClient.scala
rename to linkis-public-enhancements/linkis-pes-rpc-client/src/main/scala/org/apache/linkis/instance/label/client/SpringCloudInstanceLabelClient.scala
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-client/src/main/scala/org/apache/linkis/udf/UDFClient.scala b/linkis-public-enhancements/linkis-pes-rpc-client/src/main/scala/org/apache/linkis/udf/UDFClient.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-client/src/main/scala/org/apache/linkis/udf/UDFClient.scala
rename to linkis-public-enhancements/linkis-pes-rpc-client/src/main/scala/org/apache/linkis/udf/UDFClient.scala
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-client/src/main/scala/org/apache/linkis/udf/UDFClientConfiguration.scala b/linkis-public-enhancements/linkis-pes-rpc-client/src/main/scala/org/apache/linkis/udf/UDFClientConfiguration.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-client/src/main/scala/org/apache/linkis/udf/UDFClientConfiguration.scala
rename to linkis-public-enhancements/linkis-pes-rpc-client/src/main/scala/org/apache/linkis/udf/UDFClientConfiguration.scala
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-client/src/test/scala/org/apache/linkis/udf/UDFClientConfigurationTest.scala b/linkis-public-enhancements/linkis-pes-rpc-client/src/test/scala/org/apache/linkis/udf/UDFClientConfigurationTest.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-udf/linkis-udf-client/src/test/scala/org/apache/linkis/udf/UDFClientConfigurationTest.scala
rename to linkis-public-enhancements/linkis-pes-rpc-client/src/test/scala/org/apache/linkis/udf/UDFClientConfigurationTest.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/pom.xml b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/pom.xml
deleted file mode 100644
index 68a6469255..0000000000
--- a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
- 4.0.0
-
-
- org.apache.linkis
- linkis
- ${revision}
- ../../../pom.xml
-
-
- linkis-storage-script-dev-client
-
-
- 4.4
-
-
-
-
- org.apache.linkis
- linkis-common
- ${project.version}
-
-
- org.apache.linkis
- linkis-gateway-httpclient-support
- ${project.version}
-
-
-
- com.google.code.gson
- gson
-
-
-
-
-
-
-
- net.alchim31.maven
- scala-maven-plugin
-
-
-
-
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/pom.xml b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/pom.xml
index b3310186f1..4e7b3c72e7 100644
--- a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/pom.xml
+++ b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/pom.xml
@@ -31,7 +31,7 @@
org.apache.linkis
- linkis-bml-client
+ linkis-pes-client
${project.version}
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-client/pom.xml b/linkis-public-enhancements/linkis-udf/linkis-udf-client/pom.xml
deleted file mode 100644
index a901a1bf88..0000000000
--- a/linkis-public-enhancements/linkis-udf/linkis-udf-client/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
- 4.0.0
-
- org.apache.linkis
- linkis
- ${revision}
- ../../../pom.xml
-
- linkis-udf-client
- jar
- linkis-udf-client
-
-
-
-
- org.apache.linkis
- linkis-udf-common
- ${project.version}
-
-
-
- org.apache.linkis
- linkis-rpc
- ${project.version}
- provided
-
-
-
-
-
-
- net.alchim31.maven
- scala-maven-plugin
-
-
-
-
-
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/pom.xml b/linkis-public-enhancements/linkis-udf/linkis-udf-common/pom.xml
deleted file mode 100644
index ca5476f516..0000000000
--- a/linkis-public-enhancements/linkis-udf/linkis-udf-common/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
- 4.0.0
-
- org.apache.linkis
- linkis
- ${revision}
- ../../../pom.xml
-
- linkis-udf-common
- jar
- linkis-udf-common
-
-
-
-
- org.apache.linkis
- linkis-rpc
- ${project.version}
- provided
-
-
-
- org.apache.linkis
- linkis-bml-client
- ${project.version}
-
-
-
-
-
-
- net.alchim31.maven
- scala-maven-plugin
-
-
-
-
-
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/pom.xml b/linkis-public-enhancements/linkis-udf/linkis-udf-service/pom.xml
index fd45ce7d9e..073ab311ec 100644
--- a/linkis-public-enhancements/linkis-udf/linkis-udf-service/pom.xml
+++ b/linkis-public-enhancements/linkis-udf/linkis-udf-service/pom.xml
@@ -35,7 +35,12 @@
org.apache.linkis
- linkis-udf-common
+ linkis-pes-common
+ ${project.version}
+
+
+ org.apache.linkis
+ linkis-pes-client
${project.version}
diff --git a/linkis-public-enhancements/pom.xml b/linkis-public-enhancements/pom.xml
index db9e993c20..e3684a7779 100644
--- a/linkis-public-enhancements/pom.xml
+++ b/linkis-public-enhancements/pom.xml
@@ -28,19 +28,18 @@
pom
+ linkis-pes-common
+ linkis-pes-client
+ linkis-pes-rpc-client
linkis-bml
linkis-context-service
linkis-datasource/linkis-metadata
linkis-datasource
- linkis-udf/linkis-udf-client
- linkis-udf/linkis-udf-common
linkis-udf/linkis-udf-service
linkis-jobhistory
linkis-configuration
linkis-variable
- linkis-instance-label/linkis-instance-label-client
linkis-instance-label/linkis-instance-label-server
- linkis-script-dev/linkis-storage-script-dev-client
linkis-script-dev/linkis-storage-script-dev-server
linkis-basedata-manager
linkis-error-code
@@ -53,11 +52,6 @@
linkis-cs-server
${project.version}
-
- org.apache.linkis
- linkis-datasource-manager-server
- ${project.version}
-
org.apache.linkis
linkis-metadata
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml
index c4e68f9eb6..b089c4bfe9 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml
@@ -70,7 +70,7 @@
org.apache.linkis
- linkis-cs-common
+ linkis-pes-common
${project.version}