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 2022/08/25 07:21:20 UTC
[incubator-linkis] branch dev-1.3.0 updated (ee5364472 -> a359224af)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a change to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
from ee5364472 UPDATE README.md (#2989)
new 33a35c124 feat(public-enhancements): merge cs,datasource-manager, metadatequery to ps-publicserice
new 9b6c6bc5b fix: fix label register
new 7dd3a59d9 fix: unify commons-math3 dependency, fix dependencies
new c24a50674 fix: remove the useless linkis-start-all.sh and linkis-stop-all.sh's service
new a8f79ad90 fix: fix the HaContextGatewayRouter for ps-cs service
new 668d245ac fix: fix the restful route for cs publicServiceList, and add enable_pulbicservice judge
new 93800444b fix: fix duplicate declaration of some jars
new 4fe9ea104 fix: comment the linkis.properties's publicservice.list conf, use the code default value
new a359224af fix: add metedataquery contextPath to public_service_list
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/scala/org/apache/linkis/rpc/Sender.scala | 4 +-
.../apache/linkis/rpc/conf/RPCConfiguration.scala | 4 +-
.../linkis-application-manager/pom.xml | 20 ----
.../rm/external/yarn/YarnResourceRequester.scala | 19 ++--
linkis-dist/package/conf/linkis-ps-cs.properties | 28 ------
.../conf/linkis-ps-data-source-manager.properties | 37 -------
.../conf/linkis-ps-metadataquery.properties | 21 ----
.../conf/linkis-ps-publicservice.properties | 20 +++-
linkis-dist/package/conf/linkis.properties | 5 +-
linkis-dist/package/sbin/ext/linkis-ps-cs | 33 -------
.../package/sbin/ext/linkis-ps-data-source-manager | 35 -------
.../package/sbin/ext/linkis-ps-metadataquery | 33 -------
linkis-dist/package/sbin/linkis-start-all.sh | 43 --------
linkis-dist/package/sbin/linkis-stop-all.sh | 22 -----
linkis-dist/src/main/assembly/distribution.xml | 38 -------
linkis-engineconn-plugins/flink/pom.xml | 1 -
linkis-engineconn-plugins/python/pom.xml | 1 -
linkis-engineconn-plugins/shell/pom.xml | 9 +-
linkis-engineconn-plugins/spark/pom.xml | 2 -
linkis-engineconn-plugins/sqoop/pom.xml | 7 --
.../linkis-configuration/pom.xml | 0
.../configuration/LinkisConfigurationApp.java | 0
.../linkis/configuration/dao/ConfigMapper.java | 0
.../linkis/configuration/dao/LabelMapper.java | 0
.../linkis/configuration/dao/impl/ConfigMapper.xml | 0
.../linkis/configuration/dao/impl/LabelMapper.xml | 0
.../linkis/configuration/entity/CategoryLabel.java | 0
.../configuration/entity/CategoryLabelVo.java | 0
.../linkis/configuration/entity/ConfigKey.java | 0
.../configuration/entity/ConfigKeyValue.java | 0
.../linkis/configuration/entity/ConfigLabel.java | 0
.../linkis/configuration/entity/ConfigTree.java | 0
.../linkis/configuration/entity/ConfigValue.java | 0
.../exception/ConfigurationException.java | 0
.../restful/api/ConfigurationRestfulApi.java | 0
.../configuration/service/ConfigKeyService.java | 0
.../service/impl/ConfigKeyServiceImpl.java | 0
.../util/ConfigurationConfiguration.java | 0
.../configuration/util/LabelEntityParser.java | 0
.../linkis/configuration/conf/Configuration.scala | 0
.../receiver/ConfigurationReceiver.scala | 0
.../receiver/ConfigurationReceiverChooser.scala | 0
.../configuration/service/CategoryService.scala | 0
.../service/ConfigurationService.scala | 0
.../linkis/configuration/util/JsonNodeUtil.scala | 0
.../configuration/util/LabelParameterParser.scala | 0
.../configuration/validate/ContainValidator.scala | 0
.../configuration/validate/FloatValidator.scala | 0
.../configuration/validate/JsonValidator.scala | 0
.../configuration/validate/NoneValidator.scala | 0
.../validate/NumericalValidator.scala | 0
.../configuration/validate/OneOfValidator.scala | 0
.../configuration/validate/RegexValidator.scala | 0
.../linkis/configuration/validate/Validator.scala | 0
.../configuration/validate/ValidatorManager.scala | 0
.../validate/ValidatorManagerImpl.scala | 0
.../java/org/apache/linkis/configuration/Scan.java | 0
.../linkis/configuration/WebApplicationServer.java | 0
.../linkis/configuration/dao/BaseDaoTest.java | 0
.../linkis/configuration/dao/ConfigMapperTest.java | 0
.../linkis/configuration/dao/LabelMapperTest.java | 0
.../exception/ConfigurationExceptionTest.java | 0
.../restful/api/ConfigurationRestfulApiTest.java | 0
.../linkis/configuration/restful/api/MvcUtils.java | 0
.../util/ConfigurationConfigurationTest.java | 0
.../configuration/util/LabelEntityParserTest.java | 0
.../src/test/resources/application.properties | 0
.../src/test/resources/create.sql | 0
.../src/test/resources/data.sql | 0
.../src/test/resources/linkis.properties | 0
.../linkis-configuration/src/test/rpcTest.scala | 0
.../linkis-cs-server/pom.xml | 1 -
.../linkis-context-service/pom.xml | 8 --
.../linkis-metadata-query/server/pom.xml | 4 -
.../linkis-datasource/linkis-metadata/pom.xml | 44 ---------
.../linkis-error-code-client/pom.xml | 0
.../errorcode/client/ClientConfiguration.java | 0
.../errorcode/client/ErrorCodeClientBuilder.java | 0
.../errorcode/client/LinkisErrorCodeClient.java | 0
.../errorcode/client/handler/ErrorCodeHandler.java | 0
.../client/handler/ExceptionErrorCodeHandler.java | 0
.../client/handler/LinkisErrorCodeFactory.java | 0
.../client/handler/LinkisErrorCodeHandler.java | 0
.../client/handler/LogErrorCodeHandler.java | 0
.../client/handler/LogFileErrorCodeHandler.java | 0
.../client/manager/LinkisErrorCodeManager.java | 0
.../synchronizer/LinkisErrorCodeSynchronizer.java | 0
.../apache/linkis/errorcode/client/utils/Test.java | 0
.../errorcode/client/action/ErrorCodeAction.scala | 0
.../errorcode/client/result/ErrorCodeResult.scala | 0
.../errorcode/client/utils/ErrorCodeMatcher.scala | 0
.../linkis-error-code-common/pom.xml | 0
.../apache/linkis/errorcode/common/CommonConf.java | 0
.../errorcode/common/AbstractErrorCode.scala | 0
.../apache/linkis/errorcode/common/ErrorCode.scala | 0
.../linkis/errorcode/common/LinkisErrorCode.scala | 0
.../linkis-error-code-server/pom.xml | 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-error-code/pom.xml | 0
.../linkis-instance-label-client/pom.xml | 0
.../label/client/EurekaInstanceLabelClient.scala | 41 ++++----
.../label/client/InstanceLabelClient.scala | 6 +-
.../linkis-instance-label-server/pom.xml | 0
.../instance/label/InsLabelAutoConfiguration.java | 0
.../instance/label/async/AsyncConsumerQueue.java | 0
.../label/async/GenericAsyncConsumerQueue.java | 0
.../label/cache/InsLabelCacheConfiguration.java | 0
.../linkis/instance/label/conf/InsLabelConf.java | 0
.../instance/label/dao/InsLabelRelationDao.java | 0
.../linkis/instance/label/dao/InstanceInfoDao.java | 0
.../instance/label/dao/InstanceLabelDao.java | 0
.../label/dao/impl/InsLabelRelationMapper.xml | 0
.../instance/label/dao/impl/InstanceInfoMapper.xml | 0
.../label/dao/impl/InstanceLabelMapper.xml | 0
.../instance/label/entity/InsPersistenceLabel.java | 0
.../label/entity/InsPersistenceLabelValue.java | 0
.../linkis/instance/label/entity/InstanceInfo.java | 0
.../label/exception/InstanceErrorException.java | 0
.../instance/label/restful/InstanceRestful.java | 0
.../label/service/InsLabelAccessService.java | 0
.../instance/label/service/InsLabelService.java | 0
.../label/service/InsLabelServiceAdapter.java | 0
.../label/service/annotation/AdapterMode.java | 0
.../label/service/impl/DefaultInsLabelService.java | 0
.../impl/DefaultInsLabelServiceAdapter.java | 0
.../label/service/impl/EurekaInsLabelService.java | 0
.../linkis/instance/label/utils/EntityParser.java | 0
.../label/vo/InsPersistenceLabelSearchVo.java | 0
.../linkis/instance/label/vo/InstanceInfoVo.java | 0
.../label/service/InsLabelRpcService.scala | 0
.../label/service/conf/InstanceConfigration.scala | 0
.../service/rpc/DefaultInsLabelRpcService.scala | 0
.../linkis-jobhistory/pom.xml | 0
.../linkis/jobhistory/LinkisJobHistoryApp.java | 0
.../linkis/jobhistory/cache/QueryCacheManager.java | 0
.../linkis/jobhistory/cache/QueryCacheService.java | 0
.../linkis/jobhistory/cache/domain/TaskResult.java | 0
.../cache/impl/DefaultQueryCacheManager.java | 0
.../cache/impl/QueryCacheServiceImpl.java | 0
.../jobhistory/cache/impl/ScheduledCleanJob.java | 0
.../jobhistory/cache/impl/ScheduledRefreshJob.java | 0
.../cache/impl/ScheduledRefreshUndoneJob.java | 0
.../jobhistory/cache/impl/UserTaskResultCache.java | 0
.../linkis/jobhistory/cache/utils/MD5Util.java | 0
.../linkis/jobhistory/dao/JobDetailMapper.java | 0
.../linkis/jobhistory/dao/JobHistoryMapper.java | 0
.../linkis/jobhistory/dao/impl/JobDetailMapper.xml | 0
.../jobhistory/dao/impl/JobHistoryMapper.xml | 0
.../apache/linkis/jobhistory/entity/JobDetail.java | 0
.../linkis/jobhistory/entity/JobHistory.java | 0
.../apache/linkis/jobhistory/entity/QueryTask.java | 0
.../linkis/jobhistory/entity/QueryTaskVO.java | 0
.../jobhistory/restful/api/QueryRestfulApi.java | 0
.../linkis/jobhistory/transitional/TaskStatus.java | 0
.../apache/linkis/jobhistory/util/Constants.java | 0
.../jobhistory/conf/JobhistoryConfiguration.scala | 0
.../jobhistory/conversions/TaskConversions.scala | 0
.../linkis/jobhistory/entity/QueryJobDetail.scala | 0
.../linkis/jobhistory/entity/QueryJobHistory.scala | 0
.../jobhistory/receiver/QueryReceiverChooser.scala | 0
.../service/JobHistoryDetailQueryService.java | 0
.../jobhistory/service/JobHistoryQueryService.java | 0
.../impl/JobHistoryDetailQueryServiceImpl.scala | 0
.../service/impl/JobHistoryQueryServiceImpl.scala | 0
.../linkis/jobhistory/util/QueryConfig.scala | 0
.../apache/linkis/jobhistory/util/QueryUtils.scala | 0
.../java/org/apache/linkis/jobhistory/Scan.java | 0
.../linkis/jobhistory/WebApplicationServer.java | 0
.../apache/linkis/jobhistory/dao/BaseDaoTest.java | 0
.../linkis/jobhistory/dao/JobDetailMapperTest.java | 0
.../linkis/jobhistory/entity/JobHistoryTest.java | 0
.../restful/api/QueryRestfulApiTest.java | 0
.../service/JobHistoryDetailQueryServiceTest.java | 0
.../src/test/resources/application.properties | 0
.../src/test/resources/create.sql | 0
.../src/test/resources/linkis.properties | 0
.../linkis-ps-common-lock/pom.xml | 2 +-
.../common/lock/CommonLockSpringConfiguration.java | 0
.../common/lock/dao/CommonLockMapper.java | 0
.../common/lock/entity/CommonLock.java | 0
.../common/lock/service/CommonLockService.java | 0
.../service/impl/DefaultCommonLockService.java | 0
.../linkis-publicservice/pom.xml | 109 ---------------------
.../linkis-storage-script-dev-client/pom.xml | 0
.../linkis/filesystem/WorkspaceClientFactory.scala | 0
.../linkis/filesystem/WorkspaceClientImpl.scala | 0
.../action/OpenScriptFromBMLAction.scala | 0
.../filesystem/action/WorkspacePOSTAction.scala | 0
.../filesystem/conf/WorkspaceClientConf.scala | 0
.../filesystem/request/WorkspaceClient.scala | 0
.../filesystem/request/WorkspaceHttpConf.scala | 0
.../response/ScriptFromBMLResponse.scala | 0
.../filesystem/response/WorkspaceResponse.scala | 0
.../result/AbstractWorkspaceResult.scala | 0
.../filesystem/result/ScriptFromBMLResult.scala | 0
.../filesystem/result/ScriptToBMLResult.scala | 0
.../linkis-storage-script-dev-server/pom.xml | 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
.../src/main/resources/application.yml | 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
.../filesystem/validator/PathValidator.scala | 0
.../linkis-udf/linkis-udf-client/pom.xml | 0
.../scala/org/apache/linkis/udf/UDFClient.scala | 0
.../apache/linkis/udf/UDFClientConfiguration.scala | 0
.../linkis-udf/linkis-udf-common/pom.xml | 0
.../java/org/apache/linkis/udf/entity/UDFInfo.java | 0
.../org/apache/linkis/udf/entity/UDFManager.java | 0
.../java/org/apache/linkis/udf/entity/UDFTree.java | 0
.../org/apache/linkis/udf/entity/UDFVersion.java | 0
.../apache/linkis/udf/excepiton/UDFException.java | 0
.../org/apache/linkis/udf/utils/ConstantVar.java | 0
.../java/org/apache/linkis/udf/vo/DownloadVo.java | 0
.../java/org/apache/linkis/udf/vo/UDFAddVo.java | 0
.../java/org/apache/linkis/udf/vo/UDFInfoVo.java | 0
.../java/org/apache/linkis/udf/vo/UDFUpdateVo.java | 0
.../org/apache/linkis/udf/vo/UDFVersionVo.java | 0
.../apache/linkis/udf/api/rpc/RequestUdfTree.scala | 0
.../linkis/udf/api/rpc/ResponseUdfTree.scala | 0
.../linkis-udf/linkis-udf-service/pom.xml | 0
.../org/apache/linkis/udf/api/UDFRestfulApi.java | 0
.../java/org/apache/linkis/udf/dao/UDFDao.java | 0
.../java/org/apache/linkis/udf/dao/UDFTreeDao.java | 0
.../org/apache/linkis/udf/dao/UDFVersionDao.java | 0
.../java/org/apache/linkis/udf/dao/impl/UDFDao.xml | 0
.../org/apache/linkis/udf/dao/impl/UDFTreeDao.xml | 0
.../apache/linkis/udf/dao/impl/UDFVersionDao.xml | 0
.../org/apache/linkis/udf/service/UDFService.java | 0
.../apache/linkis/udf/service/UDFTreeService.java | 0
.../linkis/udf/service/impl/UDFServiceImpl.java | 0
.../udf/service/impl/UDFTreeServiceImpl.java | 0
.../apache/linkis/udf/api/rpc/UdfReceiver.scala | 0
.../linkis/udf/api/rpc/UdfReceiverChooser.scala | 0
.../apache/linkis/udf/utils/UdfConfiguration.scala | 0
.../linkis-variable/pom.xml | 0
.../org/apache/linkis/variable/dao/VarMapper.java | 0
.../apache/linkis/variable/dao/impl/VarMapper.xml | 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
.../variable/receiver/VariableReceiver.scala | 0
.../receiver/VariableReceiverChooser.scala | 0
.../variable/service/VariableServiceImpl.scala | 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
.../variable/service/VariableServiceTest.java | 0
.../src/test/resources/application.properties | 0
.../linkis-variable/src/test/resources/create.sql | 0
.../linkis-variable/src/test/resources/data.sql | 0
linkis-public-enhancements/pom.xml | 63 +++++++++++-
.../ujes/route/HaContextGatewayRouter.scala | 37 ++++---
pom.xml | 25 ++++-
tool/dependencies/known-dependencies.txt | 3 +-
278 files changed, 161 insertions(+), 564 deletions(-)
delete mode 100644 linkis-dist/package/conf/linkis-ps-cs.properties
delete mode 100644 linkis-dist/package/conf/linkis-ps-data-source-manager.properties
delete mode 100644 linkis-dist/package/conf/linkis-ps-metadataquery.properties
delete mode 100644 linkis-dist/package/sbin/ext/linkis-ps-cs
delete mode 100644 linkis-dist/package/sbin/ext/linkis-ps-data-source-manager
delete mode 100644 linkis-dist/package/sbin/ext/linkis-ps-metadataquery
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/pom.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/java/org/apache/linkis/configuration/LinkisConfigurationApp.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/ConfigMapper.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/LabelMapper.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/ConfigMapper.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/LabelMapper.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/CategoryLabel.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/CategoryLabelVo.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigKey.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigKeyValue.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigLabel.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigTree.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigValue.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/java/org/apache/linkis/configuration/exception/ConfigurationException.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApi.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/ConfigKeyService.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/ConfigKeyServiceImpl.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/java/org/apache/linkis/configuration/util/ConfigurationConfiguration.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/java/org/apache/linkis/configuration/util/LabelEntityParser.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/scala/org/apache/linkis/configuration/conf/Configuration.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/scala/org/apache/linkis/configuration/receiver/ConfigurationReceiver.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/scala/org/apache/linkis/configuration/receiver/ConfigurationReceiverChooser.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/CategoryService.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/scala/org/apache/linkis/configuration/util/JsonNodeUtil.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/scala/org/apache/linkis/configuration/util/LabelParameterParser.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/ContainValidator.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/FloatValidator.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/JsonValidator.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/NoneValidator.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/NumericalValidator.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/OneOfValidator.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/RegexValidator.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/Validator.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/ValidatorManager.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/ValidatorManagerImpl.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/test/java/org/apache/linkis/configuration/Scan.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/test/java/org/apache/linkis/configuration/WebApplicationServer.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/BaseDaoTest.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/ConfigMapperTest.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/LabelMapperTest.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/test/java/org/apache/linkis/configuration/exception/ConfigurationExceptionTest.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/test/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApiTest.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/test/java/org/apache/linkis/configuration/restful/api/MvcUtils.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/test/java/org/apache/linkis/configuration/util/ConfigurationConfigurationTest.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/test/java/org/apache/linkis/configuration/util/LabelEntityParserTest.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/test/resources/application.properties (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/test/resources/create.sql (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/test/resources/data.sql (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/test/resources/linkis.properties (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-configuration/src/test/rpcTest.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-client/pom.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/ClientConfiguration.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilder.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClient.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandler.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/ExceptionErrorCodeHandler.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeFactory.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogErrorCodeHandler.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogFileErrorCodeHandler.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManager.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizer.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/utils/Test.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/action/ErrorCodeAction.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/result/ErrorCodeResult.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/utils/ErrorCodeMatcher.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-common/pom.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-common/src/main/java/org/apache/linkis/errorcode/common/CommonConf.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/AbstractErrorCode.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/ErrorCode.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/LinkisErrorCode.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-server/pom.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/ErrorCodeServer.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/restful/LinkisErrorCodeRestful.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/LinkisErrorCodeService.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/impl/LinkisErrorCodeServiceImpl.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-error-code/pom.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-client/pom.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/EurekaInstanceLabelClient.scala (62%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/InstanceLabelClient.scala (94%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/pom.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/InsLabelAutoConfiguration.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/AsyncConsumerQueue.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/GenericAsyncConsumerQueue.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/cache/InsLabelCacheConfiguration.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/conf/InsLabelConf.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InsLabelRelationDao.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceInfoDao.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceLabelDao.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InsLabelRelationMapper.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InstanceInfoMapper.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InstanceLabelMapper.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabel.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabelValue.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InstanceInfo.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/exception/InstanceErrorException.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelAccessService.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelService.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelServiceAdapter.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/annotation/AdapterMode.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceAdapter.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/EurekaInsLabelService.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/utils/EntityParser.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InsPersistenceLabelSearchVo.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InstanceInfoVo.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/InsLabelRpcService.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/conf/InstanceConfigration.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/pom.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/LinkisJobHistoryApp.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/QueryCacheManager.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/QueryCacheService.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/domain/TaskResult.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/DefaultQueryCacheManager.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/QueryCacheServiceImpl.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/ScheduledCleanJob.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/ScheduledRefreshJob.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/ScheduledRefreshUndoneJob.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/UserTaskResultCache.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/utils/MD5Util.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/JobDetailMapper.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/JobHistoryMapper.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/impl/JobDetailMapper.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/impl/JobHistoryMapper.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/JobDetail.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/JobHistory.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/QueryTask.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/QueryTaskVO.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/transitional/TaskStatus.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/util/Constants.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conf/JobhistoryConfiguration.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conversions/TaskConversions.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/entity/QueryJobDetail.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/entity/QueryJobHistory.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/receiver/QueryReceiverChooser.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/JobHistoryDetailQueryService.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/JobHistoryQueryService.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryDetailQueryServiceImpl.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/util/QueryConfig.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/util/QueryUtils.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/Scan.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/WebApplicationServer.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/dao/BaseDaoTest.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/dao/JobDetailMapperTest.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/entity/JobHistoryTest.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApiTest.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/service/JobHistoryDetailQueryServiceTest.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/test/resources/application.properties (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/test/resources/create.sql (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-jobhistory/src/test/resources/linkis.properties (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-ps-common-lock/pom.xml (98%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/CommonLockSpringConfiguration.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/dao/CommonLockMapper.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/entity/CommonLock.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/service/CommonLockService.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/service/impl/DefaultCommonLockService.java (100%)
delete mode 100644 linkis-public-enhancements/linkis-publicservice/pom.xml
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-client/pom.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientFactory.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientImpl.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLAction.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/action/WorkspacePOSTAction.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConf.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceClient.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceHttpConf.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponse.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/response/WorkspaceResponse.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/AbstractWorkspaceResult.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptFromBMLResult.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptToBMLResult.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-server/pom.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/LinkisPublicServiceApp.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/conf/WorkSpaceConfiguration.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/constant/WorkSpaceConstants.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/DirFileTree.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/LogLevel.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkSpaceException.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManager.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApi.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/util/WorkspaceUtil.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-server/src/main/resources/application.yml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/bml/BMLHelper.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/cache/FsCache.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceSpringConfiguration.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/entity/FSInfo.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/quartz/FSQuartz.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/service/FsService.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-client/pom.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-client/src/main/scala/org/apache/linkis/udf/UDFClient.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-client/src/main/scala/org/apache/linkis/udf/UDFClientConfiguration.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-common/pom.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFInfo.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFManager.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFTree.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFVersion.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/excepiton/UDFException.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/utils/ConstantVar.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/DownloadVo.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFAddVo.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFInfoVo.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFUpdateVo.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFVersionVo.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfTree.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfTree.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-service/pom.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFDao.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFTreeDao.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFVersionDao.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFDao.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFTreeDao.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFVersionDao.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFService.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFTreeService.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFTreeServiceImpl.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiver.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiverChooser.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/utils/UdfConfiguration.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/pom.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/main/java/org/apache/linkis/variable/dao/VarMapper.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/main/java/org/apache/linkis/variable/dao/impl/VarMapper.xml (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKey.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyAndValue.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyUser.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyValueVO.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarTree.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/main/java/org/apache/linkis/variable/exception/VariableException.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/main/java/org/apache/linkis/variable/restful/api/VariableRestfulApi.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/main/java/org/apache/linkis/variable/service/VariableService.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/main/java/org/apache/linkis/variable/util/Constants.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/main/scala/org/apache/linkis/variable/receiver/VariableReceiver.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/main/scala/org/apache/linkis/variable/receiver/VariableReceiverChooser.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/main/scala/org/apache/linkis/variable/service/VariableServiceImpl.scala (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/test/java/org/apache/linkis/variable/Scan.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/test/java/org/apache/linkis/variable/WebApplicationServer.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/test/java/org/apache/linkis/variable/dao/BaseDaoTest.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/test/java/org/apache/linkis/variable/dao/VarMapperTest.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/test/java/org/apache/linkis/variable/service/VariableServiceTest.java (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/test/resources/application.properties (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/test/resources/create.sql (100%)
rename linkis-public-enhancements/{linkis-publicservice => }/linkis-variable/src/test/resources/data.sql (100%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 02/09: fix: fix label register
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 9b6c6bc5b78924dc5a025e24a16d65c8f5743fa0
Author: Jack Xu <xu...@126.com>
AuthorDate: Mon Aug 22 18:27:13 2022 +0800
fix: fix label register
---
.../rm/external/yarn/YarnResourceRequester.scala | 6 ++--
.../label/client/EurekaInstanceLabelClient.scala | 42 ++++++++++++----------
2 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.scala
index f93c8550b..235d1dfaa 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.scala
@@ -130,8 +130,7 @@ class YarnResourceRequester extends ExternalResourceRequester with Logging {
.exists(_._2.asInstanceOf[JString].values == realQueueName)
) {
Some(queues)
- }
- else {
+ } else {
val childQueues = queue.find(_._1 == "childQueues")
if (childQueues.isEmpty) None
else getQueue(childQueues.map(_._2).get)
@@ -168,8 +167,7 @@ class YarnResourceRequester extends ExternalResourceRequester with Logging {
.exists(_._2.asInstanceOf[JString].values == realQueueName)
) {
return Some(queues)
- }
- else if ((queues \ "queues").toOption.nonEmpty) {
+ } else if ((queues \ "queues").toOption.nonEmpty) {
val matchQueue = getQueueOfCapacity(getChildQueuesOfCapacity(queues))
if (matchQueue.nonEmpty) return matchQueue
}
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/EurekaInstanceLabelClient.scala b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/EurekaInstanceLabelClient.scala
index 91b7f262a..89735aaeb 100644
--- a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/EurekaInstanceLabelClient.scala
+++ b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/EurekaInstanceLabelClient.scala
@@ -25,13 +25,15 @@ import org.apache.linkis.rpc.Sender
import org.apache.commons.lang3.StringUtils
import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.context.event.ApplicationStartedEvent
+import org.springframework.boot.availability.{
+ AvailabilityChangeEvent,
+ AvailabilityState,
+ ReadinessState
+}
import org.springframework.cloud.client.serviceregistry.Registration
import org.springframework.context.event.{ContextClosedEvent, EventListener}
import org.springframework.stereotype.Component
-import javax.annotation.PostConstruct
-
import java.util
@Component
@@ -40,21 +42,25 @@ class EurekaInstanceLabelClient extends Logging {
@Autowired
private var registration: Registration = _
- @EventListener(Array(classOf[ApplicationStartedEvent]))
- def init(applicationStartedEvent: ApplicationStartedEvent): Unit = {
- logger.info("EurekaInstanceLabelClient init")
- val metadata = registration.getMetadata
- if (
- null != metadata && metadata.containsKey(LabelKeyConstant.ROUTE_KEY) && StringUtils
- .isNoneBlank(metadata.get(LabelKeyConstant.ROUTE_KEY))
- ) {
- logger.info(s"Start to register label for instance $metadata")
- val labels = new util.HashMap[String, Object]()
- labels.put(LabelKeyConstant.ROUTE_KEY, metadata.get(LabelKeyConstant.ROUTE_KEY))
- val insLabelRefreshRequest = new InsLabelRefreshRequest
- insLabelRefreshRequest.setLabels(labels)
- insLabelRefreshRequest.setServiceInstance(Sender.getThisServiceInstance)
- InstanceLabelClient.getInstance.refreshLabelsToInstance(insLabelRefreshRequest)
+ @EventListener
+ def init(availabilityChangeEvent: AvailabilityChangeEvent[AvailabilityState]): Unit = {
+ availabilityChangeEvent.getState match {
+ case state: ReadinessState if state.equals(ReadinessState.ACCEPTING_TRAFFIC) =>
+ logger.info("EurekaInstanceLabelClient init")
+ val metadata = registration.getMetadata
+ if (
+ null != metadata && metadata.containsKey(LabelKeyConstant.ROUTE_KEY) && StringUtils
+ .isNoneBlank(metadata.get(LabelKeyConstant.ROUTE_KEY))
+ ) {
+ logger.info(s"Start to register label for instance $metadata")
+ val labels = new util.HashMap[String, Object]()
+ labels.put(LabelKeyConstant.ROUTE_KEY, metadata.get(LabelKeyConstant.ROUTE_KEY))
+ val insLabelRefreshRequest = new InsLabelRefreshRequest
+ insLabelRefreshRequest.setLabels(labels)
+ insLabelRefreshRequest.setServiceInstance(Sender.getThisServiceInstance)
+ InstanceLabelClient.getInstance.refreshLabelsToInstance(insLabelRefreshRequest)
+ }
+ case _ =>
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 01/09: feat(public-enhancements): merge cs,datasource-manager, metadatequery to ps-publicserice
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 33a35c124e87190bb3241c9cc977c98301c2a99e
Author: Jack Xu <xu...@126.com>
AuthorDate: Mon Aug 22 11:00:40 2022 +0800
feat(public-enhancements): merge cs,datasource-manager, metadatequery to ps-publicserice
---
.../main/scala/org/apache/linkis/rpc/Sender.scala | 4 +-
.../apache/linkis/rpc/conf/RPCConfiguration.scala | 2 +-
.../rm/external/yarn/YarnResourceRequester.scala | 17 ++--
.../conf/linkis-ps-publicservice.properties | 20 +++-
linkis-dist/package/sbin/linkis-start-all.sh | 60 ++++++------
linkis-dist/package/sbin/linkis-stop-all.sh | 30 +++---
linkis-dist/src/main/assembly/distribution.xml | 38 -------
.../linkis-configuration/pom.xml | 0
.../configuration/LinkisConfigurationApp.java | 0
.../linkis/configuration/dao/ConfigMapper.java | 0
.../linkis/configuration/dao/LabelMapper.java | 0
.../linkis/configuration/dao/impl/ConfigMapper.xml | 0
.../linkis/configuration/dao/impl/LabelMapper.xml | 0
.../linkis/configuration/entity/CategoryLabel.java | 0
.../configuration/entity/CategoryLabelVo.java | 0
.../linkis/configuration/entity/ConfigKey.java | 0
.../configuration/entity/ConfigKeyValue.java | 0
.../linkis/configuration/entity/ConfigLabel.java | 0
.../linkis/configuration/entity/ConfigTree.java | 0
.../linkis/configuration/entity/ConfigValue.java | 0
.../exception/ConfigurationException.java | 0
.../restful/api/ConfigurationRestfulApi.java | 0
.../configuration/service/ConfigKeyService.java | 0
.../service/impl/ConfigKeyServiceImpl.java | 0
.../util/ConfigurationConfiguration.java | 0
.../configuration/util/LabelEntityParser.java | 0
.../linkis/configuration/conf/Configuration.scala | 0
.../receiver/ConfigurationReceiver.scala | 0
.../receiver/ConfigurationReceiverChooser.scala | 0
.../configuration/service/CategoryService.scala | 0
.../service/ConfigurationService.scala | 0
.../linkis/configuration/util/JsonNodeUtil.scala | 0
.../configuration/util/LabelParameterParser.scala | 0
.../configuration/validate/ContainValidator.scala | 0
.../configuration/validate/FloatValidator.scala | 0
.../configuration/validate/JsonValidator.scala | 0
.../configuration/validate/NoneValidator.scala | 0
.../validate/NumericalValidator.scala | 0
.../configuration/validate/OneOfValidator.scala | 0
.../configuration/validate/RegexValidator.scala | 0
.../linkis/configuration/validate/Validator.scala | 0
.../configuration/validate/ValidatorManager.scala | 0
.../validate/ValidatorManagerImpl.scala | 0
.../java/org/apache/linkis/configuration/Scan.java | 0
.../linkis/configuration/WebApplicationServer.java | 0
.../linkis/configuration/dao/BaseDaoTest.java | 0
.../linkis/configuration/dao/ConfigMapperTest.java | 0
.../linkis/configuration/dao/LabelMapperTest.java | 0
.../exception/ConfigurationExceptionTest.java | 0
.../restful/api/ConfigurationRestfulApiTest.java | 0
.../linkis/configuration/restful/api/MvcUtils.java | 0
.../util/ConfigurationConfigurationTest.java | 0
.../configuration/util/LabelEntityParserTest.java | 0
.../src/test/resources/application.properties | 0
.../src/test/resources/create.sql | 0
.../src/test/resources/data.sql | 0
.../src/test/resources/linkis.properties | 0
.../linkis-configuration/src/test/rpcTest.scala | 0
.../linkis-cs-server/pom.xml | 1 -
.../linkis-context-service/pom.xml | 8 --
.../linkis-metadata-query/server/pom.xml | 4 -
.../linkis-datasource/linkis-metadata/pom.xml | 44 ---------
.../linkis-error-code-client/pom.xml | 0
.../errorcode/client/ClientConfiguration.java | 0
.../errorcode/client/ErrorCodeClientBuilder.java | 0
.../errorcode/client/LinkisErrorCodeClient.java | 0
.../errorcode/client/handler/ErrorCodeHandler.java | 0
.../client/handler/ExceptionErrorCodeHandler.java | 0
.../client/handler/LinkisErrorCodeFactory.java | 0
.../client/handler/LinkisErrorCodeHandler.java | 0
.../client/handler/LogErrorCodeHandler.java | 0
.../client/handler/LogFileErrorCodeHandler.java | 0
.../client/manager/LinkisErrorCodeManager.java | 0
.../synchronizer/LinkisErrorCodeSynchronizer.java | 0
.../apache/linkis/errorcode/client/utils/Test.java | 0
.../errorcode/client/action/ErrorCodeAction.scala | 0
.../errorcode/client/result/ErrorCodeResult.scala | 0
.../errorcode/client/utils/ErrorCodeMatcher.scala | 0
.../linkis-error-code-common/pom.xml | 0
.../apache/linkis/errorcode/common/CommonConf.java | 0
.../errorcode/common/AbstractErrorCode.scala | 0
.../apache/linkis/errorcode/common/ErrorCode.scala | 0
.../linkis/errorcode/common/LinkisErrorCode.scala | 0
.../linkis-error-code-server/pom.xml | 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-error-code/pom.xml | 0
.../linkis-instance-label-client/pom.xml | 0
.../label/client/EurekaInstanceLabelClient.scala | 5 +-
.../label/client/InstanceLabelClient.scala | 6 +-
.../linkis-instance-label-server/pom.xml | 0
.../instance/label/InsLabelAutoConfiguration.java | 0
.../instance/label/async/AsyncConsumerQueue.java | 0
.../label/async/GenericAsyncConsumerQueue.java | 0
.../label/cache/InsLabelCacheConfiguration.java | 0
.../linkis/instance/label/conf/InsLabelConf.java | 0
.../instance/label/dao/InsLabelRelationDao.java | 0
.../linkis/instance/label/dao/InstanceInfoDao.java | 0
.../instance/label/dao/InstanceLabelDao.java | 0
.../label/dao/impl/InsLabelRelationMapper.xml | 0
.../instance/label/dao/impl/InstanceInfoMapper.xml | 0
.../label/dao/impl/InstanceLabelMapper.xml | 0
.../instance/label/entity/InsPersistenceLabel.java | 0
.../label/entity/InsPersistenceLabelValue.java | 0
.../linkis/instance/label/entity/InstanceInfo.java | 0
.../label/exception/InstanceErrorException.java | 0
.../instance/label/restful/InstanceRestful.java | 0
.../label/service/InsLabelAccessService.java | 0
.../instance/label/service/InsLabelService.java | 0
.../label/service/InsLabelServiceAdapter.java | 0
.../label/service/annotation/AdapterMode.java | 0
.../label/service/impl/DefaultInsLabelService.java | 0
.../impl/DefaultInsLabelServiceAdapter.java | 0
.../label/service/impl/EurekaInsLabelService.java | 0
.../linkis/instance/label/utils/EntityParser.java | 0
.../label/vo/InsPersistenceLabelSearchVo.java | 0
.../linkis/instance/label/vo/InstanceInfoVo.java | 0
.../label/service/InsLabelRpcService.scala | 0
.../label/service/conf/InstanceConfigration.scala | 0
.../service/rpc/DefaultInsLabelRpcService.scala | 0
.../linkis-jobhistory/pom.xml | 0
.../linkis/jobhistory/LinkisJobHistoryApp.java | 0
.../linkis/jobhistory/cache/QueryCacheManager.java | 0
.../linkis/jobhistory/cache/QueryCacheService.java | 0
.../linkis/jobhistory/cache/domain/TaskResult.java | 0
.../cache/impl/DefaultQueryCacheManager.java | 0
.../cache/impl/QueryCacheServiceImpl.java | 0
.../jobhistory/cache/impl/ScheduledCleanJob.java | 0
.../jobhistory/cache/impl/ScheduledRefreshJob.java | 0
.../cache/impl/ScheduledRefreshUndoneJob.java | 0
.../jobhistory/cache/impl/UserTaskResultCache.java | 0
.../linkis/jobhistory/cache/utils/MD5Util.java | 0
.../linkis/jobhistory/dao/JobDetailMapper.java | 0
.../linkis/jobhistory/dao/JobHistoryMapper.java | 0
.../linkis/jobhistory/dao/impl/JobDetailMapper.xml | 0
.../jobhistory/dao/impl/JobHistoryMapper.xml | 0
.../apache/linkis/jobhistory/entity/JobDetail.java | 0
.../linkis/jobhistory/entity/JobHistory.java | 0
.../apache/linkis/jobhistory/entity/QueryTask.java | 0
.../linkis/jobhistory/entity/QueryTaskVO.java | 0
.../jobhistory/restful/api/QueryRestfulApi.java | 0
.../linkis/jobhistory/transitional/TaskStatus.java | 0
.../apache/linkis/jobhistory/util/Constants.java | 0
.../jobhistory/conf/JobhistoryConfiguration.scala | 0
.../jobhistory/conversions/TaskConversions.scala | 0
.../linkis/jobhistory/entity/QueryJobDetail.scala | 0
.../linkis/jobhistory/entity/QueryJobHistory.scala | 0
.../jobhistory/receiver/QueryReceiverChooser.scala | 0
.../service/JobHistoryDetailQueryService.java | 0
.../jobhistory/service/JobHistoryQueryService.java | 0
.../impl/JobHistoryDetailQueryServiceImpl.scala | 0
.../service/impl/JobHistoryQueryServiceImpl.scala | 0
.../linkis/jobhistory/util/QueryConfig.scala | 0
.../apache/linkis/jobhistory/util/QueryUtils.scala | 0
.../java/org/apache/linkis/jobhistory/Scan.java | 0
.../linkis/jobhistory/WebApplicationServer.java | 0
.../apache/linkis/jobhistory/dao/BaseDaoTest.java | 0
.../linkis/jobhistory/dao/JobDetailMapperTest.java | 0
.../linkis/jobhistory/entity/JobHistoryTest.java | 0
.../restful/api/QueryRestfulApiTest.java | 0
.../service/JobHistoryDetailQueryServiceTest.java | 0
.../src/test/resources/application.properties | 0
.../src/test/resources/create.sql | 0
.../src/test/resources/linkis.properties | 0
.../linkis-ps-common-lock/pom.xml | 2 +-
.../common/lock/CommonLockSpringConfiguration.java | 0
.../common/lock/dao/CommonLockMapper.java | 0
.../common/lock/entity/CommonLock.java | 0
.../common/lock/service/CommonLockService.java | 0
.../service/impl/DefaultCommonLockService.java | 0
.../linkis-publicservice/pom.xml | 109 ---------------------
.../linkis-storage-script-dev-client/pom.xml | 0
.../linkis/filesystem/WorkspaceClientFactory.scala | 0
.../linkis/filesystem/WorkspaceClientImpl.scala | 0
.../action/OpenScriptFromBMLAction.scala | 0
.../filesystem/action/WorkspacePOSTAction.scala | 0
.../filesystem/conf/WorkspaceClientConf.scala | 0
.../filesystem/request/WorkspaceClient.scala | 0
.../filesystem/request/WorkspaceHttpConf.scala | 0
.../response/ScriptFromBMLResponse.scala | 0
.../filesystem/response/WorkspaceResponse.scala | 0
.../result/AbstractWorkspaceResult.scala | 0
.../filesystem/result/ScriptFromBMLResult.scala | 0
.../filesystem/result/ScriptToBMLResult.scala | 0
.../linkis-storage-script-dev-server/pom.xml | 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
.../src/main/resources/application.yml | 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
.../filesystem/validator/PathValidator.scala | 0
.../linkis-udf/linkis-udf-client/pom.xml | 0
.../scala/org/apache/linkis/udf/UDFClient.scala | 0
.../apache/linkis/udf/UDFClientConfiguration.scala | 0
.../linkis-udf/linkis-udf-common/pom.xml | 0
.../java/org/apache/linkis/udf/entity/UDFInfo.java | 0
.../org/apache/linkis/udf/entity/UDFManager.java | 0
.../java/org/apache/linkis/udf/entity/UDFTree.java | 0
.../org/apache/linkis/udf/entity/UDFVersion.java | 0
.../apache/linkis/udf/excepiton/UDFException.java | 0
.../org/apache/linkis/udf/utils/ConstantVar.java | 0
.../java/org/apache/linkis/udf/vo/DownloadVo.java | 0
.../java/org/apache/linkis/udf/vo/UDFAddVo.java | 0
.../java/org/apache/linkis/udf/vo/UDFInfoVo.java | 0
.../java/org/apache/linkis/udf/vo/UDFUpdateVo.java | 0
.../org/apache/linkis/udf/vo/UDFVersionVo.java | 0
.../apache/linkis/udf/api/rpc/RequestUdfTree.scala | 0
.../linkis/udf/api/rpc/ResponseUdfTree.scala | 0
.../linkis-udf/linkis-udf-service/pom.xml | 0
.../org/apache/linkis/udf/api/UDFRestfulApi.java | 0
.../java/org/apache/linkis/udf/dao/UDFDao.java | 0
.../java/org/apache/linkis/udf/dao/UDFTreeDao.java | 0
.../org/apache/linkis/udf/dao/UDFVersionDao.java | 0
.../java/org/apache/linkis/udf/dao/impl/UDFDao.xml | 0
.../org/apache/linkis/udf/dao/impl/UDFTreeDao.xml | 0
.../apache/linkis/udf/dao/impl/UDFVersionDao.xml | 0
.../org/apache/linkis/udf/service/UDFService.java | 0
.../apache/linkis/udf/service/UDFTreeService.java | 0
.../linkis/udf/service/impl/UDFServiceImpl.java | 0
.../udf/service/impl/UDFTreeServiceImpl.java | 0
.../apache/linkis/udf/api/rpc/UdfReceiver.scala | 0
.../linkis/udf/api/rpc/UdfReceiverChooser.scala | 0
.../apache/linkis/udf/utils/UdfConfiguration.scala | 0
.../linkis-variable/pom.xml | 0
.../org/apache/linkis/variable/dao/VarMapper.java | 0
.../apache/linkis/variable/dao/impl/VarMapper.xml | 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
.../variable/receiver/VariableReceiver.scala | 0
.../receiver/VariableReceiverChooser.scala | 0
.../variable/service/VariableServiceImpl.scala | 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
.../variable/service/VariableServiceTest.java | 0
.../src/test/resources/application.properties | 0
.../linkis-variable/src/test/resources/create.sql | 0
.../linkis-variable/src/test/resources/data.sql | 0
linkis-public-enhancements/pom.xml | 63 +++++++++++-
pom.xml | 6 ++
263 files changed, 143 insertions(+), 276 deletions(-)
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/Sender.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/Sender.scala
index d751345b7..098a073b3 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/Sender.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/Sender.scala
@@ -20,7 +20,6 @@ package org.apache.linkis.rpc
import org.apache.linkis.DataWorkCloudApplication
import org.apache.linkis.common.ServiceInstance
import org.apache.linkis.rpc.conf.RPCConfiguration
-import org.apache.linkis.rpc.sender.SpringMVCRPCSender
import org.apache.linkis.rpc.utils.RPCUtils
import java.util
@@ -92,7 +91,7 @@ object Sender {
RPCConfiguration.PUBLIC_SERVICE_APPLICATION_NAME.getValue
)
}
- if (!serviceInstanceToSenders.containsKey(serviceInstance))
+ if (!serviceInstanceToSenders.containsKey(serviceInstance)) {
serviceInstanceToSenders synchronized {
if (!serviceInstanceToSenders.containsKey(serviceInstance)) {
serviceInstanceToSenders.put(
@@ -101,6 +100,7 @@ object Sender {
)
}
}
+ }
serviceInstanceToSenders.get(serviceInstance)
}
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala
index 3e75f0139..48df786c5 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala
@@ -63,7 +63,7 @@ object RPCConfiguration {
val PUBLIC_SERVICE_LIST: Array[String] = CommonVars(
"wds.linkis.gateway.conf.publicservice.list",
- "query,jobhistory,application,configuration,filesystem,udf,variable,microservice,errorcode,bml,datasource"
+ "cs,data-source-manager,metadataquery,query,jobhistory,application,configuration,filesystem,udf,variable,microservice,errorcode,bml,datasource"
).getValue.split(",")
val METADATAQUERY_SERVICE_APPLICATION_NAME: CommonVars[String] =
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.scala
index d201ea773..f93c8550b 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.scala
@@ -118,8 +118,9 @@ class YarnResourceRequester extends ExternalResourceRequester with Logging {
queue.foreach { q =>
val yarnQueueName = (q \ "queueName").asInstanceOf[JString].values
if (yarnQueueName == realQueueName) return Some(q)
- else if (realQueueName.startsWith(yarnQueueName + "."))
+ else if (realQueueName.startsWith(yarnQueueName + ".")) {
return getQueue(getChildQueues(q))
+ }
}
None
case JObject(queue) =>
@@ -127,13 +128,15 @@ class YarnResourceRequester extends ExternalResourceRequester with Logging {
queue
.find(_._1 == "queueName")
.exists(_._2.asInstanceOf[JString].values == realQueueName)
- ) Some(queues)
+ ) {
+ Some(queues)
+ }
else {
val childQueues = queue.find(_._1 == "childQueues")
if (childQueues.isEmpty) None
else getQueue(childQueues.map(_._2).get)
}
- case JNull | JNothing => None
+ case _ => None
}
def getChildQueues(resp: JValue): JValue = {
@@ -163,13 +166,15 @@ class YarnResourceRequester extends ExternalResourceRequester with Logging {
queue
.find(_._1 == "queueName")
.exists(_._2.asInstanceOf[JString].values == realQueueName)
- ) return Some(queues)
+ ) {
+ return Some(queues)
+ }
else if ((queues \ "queues").toOption.nonEmpty) {
val matchQueue = getQueueOfCapacity(getChildQueuesOfCapacity(queues))
if (matchQueue.nonEmpty) return matchQueue
}
None
- case JNull | JNothing => None
+ case _ => None
}
def getChildQueuesOfCapacity(resp: JValue) = resp \ "queues" \ "queue"
@@ -265,7 +270,7 @@ class YarnResourceRequester extends ExternalResourceRequester with Logging {
}
}
appInfoBuffer.toArray
- case JNull | JNothing => new Array[YarnAppInfo](0)
+ case _ => new Array[YarnAppInfo](0)
}
}
diff --git a/linkis-dist/package/conf/linkis-ps-publicservice.properties b/linkis-dist/package/conf/linkis-ps-publicservice.properties
index 73e11a6d9..4b32b47ff 100644
--- a/linkis-dist/package/conf/linkis-ps-publicservice.properties
+++ b/linkis-dist/package/conf/linkis-ps-publicservice.properties
@@ -13,25 +13,35 @@
# limitations under the License.
#
-#
+wds.linkis.server.mdm.service.instance.expire-in-seconds=1800
+
##restful
-wds.linkis.server.restful.scan.packages=org.apache.linkis.jobhistory.restful,org.apache.linkis.variable.restful,org.apache.linkis.configuration.restful,org.apache.linkis.udf.api,org.apache.linkis.filesystem.restful,org.apache.linkis.filesystem.restful,org.apache.linkis.instance.label.restful,org.apache.linkis.metadata.restful.api,org.apache.linkis.cs.server.restful,org.apache.linkis.bml.restful,org.apache.linkis.errorcode.server.restful
+wds.linkis.server.restful.scan.packages=org.apache.linkis.cs.server.restful,org.apache.linkis.datasourcemanager.core.restful,org.apache.linkis.metadata.query.server.restful,org.apache.linkis.jobhistory.restful,org.apache.linkis.variable.restful,org.apache.linkis.configuration.restful,org.apache.linkis.udf.api,org.apache.linkis.filesystem.restful,org.apache.linkis.filesystem.restful,org.apache.linkis.instance.label.restful,org.apache.linkis.metadata.restful.api,org.apache.linkis.cs.server [...]
+
##mybatis
-wds.linkis.server.mybatis.mapperLocations=classpath:org/apache/linkis/jobhistory/dao/impl/*.xml,classpath:org/apache/linkis/variable/dao/impl/*.xml,classpath:org/apache/linkis/configuration/dao/impl/*.xml,classpath:org/apache/linkis/udf/dao/impl/*.xml,classpath:org/apache/linkis/instance/label/dao/impl/*.xml,classpath:org/apache/linkis/metadata/hive/dao/impl/*.xml,org/apache/linkis/metadata/dao/impl/*.xml,classpath:org/apache/linkis/bml/dao/impl/*.xml
-wds.linkis.server.mybatis.typeAliasesPackage=org.apache.linkis.configuration.entity,org.apache.linkis.jobhistory.entity,org.apache.linkis.udf.entity,org.apache.linkis.variable.entity,org.apache.linkis.instance.label.entity,org.apache.linkis.manager.entity,org.apache.linkis.metadata.domain,org.apache.linkis.bml.entity
-wds.linkis.server.mybatis.BasePackage=org.apache.linkis.jobhistory.dao,org.apache.linkis.variable.dao,org.apache.linkis.configuration.dao,org.apache.linkis.udf.dao,org.apache.linkis.instance.label.dao,org.apache.linkis.metadata.hive.dao,org.apache.linkis.metadata.dao,org.apache.linkis.bml.dao,org.apache.linkis.errorcode.server.dao,org.apache.linkis.publicservice.common.lock.dao
+wds.linkis.server.mybatis.mapperLocations=classpath*:org/apache/linkis/cs/persistence/dao/impl/*.xml,classpath:org/apache/linkis/datasourcemanager/core/dao/mapper/*.xml,classpath:org/apache/linkis/jobhistory/dao/impl/*.xml,classpath:org/apache/linkis/variable/dao/impl/*.xml,classpath:org/apache/linkis/configuration/dao/impl/*.xml,classpath:org/apache/linkis/udf/dao/impl/*.xml,classpath:org/apache/linkis/instance/label/dao/impl/*.xml,classpath:org/apache/linkis/metadata/hive/dao/impl/*.xm [...]
+wds.linkis.server.mybatis.typeAliasesPackage=org.apache.linkis.cs.persistence.entity,org.apache.linkis.datasourcemanager.common.domain,org.apache.linkis.datasourcemanager.core.vo,org.apache.linkis.configuration.entity,org.apache.linkis.jobhistory.entity,org.apache.linkis.udf.entity,org.apache.linkis.variable.entity,org.apache.linkis.instance.label.entity,org.apache.linkis.manager.entity,org.apache.linkis.metadata.domain,org.apache.linkis.bml.entity
+wds.linkis.server.mybatis.BasePackage=org.apache.linkis.cs.persistence.dao,org.apache.linkis.datasourcemanager.core.dao,org.apache.linkis.jobhistory.dao,org.apache.linkis.variable.dao,org.apache.linkis.configuration.dao,org.apache.linkis.udf.dao,org.apache.linkis.instance.label.dao,org.apache.linkis.metadata.hive.dao,org.apache.linkis.metadata.dao,org.apache.linkis.bml.dao,org.apache.linkis.errorcode.server.dao,org.apache.linkis.publicservice.common.lock.dao
+
##workspace
wds.linkis.workspace.filesystem.hdfsuserrootpath.suffix=/
wds.linkis.server.component.exclude.classes=org.apache.linkis.entranceclient.conf.ClientForEntranceSpringConfiguration,org.apache.linkis.entranceclient.conf.ClientSpringConfiguration,org.apache.linkis.entrance.conf.EntranceSpringConfiguration
+
##hive meta
hive.meta.url=
hive.meta.user=
hive.meta.password=
+wds.linkis.metadata.hive.encode.enabled=false
+
# associated with the logged-in user when querying metadata:default value is true
#linkis.metadata.hive.permission.with-login-user-enabled
#wds.linkis.jobhistory.undone.job.minimum.id=0
#wds.linkis.jobhistory.undone.job.refreshtime.daily=00:15
+wds.linkis.cs.deserialize.replace_package_header.enable=false
##Spring
spring.server.port=9105
spring.spring.main.allow-bean-definition-overriding=true
+spring.spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=false
+# ps-cs prefix must be started with 'cs_'
+spring.eureka.instance.metadata-map.route=cs_1_dev
diff --git a/linkis-dist/package/sbin/linkis-start-all.sh b/linkis-dist/package/sbin/linkis-start-all.sh
index 8dbe8487d..270ffe57f 100644
--- a/linkis-dist/package/sbin/linkis-start-all.sh
+++ b/linkis-dist/package/sbin/linkis-start-all.sh
@@ -89,9 +89,9 @@ startApp
sleep 15
#linkis-ps-cs
-SERVER_NAME="ps-cs"
-SERVER_IP=$CS_INSTALL_IP
-startApp
+#SERVER_NAME="ps-cs"
+#SERVER_IP=$CS_INSTALL_IP
+#startApp
#linkis-cg-entrance
@@ -109,21 +109,17 @@ SERVER_NAME="cg-engineplugin"
SERVER_IP=$ENGINECONN_PLUGIN_SERVER_INSTALL_IP
startApp
-
-if [ "$ENABLE_METADATA_QUERY" == "true" ]; then
- #linkis-ps-data-source-manager
- SERVER_NAME="ps-data-source-manager"
- SERVER_IP=$DATASOURCE_MANAGER_INSTALL_IP
- startApp
-
- #linkis-ps-metadataquery
- SERVER_NAME="ps-metadataquery"
- SERVER_IP=$METADATA_QUERY_INSTALL_IP
- startApp
-fi
-
-
-
+#if [ "$ENABLE_METADATA_QUERY" == "true" ]; then
+# #linkis-ps-data-source-manager
+# SERVER_NAME="ps-data-source-manager"
+# SERVER_IP=$DATASOURCE_MANAGER_INSTALL_IP
+# startApp
+#
+# #linkis-ps-metadataquery
+# SERVER_NAME="ps-metadataquery"
+# SERVER_IP=$METADATA_QUERY_INSTALL_IP
+# startApp
+#fi
echo "start-all shell script executed completely"
@@ -172,9 +168,9 @@ SERVER_IP=$PUBLICSERVICE_INSTALL_IP
checkServer
#linkis-ps-cs
-SERVER_NAME="ps-cs"
-SERVER_IP=$CS_INSTALL_IP
-checkServer
+#SERVER_NAME="ps-cs"
+#SERVER_IP=$CS_INSTALL_IP
+#checkServer
#linkis-cg-linkismanager
SERVER_NAME="cg-linkismanager"
@@ -197,16 +193,16 @@ SERVER_NAME="cg-engineplugin"
SERVER_IP=$ENGINECONN_PLUGIN_SERVER_INSTALL_IP
checkServer
-if [ "$ENABLE_METADATA_QUERY" == "true" ]; then
- #linkis-ps-data-source-manager
- SERVER_NAME="ps-data-source-manager"
- SERVER_IP=$DATASOURCE_MANAGER_INSTALL_IP
- checkServer
-
- #linkis-ps-metadataquery
- SERVER_NAME="ps-metadataquery"
- SERVER_IP=$METADATA_QUERY_INSTALL_IP
- checkServer
-fi
+#if [ "$ENABLE_METADATA_QUERY" == "true" ]; then
+# #linkis-ps-data-source-manager
+# SERVER_NAME="ps-data-source-manager"
+# SERVER_IP=$DATASOURCE_MANAGER_INSTALL_IP
+# checkServer
+#
+# #linkis-ps-metadataquery
+# SERVER_NAME="ps-metadataquery"
+# SERVER_IP=$METADATA_QUERY_INSTALL_IP
+# checkServer
+#fi
echo "Linkis started successfully"
diff --git a/linkis-dist/package/sbin/linkis-stop-all.sh b/linkis-dist/package/sbin/linkis-stop-all.sh
index c5e098f0c..c26a262a5 100644
--- a/linkis-dist/package/sbin/linkis-stop-all.sh
+++ b/linkis-dist/package/sbin/linkis-stop-all.sh
@@ -63,21 +63,21 @@ SERVER_IP=$GATEWAY_INSTALL_IP
stopApp
#linkis-ps-cs
-SERVER_NAME="ps-cs"
-SERVER_IP=$CS_INSTALL_IP
-stopApp
-
-if [ "$ENABLE_METADATA_QUERY" == "true" ]; then
- #linkis-ps-data-source-manager
- SERVER_NAME="ps-data-source-manager"
- SERVER_IP=$DATASOURCE_MANAGER_INSTALL_IP
- stopApp
-
- #linkis-ps-metadataquery
- SERVER_NAME="ps-metadataquery"
- SERVER_IP=$METADATA_QUERY_INSTALL_IP
- stopApp
-fi
+#SERVER_NAME="ps-cs"
+#SERVER_IP=$CS_INSTALL_IP
+#stopApp
+
+#if [ "$ENABLE_METADATA_QUERY" == "true" ]; then
+# #linkis-ps-data-source-manager
+# SERVER_NAME="ps-data-source-manager"
+# SERVER_IP=$DATASOURCE_MANAGER_INSTALL_IP
+# stopApp
+#
+# #linkis-ps-metadataquery
+# SERVER_NAME="ps-metadataquery"
+# SERVER_IP=$METADATA_QUERY_INSTALL_IP
+# stopApp
+#fi
#linkis-cg-engineconnmanager(ecm)
diff --git a/linkis-dist/src/main/assembly/distribution.xml b/linkis-dist/src/main/assembly/distribution.xml
index 38e3cc313..c35b34410 100644
--- a/linkis-dist/src/main/assembly/distribution.xml
+++ b/linkis-dist/src/main/assembly/distribution.xml
@@ -244,44 +244,6 @@
</includes>
</fileSet>
- <!--linkis-contextservice-->
- <fileSet>
- <directory>
- ../linkis-public-enhancements/linkis-context-service/linkis-cs-server/target/out/lib
- </directory>
- <outputDirectory>
- linkis-package/lib/linkis-public-enhancements/linkis-ps-cs
- </outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
-
- <!-- datasource manager -->
- <fileSet>
- <directory>
- ../linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/target/out/lib/
- </directory>
- <outputDirectory>
- linkis-package/lib/linkis-public-enhancements/linkis-ps-data-source-manager
- </outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <!-- metadata query -->
- <fileSet>
- <directory>
- ../linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/target/out/lib/
- </directory>
- <outputDirectory>
- linkis-package/lib/linkis-public-enhancements/linkis-ps-metadataquery
- </outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileSet>
-
</fileSets>
<dependencySets>
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/pom.xml b/linkis-public-enhancements/linkis-configuration/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/pom.xml
rename to linkis-public-enhancements/linkis-configuration/pom.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/LinkisConfigurationApp.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/LinkisConfigurationApp.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/LinkisConfigurationApp.java
rename to linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/LinkisConfigurationApp.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/ConfigMapper.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/ConfigMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/ConfigMapper.java
rename to linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/ConfigMapper.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/LabelMapper.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/LabelMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/LabelMapper.java
rename to linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/LabelMapper.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/ConfigMapper.xml b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/ConfigMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/ConfigMapper.xml
rename to linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/ConfigMapper.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/LabelMapper.xml b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/LabelMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/LabelMapper.xml
rename to linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/impl/LabelMapper.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/CategoryLabel.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/CategoryLabel.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/CategoryLabel.java
rename to linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/CategoryLabel.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/CategoryLabelVo.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/CategoryLabelVo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/CategoryLabelVo.java
rename to linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/CategoryLabelVo.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigKey.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigKey.java
rename to linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigKey.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigKeyValue.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigKeyValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigKeyValue.java
rename to linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigKeyValue.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigLabel.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigLabel.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigLabel.java
rename to linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigLabel.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigTree.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigTree.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigTree.java
rename to linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigTree.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigValue.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigValue.java
rename to linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigValue.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/exception/ConfigurationException.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/exception/ConfigurationException.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/exception/ConfigurationException.java
rename to linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/exception/ConfigurationException.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApi.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApi.java
rename to linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/ConfigKeyService.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/ConfigKeyService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/ConfigKeyService.java
rename to linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/ConfigKeyService.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/ConfigKeyServiceImpl.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/ConfigKeyServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/ConfigKeyServiceImpl.java
rename to linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/ConfigKeyServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/util/ConfigurationConfiguration.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/util/ConfigurationConfiguration.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/util/ConfigurationConfiguration.java
rename to linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/util/ConfigurationConfiguration.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/util/LabelEntityParser.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/util/LabelEntityParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/util/LabelEntityParser.java
rename to linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/util/LabelEntityParser.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/conf/Configuration.scala b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/conf/Configuration.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/conf/Configuration.scala
rename to linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/conf/Configuration.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/receiver/ConfigurationReceiver.scala b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/receiver/ConfigurationReceiver.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/receiver/ConfigurationReceiver.scala
rename to linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/receiver/ConfigurationReceiver.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/receiver/ConfigurationReceiverChooser.scala b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/receiver/ConfigurationReceiverChooser.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/receiver/ConfigurationReceiverChooser.scala
rename to linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/receiver/ConfigurationReceiverChooser.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/CategoryService.scala b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/CategoryService.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/CategoryService.scala
rename to linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/CategoryService.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala
rename to linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/util/JsonNodeUtil.scala b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/util/JsonNodeUtil.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/util/JsonNodeUtil.scala
rename to linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/util/JsonNodeUtil.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/util/LabelParameterParser.scala b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/util/LabelParameterParser.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/util/LabelParameterParser.scala
rename to linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/util/LabelParameterParser.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/ContainValidator.scala b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/ContainValidator.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/ContainValidator.scala
rename to linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/ContainValidator.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/FloatValidator.scala b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/FloatValidator.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/FloatValidator.scala
rename to linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/FloatValidator.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/JsonValidator.scala b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/JsonValidator.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/JsonValidator.scala
rename to linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/JsonValidator.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/NoneValidator.scala b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/NoneValidator.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/NoneValidator.scala
rename to linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/NoneValidator.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/NumericalValidator.scala b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/NumericalValidator.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/NumericalValidator.scala
rename to linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/NumericalValidator.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/OneOfValidator.scala b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/OneOfValidator.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/OneOfValidator.scala
rename to linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/OneOfValidator.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/RegexValidator.scala b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/RegexValidator.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/RegexValidator.scala
rename to linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/RegexValidator.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/Validator.scala b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/Validator.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/Validator.scala
rename to linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/Validator.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/ValidatorManager.scala b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/ValidatorManager.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/ValidatorManager.scala
rename to linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/ValidatorManager.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/ValidatorManagerImpl.scala b/linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/ValidatorManagerImpl.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/ValidatorManagerImpl.scala
rename to linkis-public-enhancements/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/ValidatorManagerImpl.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/Scan.java b/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/Scan.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/Scan.java
rename to linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/Scan.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/WebApplicationServer.java b/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/WebApplicationServer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/WebApplicationServer.java
rename to linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/WebApplicationServer.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/BaseDaoTest.java b/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/BaseDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/BaseDaoTest.java
rename to linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/BaseDaoTest.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/ConfigMapperTest.java b/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/ConfigMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/ConfigMapperTest.java
rename to linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/ConfigMapperTest.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/LabelMapperTest.java b/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/LabelMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/LabelMapperTest.java
rename to linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/LabelMapperTest.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/exception/ConfigurationExceptionTest.java b/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/exception/ConfigurationExceptionTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/exception/ConfigurationExceptionTest.java
rename to linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/exception/ConfigurationExceptionTest.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApiTest.java b/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApiTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApiTest.java
rename to linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApiTest.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/restful/api/MvcUtils.java b/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/restful/api/MvcUtils.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/restful/api/MvcUtils.java
rename to linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/restful/api/MvcUtils.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/util/ConfigurationConfigurationTest.java b/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/util/ConfigurationConfigurationTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/util/ConfigurationConfigurationTest.java
rename to linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/util/ConfigurationConfigurationTest.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/util/LabelEntityParserTest.java b/linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/util/LabelEntityParserTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/util/LabelEntityParserTest.java
rename to linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/util/LabelEntityParserTest.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/resources/application.properties b/linkis-public-enhancements/linkis-configuration/src/test/resources/application.properties
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/resources/application.properties
rename to linkis-public-enhancements/linkis-configuration/src/test/resources/application.properties
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/resources/create.sql b/linkis-public-enhancements/linkis-configuration/src/test/resources/create.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/resources/create.sql
rename to linkis-public-enhancements/linkis-configuration/src/test/resources/create.sql
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/resources/data.sql b/linkis-public-enhancements/linkis-configuration/src/test/resources/data.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/resources/data.sql
rename to linkis-public-enhancements/linkis-configuration/src/test/resources/data.sql
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/resources/linkis.properties b/linkis-public-enhancements/linkis-configuration/src/test/resources/linkis.properties
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/resources/linkis.properties
rename to linkis-public-enhancements/linkis-configuration/src/test/resources/linkis.properties
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/rpcTest.scala b/linkis-public-enhancements/linkis-configuration/src/test/rpcTest.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/rpcTest.scala
rename to linkis-public-enhancements/linkis-configuration/src/test/rpcTest.scala
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
index cc2e28b3d..1ad21288e 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
@@ -76,7 +76,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
- <version>3.1.1</version>
</dependency>
</dependencies>
diff --git a/linkis-public-enhancements/linkis-context-service/pom.xml b/linkis-public-enhancements/linkis-context-service/pom.xml
index 34d850672..f02447aa1 100644
--- a/linkis-public-enhancements/linkis-context-service/pom.xml
+++ b/linkis-public-enhancements/linkis-context-service/pom.xml
@@ -37,12 +37,4 @@
</modules>
- <dependencies>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-cs-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
</project>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml
index 6583a4c4d..75c91987c 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml
@@ -24,10 +24,6 @@
</parent>
<artifactId>linkis-metadata-query-server</artifactId>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<!--Metadata common-->
<dependency>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata/pom.xml
index 2cd8957e8..06ce4c425 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/pom.xml
@@ -75,50 +75,6 @@
</exclusion>
</exclusions>
</dependency>
- <!--<dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter</artifactId>
- <version>2.1.2</version>
- <exclusions>
- <exclusion>
- <artifactId>spring-boot-starter</artifactId>
- <groupId>org.springframework.boot</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-boot-autoconfigure</artifactId>
- <groupId>org.springframework.boot</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-beans</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>tomcat-juli</artifactId>
- <groupId>org.apache.tomcat</groupId>
- </exclusion>
- <exclusion>
- <artifactId>tomcat-jdbc</artifactId>
- <groupId>org.apache.tomcat</groupId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>spring-core</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-jdbc</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <artifactId>spring-jdbc</artifactId>
- <groupId>org.springframework</groupId>
- <version>${spring.version}</version>
- </dependency>-->
<dependency>
<groupId>com.alibaba</groupId>
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/pom.xml b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/pom.xml
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-client/pom.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/ClientConfiguration.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/ClientConfiguration.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/ClientConfiguration.java
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/ClientConfiguration.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilder.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilder.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilder.java
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilder.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClient.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClient.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClient.java
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClient.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandler.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandler.java
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandler.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/ExceptionErrorCodeHandler.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/ExceptionErrorCodeHandler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/ExceptionErrorCodeHandler.java
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/ExceptionErrorCodeHandler.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeFactory.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeFactory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeFactory.java
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeFactory.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogErrorCodeHandler.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogErrorCodeHandler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogErrorCodeHandler.java
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogErrorCodeHandler.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogFileErrorCodeHandler.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogFileErrorCodeHandler.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogFileErrorCodeHandler.java
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogFileErrorCodeHandler.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManager.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManager.java
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManager.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizer.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizer.java
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizer.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/utils/Test.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/utils/Test.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/utils/Test.java
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/utils/Test.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/action/ErrorCodeAction.scala b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/action/ErrorCodeAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/action/ErrorCodeAction.scala
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/action/ErrorCodeAction.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/result/ErrorCodeResult.scala b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/result/ErrorCodeResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/result/ErrorCodeResult.scala
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/result/ErrorCodeResult.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/utils/ErrorCodeMatcher.scala b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/utils/ErrorCodeMatcher.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/utils/ErrorCodeMatcher.scala
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/utils/ErrorCodeMatcher.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-common/pom.xml b/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-common/pom.xml
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-common/pom.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-common/src/main/java/org/apache/linkis/errorcode/common/CommonConf.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/java/org/apache/linkis/errorcode/common/CommonConf.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-common/src/main/java/org/apache/linkis/errorcode/common/CommonConf.java
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/java/org/apache/linkis/errorcode/common/CommonConf.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/AbstractErrorCode.scala b/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/AbstractErrorCode.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/AbstractErrorCode.scala
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/AbstractErrorCode.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/ErrorCode.scala b/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/ErrorCode.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/ErrorCode.scala
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/ErrorCode.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/LinkisErrorCode.scala b/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/LinkisErrorCode.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/LinkisErrorCode.scala
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/LinkisErrorCode.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-server/pom.xml b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-server/pom.xml
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-server/pom.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/ErrorCodeServer.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/ErrorCodeServer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/ErrorCodeServer.java
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/ErrorCodeServer.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/restful/LinkisErrorCodeRestful.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/restful/LinkisErrorCodeRestful.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/restful/LinkisErrorCodeRestful.java
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/restful/LinkisErrorCodeRestful.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/LinkisErrorCodeService.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/LinkisErrorCodeService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/LinkisErrorCodeService.java
rename to linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/LinkisErrorCodeService.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/impl/LinkisErrorCodeServiceImpl.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/impl/LinkisErrorCodeServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/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-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/impl/LinkisErrorCodeServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-error-code/pom.xml b/linkis-public-enhancements/linkis-error-code/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-error-code/pom.xml
rename to linkis-public-enhancements/linkis-error-code/pom.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-client/pom.xml b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-client/pom.xml
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/pom.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/EurekaInstanceLabelClient.scala b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/EurekaInstanceLabelClient.scala
similarity index 93%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/EurekaInstanceLabelClient.scala
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/EurekaInstanceLabelClient.scala
index e14fefd3e..91b7f262a 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/EurekaInstanceLabelClient.scala
+++ b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/EurekaInstanceLabelClient.scala
@@ -25,6 +25,7 @@ import org.apache.linkis.rpc.Sender
import org.apache.commons.lang3.StringUtils
import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.context.event.ApplicationStartedEvent
import org.springframework.cloud.client.serviceregistry.Registration
import org.springframework.context.event.{ContextClosedEvent, EventListener}
import org.springframework.stereotype.Component
@@ -39,8 +40,8 @@ class EurekaInstanceLabelClient extends Logging {
@Autowired
private var registration: Registration = _
- @PostConstruct
- def init(): Unit = {
+ @EventListener(Array(classOf[ApplicationStartedEvent]))
+ def init(applicationStartedEvent: ApplicationStartedEvent): Unit = {
logger.info("EurekaInstanceLabelClient init")
val metadata = registration.getMetadata
if (
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/InstanceLabelClient.scala b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/InstanceLabelClient.scala
similarity index 94%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/InstanceLabelClient.scala
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/InstanceLabelClient.scala
index 87efa503f..d1f17480f 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/InstanceLabelClient.scala
+++ b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/InstanceLabelClient.scala
@@ -19,7 +19,7 @@ package org.apache.linkis.instance.label.client
import org.apache.linkis.common.ServiceInstance
import org.apache.linkis.common.conf.CommonVars
-import org.apache.linkis.common.utils.{Logging, Utils}
+import org.apache.linkis.common.utils.{JsonUtils, Logging, Utils}
import org.apache.linkis.manager.label.builder.factory.LabelBuilderFactoryContext
import org.apache.linkis.manager.label.entity.Label
import org.apache.linkis.manager.label.utils.LabelUtils
@@ -92,8 +92,8 @@ class InstanceLabelClient extends Logging {
}
resp.getInsList
case o =>
- logger.error(s"Invalid resp : ${BDPJettyServerHelper.gson
- .toJson(o)} from request : ${BDPJettyServerHelper.gson.toJson(request)}")
+ logger.error(s"Invalid resp : ${JsonUtils.jackson
+ .writeValueAsString(o)} from request : ${BDPJettyServerHelper.gson.toJson(request)}")
new util.ArrayList[ServiceInstance]()
}
}
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/pom.xml b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/pom.xml
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/InsLabelAutoConfiguration.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/InsLabelAutoConfiguration.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/InsLabelAutoConfiguration.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/InsLabelAutoConfiguration.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/AsyncConsumerQueue.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/AsyncConsumerQueue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/AsyncConsumerQueue.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/AsyncConsumerQueue.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/GenericAsyncConsumerQueue.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/GenericAsyncConsumerQueue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/GenericAsyncConsumerQueue.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/GenericAsyncConsumerQueue.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/cache/InsLabelCacheConfiguration.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/cache/InsLabelCacheConfiguration.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/cache/InsLabelCacheConfiguration.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/cache/InsLabelCacheConfiguration.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/conf/InsLabelConf.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/conf/InsLabelConf.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/conf/InsLabelConf.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/conf/InsLabelConf.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InsLabelRelationDao.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InsLabelRelationDao.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InsLabelRelationDao.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InsLabelRelationDao.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceInfoDao.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceInfoDao.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceInfoDao.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceInfoDao.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceLabelDao.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceLabelDao.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceLabelDao.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceLabelDao.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InsLabelRelationMapper.xml b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InsLabelRelationMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InsLabelRelationMapper.xml
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InsLabelRelationMapper.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InstanceInfoMapper.xml b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InstanceInfoMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InstanceInfoMapper.xml
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InstanceInfoMapper.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InstanceLabelMapper.xml b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InstanceLabelMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InstanceLabelMapper.xml
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InstanceLabelMapper.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabel.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabel.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabel.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabel.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabelValue.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabelValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabelValue.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabelValue.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InstanceInfo.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InstanceInfo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InstanceInfo.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InstanceInfo.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/exception/InstanceErrorException.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/exception/InstanceErrorException.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/exception/InstanceErrorException.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/exception/InstanceErrorException.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelAccessService.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelAccessService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelAccessService.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelAccessService.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelService.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelService.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelService.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelServiceAdapter.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelServiceAdapter.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelServiceAdapter.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelServiceAdapter.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/annotation/AdapterMode.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/annotation/AdapterMode.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/annotation/AdapterMode.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/annotation/AdapterMode.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceAdapter.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceAdapter.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceAdapter.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceAdapter.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/EurekaInsLabelService.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/EurekaInsLabelService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/EurekaInsLabelService.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/EurekaInsLabelService.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/utils/EntityParser.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/utils/EntityParser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/utils/EntityParser.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/utils/EntityParser.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InsPersistenceLabelSearchVo.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InsPersistenceLabelSearchVo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InsPersistenceLabelSearchVo.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InsPersistenceLabelSearchVo.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InstanceInfoVo.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InstanceInfoVo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InstanceInfoVo.java
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InstanceInfoVo.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/InsLabelRpcService.scala b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/InsLabelRpcService.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/InsLabelRpcService.scala
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/InsLabelRpcService.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/conf/InstanceConfigration.scala b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/conf/InstanceConfigration.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/conf/InstanceConfigration.scala
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/conf/InstanceConfigration.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala
rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/pom.xml b/linkis-public-enhancements/linkis-jobhistory/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/pom.xml
rename to linkis-public-enhancements/linkis-jobhistory/pom.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/LinkisJobHistoryApp.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/LinkisJobHistoryApp.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/LinkisJobHistoryApp.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/LinkisJobHistoryApp.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/QueryCacheManager.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/QueryCacheManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/QueryCacheManager.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/QueryCacheManager.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/QueryCacheService.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/QueryCacheService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/QueryCacheService.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/QueryCacheService.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/domain/TaskResult.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/domain/TaskResult.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/domain/TaskResult.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/domain/TaskResult.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/DefaultQueryCacheManager.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/DefaultQueryCacheManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/DefaultQueryCacheManager.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/DefaultQueryCacheManager.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/QueryCacheServiceImpl.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/QueryCacheServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/QueryCacheServiceImpl.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/QueryCacheServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/ScheduledCleanJob.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/ScheduledCleanJob.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/ScheduledCleanJob.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/ScheduledCleanJob.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/ScheduledRefreshJob.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/ScheduledRefreshJob.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/ScheduledRefreshJob.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/ScheduledRefreshJob.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/ScheduledRefreshUndoneJob.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/ScheduledRefreshUndoneJob.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/ScheduledRefreshUndoneJob.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/ScheduledRefreshUndoneJob.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/UserTaskResultCache.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/UserTaskResultCache.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/UserTaskResultCache.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/UserTaskResultCache.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/utils/MD5Util.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/utils/MD5Util.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/utils/MD5Util.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/utils/MD5Util.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/JobDetailMapper.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/JobDetailMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/JobDetailMapper.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/JobDetailMapper.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/JobHistoryMapper.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/JobHistoryMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/JobHistoryMapper.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/JobHistoryMapper.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/impl/JobDetailMapper.xml b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/impl/JobDetailMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/impl/JobDetailMapper.xml
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/impl/JobDetailMapper.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/impl/JobHistoryMapper.xml b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/impl/JobHistoryMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/impl/JobHistoryMapper.xml
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/impl/JobHistoryMapper.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/JobDetail.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/JobDetail.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/JobDetail.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/JobDetail.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/JobHistory.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/JobHistory.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/JobHistory.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/JobHistory.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/QueryTask.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/QueryTask.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/QueryTask.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/QueryTask.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/QueryTaskVO.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/QueryTaskVO.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/QueryTaskVO.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/entity/QueryTaskVO.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/transitional/TaskStatus.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/transitional/TaskStatus.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/transitional/TaskStatus.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/transitional/TaskStatus.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/util/Constants.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/util/Constants.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/util/Constants.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/util/Constants.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conf/JobhistoryConfiguration.scala b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conf/JobhistoryConfiguration.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conf/JobhistoryConfiguration.scala
rename to linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conf/JobhistoryConfiguration.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conversions/TaskConversions.scala b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conversions/TaskConversions.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conversions/TaskConversions.scala
rename to linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conversions/TaskConversions.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/entity/QueryJobDetail.scala b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/entity/QueryJobDetail.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/entity/QueryJobDetail.scala
rename to linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/entity/QueryJobDetail.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/entity/QueryJobHistory.scala b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/entity/QueryJobHistory.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/entity/QueryJobHistory.scala
rename to linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/entity/QueryJobHistory.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/receiver/QueryReceiverChooser.scala b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/receiver/QueryReceiverChooser.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/receiver/QueryReceiverChooser.scala
rename to linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/receiver/QueryReceiverChooser.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/JobHistoryDetailQueryService.java b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/JobHistoryDetailQueryService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/JobHistoryDetailQueryService.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/JobHistoryDetailQueryService.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/JobHistoryQueryService.java b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/JobHistoryQueryService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/JobHistoryQueryService.java
rename to linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/JobHistoryQueryService.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryDetailQueryServiceImpl.scala b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryDetailQueryServiceImpl.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryDetailQueryServiceImpl.scala
rename to linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryDetailQueryServiceImpl.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala
rename to linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/util/QueryConfig.scala b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/util/QueryConfig.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/util/QueryConfig.scala
rename to linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/util/QueryConfig.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/util/QueryUtils.scala b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/util/QueryUtils.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/util/QueryUtils.scala
rename to linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/util/QueryUtils.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/Scan.java b/linkis-public-enhancements/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/Scan.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/Scan.java
rename to linkis-public-enhancements/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/Scan.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/WebApplicationServer.java b/linkis-public-enhancements/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/WebApplicationServer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/WebApplicationServer.java
rename to linkis-public-enhancements/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/WebApplicationServer.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/dao/BaseDaoTest.java b/linkis-public-enhancements/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/dao/BaseDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/dao/BaseDaoTest.java
rename to linkis-public-enhancements/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/dao/BaseDaoTest.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/dao/JobDetailMapperTest.java b/linkis-public-enhancements/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/dao/JobDetailMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/dao/JobDetailMapperTest.java
rename to linkis-public-enhancements/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/dao/JobDetailMapperTest.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/entity/JobHistoryTest.java b/linkis-public-enhancements/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/entity/JobHistoryTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/entity/JobHistoryTest.java
rename to linkis-public-enhancements/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/entity/JobHistoryTest.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApiTest.java b/linkis-public-enhancements/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApiTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApiTest.java
rename to linkis-public-enhancements/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApiTest.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/service/JobHistoryDetailQueryServiceTest.java b/linkis-public-enhancements/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/service/JobHistoryDetailQueryServiceTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/service/JobHistoryDetailQueryServiceTest.java
rename to linkis-public-enhancements/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/service/JobHistoryDetailQueryServiceTest.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/resources/application.properties b/linkis-public-enhancements/linkis-jobhistory/src/test/resources/application.properties
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/resources/application.properties
rename to linkis-public-enhancements/linkis-jobhistory/src/test/resources/application.properties
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/resources/create.sql b/linkis-public-enhancements/linkis-jobhistory/src/test/resources/create.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/resources/create.sql
rename to linkis-public-enhancements/linkis-jobhistory/src/test/resources/create.sql
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/resources/linkis.properties b/linkis-public-enhancements/linkis-jobhistory/src/test/resources/linkis.properties
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/resources/linkis.properties
rename to linkis-public-enhancements/linkis-jobhistory/src/test/resources/linkis.properties
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-ps-common-lock/pom.xml b/linkis-public-enhancements/linkis-ps-common-lock/pom.xml
similarity index 98%
rename from linkis-public-enhancements/linkis-publicservice/linkis-ps-common-lock/pom.xml
rename to linkis-public-enhancements/linkis-ps-common-lock/pom.xml
index 425763f8d..e7c34e5d5 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-ps-common-lock/pom.xml
+++ b/linkis-public-enhancements/linkis-ps-common-lock/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.linkis</groupId>
<artifactId>linkis</artifactId>
<version>1.2.0</version>
- <!--<relativePath>../pom.xml</relativePath>-->
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>linkis-ps-common-lock</artifactId>
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/CommonLockSpringConfiguration.java b/linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/CommonLockSpringConfiguration.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/CommonLockSpringConfiguration.java
rename to linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/CommonLockSpringConfiguration.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/dao/CommonLockMapper.java b/linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/dao/CommonLockMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/dao/CommonLockMapper.java
rename to linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/dao/CommonLockMapper.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/entity/CommonLock.java b/linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/entity/CommonLock.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/entity/CommonLock.java
rename to linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/entity/CommonLock.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/service/CommonLockService.java b/linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/service/CommonLockService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/service/CommonLockService.java
rename to linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/service/CommonLockService.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/service/impl/DefaultCommonLockService.java b/linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/service/impl/DefaultCommonLockService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/service/impl/DefaultCommonLockService.java
rename to linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/service/impl/DefaultCommonLockService.java
diff --git a/linkis-public-enhancements/linkis-publicservice/pom.xml b/linkis-public-enhancements/linkis-publicservice/pom.xml
deleted file mode 100644
index 93d1a9efb..000000000
--- a/linkis-public-enhancements/linkis-publicservice/pom.xml
+++ /dev/null
@@ -1,109 +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>1.2.0</version>
- </parent>
-
- <artifactId>linkis-publicservice</artifactId>
- <packaging>pom</packaging>
- <modules>
- <module>linkis-udf/linkis-udf-client</module>
- <module>linkis-udf/linkis-udf-common</module>
- <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-client</module>
- <module>linkis-instance-label/linkis-instance-label-server</module>
- <module>linkis-script-dev/linkis-storage-script-dev-client</module>
- <module>linkis-script-dev/linkis-storage-script-dev-server</module>
-
- <module>linkis-error-code</module>
- <module>linkis-ps-common-lock</module>
-
- </modules>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-configuration</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-instance-label-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-jobhistory</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-udf-service</artifactId>
- <version>${project.version}</version>
- </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>
-
- </dependencies>
- <build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
-
- </plugins>
- </build>
-
-</project>
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/pom.xml b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/pom.xml
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/pom.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientFactory.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientFactory.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientFactory.scala
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientFactory.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientImpl.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientImpl.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientImpl.scala
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientImpl.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLAction.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLAction.scala
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLAction.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/action/WorkspacePOSTAction.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/action/WorkspacePOSTAction.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/action/WorkspacePOSTAction.scala
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/action/WorkspacePOSTAction.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConf.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConf.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConf.scala
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConf.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceClient.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceClient.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceClient.scala
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceClient.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceHttpConf.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceHttpConf.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceHttpConf.scala
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceHttpConf.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponse.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponse.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponse.scala
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponse.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/response/WorkspaceResponse.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/response/WorkspaceResponse.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/response/WorkspaceResponse.scala
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/response/WorkspaceResponse.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/AbstractWorkspaceResult.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/AbstractWorkspaceResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/AbstractWorkspaceResult.scala
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/AbstractWorkspaceResult.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptFromBMLResult.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptFromBMLResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptFromBMLResult.scala
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptFromBMLResult.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptToBMLResult.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptToBMLResult.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptToBMLResult.scala
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptToBMLResult.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/pom.xml b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/pom.xml
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/pom.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/LinkisPublicServiceApp.java b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/LinkisPublicServiceApp.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/LinkisPublicServiceApp.java
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/LinkisPublicServiceApp.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/conf/WorkSpaceConfiguration.java b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/conf/WorkSpaceConfiguration.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/conf/WorkSpaceConfiguration.java
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/conf/WorkSpaceConfiguration.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/constant/WorkSpaceConstants.java b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/constant/WorkSpaceConstants.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/constant/WorkSpaceConstants.java
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/constant/WorkSpaceConstants.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/DirFileTree.java b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/DirFileTree.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/DirFileTree.java
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/DirFileTree.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/LogLevel.java b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/LogLevel.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/LogLevel.java
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/LogLevel.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkSpaceException.java b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkSpaceException.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkSpaceException.java
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkSpaceException.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManager.java b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManager.java
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManager.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApi.java b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/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-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/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-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/util/WorkspaceUtil.java b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/util/WorkspaceUtil.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/util/WorkspaceUtil.java
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/util/WorkspaceUtil.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/resources/application.yml b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/resources/application.yml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/resources/application.yml
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/resources/application.yml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/bml/BMLHelper.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/bml/BMLHelper.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/bml/BMLHelper.scala
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/bml/BMLHelper.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/cache/FsCache.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/cache/FsCache.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/cache/FsCache.scala
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/cache/FsCache.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceSpringConfiguration.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceSpringConfiguration.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceSpringConfiguration.scala
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceSpringConfiguration.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/entity/FSInfo.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/entity/FSInfo.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/entity/FSInfo.scala
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/entity/FSInfo.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/quartz/FSQuartz.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/quartz/FSQuartz.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/quartz/FSQuartz.scala
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/quartz/FSQuartz.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/service/FsService.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/service/FsService.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/service/FsService.scala
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/service/FsService.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala
rename to linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-client/pom.xml b/linkis-public-enhancements/linkis-udf/linkis-udf-client/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-client/pom.xml
rename to linkis-public-enhancements/linkis-udf/linkis-udf-client/pom.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-client/src/main/scala/org/apache/linkis/udf/UDFClient.scala b/linkis-public-enhancements/linkis-udf/linkis-udf-client/src/main/scala/org/apache/linkis/udf/UDFClient.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-client/src/main/scala/org/apache/linkis/udf/UDFClient.scala
rename to linkis-public-enhancements/linkis-udf/linkis-udf-client/src/main/scala/org/apache/linkis/udf/UDFClient.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-client/src/main/scala/org/apache/linkis/udf/UDFClientConfiguration.scala b/linkis-public-enhancements/linkis-udf/linkis-udf-client/src/main/scala/org/apache/linkis/udf/UDFClientConfiguration.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-client/src/main/scala/org/apache/linkis/udf/UDFClientConfiguration.scala
rename to linkis-public-enhancements/linkis-udf/linkis-udf-client/src/main/scala/org/apache/linkis/udf/UDFClientConfiguration.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/pom.xml b/linkis-public-enhancements/linkis-udf/linkis-udf-common/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/pom.xml
rename to linkis-public-enhancements/linkis-udf/linkis-udf-common/pom.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFInfo.java b/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFInfo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFInfo.java
rename to linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFInfo.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFManager.java b/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFManager.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFManager.java
rename to linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFManager.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFTree.java b/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFTree.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFTree.java
rename to linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFTree.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFVersion.java b/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFVersion.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFVersion.java
rename to linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFVersion.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/excepiton/UDFException.java b/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/excepiton/UDFException.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/excepiton/UDFException.java
rename to linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/excepiton/UDFException.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/utils/ConstantVar.java b/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/utils/ConstantVar.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/utils/ConstantVar.java
rename to linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/utils/ConstantVar.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/DownloadVo.java b/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/DownloadVo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/DownloadVo.java
rename to linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/DownloadVo.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFAddVo.java b/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFAddVo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFAddVo.java
rename to linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFAddVo.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFInfoVo.java b/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFInfoVo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFInfoVo.java
rename to linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFInfoVo.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFUpdateVo.java b/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFUpdateVo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFUpdateVo.java
rename to linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFUpdateVo.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFVersionVo.java b/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFVersionVo.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFVersionVo.java
rename to linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFVersionVo.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfTree.scala b/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfTree.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfTree.scala
rename to linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfTree.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfTree.scala b/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfTree.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfTree.scala
rename to linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfTree.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/pom.xml b/linkis-public-enhancements/linkis-udf/linkis-udf-service/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/pom.xml
rename to linkis-public-enhancements/linkis-udf/linkis-udf-service/pom.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java
rename to linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFDao.java b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFDao.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFDao.java
rename to linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFDao.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFTreeDao.java b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFTreeDao.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFTreeDao.java
rename to linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFTreeDao.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFVersionDao.java b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFVersionDao.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFVersionDao.java
rename to linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFVersionDao.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFDao.xml b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFDao.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFDao.xml
rename to linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFDao.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFTreeDao.xml b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFTreeDao.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFTreeDao.xml
rename to linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFTreeDao.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFVersionDao.xml b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFVersionDao.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFVersionDao.xml
rename to linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/impl/UDFVersionDao.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFService.java b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFService.java
rename to linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFService.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFTreeService.java b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFTreeService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFTreeService.java
rename to linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFTreeService.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java
rename to linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFTreeServiceImpl.java b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFTreeServiceImpl.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFTreeServiceImpl.java
rename to linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFTreeServiceImpl.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiver.scala b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiver.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiver.scala
rename to linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiver.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiverChooser.scala b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiverChooser.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiverChooser.scala
rename to linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiverChooser.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/utils/UdfConfiguration.scala b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/utils/UdfConfiguration.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/utils/UdfConfiguration.scala
rename to linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/utils/UdfConfiguration.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/pom.xml b/linkis-public-enhancements/linkis-variable/pom.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/pom.xml
rename to linkis-public-enhancements/linkis-variable/pom.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/dao/VarMapper.java b/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/dao/VarMapper.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/dao/VarMapper.java
rename to linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/dao/VarMapper.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/dao/impl/VarMapper.xml b/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/dao/impl/VarMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/dao/impl/VarMapper.xml
rename to linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/dao/impl/VarMapper.xml
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKey.java b/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKey.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKey.java
rename to linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKey.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyAndValue.java b/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyAndValue.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyAndValue.java
rename to linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyAndValue.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyUser.java b/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyUser.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyUser.java
rename to linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyUser.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyValueVO.java b/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyValueVO.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyValueVO.java
rename to linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarKeyValueVO.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarTree.java b/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarTree.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarTree.java
rename to linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/entity/VarTree.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/exception/VariableException.java b/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/exception/VariableException.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/exception/VariableException.java
rename to linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/exception/VariableException.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/restful/api/VariableRestfulApi.java b/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/restful/api/VariableRestfulApi.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/restful/api/VariableRestfulApi.java
rename to linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/restful/api/VariableRestfulApi.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/service/VariableService.java b/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/service/VariableService.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/service/VariableService.java
rename to linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/service/VariableService.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/util/Constants.java b/linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/util/Constants.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/java/org/apache/linkis/variable/util/Constants.java
rename to linkis-public-enhancements/linkis-variable/src/main/java/org/apache/linkis/variable/util/Constants.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/scala/org/apache/linkis/variable/receiver/VariableReceiver.scala b/linkis-public-enhancements/linkis-variable/src/main/scala/org/apache/linkis/variable/receiver/VariableReceiver.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/scala/org/apache/linkis/variable/receiver/VariableReceiver.scala
rename to linkis-public-enhancements/linkis-variable/src/main/scala/org/apache/linkis/variable/receiver/VariableReceiver.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/scala/org/apache/linkis/variable/receiver/VariableReceiverChooser.scala b/linkis-public-enhancements/linkis-variable/src/main/scala/org/apache/linkis/variable/receiver/VariableReceiverChooser.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/scala/org/apache/linkis/variable/receiver/VariableReceiverChooser.scala
rename to linkis-public-enhancements/linkis-variable/src/main/scala/org/apache/linkis/variable/receiver/VariableReceiverChooser.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/scala/org/apache/linkis/variable/service/VariableServiceImpl.scala b/linkis-public-enhancements/linkis-variable/src/main/scala/org/apache/linkis/variable/service/VariableServiceImpl.scala
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/scala/org/apache/linkis/variable/service/VariableServiceImpl.scala
rename to linkis-public-enhancements/linkis-variable/src/main/scala/org/apache/linkis/variable/service/VariableServiceImpl.scala
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/java/org/apache/linkis/variable/Scan.java b/linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/Scan.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/java/org/apache/linkis/variable/Scan.java
rename to linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/Scan.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/java/org/apache/linkis/variable/WebApplicationServer.java b/linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/WebApplicationServer.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/java/org/apache/linkis/variable/WebApplicationServer.java
rename to linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/WebApplicationServer.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/java/org/apache/linkis/variable/dao/BaseDaoTest.java b/linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/dao/BaseDaoTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/java/org/apache/linkis/variable/dao/BaseDaoTest.java
rename to linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/dao/BaseDaoTest.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/java/org/apache/linkis/variable/dao/VarMapperTest.java b/linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/dao/VarMapperTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/java/org/apache/linkis/variable/dao/VarMapperTest.java
rename to linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/dao/VarMapperTest.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/java/org/apache/linkis/variable/service/VariableServiceTest.java b/linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/service/VariableServiceTest.java
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/java/org/apache/linkis/variable/service/VariableServiceTest.java
rename to linkis-public-enhancements/linkis-variable/src/test/java/org/apache/linkis/variable/service/VariableServiceTest.java
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/resources/application.properties b/linkis-public-enhancements/linkis-variable/src/test/resources/application.properties
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/resources/application.properties
rename to linkis-public-enhancements/linkis-variable/src/test/resources/application.properties
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/resources/create.sql b/linkis-public-enhancements/linkis-variable/src/test/resources/create.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/resources/create.sql
rename to linkis-public-enhancements/linkis-variable/src/test/resources/create.sql
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/resources/data.sql b/linkis-public-enhancements/linkis-variable/src/test/resources/data.sql
similarity index 100%
rename from linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/resources/data.sql
rename to linkis-public-enhancements/linkis-variable/src/test/resources/data.sql
diff --git a/linkis-public-enhancements/pom.xml b/linkis-public-enhancements/pom.xml
index 7c70b596d..bf948fedd 100644
--- a/linkis-public-enhancements/pom.xml
+++ b/linkis-public-enhancements/pom.xml
@@ -32,15 +32,41 @@
<module>linkis-context-service</module>
<module>linkis-datasource/linkis-metadata</module>
<module>linkis-datasource</module>
- <module>linkis-publicservice</module>
+ <module>linkis-udf/linkis-udf-client</module>
+ <module>linkis-udf/linkis-udf-common</module>
+ <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-client</module>
+ <module>linkis-instance-label/linkis-instance-label-server</module>
+ <module>linkis-script-dev/linkis-storage-script-dev-client</module>
+ <module>linkis-script-dev/linkis-storage-script-dev-server</module>
+ <module>linkis-error-code</module>
+ <module>linkis-ps-common-lock</module>
</modules>
<dependencies>
+ <dependency>
+ <groupId>org.apache.linkis</groupId>
+ <artifactId>linkis-cs-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.linkis</groupId>
+ <artifactId>linkis-datasource-manager-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-metadata</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.linkis</groupId>
+ <artifactId>linkis-metadata-query-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-bmlserver</artifactId>
@@ -48,11 +74,39 @@
</dependency>
<dependency>
<groupId>org.apache.linkis</groupId>
- <artifactId>linkis-publicservice</artifactId>
+ <artifactId>linkis-configuration</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.linkis</groupId>
+ <artifactId>linkis-instance-label-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.linkis</groupId>
+ <artifactId>linkis-jobhistory</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.linkis</groupId>
+ <artifactId>linkis-udf-service</artifactId>
+ <version>${project.version}</version>
+ </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>
- <type>pom</type>
</dependency>
-
</dependencies>
<build>
@@ -67,7 +121,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 6afc216bf..217161d27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,6 +125,7 @@
<commons-lang.version>2.6</commons-lang.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<commons-text.version>1.9</commons-text.version>
+ <commons-math3.version>3.6.1</commons-math3.version>
<commons-io.version>2.11.0</commons-io.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-compress.version>1.21</commons-compress.version>
@@ -290,6 +291,11 @@
<artifactId>commons-text</artifactId>
<version>${commons-text.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ <version>${commons-math3.version}</version>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 04/09: fix: remove the useless linkis-start-all.sh and linkis-stop-all.sh's service
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit c24a506747dad7f6f26b336ca4e3ddb5fc09e259
Author: Jack Xu <xu...@126.com>
AuthorDate: Mon Aug 22 22:35:09 2022 +0800
fix: remove the useless linkis-start-all.sh and linkis-stop-all.sh's service
---
linkis-dist/package/sbin/linkis-start-all.sh | 39 ----------------------------
linkis-dist/package/sbin/linkis-stop-all.sh | 22 ----------------
2 files changed, 61 deletions(-)
diff --git a/linkis-dist/package/sbin/linkis-start-all.sh b/linkis-dist/package/sbin/linkis-start-all.sh
index 270ffe57f..7f83581f1 100644
--- a/linkis-dist/package/sbin/linkis-start-all.sh
+++ b/linkis-dist/package/sbin/linkis-start-all.sh
@@ -77,23 +77,13 @@ SERVER_NAME="ps-publicservice"
SERVER_IP=$PUBLICSERVICE_INSTALL_IP
startApp
-
-
-
#linkis-cg-linkismanage
SERVER_NAME="cg-linkismanager"
SERVER_IP=$MANAGER_INSTALL_IP
startApp
-
sleep 15
-#linkis-ps-cs
-#SERVER_NAME="ps-cs"
-#SERVER_IP=$CS_INSTALL_IP
-#startApp
-
-
#linkis-cg-entrance
SERVER_NAME="cg-entrance"
SERVER_IP=$ENTRANCE_INSTALL_IP
@@ -109,18 +99,6 @@ SERVER_NAME="cg-engineplugin"
SERVER_IP=$ENGINECONN_PLUGIN_SERVER_INSTALL_IP
startApp
-#if [ "$ENABLE_METADATA_QUERY" == "true" ]; then
-# #linkis-ps-data-source-manager
-# SERVER_NAME="ps-data-source-manager"
-# SERVER_IP=$DATASOURCE_MANAGER_INSTALL_IP
-# startApp
-#
-# #linkis-ps-metadataquery
-# SERVER_NAME="ps-metadataquery"
-# SERVER_IP=$METADATA_QUERY_INSTALL_IP
-# startApp
-#fi
-
echo "start-all shell script executed completely"
echo "Start to check all linkis microservice"
@@ -167,11 +145,6 @@ SERVER_NAME="ps-publicservice"
SERVER_IP=$PUBLICSERVICE_INSTALL_IP
checkServer
-#linkis-ps-cs
-#SERVER_NAME="ps-cs"
-#SERVER_IP=$CS_INSTALL_IP
-#checkServer
-
#linkis-cg-linkismanager
SERVER_NAME="cg-linkismanager"
SERVER_IP=$MANAGER_INSTALL_IP
@@ -193,16 +166,4 @@ SERVER_NAME="cg-engineplugin"
SERVER_IP=$ENGINECONN_PLUGIN_SERVER_INSTALL_IP
checkServer
-#if [ "$ENABLE_METADATA_QUERY" == "true" ]; then
-# #linkis-ps-data-source-manager
-# SERVER_NAME="ps-data-source-manager"
-# SERVER_IP=$DATASOURCE_MANAGER_INSTALL_IP
-# checkServer
-#
-# #linkis-ps-metadataquery
-# SERVER_NAME="ps-metadataquery"
-# SERVER_IP=$METADATA_QUERY_INSTALL_IP
-# checkServer
-#fi
-
echo "Linkis started successfully"
diff --git a/linkis-dist/package/sbin/linkis-stop-all.sh b/linkis-dist/package/sbin/linkis-stop-all.sh
index c26a262a5..baa93dd85 100644
--- a/linkis-dist/package/sbin/linkis-stop-all.sh
+++ b/linkis-dist/package/sbin/linkis-stop-all.sh
@@ -40,7 +40,6 @@ if [ "$LINKIS_CONF_DIR" = "" ]; then
fi
source $LINKIS_CONF_DIR/linkis-env.sh
-
function stopApp(){
echo "<-------------------------------->"
echo "Begin to stop $SERVER_NAME"
@@ -55,37 +54,16 @@ executeCMD $SERVER_IP "$SERVER_STOP_CMD"
echo "<-------------------------------->"
}
-
-
#linkis-mg-gateway
SERVER_NAME="mg-gateway"
SERVER_IP=$GATEWAY_INSTALL_IP
stopApp
-#linkis-ps-cs
-#SERVER_NAME="ps-cs"
-#SERVER_IP=$CS_INSTALL_IP
-#stopApp
-
-#if [ "$ENABLE_METADATA_QUERY" == "true" ]; then
-# #linkis-ps-data-source-manager
-# SERVER_NAME="ps-data-source-manager"
-# SERVER_IP=$DATASOURCE_MANAGER_INSTALL_IP
-# stopApp
-#
-# #linkis-ps-metadataquery
-# SERVER_NAME="ps-metadataquery"
-# SERVER_IP=$METADATA_QUERY_INSTALL_IP
-# stopApp
-#fi
-
-
#linkis-cg-engineconnmanager(ecm)
SERVER_NAME="cg-engineconnmanager"
SERVER_IP=$ENGINECONNMANAGER_INSTALL_IP
stopApp
-
#linkis-cg-entrance
SERVER_NAME="cg-entrance"
SERVER_IP=$ENTRANCE_INSTALL_IP
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 03/09: fix: unify commons-math3 dependency, fix dependencies
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 7dd3a59d90f718cde43799e2d8577bf03af6c638
Author: Jack Xu <xu...@126.com>
AuthorDate: Mon Aug 22 19:04:50 2022 +0800
fix: unify commons-math3 dependency, fix dependencies
---
tool/dependencies/known-dependencies.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tool/dependencies/known-dependencies.txt b/tool/dependencies/known-dependencies.txt
index 5a8919636..842bee07c 100644
--- a/tool/dependencies/known-dependencies.txt
+++ b/tool/dependencies/known-dependencies.txt
@@ -72,8 +72,7 @@ commons-lang-2.6.jar
commons-lang3-3.12.0.jar
commons-logging-1.2.jar
commons-math-2.2.jar
-commons-math3-3.1.1.jar
-commons-math3-3.5.jar
+commons-math3-3.6.1.jar
commons-net-3.1.jar
commons-pool-1.6.jar
commons-text-1.9.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 07/09: fix: fix duplicate declaration of some jars
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 93800444bb4c3edf23dc99abcc972443d06a7b1d
Author: Jack Xu <xu...@126.com>
AuthorDate: Wed Aug 24 20:53:24 2022 +0800
fix: fix duplicate declaration of some jars
---
.../linkis-application-manager/pom.xml | 20 --------------------
linkis-engineconn-plugins/flink/pom.xml | 1 -
linkis-engineconn-plugins/python/pom.xml | 1 -
linkis-engineconn-plugins/shell/pom.xml | 9 +--------
linkis-engineconn-plugins/spark/pom.xml | 2 --
linkis-engineconn-plugins/sqoop/pom.xml | 7 -------
.../gateway/ujes/route/HaContextGatewayRouter.scala | 17 +++++++++++------
pom.xml | 19 ++++++++++++++-----
8 files changed, 26 insertions(+), 50 deletions(-)
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml b/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml
index 9e2d28fe5..093176a4f 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml
@@ -87,26 +87,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-engineconn-plugin-core</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-executor-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis-engineconn-common</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
</dependencies>
<build>
diff --git a/linkis-engineconn-plugins/flink/pom.xml b/linkis-engineconn-plugins/flink/pom.xml
index 4bfdf897e..6cd5cb394 100644
--- a/linkis-engineconn-plugins/flink/pom.xml
+++ b/linkis-engineconn-plugins/flink/pom.xml
@@ -389,7 +389,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
- <version>1.3</version>
</dependency>
<dependency>
diff --git a/linkis-engineconn-plugins/python/pom.xml b/linkis-engineconn-plugins/python/pom.xml
index 0be87249f..068ecd5b7 100644
--- a/linkis-engineconn-plugins/python/pom.xml
+++ b/linkis-engineconn-plugins/python/pom.xml
@@ -33,7 +33,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
- <version>1.3</version>
</dependency>
<dependency>
diff --git a/linkis-engineconn-plugins/shell/pom.xml b/linkis-engineconn-plugins/shell/pom.xml
index 9078b34d7..4096d8e6b 100755
--- a/linkis-engineconn-plugins/shell/pom.xml
+++ b/linkis-engineconn-plugins/shell/pom.xml
@@ -33,8 +33,8 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
- <version>1.3</version>
</dependency>
+
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-engineconn-plugin-core</artifactId>
@@ -75,13 +75,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-exec</artifactId>
- <version>1.3</version>
-
- </dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
diff --git a/linkis-engineconn-plugins/spark/pom.xml b/linkis-engineconn-plugins/spark/pom.xml
index 14afae034..f8deb8ec2 100644
--- a/linkis-engineconn-plugins/spark/pom.xml
+++ b/linkis-engineconn-plugins/spark/pom.xml
@@ -137,8 +137,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
- <version>1.3</version>
-
</dependency>
<dependency>
diff --git a/linkis-engineconn-plugins/sqoop/pom.xml b/linkis-engineconn-plugins/sqoop/pom.xml
index 0221d8477..60afdca33 100644
--- a/linkis-engineconn-plugins/sqoop/pom.xml
+++ b/linkis-engineconn-plugins/sqoop/pom.xml
@@ -34,7 +34,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
- <version>1.3</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -43,12 +42,6 @@
<version>${sqoop.version}</version>
<classifier>hadoop200</classifier>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-exec</artifactId>
- <version>1.3</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala
index 89de5e0c7..f7c526dbb 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala
@@ -156,16 +156,21 @@ class HaContextGatewayRouter extends AbstractGatewayRouter {
}
object HaContextGatewayRouter {
- val CONTEXT_ID_STR: String = "contextId"
- val CONTEXT_SERVICE_NAME: String = if (RPCConfiguration.ENABLE_PUBLIC_SERVICE.getValue) {
- RPCConfiguration.PUBLIC_SERVICE_APPLICATION_NAME.getValue
- } else {
- RPCConfiguration.CONTEXT_SERVICE_APPLICATION_NAME.getValue
- }
+ val CONTEXT_ID_STR: String = "contextId"
val CONTEXT_SERVICE_REQUEST_PREFIX = "contextservice"
+ val CONTEXT_SERVICE_NAME: String =
+ if (
+ RPCConfiguration.ENABLE_PUBLIC_SERVICE.getValue && RPCConfiguration.PUBLIC_SERVICE_LIST
+ .exists(_.equalsIgnoreCase(CONTEXT_SERVICE_REQUEST_PREFIX))
+ ) {
+ RPCConfiguration.PUBLIC_SERVICE_APPLICATION_NAME.getValue
+ } else {
+ RPCConfiguration.CONTEXT_SERVICE_APPLICATION_NAME.getValue
+ }
+
val CONTEXT_REGEX: Regex =
(normalPath(API_URL_PREFIX) + "rest_[a-zA-Z][a-zA-Z_0-9]*/(v\\d+)/contextservice/" + ".+").r
diff --git a/pom.xml b/pom.xml
index 217161d27..8cdf524cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,6 +130,7 @@
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-compress.version>1.21</commons-compress.version>
<commons-configuration.version>1.10</commons-configuration.version>
+ <commons-exec.version>1.3</commons-exec.version>
<protobuf.version>3.15.8</protobuf.version>
<cglib.version>3.3.0</cglib.version>
<asm-bom.version>9.3</asm-bom.version>
@@ -271,6 +272,13 @@
<artifactId>ant-launcher</artifactId>
<version>${ant.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ <version>${reflections.version}</version>
+ </dependency>
+
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -311,16 +319,17 @@
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
</dependency>
- <dependency>
- <groupId>org.reflections</groupId>
- <artifactId>reflections</artifactId>
- <version>${reflections.version}</version>
- </dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>${commons-configuration.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-exec</artifactId>
+ <version>${commons-exec.version}</version>
+ </dependency>
+
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 05/09: fix: fix the HaContextGatewayRouter for ps-cs service
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit a8f79ad90056694f86a9e566d9f0da3c82f993af
Author: Jack Xu <xu...@126.com>
AuthorDate: Tue Aug 23 22:34:13 2022 +0800
fix: fix the HaContextGatewayRouter for ps-cs service
---
linkis-dist/package/conf/linkis-ps-cs.properties | 28 ----------------
.../conf/linkis-ps-data-source-manager.properties | 37 ----------------------
.../conf/linkis-ps-metadataquery.properties | 21 ------------
linkis-dist/package/sbin/ext/linkis-ps-cs | 33 -------------------
.../package/sbin/ext/linkis-ps-data-source-manager | 35 --------------------
.../package/sbin/ext/linkis-ps-metadataquery | 33 -------------------
.../ujes/route/HaContextGatewayRouter.scala | 28 ++++++++--------
7 files changed, 13 insertions(+), 202 deletions(-)
diff --git a/linkis-dist/package/conf/linkis-ps-cs.properties b/linkis-dist/package/conf/linkis-ps-cs.properties
deleted file mode 100644
index f5526de38..000000000
--- a/linkis-dist/package/conf/linkis-ps-cs.properties
+++ /dev/null
@@ -1,28 +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.
-#
-
-#
-##restful
-wds.linkis.server.restful.scan.packages=org.apache.linkis.cs.server.restful
-##mybatis
-wds.linkis.server.mybatis.mapperLocations=classpath*:org/apache/linkis/cs/persistence/dao/impl/*.xml
-wds.linkis.server.mybatis.typeAliasesPackage=org.apache.linkis.cs.persistence.entity
-wds.linkis.server.mybatis.BasePackage=org.apache.linkis.cs.persistence.dao
-##Spring
-spring.server.port=9108
-# ps-cs prefix must be started with 'cs_'
-spring.eureka.instance.metadata-map.route=cs_1_dev
-wds.linkis.cs.deserialize.replace_package_header.enable=false
-
diff --git a/linkis-dist/package/conf/linkis-ps-data-source-manager.properties b/linkis-dist/package/conf/linkis-ps-data-source-manager.properties
deleted file mode 100644
index b4f0d634b..000000000
--- a/linkis-dist/package/conf/linkis-ps-data-source-manager.properties
+++ /dev/null
@@ -1,37 +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.
-#
-
-##restful
-wds.linkis.server.restful.scan.packages=org.apache.linkis.datasourcemanager.core.restful
-
-##mybatis
-wds.linkis.server.mybatis.mapperLocations=classpath:org/apache/linkis/datasourcemanager/core/dao/mapper/*.xml
-
-wds.linkis.server.mybatis.typeAliasesPackage=org.apache.linkis.datasourcemanager.common.domain,org.apache.linkis.datasourcemanager.core.vo
-
-wds.linkis.server.mybatis.BasePackage=org.apache.linkis.datasourcemanager.core.dao
-
-
-##hive meta
-hive.meta.url=
-hive.meta.user=
-hive.meta.password=
-wds.linkis.metadata.hive.encode.enabled=false
-
-##Spring
-spring.server.port=9109
-spring.spring.main.allow-bean-definition-overriding=true
-spring.spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=false
-spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=false
diff --git a/linkis-dist/package/conf/linkis-ps-metadataquery.properties b/linkis-dist/package/conf/linkis-ps-metadataquery.properties
deleted file mode 100644
index 02450d77b..000000000
--- a/linkis-dist/package/conf/linkis-ps-metadataquery.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.server.mdm.service.instance.expire-in-seconds=1800
-wds.linkis.server.restful.scan.packages=org.apache.linkis.metadata.query.server.restful
-
-wds.linkis.server.dsm.app.name=linkis-ps-data-source-manager
-##Spring
-spring.server.port=9110
diff --git a/linkis-dist/package/sbin/ext/linkis-ps-cs b/linkis-dist/package/sbin/ext/linkis-ps-cs
deleted file mode 100644
index fecc83c21..000000000
--- a/linkis-dist/package/sbin/ext/linkis-ps-cs
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-# description: cs start cmd
-#
-# Modified for Linkis 1.0.0
-
-
-export SERVER_SUFFIX="linkis-public-enhancements/linkis-ps-cs"
-
-#export DEBUG_PORT=
-
-export SERVER_CLASS=org.apache.linkis.cs.server.LinkisCSApplication
-
-export COMMON_START_BIN=$LINKIS_HOME/sbin/ext/linkis-common-start
-if [[ ! -f "${COMMON_START_BIN}" ]]; then
- echo "The $COMMON_START_BIN does not exist!"
- exit 1
-else
- sh $COMMON_START_BIN
-fi
\ No newline at end of file
diff --git a/linkis-dist/package/sbin/ext/linkis-ps-data-source-manager b/linkis-dist/package/sbin/ext/linkis-ps-data-source-manager
deleted file mode 100644
index 200305b49..000000000
--- a/linkis-dist/package/sbin/ext/linkis-ps-data-source-manager
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-# description: data-source-manager start cmd
-#
-# Modified for Linkis 1.1.0
-#
-
-
-export SERVER_SUFFIX="linkis-public-enhancements/linkis-ps-data-source-manager"
-
-
-#export DEBUG_PORT=
-
-export SERVER_CLASS=org.apache.linkis.datasourcemanager.core.LinkisDataSourceManagerApplication
-
-export COMMON_START_BIN=$LINKIS_HOME/sbin/ext/linkis-common-start
-if [[ ! -f "${COMMON_START_BIN}" ]]; then
- echo "The $COMMON_START_BIN does not exist!"
- exit 1
-else
- sh $COMMON_START_BIN
-fi
diff --git a/linkis-dist/package/sbin/ext/linkis-ps-metadataquery b/linkis-dist/package/sbin/ext/linkis-ps-metadataquery
deleted file mode 100644
index 8bfeece41..000000000
--- a/linkis-dist/package/sbin/ext/linkis-ps-metadataquery
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-# description: ps-metadataquery start cmd
-#
-# Modified for Linkis 1.1.0
-#
-
-export SERVER_SUFFIX="linkis-public-enhancements/linkis-ps-metadataquery"
-
-#export DEBUG_PORT=
-
-export SERVER_CLASS=org.apache.linkis.metadata.query.server.LinkisMetadataQueryApplication
-
-export COMMON_START_BIN=$LINKIS_HOME/sbin/ext/linkis-common-start
-if [[ ! -f "${COMMON_START_BIN}" ]]; then
- echo "The $COMMON_START_BIN does not exist!"
- exit 1
-else
- sh $COMMON_START_BIN
-fi
\ No newline at end of file
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala
index 8dbe7ca1c..5581965c9 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala
@@ -36,7 +36,7 @@ import org.springframework.stereotype.Component
import java.util
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
import scala.util.Random
import scala.util.matching.Regex
@@ -55,15 +55,12 @@ class HaContextGatewayRouter extends AbstractGatewayRouter {
if (
gatewayContext.getGatewayRoute.getRequestURI.contains(
- HaContextGatewayRouter.CONTEXT_SERVICE_STR
- ) ||
- gatewayContext.getGatewayRoute.getRequestURI.contains(
- HaContextGatewayRouter.OLD_CONTEXT_SERVICE_PREFIX
+ HaContextGatewayRouter.CONTEXT_SERVICE_REQUEST_PREFIX
)
) {
val params: util.HashMap[String, String] = gatewayContext.getGatewayRoute.getParams
if (!gatewayContext.getRequest.getQueryParams.isEmpty) {
- for ((k, vArr) <- gatewayContext.getRequest.getQueryParams) {
+ for ((k, vArr) <- gatewayContext.getRequest.getQueryParams.asScala) {
if (vArr.nonEmpty) {
params.putIfAbsent(k, vArr.head)
}
@@ -79,13 +76,13 @@ class HaContextGatewayRouter extends AbstractGatewayRouter {
dealContextCreate(gatewayContext)
} else {
var contextId: String = null
- for ((key, value) <- params) {
+ for ((key, value) <- params.asScala) {
if (key.equalsIgnoreCase(ContextHTTPConstant.CONTEXT_ID_STR)) {
contextId = value
}
}
if (StringUtils.isNotBlank(contextId)) {
- dealContextAccess(contextId.toString, gatewayContext)
+ dealContextAccess(contextId, gatewayContext)
} else {
dealContextCreate(gatewayContext)
}
@@ -97,9 +94,9 @@ class HaContextGatewayRouter extends AbstractGatewayRouter {
def dealContextCreate(gatewayContext: GatewayContext): ServiceInstance = {
val serviceId = findService(
- HaContextGatewayRouter.CONTEXT_SERVICE_STR,
+ HaContextGatewayRouter.CONTEXT_SERVICE_NAME,
list => {
- val services = list.filter(_.contains(HaContextGatewayRouter.CONTEXT_SERVICE_STR))
+ val services = list.filter(_.contains(HaContextGatewayRouter.CONTEXT_SERVICE_NAME))
services.headOption
}
)
@@ -137,9 +134,9 @@ class HaContextGatewayRouter extends AbstractGatewayRouter {
val instances = contextIDParser.parse(contextId)
var serviceId: Option[String] = None
serviceId = findService(
- HaContextGatewayRouter.CONTEXT_SERVICE_STR,
+ HaContextGatewayRouter.CONTEXT_SERVICE_NAME,
list => {
- val services = list.filter(_.contains(HaContextGatewayRouter.CONTEXT_SERVICE_STR))
+ val services = list.filter(_.contains(HaContextGatewayRouter.CONTEXT_SERVICE_NAME))
services.headOption
}
)
@@ -159,10 +156,11 @@ class HaContextGatewayRouter extends AbstractGatewayRouter {
object HaContextGatewayRouter {
val CONTEXT_ID_STR: String = "contextId"
- val CONTEXT_SERVICE_STR: String = "ps-cs"
- @Deprecated
- val OLD_CONTEXT_SERVICE_PREFIX = "contextservice"
+ // because the ps-cs service had merged to ps-publicservice, so change the serviceName to ps-publicservice
+ val CONTEXT_SERVICE_NAME: String = "ps-publicservice"
+
+ val CONTEXT_SERVICE_REQUEST_PREFIX = "contextservice"
val CONTEXT_REGEX: Regex =
(normalPath(API_URL_PREFIX) + "rest_[a-zA-Z][a-zA-Z_0-9]*/(v\\d+)/contextservice/" + ".+").r
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 08/09: fix: comment the linkis.properties's publicservice.list conf, use the code default value
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 4fe9ea1047e34dfcd5ce9506db12bdf01e622722
Author: Jack Xu <xu...@126.com>
AuthorDate: Wed Aug 24 22:05:12 2022 +0800
fix: comment the linkis.properties's publicservice.list conf, use the code default value
---
linkis-dist/package/conf/linkis.properties | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/linkis-dist/package/conf/linkis.properties b/linkis-dist/package/conf/linkis.properties
index c0eedcc04..647c12e1b 100644
--- a/linkis-dist/package/conf/linkis.properties
+++ b/linkis-dist/package/conf/linkis.properties
@@ -55,14 +55,11 @@ wds.linkis.bml.is.hdfs=true
wds.linkis.home=/appcom/Install/LinkisInstall
#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
+#wds.linkis.gateway.conf.publicservice.list=query,jobhistory,application,configuration,filesystem,udf,variable,microservice,errorcode,bml,datasource
#wds.linkis.prometheus.enable=true
wds.linkis.server.user.restful.uri.pass.auth=/actuator/prometheus,/api/rest_j/v1/offline,/api/rest_j/v1/doc.html,/api/rest_j/v1/swagger-resources,/api/rest_j/v1/webjars,/api/rest_j/v1/v2/api-docs
-
-
-
wds.linkis.gateway.conf.metadataquery.list=metadatamanager,metadataquery
spring.spring.servlet.multipart.max-file-size=500MB
spring.spring.servlet.multipart.max-request-size=500MB
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 06/09: fix: fix the restful route for cs publicServiceList, and add enable_pulbicservice judge
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 668d245acc40bd85598b54c99ccfad9e072d6db5
Author: Jack Xu <xu...@126.com>
AuthorDate: Wed Aug 24 13:45:36 2022 +0800
fix: fix the restful route for cs publicServiceList, and add enable_pulbicservice judge
---
.../main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala | 2 +-
.../apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala
index 48df786c5..8a4fd6894 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala
@@ -63,7 +63,7 @@ object RPCConfiguration {
val PUBLIC_SERVICE_LIST: Array[String] = CommonVars(
"wds.linkis.gateway.conf.publicservice.list",
- "cs,data-source-manager,metadataquery,query,jobhistory,application,configuration,filesystem,udf,variable,microservice,errorcode,bml,datasource"
+ "cs,contextservice,data-source-manager,metadataquery,query,jobhistory,application,configuration,filesystem,udf,variable,microservice,errorcode,bml,datasource"
).getValue.split(",")
val METADATAQUERY_SERVICE_APPLICATION_NAME: CommonVars[String] =
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala
index 5581965c9..89de5e0c7 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala
@@ -27,6 +27,7 @@ import org.apache.linkis.gateway.springcloud.SpringCloudGatewayConfiguration.{
normalPath,
API_URL_PREFIX
}
+import org.apache.linkis.rpc.conf.RPCConfiguration
import org.apache.linkis.rpc.interceptor.ServiceInstanceUtils
import org.apache.commons.lang3.StringUtils
@@ -157,8 +158,11 @@ class HaContextGatewayRouter extends AbstractGatewayRouter {
object HaContextGatewayRouter {
val CONTEXT_ID_STR: String = "contextId"
- // because the ps-cs service had merged to ps-publicservice, so change the serviceName to ps-publicservice
- val CONTEXT_SERVICE_NAME: String = "ps-publicservice"
+ val CONTEXT_SERVICE_NAME: String = if (RPCConfiguration.ENABLE_PUBLIC_SERVICE.getValue) {
+ RPCConfiguration.PUBLIC_SERVICE_APPLICATION_NAME.getValue
+ } else {
+ RPCConfiguration.CONTEXT_SERVICE_APPLICATION_NAME.getValue
+ }
val CONTEXT_SERVICE_REQUEST_PREFIX = "contextservice"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 09/09: fix: add metedataquery contextPath to public_service_list
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit a359224afbb7d9bb5116147ade13baaec0d07332
Author: Jack Xu <xu...@126.com>
AuthorDate: Wed Aug 24 22:22:59 2022 +0800
fix: add metedataquery contextPath to public_service_list
---
.../src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala
index 8a4fd6894..f7aff2442 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala
@@ -29,7 +29,7 @@ import org.reflections.scanners.{
object RPCConfiguration {
val BDP_RPC_BROADCAST_THREAD_SIZE: CommonVars[Integer] =
- CommonVars("wds.linkis.rpc.broadcast.thread.num", new Integer(25))
+ CommonVars("wds.linkis.rpc.broadcast.thread.num", 25)
val BDP_RPC_EUREKA_SERVICE_REFRESH_INTERVAL: CommonVars[TimeType] =
CommonVars("wds.linkis.rpc.eureka.client.refresh.interval", new TimeType("1s"))
@@ -63,7 +63,7 @@ object RPCConfiguration {
val PUBLIC_SERVICE_LIST: Array[String] = CommonVars(
"wds.linkis.gateway.conf.publicservice.list",
- "cs,contextservice,data-source-manager,metadataquery,query,jobhistory,application,configuration,filesystem,udf,variable,microservice,errorcode,bml,datasource"
+ "cs,contextservice,data-source-manager,metadataquery,metadatamanager,query,jobhistory,application,configuration,filesystem,udf,variable,microservice,errorcode,bml,datasource"
).getValue.split(",")
val METADATAQUERY_SERVICE_APPLICATION_NAME: CommonVars[String] =
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org