You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2023/10/01 15:01:07 UTC
[linkis] branch master updated: [Feature][linkis-public-enhancements] Mer pes publicservice (#4854)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/master by this push:
new 16183c973 [Feature][linkis-public-enhancements] Mer pes publicservice (#4854)
16183c973 is described below
commit 16183c973c59380cbb05250f773692bfd02f1dcb
Author: GuoPhilipse <46...@users.noreply.github.com>
AuthorDate: Sun Oct 1 23:00:58 2023 +0800
[Feature][linkis-public-enhancements] Mer pes publicservice (#4854)
* merge pes service
* remove instance label
---
docs/errorcode/linkis-instance-label-errorcode.md | 2 +-
.../src/test/resources/linkis.properties | 21 ----
.../linkis-datasource-manager/server/pom.xml | 6 -
.../linkis-error-code-server/pom.xml | 48 --------
.../src/test/resources/application.properties | 55 ---------
.../src/test/resources/linkis.properties | 21 ----
.../linkis-error-code/pom.xml | 37 ------
.../linkis-instance-label-server/pom.xml | 4 +-
.../src/test/resources/create_pg.sql | 130 ++++++++++-----------
.../pom.xml | 57 ++++++++-
.../src/main/assembly/distribution.xml | 4 +-
.../server/LinkisBasedataManagerApplication.java | 0
.../server/dao/CgManagerLabelMapper.java | 0
.../server/dao/ConfigurationConfigKeyMapper.java | 0
.../server/dao/ConfigurationConfigValueMapper.java | 0
.../dao/ConfigurationKeyEngineRelationMapper.java | 0
.../server/dao/DatasourceAccessMapper.java | 0
.../server/dao/DatasourceEnvMapper.java | 0
.../server/dao/DatasourceTypeKeyMapper.java | 0
.../server/dao/DatasourceTypeMapper.java | 0
.../dao/EngineConnPluginBmlResourcesMapper.java | 0
.../server/dao/GatewayAuthTokenMapper.java | 0
.../server/dao/PsErrorCodeMapper.java | 0
.../dao/RmExternalResourceProviderMapper.java | 0
.../server/dao/UdfManagerMapper.java | 0
.../basedatamanager/server/dao/UdfTreeMapper.java | 0
.../server/domain/CgManagerLabel.java | 0
.../server/domain/ConfigurationConfigKey.java | 0
.../server/domain/ConfigurationConfigValue.java | 0
.../domain/ConfigurationKeyEngineRelation.java | 0
.../server/domain/DatasourceAccessEntity.java | 0
.../server/domain/DatasourceEnvEntity.java | 0
.../server/domain/DatasourceTypeEntity.java | 0
.../server/domain/DatasourceTypeKeyEntity.java | 0
.../domain/EngineConnPluginBmlResources.java | 0
.../server/domain/ErrorCodeEntity.java | 0
.../server/domain/GatewayAuthTokenEntity.java | 0
.../domain/RmExternalResourceProviderEntity.java | 0
.../server/domain/UdfManagerEntity.java | 0
.../server/domain/UdfTreeEntity.java | 0
.../request/ConfigurationTemplateSaveRequest.java | 0
.../server/response/EngineLabelResponse.java | 0
.../restful/ConfigurationTemplateRestfulApi.java | 0
.../server/restful/DatasourceAccessRestfulApi.java | 0
.../server/restful/DatasourceEnvRestfulApi.java | 0
.../restful/DatasourceTypeKeyRestfulApi.java | 0
.../server/restful/DatasourceTypeRestfulApi.java | 0
.../server/restful/ErrorCodeRestfulApi.java | 0
.../server/restful/GatewayAuthTokenRestfulApi.java | 0
.../RmExternalResourceProviderRestfulApi.java | 0
.../server/restful/UdfManagerRestfulApi.java | 0
.../server/restful/UdfTreeRestfulApi.java | 0
.../service/ConfigurationTemplateService.java | 0
.../server/service/DatasourceAccessService.java | 0
.../server/service/DatasourceEnvService.java | 0
.../server/service/DatasourceTypeKeyService.java | 0
.../server/service/DatasourceTypeService.java | 0
.../server/service/ErrorCodeService.java | 0
.../server/service/GatewayAuthTokenService.java | 0
.../service/RmExternalResourceProviderService.java | 0
.../server/service/UdfManagerService.java | 0
.../server/service/UdfTreeService.java | 0
.../impl/ConfigurationTemplateServiceImpl.java | 0
.../service/impl/DatasourceAccessServiceImpl.java | 0
.../service/impl/DatasourceEnvServiceImpl.java | 0
.../service/impl/DatasourceTypeKeyServiceImpl.java | 0
.../service/impl/DatasourceTypeServiceImpl.java | 0
.../server/service/impl/ErrorCodeServiceImpl.java | 0
.../service/impl/GatewayAuthTokenServiceImpl.java | 0
.../RmExternalResourceProviderServiceImpl.java | 0
.../server/service/impl/UdfManagerServiceImpl.java | 0
.../server/service/impl/UdfTreeServiceImpl.java | 0
.../linkis/errorcode/server/ErrorCodeServer.java | 0
.../errorcode/server/dao/ErrorCodeMapper.java | 0
.../server/restful/LinkisErrorCodeRestful.java | 0
.../server/service/LinkisErrorCodeService.java | 0
.../service/impl/LinkisErrorCodeServiceImpl.java | 0
.../linkis/filesystem/LinkisPublicServiceApp.java | 0
.../filesystem/conf/WorkSpaceConfiguration.java | 0
.../filesystem/constant/WorkSpaceConstants.java | 0
.../linkis/filesystem/entity/DirFileTree.java | 0
.../apache/linkis/filesystem/entity/LogLevel.java | 0
.../filesystem/exception/WorkSpaceException.java | 0
.../exception/WorkspaceExceptionManager.java | 0
.../filesystem/restful/api/BMLFsRestfulApi.java | 0
.../filesystem/restful/api/FsRestfulApi.java | 0
.../linkis/filesystem/util/WorkspaceUtil.java | 0
.../org/apache/linkis/variable/dao/VarMapper.java | 0
.../org/apache/linkis/variable/entity/VarKey.java | 0
.../linkis/variable/entity/VarKeyAndValue.java | 0
.../apache/linkis/variable/entity/VarKeyUser.java | 0
.../linkis/variable/entity/VarKeyValueVO.java | 0
.../org/apache/linkis/variable/entity/VarTree.java | 0
.../variable/exception/VariableException.java | 0
.../variable/restful/api/VariableRestfulApi.java | 0
.../linkis/variable/service/VariableService.java | 0
.../org/apache/linkis/variable/util/Constants.java | 0
.../mapper/common/CgManagerLabelMapper.xml | 0
.../common/ConfigurationConfigValueMapper.xml | 0
.../ConfigurationKeyEngineRelationMapper.xml | 0
.../common/EngineConnPluginBmlResourcesMapper.xml | 0
.../resources/mapper/common/ErrorCodeMapper.xml | 0
.../mapper/mysql/ConfigurationConfigKeyMapper.xml | 0
.../mapper/mysql/DatasourceAccessMapper.xml | 0
.../resources/mapper/mysql/DatasourceEnvMapper.xml | 0
.../mapper/mysql/DatasourceTypeKeyMapper.xml | 0
.../mapper/mysql/DatasourceTypeMapper.xml | 0
.../mapper/mysql/GatewayAuthTokenMapper.xml | 0
.../resources/mapper/mysql/PsErrorCodeMapper.xml | 0
.../mysql/RmExternalResourceProviderMapper.xml | 0
.../resources/mapper/mysql/UdfManagerMapper.xml | 0
.../main/resources/mapper/mysql/UdfTreeMapper.xml | 0
.../src/main/resources/mapper/mysql/VarMapper.xml | 0
.../postgresql/ConfigurationConfigKeyMapper.xml | 0
.../mapper/postgresql/DatasourceAccessMapper.xml | 0
.../mapper/postgresql/DatasourceEnvMapper.xml | 0
.../mapper/postgresql/DatasourceTypeKeyMapper.xml | 0
.../mapper/postgresql/DatasourceTypeMapper.xml | 0
.../mapper/postgresql/GatewayAuthTokenMapper.xml | 0
.../mapper/postgresql/PsErrorCodeMapper.xml | 0
.../RmExternalResourceProviderMapper.xml | 0
.../mapper/postgresql/UdfManagerMapper.xml | 0
.../resources/mapper/postgresql/UdfTreeMapper.xml | 0
.../main/resources/mapper/postgresql/VarMapper.xml | 0
.../apache/linkis/filesystem/bml/BMLHelper.scala | 0
.../apache/linkis/filesystem/cache/FsCache.scala | 0
.../conf/WorkspaceSpringConfiguration.scala | 0
.../apache/linkis/filesystem/entity/FSInfo.scala | 0
.../apache/linkis/filesystem/quartz/FSQuartz.scala | 0
.../linkis/filesystem/service/FsService.scala | 0
.../linkis/filesystem/utils/UserGroupInfo.scala | 0
.../filesystem/validator/PathValidator.scala | 0
.../variable/receiver/VariableReceiver.scala | 0
.../receiver/VariableReceiverChooser.scala | 0
.../variable/service/VariableServiceImpl.scala | 0
.../apache/linkis/basedatamanager/server/Scan.java | 0
.../server/WebApplicationServer.java | 0
.../basedatamanager/server/dao/BaseDaoTest.java | 0
.../server/dao/CgManagerLabelMapperTest.java | 0
.../dao/ConfigurationConfigKeyMapperTest.java | 0
.../dao/ConfigurationConfigValueMapperTest.java | 0
.../ConfigurationKeyEngineRelationMapperTest.java | 0
.../server/dao/DatasourceAccessMapperTest.java | 0
.../server/dao/DatasourceEnvMapperTest.java | 0
.../server/dao/DatasourceTypeKeyMapperTest.java | 0
.../server/dao/DatasourceTypeMapperTest.java | 0
.../EngineConnPluginBmlResourcesMapperTest.java | 0
.../server/dao/GatewayAuthTokenMapperTest.java | 0
.../server/dao/PsErrorCodeMapperTest.java | 0
.../dao/RmExternalResourceProviderMapperTest.java | 0
.../server/dao/UdfManagerMapperTest.java | 0
.../server/dao/UdfTreeMapperTest.java | 0
.../ConfigurationTemplateRestfulApiTest.java | 0
.../restful/DatasourceAccessRestfulApiTest.java | 0
.../restful/DatasourceEnvRestfulApiTest.java | 0
.../restful/DatasourceTypeKeyRestfulApiTest.java | 0
.../restful/DatasourceTypeRestfulApiTest.java | 0
.../server/restful/ErrorCodeRestfulApiTest.java | 0
.../restful/GatewayAuthTokenRestfulApiTest.java | 0
.../basedatamanager/server/restful/MvcUtils.java | 0
.../RmExternalResourceProviderRestfulApiTest.java | 0
.../server/restful/UdfManagerRestfulApiTest.java | 0
.../server/restful/UdfTreeRestfulApiTest.java | 0
.../service/DatasourceAccessServiceTest.java | 0
.../server/service/DatasourceEnvServiceTest.java | 0
.../service/DatasourceTypeKeyServiceTest.java | 0
.../server/service/DatasourceTypeServiceTest.java | 0
.../server/service/ErrorCodeServiceTest.java | 0
.../service/GatewayAuthTokenServiceTest.java | 0
.../RmExternalResourceProviderServiceTest.java | 0
.../server/service/UdfManagerServiceTest.java | 0
.../server/service/UdfTreeServiceTest.java | 0
.../org/apache/linkis/errorcode/server/Scan.java | 0
.../errorcode/server/WebApplicationServer.java | 0
.../linkis/errorcode/server/dao/BaseDaoTest.java | 0
.../errorcode/server/dao/ErrorCodeMapperTest.java | 0
.../java/org/apache/linkis/filesystem/Scan.java | 0
.../linkis/filesystem/WebApplicationServer.java | 0
.../conf/WorkSpaceConfigurationTest.java | 0
.../constant/WorkSpaceConstantsTest.java | 0
.../exception/WorkSpaceExceptionTest.java | 0
.../exception/WorkspaceExceptionManagerTest.java | 0
.../restful/api/BMLFsRestfulApiTest.java | 0
.../filesystem/restful/api/FsRestfulApiTest.java | 2 +-
.../linkis/filesystem/util/WorkspaceUtilTest.java | 0
.../test/java/org/apache/linkis/variable/Scan.java | 0
.../linkis/variable/WebApplicationServer.java | 0
.../apache/linkis/variable/dao/BaseDaoTest.java | 0
.../apache/linkis/variable/dao/VarMapperTest.java | 0
.../apache/linkis/variable/restful/MvcUtils.java | 0
.../restful/api/VariableRestfulApiTest.java | 0
.../variable/service/VariableServiceTest.java | 0
.../src/test/resources/application.properties | 14 ++-
.../test/resources/basedata_manager_create.sql} | 0
.../test/resources/basedata_manager_create_pg.sql} | 0
.../src/test/resources/deleteFile.sql | 0
.../src/test/resources/error_code_create.sql} | 0
.../src/test/resources/error_code_create_pg.sql} | 0
.../src/test/resources/existsSql.sql | 0
.../src/test/resources/info.text} | 0
.../src/test/resources/linkis.properties | 0
.../src/test/resources/query.sql | 0
.../src/test/resources/variable_create.sql} | 0
.../src/test/resources/variable_create_pg.sql} | 0
.../linkis/filesystem/entity/FSInfoTest.scala | 0
.../linkis-storage-script-dev-server/pom.xml | 90 --------------
.../src/test/resources/application.properties | 63 ----------
linkis-public-enhancements/linkis-variable/pom.xml | 53 ---------
.../src/test/resources/application.properties | 53 ---------
.../src/test/resources/linkis.properties | 21 ----
linkis-public-enhancements/pom.xml | 22 +---
211 files changed, 138 insertions(+), 565 deletions(-)
diff --git a/docs/errorcode/linkis-instance-label-errorcode.md b/docs/errorcode/linkis-instance-label-errorcode.md
index 7f38e00a1..5aa743243 100644
--- a/docs/errorcode/linkis-instance-label-errorcode.md
+++ b/docs/errorcode/linkis-instance-label-errorcode.md
@@ -1,7 +1,7 @@
## linkis-instance-label errorcode
| 模块名(服务名) | 错误码 | 描述 | Exception Class|
-| -------- | -------- | ----- |-----|
+| | -------- | ----- |-----|
|linkis-instance-label |14100|Failed to insert service instance(插入服务实例失败)|LinkisInstanceLabelErrorCodeSummary|
|linkis-instance-label |14100|Only admin can view all instances(只有管理员才能查看所有实例).|LinkisInstanceLabelErrorCodeSummary|
|linkis-instance-label |14100|Only admin can modify instance label(只有管理员才能修改标签).|LinkisInstanceLabelErrorCodeSummary|
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/resources/linkis.properties b/linkis-public-enhancements/linkis-basedata-manager/src/test/resources/linkis.properties
deleted file mode 100644
index 1c575edc5..000000000
--- a/linkis-public-enhancements/linkis-basedata-manager/src/test/resources/linkis.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#wds.linkis.test.mode=true
-wds.linkis.server.version=v1
-
-#test
-wds.linkis.test.mode=true
-wds.linkis.test.user=hadoop
\ No newline at end of file
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 5f4b2ed55..1de3798a3 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
@@ -91,12 +91,6 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <!--Metadata common-->
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-pes-common</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
<build>
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
deleted file mode 100644
index 85d8b017e..000000000
--- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis</artifactId>
- <version>${revision}</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
-
- <artifactId>linkis-error-code-server</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-pes-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-module</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-mybatis</artifactId>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/application.properties
deleted file mode 100644
index 1020eb506..000000000
--- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/application.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#wds.linkis.test.mode=true
-wds.linkis.server.version=v1
-
-#test
-wds.linkis.test.mode=true
-wds.linkis.test.user=hadoop
-
-
-##Linkis governance station administrators
-wds.linkis.governance.station.admin=hadoop
-wds.linkis.gateway.conf.publicservice.list=query,jobhistory,application,configuration,filesystem,udf,variable,microservice,errorcode,bml,datasource
-#
-
-#logging.level.root=debug
-#logging.file=./test.log
-#debug=true
-
-spring.datasource.driver-class-name=org.h2.Driver
-spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true
-spring.datasource.schema=classpath:create.sql
-spring.datasource.username=sa
-spring.datasource.password=
-#pgtest
-#spring.datasource.url=jdbc:h2:mem:testPgDb;MODE=PostgreSQL;IGNORECASE=TRUE;DATABASE_TO_LOWER=TRUE;
-#spring.datasource.schema=classpath:create_pg.sql
-
-spring.main.web-application-type=servlet
-server.port=1234
-spring.h2.console.enabled=true
-
-
-#disable eureka discovery client
-spring.cloud.service-registry.auto-registration.enabled=false
-eureka.client.enabled=false
-eureka.client.serviceUrl.registerWithEureka=false
-
-mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
-#mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/postgresql/*.xml
-mybatis-plus.type-aliases-package=org.apache.linkis.errorcode.common
-mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/linkis.properties b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/linkis.properties
deleted file mode 100644
index 1c575edc5..000000000
--- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/linkis.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#wds.linkis.test.mode=true
-wds.linkis.server.version=v1
-
-#test
-wds.linkis.test.mode=true
-wds.linkis.test.user=hadoop
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-error-code/pom.xml b/linkis-public-enhancements/linkis-error-code/pom.xml
deleted file mode 100644
index 20d3f1b4a..000000000
--- a/linkis-public-enhancements/linkis-error-code/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis</artifactId>
- <version>${revision}</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <artifactId>linkis-error-code</artifactId>
-
- <packaging>pom</packaging>
-
- <modules>
-
- <module>linkis-error-code-server</module>
-
- </modules>
-
-</project>
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml
index cfcf5ab9b..bf0ff327f 100644
--- a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml
+++ b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/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.
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/create_pg.sql b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/create_pg.sql
index 881fa2098..78e85b75d 100644
--- a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/create_pg.sql
+++ b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/create_pg.sql
@@ -1,65 +1,65 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-DROP TABLE IF EXISTS "linkis_ps_instance_info";
-CREATE TABLE linkis_ps_instance_info (
- id serial NOT NULL,
- "instance" varchar(128) NULL,
- "name" varchar(128) NULL,
- update_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
- create_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
- CONSTRAINT linkis_instance_info_pkey PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX uniq_instance_ii ON linkis_ps_instance_info USING btree (instance);
-
-
-DROP TABLE IF EXISTS "linkis_ps_instance_label";
-CREATE TABLE linkis_ps_instance_label (
- id serial NOT NULL,
- label_key varchar(32) NOT NULL,
- label_value varchar(255) NOT NULL,
- label_feature varchar(16) NOT NULL,
- label_value_size int4 NOT NULL,
- update_time timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
- create_time timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
- CONSTRAINT linkis_instance_label_pkey PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX uniq_lk_lv_il ON linkis_ps_instance_label USING btree (label_key, label_value);
-
-DROP TABLE IF EXISTS "linkis_ps_instance_label_relation";
-CREATE TABLE linkis_ps_instance_label_relation (
- id serial NOT NULL,
- label_id int4 NULL,
- service_instance varchar(128) NOT NULL,
- update_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
- create_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
- CONSTRAINT linkis_instance_label_relation_pkey PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX uniq_lid_instance ON linkis_ps_instance_label_relation USING btree (label_id, service_instance);
-
-
-DROP TABLE IF EXISTS "linkis_ps_instance_label_value_relation";
-CREATE TABLE linkis_ps_instance_label_value_relation (
- id serial NOT NULL,
- label_value_key varchar(255) NOT NULL,
- label_value_content varchar(255) NULL,
- label_id int4 NULL,
- update_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
- create_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
- CONSTRAINT linkis_ps_instance_label_value_relation_pkey PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX uniq_lvk_lid_ilvr ON linkis_ps_instance_label_value_relation USING btree (label_value_key, label_id);
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+DROP TABLE IF EXISTS "linkis_ps_instance_info";
+CREATE TABLE linkis_ps_instance_info (
+ id serial NOT NULL,
+ "instance" varchar(128) NULL,
+ "name" varchar(128) NULL,
+ update_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
+ create_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
+ CONSTRAINT linkis_instance_info_pkey PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX uniq_instance_ii ON linkis_ps_instance_info USING btree (instance);
+
+
+DROP TABLE IF EXISTS "linkis_ps_instance_label";
+CREATE TABLE linkis_ps_instance_label (
+ id serial NOT NULL,
+ label_key varchar(32) NOT NULL,
+ label_value varchar(255) NOT NULL,
+ label_feature varchar(16) NOT NULL,
+ label_value_size int4 NOT NULL,
+ update_time timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ create_time timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ CONSTRAINT linkis_instance_label_pkey PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX uniq_lk_lv_il ON linkis_ps_instance_label USING btree (label_key, label_value);
+
+DROP TABLE IF EXISTS "linkis_ps_instance_label_relation";
+CREATE TABLE linkis_ps_instance_label_relation (
+ id serial NOT NULL,
+ label_id int4 NULL,
+ service_instance varchar(128) NOT NULL,
+ update_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
+ create_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
+ CONSTRAINT linkis_instance_label_relation_pkey PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX uniq_lid_instance ON linkis_ps_instance_label_relation USING btree (label_id, service_instance);
+
+
+DROP TABLE IF EXISTS "linkis_ps_instance_label_value_relation";
+CREATE TABLE linkis_ps_instance_label_value_relation (
+ id serial NOT NULL,
+ label_value_key varchar(255) NOT NULL,
+ label_value_content varchar(255) NULL,
+ label_id int4 NULL,
+ update_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
+ create_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
+ CONSTRAINT linkis_ps_instance_label_value_relation_pkey PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX uniq_lvk_lid_ilvr ON linkis_ps_instance_label_value_relation USING btree (label_value_key, label_id);
diff --git a/linkis-public-enhancements/linkis-basedata-manager/pom.xml b/linkis-public-enhancements/linkis-pes-publicservice/pom.xml
similarity index 64%
rename from linkis-public-enhancements/linkis-basedata-manager/pom.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/pom.xml
index da354f952..86e45f43f 100644
--- a/linkis-public-enhancements/linkis-basedata-manager/pom.xml
+++ b/linkis-public-enhancements/linkis-pes-publicservice/pom.xml
@@ -16,7 +16,6 @@
~ limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.linkis</groupId>
@@ -24,9 +23,9 @@
<version>${revision}</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>linkis-basedata-manager</artifactId>
+
+ <artifactId>linkis-pes-publicservice</artifactId>
<packaging>jar</packaging>
- <name>linkis-basedata-manager</name>
<dependencies>
@@ -48,6 +47,58 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.linkis</groupId>
+ <artifactId>linkis-pes-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.linkis</groupId>
+ <artifactId>linkis-pes-client</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.linkis</groupId>
+ <artifactId>linkis-storage</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.linkis</groupId>
+ <artifactId>linkis-storage</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-quartz</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.linkis</groupId>
+ <artifactId>linkis-rpc</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.linkis</groupId>
+ <artifactId>linkis-io_file-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.oshi</groupId>
+ <artifactId>oshi-core</artifactId>
+ <version>6.2.1</version>
+ </dependency>
</dependencies>
<build>
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/assembly/distribution.xml
similarity index 99%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/assembly/distribution.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/assembly/distribution.xml
index 5183fc651..c389e0b96 100644
--- a/linkis-public-enhancements/linkis-basedata-manager/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-pes-publicservice/src/main/assembly/distribution.xml
@@ -18,12 +18,12 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.1 https://maven.apache.org/xsd/assembly-2.1.1.xsd">
- <id>linkis-basedata-manager</id>
+ <id>linkis-pes-publicservice</id>
<formats>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <baseDirectory>linkis-basedata-manager</baseDirectory>
+ <baseDirectory>linkis-pes-publicservice</baseDirectory>
<dependencySets>
<dependencySet>
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/LinkisBasedataManagerApplication.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/LinkisBasedataManagerApplication.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/LinkisBasedataManagerApplication.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/LinkisBasedataManagerApplication.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/CgManagerLabelMapper.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/CgManagerLabelMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/CgManagerLabelMapper.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/CgManagerLabelMapper.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationConfigKeyMapper.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationConfigKeyMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationConfigKeyMapper.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationConfigKeyMapper.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationConfigValueMapper.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationConfigValueMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationConfigValueMapper.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationConfigValueMapper.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationKeyEngineRelationMapper.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationKeyEngineRelationMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationKeyEngineRelationMapper.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationKeyEngineRelationMapper.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceAccessMapper.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceAccessMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceAccessMapper.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceAccessMapper.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceEnvMapper.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceEnvMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceEnvMapper.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceEnvMapper.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeKeyMapper.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeKeyMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeKeyMapper.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeKeyMapper.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeMapper.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeMapper.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeMapper.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/EngineConnPluginBmlResourcesMapper.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/EngineConnPluginBmlResourcesMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/EngineConnPluginBmlResourcesMapper.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/EngineConnPluginBmlResourcesMapper.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/GatewayAuthTokenMapper.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/GatewayAuthTokenMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/GatewayAuthTokenMapper.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/GatewayAuthTokenMapper.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/PsErrorCodeMapper.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/PsErrorCodeMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/PsErrorCodeMapper.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/PsErrorCodeMapper.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/RmExternalResourceProviderMapper.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/RmExternalResourceProviderMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/RmExternalResourceProviderMapper.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/RmExternalResourceProviderMapper.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/UdfManagerMapper.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/UdfManagerMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/UdfManagerMapper.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/UdfManagerMapper.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/UdfTreeMapper.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/UdfTreeMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/UdfTreeMapper.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/UdfTreeMapper.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/CgManagerLabel.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/CgManagerLabel.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/CgManagerLabel.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/CgManagerLabel.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/ConfigurationConfigKey.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/ConfigurationConfigKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/ConfigurationConfigKey.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/ConfigurationConfigKey.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/ConfigurationConfigValue.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/ConfigurationConfigValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/ConfigurationConfigValue.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/ConfigurationConfigValue.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/ConfigurationKeyEngineRelation.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/ConfigurationKeyEngineRelation.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/ConfigurationKeyEngineRelation.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/ConfigurationKeyEngineRelation.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceAccessEntity.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceAccessEntity.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceAccessEntity.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceAccessEntity.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceEnvEntity.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceEnvEntity.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceEnvEntity.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceEnvEntity.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceTypeEntity.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceTypeEntity.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceTypeEntity.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceTypeEntity.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceTypeKeyEntity.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceTypeKeyEntity.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceTypeKeyEntity.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceTypeKeyEntity.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/EngineConnPluginBmlResources.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/EngineConnPluginBmlResources.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/EngineConnPluginBmlResources.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/EngineConnPluginBmlResources.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/ErrorCodeEntity.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/ErrorCodeEntity.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/ErrorCodeEntity.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/ErrorCodeEntity.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/GatewayAuthTokenEntity.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/GatewayAuthTokenEntity.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/GatewayAuthTokenEntity.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/GatewayAuthTokenEntity.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/RmExternalResourceProviderEntity.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/RmExternalResourceProviderEntity.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/RmExternalResourceProviderEntity.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/RmExternalResourceProviderEntity.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/UdfManagerEntity.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/UdfManagerEntity.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/UdfManagerEntity.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/UdfManagerEntity.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/UdfTreeEntity.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/UdfTreeEntity.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/UdfTreeEntity.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/UdfTreeEntity.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/request/ConfigurationTemplateSaveRequest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/request/ConfigurationTemplateSaveRequest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/request/ConfigurationTemplateSaveRequest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/request/ConfigurationTemplateSaveRequest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/response/EngineLabelResponse.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/response/EngineLabelResponse.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/response/EngineLabelResponse.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/response/EngineLabelResponse.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/ConfigurationTemplateRestfulApi.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/ConfigurationTemplateRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/ConfigurationTemplateRestfulApi.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/ConfigurationTemplateRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceAccessRestfulApi.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceAccessRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceAccessRestfulApi.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceAccessRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceEnvRestfulApi.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceEnvRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceEnvRestfulApi.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceEnvRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeKeyRestfulApi.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeKeyRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeKeyRestfulApi.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeKeyRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeRestfulApi.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeRestfulApi.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/ErrorCodeRestfulApi.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/ErrorCodeRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/ErrorCodeRestfulApi.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/ErrorCodeRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/GatewayAuthTokenRestfulApi.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/GatewayAuthTokenRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/GatewayAuthTokenRestfulApi.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/GatewayAuthTokenRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/RmExternalResourceProviderRestfulApi.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/RmExternalResourceProviderRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/RmExternalResourceProviderRestfulApi.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/RmExternalResourceProviderRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfManagerRestfulApi.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfManagerRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfManagerRestfulApi.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfManagerRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfTreeRestfulApi.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfTreeRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfTreeRestfulApi.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfTreeRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/ConfigurationTemplateService.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/ConfigurationTemplateService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/ConfigurationTemplateService.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/ConfigurationTemplateService.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceAccessService.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceAccessService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceAccessService.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceAccessService.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceEnvService.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceEnvService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceEnvService.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceEnvService.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeKeyService.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeKeyService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeKeyService.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeKeyService.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeService.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeService.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeService.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/ErrorCodeService.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/ErrorCodeService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/ErrorCodeService.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/ErrorCodeService.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/GatewayAuthTokenService.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/GatewayAuthTokenService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/GatewayAuthTokenService.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/GatewayAuthTokenService.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/RmExternalResourceProviderService.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/RmExternalResourceProviderService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/RmExternalResourceProviderService.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/RmExternalResourceProviderService.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/UdfManagerService.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/UdfManagerService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/UdfManagerService.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/UdfManagerService.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/UdfTreeService.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/UdfTreeService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/UdfTreeService.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/UdfTreeService.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/ConfigurationTemplateServiceImpl.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/ConfigurationTemplateServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/ConfigurationTemplateServiceImpl.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/ConfigurationTemplateServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceAccessServiceImpl.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceAccessServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceAccessServiceImpl.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceAccessServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceEnvServiceImpl.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceEnvServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceEnvServiceImpl.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceEnvServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceTypeKeyServiceImpl.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceTypeKeyServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceTypeKeyServiceImpl.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceTypeKeyServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceTypeServiceImpl.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceTypeServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceTypeServiceImpl.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceTypeServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/ErrorCodeServiceImpl.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/ErrorCodeServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/ErrorCodeServiceImpl.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/ErrorCodeServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/GatewayAuthTokenServiceImpl.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/GatewayAuthTokenServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/GatewayAuthTokenServiceImpl.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/GatewayAuthTokenServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/RmExternalResourceProviderServiceImpl.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/RmExternalResourceProviderServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/RmExternalResourceProviderServiceImpl.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/RmExternalResourceProviderServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/UdfManagerServiceImpl.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/UdfManagerServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/UdfManagerServiceImpl.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/UdfManagerServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/UdfTreeServiceImpl.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/UdfTreeServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/UdfTreeServiceImpl.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/UdfTreeServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/ErrorCodeServer.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/errorcode/server/ErrorCodeServer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/ErrorCodeServer.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/errorcode/server/ErrorCodeServer.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/restful/LinkisErrorCodeRestful.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/errorcode/server/restful/LinkisErrorCodeRestful.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/restful/LinkisErrorCodeRestful.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/errorcode/server/restful/LinkisErrorCodeRestful.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/LinkisErrorCodeService.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/errorcode/server/service/LinkisErrorCodeService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/LinkisErrorCodeService.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/errorcode/server/service/LinkisErrorCodeService.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/impl/LinkisErrorCodeServiceImpl.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/errorcode/server/service/impl/LinkisErrorCodeServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/impl/LinkisErrorCodeServiceImpl.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/errorcode/server/service/impl/LinkisErrorCodeServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/LinkisPublicServiceApp.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/LinkisPublicServiceApp.java
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/LinkisPublicServiceApp.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/LinkisPublicServiceApp.java
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/conf/WorkSpaceConfiguration.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/conf/WorkSpaceConfiguration.java
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/conf/WorkSpaceConfiguration.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/conf/WorkSpaceConfiguration.java
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/constant/WorkSpaceConstants.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/constant/WorkSpaceConstants.java
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/constant/WorkSpaceConstants.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/constant/WorkSpaceConstants.java
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/DirFileTree.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/entity/DirFileTree.java
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/DirFileTree.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/entity/DirFileTree.java
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/LogLevel.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/entity/LogLevel.java
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/LogLevel.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/entity/LogLevel.java
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkSpaceException.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/exception/WorkSpaceException.java
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkSpaceException.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/exception/WorkSpaceException.java
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManager.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManager.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManager.java
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApi.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApi.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/util/WorkspaceUtil.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/util/WorkspaceUtil.java
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/util/WorkspaceUtil.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/util/WorkspaceUtil.java
diff --git a/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/dao/VarMapper.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/dao/VarMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/dao/VarMapper.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/dao/VarMapper.java
diff --git a/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKey.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/entity/VarKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKey.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/entity/VarKey.java
diff --git a/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyAndValue.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/entity/VarKeyAndValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyAndValue.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/entity/VarKeyAndValue.java
diff --git a/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyUser.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/entity/VarKeyUser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyUser.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/entity/VarKeyUser.java
diff --git a/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyValueVO.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/entity/VarKeyValueVO.java
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyValueVO.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/entity/VarKeyValueVO.java
diff --git a/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarTree.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/entity/VarTree.java
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarTree.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/entity/VarTree.java
diff --git a/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/exception/VariableException.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/exception/VariableException.java
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/exception/VariableException.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/exception/VariableException.java
diff --git a/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/restful/api/VariableRestfulApi.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/restful/api/VariableRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/restful/api/VariableRestfulApi.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/restful/api/VariableRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/service/VariableService.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/service/VariableService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/service/VariableService.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/service/VariableService.java
diff --git a/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/util/Constants.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/util/Constants.java
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/util/Constants.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/variable/util/Constants.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/CgManagerLabelMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/common/CgManagerLabelMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/CgManagerLabelMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/common/CgManagerLabelMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/ConfigurationConfigValueMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/common/ConfigurationConfigValueMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/ConfigurationConfigValueMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/common/ConfigurationConfigValueMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/ConfigurationKeyEngineRelationMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/common/ConfigurationKeyEngineRelationMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/ConfigurationKeyEngineRelationMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/common/ConfigurationKeyEngineRelationMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/EngineConnPluginBmlResourcesMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/common/EngineConnPluginBmlResourcesMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/EngineConnPluginBmlResourcesMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/common/EngineConnPluginBmlResourcesMapper.xml
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/resources/mapper/common/ErrorCodeMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/common/ErrorCodeMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/resources/mapper/common/ErrorCodeMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/common/ErrorCodeMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/ConfigurationConfigKeyMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/ConfigurationConfigKeyMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/ConfigurationConfigKeyMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/ConfigurationConfigKeyMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/DatasourceAccessMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/DatasourceAccessMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/DatasourceAccessMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/DatasourceAccessMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/DatasourceEnvMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/DatasourceEnvMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/DatasourceEnvMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/DatasourceEnvMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/DatasourceTypeKeyMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/DatasourceTypeKeyMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/DatasourceTypeKeyMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/DatasourceTypeKeyMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/DatasourceTypeMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/DatasourceTypeMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/DatasourceTypeMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/DatasourceTypeMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/GatewayAuthTokenMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/GatewayAuthTokenMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/GatewayAuthTokenMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/GatewayAuthTokenMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/PsErrorCodeMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/PsErrorCodeMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/PsErrorCodeMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/PsErrorCodeMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/RmExternalResourceProviderMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/RmExternalResourceProviderMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/RmExternalResourceProviderMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/RmExternalResourceProviderMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/UdfManagerMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/UdfManagerMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/UdfManagerMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/UdfManagerMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/UdfTreeMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/UdfTreeMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/UdfTreeMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/UdfTreeMapper.xml
diff --git a/linkis-public-enhancements/linkis-variable/src/main/resources/mapper/mysql/VarMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/VarMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/main/resources/mapper/mysql/VarMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/VarMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/ConfigurationConfigKeyMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/ConfigurationConfigKeyMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/ConfigurationConfigKeyMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/ConfigurationConfigKeyMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceAccessMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/DatasourceAccessMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceAccessMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/DatasourceAccessMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceEnvMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/DatasourceEnvMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceEnvMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/DatasourceEnvMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeKeyMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/DatasourceTypeKeyMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeKeyMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/DatasourceTypeKeyMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/DatasourceTypeMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/DatasourceTypeMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/GatewayAuthTokenMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/GatewayAuthTokenMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/GatewayAuthTokenMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/GatewayAuthTokenMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/PsErrorCodeMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/PsErrorCodeMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/PsErrorCodeMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/PsErrorCodeMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/RmExternalResourceProviderMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/RmExternalResourceProviderMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/RmExternalResourceProviderMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/RmExternalResourceProviderMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/UdfManagerMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/UdfManagerMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/UdfManagerMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/UdfManagerMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/UdfTreeMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/UdfTreeMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/UdfTreeMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/UdfTreeMapper.xml
diff --git a/linkis-public-enhancements/linkis-variable/src/main/resources/mapper/postgresql/VarMapper.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/VarMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/main/resources/mapper/postgresql/VarMapper.xml
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/VarMapper.xml
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/bml/BMLHelper.scala b/linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/filesystem/bml/BMLHelper.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/bml/BMLHelper.scala
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/filesystem/bml/BMLHelper.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/cache/FsCache.scala b/linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/filesystem/cache/FsCache.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/cache/FsCache.scala
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/filesystem/cache/FsCache.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceSpringConfiguration.scala b/linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceSpringConfiguration.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceSpringConfiguration.scala
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceSpringConfiguration.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/entity/FSInfo.scala b/linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/filesystem/entity/FSInfo.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/entity/FSInfo.scala
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/filesystem/entity/FSInfo.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/quartz/FSQuartz.scala b/linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/filesystem/quartz/FSQuartz.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/quartz/FSQuartz.scala
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/filesystem/quartz/FSQuartz.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/service/FsService.scala b/linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/filesystem/service/FsService.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/service/FsService.scala
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/filesystem/service/FsService.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/utils/UserGroupInfo.scala b/linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/filesystem/utils/UserGroupInfo.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/utils/UserGroupInfo.scala
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/filesystem/utils/UserGroupInfo.scala
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala b/linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala
diff --git a/linkis-public-enhancements/linkis-variable/src/main/scala/org/apache/linkis/variable/receiver/VariableReceiver.scala b/linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/variable/receiver/VariableReceiver.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/main/scala/org/apache/linkis/variable/receiver/VariableReceiver.scala
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/variable/receiver/VariableReceiver.scala
diff --git a/linkis-public-enhancements/linkis-variable/src/main/scala/org/apache/linkis/variable/receiver/VariableReceiverChooser.scala b/linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/variable/receiver/VariableReceiverChooser.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/main/scala/org/apache/linkis/variable/receiver/VariableReceiverChooser.scala
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/variable/receiver/VariableReceiverChooser.scala
diff --git a/linkis-public-enhancements/linkis-variable/src/main/scala/org/apache/linkis/variable/service/VariableServiceImpl.scala b/linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/variable/service/VariableServiceImpl.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/main/scala/org/apache/linkis/variable/service/VariableServiceImpl.scala
rename to linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/variable/service/VariableServiceImpl.scala
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/Scan.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/Scan.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/Scan.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/Scan.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/WebApplicationServer.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/WebApplicationServer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/WebApplicationServer.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/WebApplicationServer.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/BaseDaoTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/BaseDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/BaseDaoTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/BaseDaoTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/CgManagerLabelMapperTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/CgManagerLabelMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/CgManagerLabelMapperTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/CgManagerLabelMapperTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationConfigKeyMapperTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationConfigKeyMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationConfigKeyMapperTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationConfigKeyMapperTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationConfigValueMapperTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationConfigValueMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationConfigValueMapperTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationConfigValueMapperTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationKeyEngineRelationMapperTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationKeyEngineRelationMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationKeyEngineRelationMapperTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/ConfigurationKeyEngineRelationMapperTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/DatasourceAccessMapperTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/DatasourceAccessMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/DatasourceAccessMapperTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/DatasourceAccessMapperTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/DatasourceEnvMapperTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/DatasourceEnvMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/DatasourceEnvMapperTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/DatasourceEnvMapperTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeKeyMapperTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeKeyMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeKeyMapperTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeKeyMapperTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeMapperTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeMapperTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/DatasourceTypeMapperTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/EngineConnPluginBmlResourcesMapperTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/EngineConnPluginBmlResourcesMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/EngineConnPluginBmlResourcesMapperTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/EngineConnPluginBmlResourcesMapperTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/GatewayAuthTokenMapperTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/GatewayAuthTokenMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/GatewayAuthTokenMapperTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/GatewayAuthTokenMapperTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/PsErrorCodeMapperTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/PsErrorCodeMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/PsErrorCodeMapperTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/PsErrorCodeMapperTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/RmExternalResourceProviderMapperTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/RmExternalResourceProviderMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/RmExternalResourceProviderMapperTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/RmExternalResourceProviderMapperTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/UdfManagerMapperTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/UdfManagerMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/UdfManagerMapperTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/UdfManagerMapperTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/UdfTreeMapperTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/UdfTreeMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/dao/UdfTreeMapperTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/dao/UdfTreeMapperTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/ConfigurationTemplateRestfulApiTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/ConfigurationTemplateRestfulApiTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/ConfigurationTemplateRestfulApiTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/ConfigurationTemplateRestfulApiTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/DatasourceAccessRestfulApiTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/DatasourceAccessRestfulApiTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/DatasourceAccessRestfulApiTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/DatasourceAccessRestfulApiTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/DatasourceEnvRestfulApiTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/DatasourceEnvRestfulApiTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/DatasourceEnvRestfulApiTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/DatasourceEnvRestfulApiTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeKeyRestfulApiTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeKeyRestfulApiTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeKeyRestfulApiTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeKeyRestfulApiTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeRestfulApiTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeRestfulApiTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeRestfulApiTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeRestfulApiTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/ErrorCodeRestfulApiTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/ErrorCodeRestfulApiTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/ErrorCodeRestfulApiTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/ErrorCodeRestfulApiTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/GatewayAuthTokenRestfulApiTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/GatewayAuthTokenRestfulApiTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/GatewayAuthTokenRestfulApiTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/GatewayAuthTokenRestfulApiTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/MvcUtils.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/MvcUtils.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/MvcUtils.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/MvcUtils.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/RmExternalResourceProviderRestfulApiTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/RmExternalResourceProviderRestfulApiTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/RmExternalResourceProviderRestfulApiTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/RmExternalResourceProviderRestfulApiTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/UdfManagerRestfulApiTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/UdfManagerRestfulApiTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/UdfManagerRestfulApiTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/UdfManagerRestfulApiTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/UdfTreeRestfulApiTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/UdfTreeRestfulApiTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/restful/UdfTreeRestfulApiTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/restful/UdfTreeRestfulApiTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/service/DatasourceAccessServiceTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/service/DatasourceAccessServiceTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/service/DatasourceAccessServiceTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/service/DatasourceAccessServiceTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/service/DatasourceEnvServiceTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/service/DatasourceEnvServiceTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/service/DatasourceEnvServiceTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/service/DatasourceEnvServiceTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeKeyServiceTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeKeyServiceTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeKeyServiceTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeKeyServiceTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeServiceTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeServiceTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeServiceTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeServiceTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/service/ErrorCodeServiceTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/service/ErrorCodeServiceTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/service/ErrorCodeServiceTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/service/ErrorCodeServiceTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/service/GatewayAuthTokenServiceTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/service/GatewayAuthTokenServiceTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/service/GatewayAuthTokenServiceTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/service/GatewayAuthTokenServiceTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/service/RmExternalResourceProviderServiceTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/service/RmExternalResourceProviderServiceTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/service/RmExternalResourceProviderServiceTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/service/RmExternalResourceProviderServiceTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/service/UdfManagerServiceTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/service/UdfManagerServiceTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/service/UdfManagerServiceTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/service/UdfManagerServiceTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/service/UdfTreeServiceTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/service/UdfTreeServiceTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/java/org/apache/linkis/basedatamanager/server/service/UdfTreeServiceTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/basedatamanager/server/service/UdfTreeServiceTest.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/Scan.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/errorcode/server/Scan.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/Scan.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/errorcode/server/Scan.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/WebApplicationServer.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/errorcode/server/WebApplicationServer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/WebApplicationServer.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/errorcode/server/WebApplicationServer.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/dao/BaseDaoTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/errorcode/server/dao/BaseDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/dao/BaseDaoTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/errorcode/server/dao/BaseDaoTest.java
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapperTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapperTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapperTest.java
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/Scan.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/filesystem/Scan.java
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/Scan.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/filesystem/Scan.java
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/WebApplicationServer.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/filesystem/WebApplicationServer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/WebApplicationServer.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/filesystem/WebApplicationServer.java
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/conf/WorkSpaceConfigurationTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/filesystem/conf/WorkSpaceConfigurationTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/conf/WorkSpaceConfigurationTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/filesystem/conf/WorkSpaceConfigurationTest.java
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/constant/WorkSpaceConstantsTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/filesystem/constant/WorkSpaceConstantsTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/constant/WorkSpaceConstantsTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/filesystem/constant/WorkSpaceConstantsTest.java
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/exception/WorkSpaceExceptionTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/filesystem/exception/WorkSpaceExceptionTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/exception/WorkSpaceExceptionTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/filesystem/exception/WorkSpaceExceptionTest.java
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManagerTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManagerTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManagerTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManagerTest.java
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApiTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApiTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApiTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApiTest.java
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/restful/api/FsRestfulApiTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/filesystem/restful/api/FsRestfulApiTest.java
similarity index 99%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/restful/api/FsRestfulApiTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/filesystem/restful/api/FsRestfulApiTest.java
index 2996d5d90..72ebc0c09 100644
--- a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/restful/api/FsRestfulApiTest.java
+++ b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/filesystem/restful/api/FsRestfulApiTest.java
@@ -207,7 +207,7 @@ public class FsRestfulApiTest {
Mockito.when(fsService.getFileSystem(Mockito.anyString(), Mockito.any(FsPath.class)))
.thenReturn(fs);
- String path = this.getClass().getResource("/").getPath() + "info.log";
+ String path = this.getClass().getResource("/").getPath() + "info.text";
MvcResult mvcResult =
mockMvc
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/util/WorkspaceUtilTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/filesystem/util/WorkspaceUtilTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/util/WorkspaceUtilTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/filesystem/util/WorkspaceUtilTest.java
diff --git a/linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/Scan.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/variable/Scan.java
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/Scan.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/variable/Scan.java
diff --git a/linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/WebApplicationServer.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/variable/WebApplicationServer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/WebApplicationServer.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/variable/WebApplicationServer.java
diff --git a/linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/dao/BaseDaoTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/variable/dao/BaseDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/dao/BaseDaoTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/variable/dao/BaseDaoTest.java
diff --git a/linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/dao/VarMapperTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/variable/dao/VarMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/dao/VarMapperTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/variable/dao/VarMapperTest.java
diff --git a/linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/restful/MvcUtils.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/variable/restful/MvcUtils.java
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/restful/MvcUtils.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/variable/restful/MvcUtils.java
diff --git a/linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/restful/api/VariableRestfulApiTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/variable/restful/api/VariableRestfulApiTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/restful/api/VariableRestfulApiTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/variable/restful/api/VariableRestfulApiTest.java
diff --git a/linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/service/VariableServiceTest.java b/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/variable/service/VariableServiceTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/service/VariableServiceTest.java
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/variable/service/VariableServiceTest.java
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/resources/application.properties b/linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/application.properties
similarity index 75%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/resources/application.properties
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/application.properties
index bc29d4cf2..f997dc072 100644
--- a/linkis-public-enhancements/linkis-basedata-manager/src/test/resources/application.properties
+++ b/linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/application.properties
@@ -20,6 +20,14 @@ wds.linkis.server.version=v1
wds.linkis.test.mode=true
wds.linkis.test.user=hadoop
+wds.linkis.storage.enable.io.proxy=true
+linkis.workspace.filesystem.auto.create=true
+wds.linkis.is.gateway=true
+wds.linkis.server.web.session.timeout=1h
+wds.linkis.gateway.conf.enable.proxy.user=false
+wds.linkis.gateway.conf.url.pass.auth=/dss/
+wds.linkis.gateway.conf.enable.token.auth=true
+wds.linkis.login_encrypt.enable=false
##Linkis governance station administrators
wds.linkis.governance.station.admin=hadoop
@@ -33,12 +41,12 @@ logging.level.org.springframework.web=trace
spring.datasource.driver-class-name=org.h2.Driver
spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true
-spring.datasource.schema=classpath:create.sql
+spring.datasource.schema=classpath:basedata_manager_create.sql,classpath:error_code_create.sql,classpath:variable_create.sql
spring.datasource.username=sa
spring.datasource.password=
#pgtest
#spring.datasource.url=jdbc:h2:mem:testPgDb;MODE=PostgreSQL;IGNORECASE=TRUE;DATABASE_TO_LOWER=TRUE;
-#spring.datasource.schema=classpath:create_pg.sql
+#spring.datasource.schema=classpath:basedata_manager_create_pg.sql,classpath:error_code_create_pg.sql,classpath:variable_create_pg.sql
spring.main.web-application-type=servlet
server.port=1234
@@ -52,5 +60,5 @@ eureka.client.serviceUrl.registerWithEureka=false
mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
#mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/postgresql/*.xml
-mybatis-plus.type-aliases-package=org.apache.linkis.basedatamanager.server.domain
+mybatis-plus.type-aliases-package=org.apache.linkis.basedatamanager.server.domain,org.apache.linkis.errorcode.common,org.apache.linkis.variable.entity
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/resources/create.sql b/linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/basedata_manager_create.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/resources/create.sql
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/basedata_manager_create.sql
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/test/resources/create_pg.sql b/linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/basedata_manager_create_pg.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/test/resources/create_pg.sql
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/basedata_manager_create_pg.sql
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/deleteFile.sql b/linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/deleteFile.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/deleteFile.sql
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/deleteFile.sql
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/create.sql b/linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/error_code_create.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/create.sql
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/error_code_create.sql
diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/create_pg.sql b/linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/error_code_create_pg.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/create_pg.sql
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/error_code_create_pg.sql
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/existsSql.sql b/linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/existsSql.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/existsSql.sql
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/existsSql.sql
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/info.log b/linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/info.text
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/info.log
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/info.text
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/linkis.properties b/linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/linkis.properties
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/linkis.properties
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/linkis.properties
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/query.sql b/linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/query.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/query.sql
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/query.sql
diff --git a/linkis-public-enhancements/linkis-variable/src/test/resources/create.sql b/linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/variable_create.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/test/resources/create.sql
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/variable_create.sql
diff --git a/linkis-public-enhancements/linkis-variable/src/test/resources/create_pg.sql b/linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/variable_create_pg.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-variable/src/test/resources/create_pg.sql
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/variable_create_pg.sql
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/scala/org/apache/linkis/filesystem/entity/FSInfoTest.scala b/linkis-public-enhancements/linkis-pes-publicservice/src/test/scala/org/apache/linkis/filesystem/entity/FSInfoTest.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/scala/org/apache/linkis/filesystem/entity/FSInfoTest.scala
rename to linkis-public-enhancements/linkis-pes-publicservice/src/test/scala/org/apache/linkis/filesystem/entity/FSInfoTest.scala
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
deleted file mode 100644
index 4e7b3c72e..000000000
--- a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/pom.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis</artifactId>
- <version>${revision}</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
- <artifactId>linkis-storage-script-dev-server</artifactId>
- <packaging>jar</packaging>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-pes-client</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-storage</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-storage</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-quartz</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-rpc</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-io_file-client</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.github.oshi</groupId>
- <artifactId>oshi-core</artifactId>
- <version>6.2.1</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/application.properties
deleted file mode 100644
index d1222e33b..000000000
--- a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/application.properties
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#wds.linkis.test.mode=true
-wds.linkis.server.version=v1
-
-#test
-wds.linkis.test.mode=true
-wds.linkis.test.user=hadoop
-
-wds.linkis.is.gateway=true
-wds.linkis.server.web.session.timeout=1h
-wds.linkis.gateway.conf.enable.proxy.user=false
-wds.linkis.gateway.conf.url.pass.auth=/dss/
-wds.linkis.gateway.conf.enable.token.auth=true
-wds.linkis.login_encrypt.enable=false
-#logging.level.root=debug
-#logging.file=./test.log
-#debug=true
-
-#spring.datasource.driver-class-name=org.h2.Driver
-#spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true
-#spring.datasource.schema=classpath:create.sql
-#spring.datasource.data=classpath:data.sql
-##spring.datasource.username=sa
-#spring.datasource.password=
-#spring.datasource.hikari.connection-test-query=select 1
-##spring.datasource.hikari.minimum-idle=5
-#spring.datasource.hikari.auto-commit=true
-#spring.datasource.hikari.validation-timeout=3000
-#spring.datasource.hikari.pool-name=linkis-test
-#spring.datasource.hikari.maximum-pool-size=50
-#spring.datasource.hikari.connection-timeout=30000
-#spring.datasource.hikari.idle-timeout=600000
-#spring.datasource.hikari.leak-detection-threshold=0
-#spring.datasource.hikari.initialization-fail-timeout=1
-
-#spring.main.web-application-type=servlet
-#server.port=1234
-#spring.h2.console.enabled=true
-
-#disable eureka discovery client
-spring.cloud.service-registry.auto-registration.enabled=false
-eureka.client.enabled=false
-eureka.client.serviceUrl.registerWithEureka=false
-linkis.workspace.filesystem.auto.create=true
-
-#mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
-#mybatis-plus.type-aliases-package=org.apache.linkis.udf.entity
-#mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-
diff --git a/linkis-public-enhancements/linkis-variable/pom.xml b/linkis-public-enhancements/linkis-variable/pom.xml
deleted file mode 100644
index ad4e1e7ec..000000000
--- a/linkis-public-enhancements/linkis-variable/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis</artifactId>
- <version>${revision}</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>linkis-variable</artifactId>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-mybatis</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-rpc</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/linkis-public-enhancements/linkis-variable/src/test/resources/application.properties b/linkis-public-enhancements/linkis-variable/src/test/resources/application.properties
deleted file mode 100644
index b60cb57d1..000000000
--- a/linkis-public-enhancements/linkis-variable/src/test/resources/application.properties
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#wds.linkis.test.mode=true
-wds.linkis.server.version=v1
-
-#test
-wds.linkis.test.mode=true
-wds.linkis.test.user=hadoop
-
-
-##Linkis governance station administrators
-wds.linkis.governance.station.admin=hadoop
-wds.linkis.gateway.conf.publicservice.list=query,jobhistory,application,configuration,filesystem,udf,variable,microservice,errorcode,bml,datasource
-#
-
-#logging.level.root=debug
-#logging.file=./test.log
-#debug=true
-
-spring.datasource.driver-class-name=org.h2.Driver
-spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true
-spring.datasource.schema=classpath:create.sql
-spring.datasource.username=sa
-#pgtest
-#spring.datasource.url=jdbc:h2:mem:testPgDb;MODE=PostgreSQL;IGNORECASE=TRUE;DATABASE_TO_LOWER=TRUE;
-#spring.datasource.schema=classpath:create_pg.sql
-
-spring.main.web-application-type=servlet
-server.port=1234
-spring.h2.console.enabled=true
-
-#disable eureka discovery client
-spring.cloud.service-registry.auto-registration.enabled=false
-eureka.client.enabled=false
-eureka.client.serviceUrl.registerWithEureka=false
-
-mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
-#mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/postgresql/*.xml
-mybatis-plus.type-aliases-package=org.apache.linkis.variable.entity
-mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-variable/src/test/resources/linkis.properties b/linkis-public-enhancements/linkis-variable/src/test/resources/linkis.properties
deleted file mode 100644
index 1c575edc5..000000000
--- a/linkis-public-enhancements/linkis-variable/src/test/resources/linkis.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#wds.linkis.test.mode=true
-wds.linkis.server.version=v1
-
-#test
-wds.linkis.test.mode=true
-wds.linkis.test.user=hadoop
\ No newline at end of file
diff --git a/linkis-public-enhancements/pom.xml b/linkis-public-enhancements/pom.xml
index e3684a777..760ea0569 100644
--- a/linkis-public-enhancements/pom.xml
+++ b/linkis-public-enhancements/pom.xml
@@ -31,6 +31,7 @@
<module>linkis-pes-common</module>
<module>linkis-pes-client</module>
<module>linkis-pes-rpc-client</module>
+ <module>linkis-pes-publicservice</module>
<module>linkis-bml</module>
<module>linkis-context-service</module>
<module>linkis-datasource/linkis-metadata</module>
@@ -38,11 +39,7 @@
<module>linkis-udf/linkis-udf-service</module>
<module>linkis-jobhistory</module>
<module>linkis-configuration</module>
- <module>linkis-variable</module>
<module>linkis-instance-label/linkis-instance-label-server</module>
- <module>linkis-script-dev/linkis-storage-script-dev-server</module>
- <module>linkis-basedata-manager</module>
- <module>linkis-error-code</module>
<module>linkis-ps-common-lock</module>
</modules>
@@ -89,22 +86,7 @@
</dependency>
<dependency>
<groupId>org.apache.linkis</groupId>
- <artifactId>linkis-variable</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-storage-script-dev-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-error-code-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-basedata-manager</artifactId>
+ <artifactId>linkis-pes-publicservice</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org