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/07/25 02:51:09 UTC
[incubator-linkis] 01/01: Merge pull request #2523 from apache/dev-1.2.0
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.2.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 5727c0990775c9fa9b3c80f4335a7776afc28387
Merge: 52ae800c2 bdafa8b3f
Author: peacewong <wp...@gmail.com>
AuthorDate: Mon Jul 25 10:51:04 2022 +0800
Merge pull request #2523 from apache/dev-1.2.0
Merge dev-1.2.0 to dev-1.2.1
.github/workflows/auto-comment.yml | 34 ++
CONTRIBUTING.md | 126 ++++---
CONTRIBUTING_CN.md | 119 ++++---
README.md | 98 +++---
README_CN.md | 95 ++---
linkis-commons/linkis-common/pom.xml | 4 -
.../org/apache/linkis/common/utils/DESUtil.java | 2 +-
.../linkis/common/conf/BDPConfiguration.scala | 4 +-
.../linkis/common/utils/CodeAndRunTypeUtils.scala | 2 +-
.../apache/linkis/common/utils/RetryHandler.scala | 6 +-
.../linkis/common/variable/DateTypeUtils.scala | 2 +-
.../apache/linkis/DataWorkCloudApplication.java | 2 +-
.../org/apache/linkis/LinkisBaseServerApp.java | 11 +-
.../linkis/server/security/ProxyUserSSOUtils.scala | 2 +-
.../linkis/server/socket/ControllerServer.scala | 6 +-
.../socket/controller/ServerListenerEventBus.scala | 2 +-
.../org/apache/linkis/mybatis/DataSourceUtils.java | 2 +-
.../mybatis/MybatisConfigurationFactory.java | 2 +-
.../org/apache/linkis/rpc/RPCReceiveRestful.scala | 2 +-
.../common/RetryableRPCInterceptor.scala | 2 +-
.../common/SingleInstanceRPCLoadBalancer.scala | 2 +-
.../linkis/rpc/sender/SpringMVCRPCSender.scala | 2 +-
.../org/apache/linkis/rpc/utils/RPCUtils.scala | 2 +-
.../org/apache/linkis/rpc/RPCFormatsTest.scala | 2 +-
.../org/apache/linkis/scheduler/queue/Job.scala | 68 ++--
.../linkis/storage/fs/impl/HDFSFileSystem.java | 6 +-
.../linkis/storage/fs/impl/LocalFileSystem.java | 2 +-
.../resultset/DefaultResultSetFactory.scala | 2 +-
.../apache/linkis/storage/utils/StorageUtils.scala | 2 +-
.../src/main/assembly/distribution.xml | 4 +-
.../computation/client/LinkisJobBuilder.scala | 3 +-
.../client/interactive/InteractiveJobBuilder.scala | 2 +-
.../operator/impl/EngineConnLogOperator.scala | 2 +-
.../request/GetPartitionStatisticInfoAction.scala | 2 +-
.../request/GetTableStatisticInfoAction.scala | 2 +-
.../ujes/client/request/JobExecuteAction.scala | 2 +-
.../linkis/ujes/client/request/JobInfoAction.scala | 2 +-
.../linkis/ujes/client/request/JobListAction.scala | 2 +-
.../common/entity/task/RequestPersistTask.java | 4 +-
.../common/entity/task/ResponsePersist.java | 13 +-
.../common/conf/GovernaceCommonConf.scala | 4 +-
.../governance/common/paser/CodeParser.scala | 28 +-
.../common/protocol/job/JobRespProtocol.scala | 3 +-
.../common/utils/EngineConnArguments.scala | 2 +-
.../governance/common/utils/GovernanceUtils.scala | 22 +-
.../ecm/core/launch/ProcessEngineConnLaunch.scala | 2 +-
.../apache/linkis/ecm/core/utils/PortUtils.scala | 2 +-
.../linkis/ecm/server/hook/JarUDFLoadECMHook.scala | 2 +-
.../impl/AbstractEngineConnLaunchService.scala | 2 +-
.../service/impl/DefaultEngineConnKillService.java | 93 ++++-
.../service/impl/DefaultOperateService.scala | 2 +-
.../impl/ProcessEngineConnLaunchService.scala | 6 +-
.../impl/DefaultEngineConnKillServiceTest.java | 86 +++++
.../engineconn/once/executor/OnceExecutor.scala | 2 +-
.../async/AsyncConcurrentComputationExecutor.scala | 8 +-
.../computation/executor/cs/CSResourceParser.scala | 2 +-
.../computation/executor/cs/CSTableRegister.scala | 3 +-
.../executor/cs/CSTableResultSetWriter.scala | 2 +-
.../executor/execute/ComputationExecutor.scala | 4 +-
.../computation/executor/hook/InitSQLHook.scala | 2 +-
.../executor/hook/UDFLoadEngineConnHook.scala | 2 +-
.../executor/hook/UseDatabaseEngineHook.scala | 2 +-
.../engineconn/common/conf/EngineConnConf.scala | 11 +-
.../engineconn/common/hook/EngineConnHook.scala | 2 +-
.../engineconn/launch/EngineConnServer.scala | 2 +-
.../acessible/executor/log/MountLogCache.java | 2 +-
.../execution/AccessibleEngineConnExecution.scala | 1 +
.../executor/service/DefaultOperateService.scala | 2 +-
.../service/EngineConnTimedLockService.scala | 13 +-
.../acessible/executor/service/LockService.scala | 2 +-
.../callback/hook/CallbackEngineConnHook.scala | 4 +-
.../executor/ExecutorExecutionContext.scala | 4 +-
.../JavaProcessEngineConnLaunchBuilder.scala | 4 +-
.../resource/GenericEngineResourceFactory.scala | 2 +-
.../BmlEngineConnPluginResourceLoader.java | 2 +-
.../loader/loaders/resource/PluginResource.java | 2 +-
.../loader/utils/EngineConnPluginUtils.java | 2 +-
.../AbstractEngineConnBmlResourceGenerator.scala | 2 +-
.../service/DefaultEngineConnLaunchService.scala | 3 +-
.../service/DefaultEngineConnResourceService.scala | 2 +-
.../BackGroundServiceBeanAnnotation.java | 58 ----
.../annotation/CliHeartBeatMonitorAnnotation.java | 58 ----
.../annotation/ConsumerManagerBeanAnnotation.java | 58 ----
.../annotation/EngineBuilderBeanAnnotation.java | 58 ----
.../annotation/EngineManagerBeanAnnotation.java | 55 ---
.../annotation/EngineRequesterBeanAnnotation.java | 58 ----
.../annotation/EngineSelectorBeanAnnotation.java | 58 ----
.../annotation/EntranceContextBeanAnnotation.java | 58 ----
.../EntranceInterceptorBeanAnnotation.java | 58 ----
.../EntranceListenerBusBeanAnnotation.java | 58 ----
.../EntranceLogListenerBusBeanAnnotation.java | 58 ----
.../ErrorCodeListenerBeanAnnotation.java | 58 ----
.../annotation/ErrorCodeManagerBeanAnnotation.java | 58 ----
.../annotation/GroupFactoryBeanAnnotation.java | 58 ----
.../annotation/LogManagerBeanAnnotation.java | 58 ----
.../NewEngineBroadcastListenerBeanAnnotation.java | 58 ----
.../PersistenceManagerBeanAnnotation.java | 58 ----
.../annotation/ReceiverChooserBeanAnnotation.java | 58 ----
...atusChangedBroadcastListenerBeanAnnotation.java | 58 ----
.../annotation/ResultSetEngineBeanAnnotation.java | 58 ----
.../annotation/SchedulerBeanAnnotation.java | 58 ----
.../annotation/SchedulerContextBeanAnnotation.java | 58 ----
.../entrance/conf/EntranceSpringConfiguration.java | 165 ++++-----
.../entrance/constant/ServiceNameConsts.java | 27 +-
.../entrance/context/DefaultEntranceContext.java | 38 +-
.../entrance/parser/AbstractEntranceParser.java | 2 +-
.../apache/linkis/entrance/parser/ParserUtils.java | 2 +-
.../persistence/QueryPersistenceManager.java | 2 +-
.../entrance/restful/EntranceMetricRestfulApi.java | 9 +-
.../entrance/restful/EntranceRestfulApi.java | 20 +-
.../entrance/server/DefaultEntranceServer.java | 10 +-
.../apache/linkis/entrance/EntranceServer.scala | 26 +-
.../linkis/entrance/cs/CSEntranceHelper.scala | 2 +-
.../entrance/execute/DefaultEntranceExecutor.scala | 4 +-
.../linkis/entrance/execute/EntranceExecutor.scala | 4 +-
.../linkis/entrance/execute/EntranceJob.scala | 2 +-
.../linkis/entrance/interceptor/impl/Explain.scala | 2 +-
.../interceptor/impl/LabelCheckInterceptor.scala | 2 +-
.../impl/PythonCodeCheckInterceptor.scala | 2 +-
.../impl/StorePathEntranceInterceptor.scala | 2 +-
.../impl/VarSubstitutionInterceptor.scala | 2 +-
.../linkis/entrance/log/ErrorCodeManager.scala | 76 +---
.../linkis/entrance/log/HDFSCacheLogWriter.scala | 2 +-
.../org/apache/linkis/entrance/log/LogReader.scala | 2 +-
.../org/apache/linkis/entrance/log/LogWriter.scala | 2 +-
.../EntranceUserParallelOrchestratorPlugin.scala | 2 +-
.../entrance/parser/CommonEntranceParser.scala | 2 +-
.../persistence/EntranceResultSetEngine.scala | 2 +-
.../entrance/scheduler/EntranceGroupFactory.scala | 2 +-
.../scheduler/cache/ReadCacheConsumer.scala | 2 +-
.../linkis/ujes/jdbc/UJESClientFactory.scala | 2 +-
.../linkis/ujes/jdbc/UJESSQLConnection.scala | 2 +-
.../linkis/ujes/jdbc/UJESSQLDatabaseMetaData.scala | 2 +-
.../linkis/ujes/jdbc/UJESSQLDriverMain.scala | 2 +-
.../apache/linkis/ujes/jdbc/UJESSQLResultSet.scala | 2 +-
.../am/restful/ECResourceInfoRestfulApi.java | 2 +-
.../linkis/manager/am/restful/EMRestfulApi.java | 6 +-
.../manager/am/restful/EngineRestfulApi.java | 4 +-
.../manager/am/util/ECResourceInfoUtils.java | 2 +-
.../service/impl/ExternalResourceServiceImpl.java | 2 +-
.../am/converter/DefaultMetricsConverter.scala | 2 +-
.../label/MultiUserEngineReuseLabelChooser.scala | 2 +-
.../am/service/em/DefaultEMRegisterService.scala | 4 +-
.../engine/DefaultEngineAskEngineService.scala | 2 +-
.../engine/DefaultEngineConnCanKillService.scala | 2 +-
.../DefaultEngineConnStatusCallbackService.scala | 2 +-
.../engine/DefaultEngineCreateService.scala | 12 +-
.../service/engine/DefaultEngineReuseService.scala | 2 +-
.../manager/rm/service/ResourceLockService.scala | 2 +-
.../rm/service/impl/DefaultResourceManager.scala | 5 +-
.../label/builder/DefaultGlobalLabelBuilder.java | 2 +-
.../factory/LabelBuilderFactoryContext.java | 8 +-
.../manager/label/entity/CombinedLabelImpl.java | 2 +-
.../manager/label/entity/SerializableLabel.java | 2 +-
.../linkis/manager/label/entity/TenantLabel.java | 2 +-
.../label/entity/engine/EngineTypeLabel.java | 2 +-
.../label/entity/engine/UserCreatorLabel.java | 2 +-
.../manager/label/entity/route/RouteLabel.java | 2 +-
.../label/utils/EngineTypeLabelCreator.java | 2 +-
.../linkis/manager/label/utils/LabelUtils.java | 2 +-
.../linkis/manager/common/utils/ManagerUtils.java | 2 +-
.../manager/common/entity/resource/Resource.scala | 2 +-
.../linkis/manager/dao/LockManagerMapper.java | 6 +
.../impl/DefaultLabelManagerPersistence.java | 4 +-
.../impl/DefaultLockManagerPersistence.java | 8 +-
.../impl/DefaultResourceLabelPersistence.java | 2 +-
linkis-dist/bin/install.sh | 22 +-
linkis-dist/package/conf/application-eureka.yml | 8 +
linkis-dist/package/conf/application-linkis.yml | 6 +-
linkis-dist/package/conf/linkis.properties | 10 +
.../db/upgrade/1.1.1_schema/mysql/linkis_ddl.sql | 2 +-
linkis-dist/package/sbin/common.sh | 12 +-
.../package/sbin}/kill-yarn-jobs.sh | 10 +-
linkis-dist/package/sbin/linkis-start-all.sh | 2 +-
linkis-dist/release-docs/LICENSE | 40 +--
.../flink/src/main/assembly/distribution.xml | 4 +-
.../hive/src/main/assembly/distribution.xml | 4 +-
.../hive/src/main/resources/log4j2.xml | 10 +-
.../hive/executor/HiveEngineConnExecutor.scala | 2 +-
.../hive/hook/HiveAddJarsEngineHook.scala | 2 +-
.../hive/hook/HiveAddMetaTableNameHook.scala | 2 +-
.../io_file/src/main/assembly/distribution.xml | 4 +-
.../io/factory/IoEngineConnFactory.scala | 2 +-
.../jdbc/src/main/assembly/distribution.xml | 4 +-
.../engineplugin/jdbc/ConnectionManager.java | 2 +-
.../engineplugin/jdbc/PropertiesParser.java | 2 +-
.../jdbc/executer/JDBCEngineConnExecutor.scala | 2 +-
.../jdbc/executer/JDBCMultiDatasourceParser.scala | 2 +-
.../jdbc/executer/JDBCSQLCodeParser.scala | 2 +-
.../openlookeng/src/main/assembly/distribution.xml | 4 +-
.../executor/OpenLooKengEngineConnExecutor.java | 4 +-
.../pipeline/src/main/assembly/distribution.xml | 4 +-
.../python/src/main/assembly/distribution.xml | 6 +-
.../python/executor/PythonSession.scala | 2 +-
.../manager/engineplugin/python/utils/Kind.scala | 2 +-
.../shell/src/main/assembly/distribution.xml | 6 +-
.../shell/src/main/resources/conf/log4j2.xml | 11 +-
.../shell/executor/ShellEngineConnExecutor.scala | 23 +-
.../shell/executor/YarnAppIdExtractor.scala | 18 +-
.../spark/src/main/assembly/distribution.xml | 4 +-
.../spark/src/main/resources/log4j2.xml | 9 +-
.../args/SparkPythonArgsPreExecutionHook.scala | 2 +-
.../linkis/engineplugin/spark/common/Kind.scala | 2 +-
.../spark/cs/CSSparkPostExecutionHook.scala | 2 +-
.../engineplugin/spark/cs/CSTableParser.scala | 2 +-
.../engineplugin/spark/executor/SQLSession.scala | 2 +-
.../spark/executor/SparkPythonExecutor.scala | 2 +-
.../spark/executor/SparkSqlExecutor.scala | 2 +-
.../spark/extension/SparkSqlExtension.scala | 2 +-
.../spark/factory/SparkEngineConnFactory.scala | 2 +-
.../factory/SparkEngineConnResourceFactory.scala | 2 +-
.../engineplugin/spark/imexport/LoadData.scala | 2 +-
.../imexport/util/BackGroundServiceUtils.scala | 2 +-
...SparkSubmitProcessEngineConnLaunchBuilder.scala | 2 +-
.../spark/mdq/MDQPostExecutionHook.scala | 2 +-
.../engineplugin/spark/utils/EngineUtils.scala | 2 +-
.../engineplugin/spark/utils/JobProgressUtil.scala | 2 +-
linkis-engineconn-plugins/sqoop/pom.xml | 8 +-
.../sqoop/src/main/assembly/distribution.xml | 4 +-
.../engineconnplugin/sqoop/client/Sqoop.java | 2 +-
.../java/org/apache/sqoop/mapreduce/JobBase.java | 2 +-
.../sqoop/src/main/resources/log4j2.xml | 12 +-
.../io/iteraceptor/IOMethodInterceptor.scala | 2 +-
.../linkis/storage/io/utils/IOClientUtils.scala | 2 +-
.../ComputationOrchestratorSessionFactory.scala | 6 +-
...ComputationOrchestratorSessionFactoryImpl.scala | 2 +-
.../converter/ruler/JobReqParamCheckRuler.scala | 2 +-
.../execute/CodeExecTaskExecutorManager.scala | 2 +-
.../DefaultCodeExecTaskExecutorManager.scala | 2 +-
.../physical/CodeLogicalUnitExecTask.scala | 4 +-
.../apache/linkis/orchestrator/Orchestrator.scala | 2 +-
.../orchestrator/execution/ExecTaskRunner.scala | 2 +-
.../orchestrator/execution/ExecutionFactory.scala | 2 +-
.../apache/linkis/orchestrator/plans/ast/Job.scala | 2 +-
.../ecm/ComputationEngineConnManager.scala | 2 +-
.../ecm/cache/EngineAsyncResponseCache.scala | 2 +-
.../linkis/orchestrator/ecm/entity/MarkReq.scala | 2 +-
.../ecm/service/EngineConnExecutor.scala | 2 +-
.../linkis/bml/client/impl/HttpBmlClient.scala | 2 +-
.../linkis/bml/common/HdfsResourceHelper.java | 2 +-
.../linkis/bml/common/LocalResourceHelper.java | 2 +-
.../linkis/bml/restful/BmlProjectRestful.java | 2 +-
.../apache/linkis/bml/restful/BmlRestfulApi.java | 2 +-
.../bml/service/impl/ResourceServiceImpl.java | 2 +-
.../linkis/bml/service/impl/TaskServiceImpl.java | 2 +-
.../bml/service/impl/VersionServiceImpl.java | 2 +-
.../apache/linkis/bml/util/HttpRequestHelper.java | 2 +-
.../cs/client/service/CSMetaDataService.java | 2 +-
.../cs/client/service/CSResourceService.java | 2 +-
.../cs/client/service/CSResultDataServiceImpl.java | 2 +-
.../linkis/cs/client/service/CSTableService.java | 10 +-
.../cs/client/service/CSVariableService.java | 2 +-
.../cs/client/service/DefaultSearchService.java | 2 +-
.../client/service/LinkisJobDataServiceImpl.java | 2 +-
.../cs/client/utils/ContextServiceUtils.java | 2 +-
.../cs/common/serialize/AbstractSerializer.java | 2 +-
.../helper/AbstractSerializationHelper.java | 2 +-
.../cs/common/utils/CSHighAvailableUtils.java | 2 +-
.../construction/ConditionBuilderImpl.java | 2 +-
.../contextcache/DefaultContextCacheService.java | 2 +-
.../cs/contextcache/cache/DefaultContextCache.java | 2 +-
.../cache/cskey/impl/ContextValueMapSetImpl.java | 2 +-
.../cskey/impl/DefaultContextKeyValueContext.java | 2 +-
.../cache/guava/ContextIDRemoveListener.java | 2 +-
.../parser/DefaultContextKeyValueParser.java | 2 +-
.../execution/ruler/NearestContextSearchRuler.java | 2 +-
.../cs/highavailable/DefaultContextHAManager.java | 2 +-
.../ha/impl/BackupInstanceGeneratorImpl.java | 2 +-
.../ha/impl/ContextHACheckerImpl.java | 2 +-
.../ha/impl/ContextHAIDGeneratorImpl.java | 2 +-
.../highavailable/proxy/MethodInterceptorImpl.java | 2 +-
.../cs/server/parser/DefaultKeywordParser.java | 2 +-
.../cs/server/protocol/RestResponseProtocol.java | 4 +-
.../impl/DefaultInstanceAliasConverter.scala | 2 +-
.../impl/InstanceAliasManagerImpl.scala | 2 +-
.../impl/RouteLabelInstanceAliasConverter.scala | 2 +-
.../highavailable/test/TestContextHAManager.java | 2 +-
.../client/impl/LinkisDataSourceRemoteClient.scala | 2 +-
.../linkis-datasource-manager/common/pom.xml | 4 +
.../datasourcemanager/common/auth/AuthContext.java | 2 +-
.../common/domain/DataSource.java | 2 +-
.../common/domain/DataSourceEnv.java | 2 +-
.../common/domain/DatasourceVersion.java | 2 +-
.../datasourcemanager/common/util/CryptoUtils.java | 2 +-
.../common/util/PatternInjectUtils.java | 4 +-
.../datasourcemanager/common/util/json/Json.java | 2 +-
.../service/impl/DataSourceInfoServiceImpl.java | 2 +-
.../validate/DataSourceParameterValidator.java | 2 +-
.../strategy/RegExpParameterValidateStrategy.java | 2 +-
.../datasourcemanager/core/vo/DataSourceVo.java | 2 +-
.../query/common/service/AbstractMetaService.java | 2 +-
.../server/loader/MetaClassLoaderManager.java | 2 +-
.../query/server/restful/MetadataCoreRestful.java | 2 +-
.../query/server/restful/MetadataQueryRestful.java | 2 +-
.../service/impl/MetadataQueryServiceImpl.java | 2 +-
.../metadata/query/server/utils/MetadataUtils.java | 2 +-
.../metadata/query/service/ElasticConnection.java | 2 +-
.../metadata/query/service/HiveConnection.java | 2 +-
.../metadata/query/service/HiveMetaService.java | 2 +-
.../metadata/query/service/KafkaMetaService.java | 2 +-
.../metadata/query/service/MysqlMetaService.java | 10 +-
.../metadata/query/service/SqlConnection.java | 3 +
.../metadata/hive/config/LinkisMybatisConfig.java | 2 +-
.../metadata/restful/api/DataSourceRestfulApi.java | 2 +-
.../service/impl/DataSourceServiceImpl.java | 4 +-
.../metadata/service/impl/MdqServiceImpl.java | 4 +-
.../org/apache/linkis/metadata/util/HiveUtils.java | 2 +-
.../linkis/metadata/ddl/ImportDDLCreator.scala | 4 +-
.../linkis/metadata/ddl/ScalaDDLCreator.scala | 2 +-
.../restful/api/ConfigurationRestfulApi.java | 2 +-
.../configuration/util/LabelEntityParser.java | 2 +-
.../configuration/service/CategoryService.scala | 2 +-
.../configuration/validate/RegexValidator.scala | 4 +-
.../client/handler/LinkisErrorCodeHandler.java | 2 +-
.../instance/label/restful/InstanceRestful.java | 2 +-
.../label/service/impl/DefaultInsLabelService.java | 12 +-
.../cache/impl/DefaultQueryCacheManager.java | 2 +-
.../linkis/jobhistory/dao/JobHistoryMapper.java | 38 +-
.../jobhistory/dao/impl/JobHistoryMapper.xml | 40 +++
.../jobhistory/restful/api/QueryRestfulApi.java | 51 ++-
.../jobhistory/conversions/TaskConversions.scala | 2 +-
.../jobhistory/service/JobHistoryQueryService.java | 4 +-
.../impl/JobHistoryDetailQueryServiceImpl.scala | 15 +-
.../service/impl/JobHistoryQueryServiceImpl.scala | 87 +++--
.../apache/linkis/jobhistory/util/QueryUtils.scala | 17 +-
.../linkis/udf/service/impl/UDFServiceImpl.java | 2 +-
.../variable/service/VariableServiceImpl.scala | 2 +-
.../linkis/gateway/parser/GatewayParser.scala | 2 +-
.../linkis/gateway/route/GatewayRouter.scala | 4 +-
.../linkis/gateway/security/ProxyUserUtils.scala | 2 +-
.../linkis/gateway/security/SecurityFilter.scala | 4 +-
.../linkis/gateway/security/UserRestful.scala | 2 +-
.../security/token/TokenAuthentication.scala | 2 +-
.../linkis/httpclient/dws/DWSHttpClient.scala | 2 +-
.../StaticAuthenticationStrategy.scala | 2 +-
.../dws/config/DWSClientConfigBuilder.scala | 2 +-
.../dws/response/DWSHttpMessageFactory.scala | 2 +-
.../linkis/httpclient/dws/response/DWSResult.scala | 2 +-
.../ujes/parser/ResultSetCacheGatewayParser.scala | 2 +-
.../ujes/route/DefaultLabelGatewayRouter.scala | 2 +-
.../gateway/ujes/route/EntranceGatewayRouter.scala | 2 +-
.../ujes/route/HaContextGatewayRouter.scala | 2 +-
.../route/contextservice/ContextIdParserImpl.scala | 2 +-
.../http/GatewayAuthorizationFilter.java | 36 +-
.../http/SpringCloudGatewayHttpRequest.scala | 30 +-
.../http/SpringCloudGatewayHttpResponse.scala | 11 +-
.../SpringCloudGatewayWebsocketUtils.scala | 10 +-
.../datasource/DatasourceGatewayRouterRuler.scala | 2 +-
pom.xml | 8 +-
tool/dependencies/known-dependencies.txt | 84 ++---
web/src/apps/linkis/components/tag/index.vue | 2 +-
web/src/apps/linkis/i18n/common/en.json | 2 +
web/src/apps/linkis/i18n/common/zh.json | 2 +
web/src/apps/linkis/module/ECM/index.vue | 2 +-
web/src/apps/linkis/module/ECM/log.vue | 5 +-
web/src/apps/linkis/module/ECM/search.vue | 5 +-
web/src/apps/linkis/module/datasource/index.vue | 2 +-
.../module/globalHistoryManagement/index.scss | 2 +-
.../module/resourceManagement/engineConn.vue | 386 +++++++++++++++++++++
.../linkis/module/resourceManagement/index.scss | 50 +++
.../linkis/module/resourceManagement/index.vue | 21 +-
.../module/{ECM => resourceManagement}/log.vue | 9 +-
.../module/{ECM => resourceManagement}/search.vue | 88 +++--
web/src/apps/linkis/router.js | 12 +-
web/src/apps/linkis/view/linkis/index.vue | 20 +-
web/src/components/consoleComponent/log.vue | 3 +
366 files changed, 2050 insertions(+), 2373 deletions(-)
diff --cc linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/src/main/java/org/apache/linkis/metadata/query/service/MysqlMetaService.java
index 7045898b5,622da4ed7..b34bb8fa8
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/src/main/java/org/apache/linkis/metadata/query/service/MysqlMetaService.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/src/main/java/org/apache/linkis/metadata/query/service/MysqlMetaService.java
@@@ -21,9 -21,9 +21,11 @@@ import org.apache.linkis.datasourcemana
import org.apache.linkis.metadata.query.common.domain.MetaColumnInfo;
import org.apache.linkis.metadata.query.common.service.AbstractMetaService;
import org.apache.linkis.metadata.query.common.service.MetadataConnection;
+import org.apache.linkis.metadata.query.service.conf.SqlParamsMapper;
+import org.apache.linkis.metadata.query.service.mysql.SqlConnection;
+ import org.apache.commons.lang3.StringUtils;
+
import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org