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/03/29 13:59:33 UTC
[incubator-linkis] branch dev-1.1.2 updated: Dev 1.1.2 update commons-lang to commons-lang3 (#1808)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.1.2 by this push:
new 47ea69e Dev 1.1.2 update commons-lang to commons-lang3 (#1808)
47ea69e is described below
commit 47ea69ef443990f1c57abab6161d409ec920f4a6
Author: husofskyzy <15...@163.com>
AuthorDate: Tue Mar 29 21:59:27 2022 +0800
Dev 1.1.2 update commons-lang to commons-lang3 (#1808)
* update commons-lang to commons-lang3
* update commons-lang to commons-lang3
* update commons-lang to commons-lang3
---
.../src/main/java/org/apache/linkis/common/io/FsPath.java | 2 +-
.../src/main/java/org/apache/linkis/common/utils/DESUtil.java | 2 +-
.../scala/org/apache/linkis/common/conf/BDPConfiguration.scala | 2 +-
.../org/apache/linkis/common/conf/DWCArgumentsParser.scala | 2 +-
.../org/apache/linkis/common/listener/ListenerEventBus.scala | 2 +-
.../main/scala/org/apache/linkis/common/utils/LDAPUtils.scala | 2 +-
.../scala/org/apache/linkis/common/utils/RetryHandler.scala | 2 +-
.../scala/org/apache/linkis/common/utils/VariableUtils.scala | 4 ++--
.../org/apache/linkis/hadoop/common/utils/HDFSUtils.scala | 2 +-
.../org/apache/linkis/httpclient/AbstractHttpClient.scala | 2 +-
.../authentication/AbstractAuthenticationStrategy.scala | 2 +-
.../scala/org/apache/linkis/rpc/MessageRPCReceiveRestful.scala | 2 +-
.../main/java/org/apache/linkis/DataWorkCloudApplication.java | 2 +-
.../src/main/java/org/apache/linkis/LinkisBaseServerApp.java | 4 ++--
.../src/main/scala/org/apache/linkis/server/Message.scala | 10 +++++-----
.../linkis/server/conf/DataWorkCloudCustomExcludeFilter.scala | 2 +-
.../org/apache/linkis/server/conf/ServerConfiguration.scala | 2 +-
.../src/main/scala/org/apache/linkis/server/package.scala | 4 ++--
.../scala/org/apache/linkis/server/security/SSOUtils.scala | 2 +-
.../org/apache/linkis/server/security/SecurityFilter.scala | 2 +-
.../org/apache/linkis/server/socket/ControllerServer.scala | 6 +++---
.../server/socket/controller/ServerListenerEventBus.scala | 2 +-
.../org/apache/linkis/mybatis/MybatisConfigurationFactory.java | 2 +-
.../main/scala/org/apache/linkis/rpc/RPCReceiveRestful.scala | 2 +-
.../org/apache/linkis/rpc/conf/RPCSpringConfiguration.scala | 2 +-
.../rpc/interceptor/common/RetryableRPCInterceptor.scala | 2 +-
.../rpc/interceptor/common/SingleInstanceRPCLoadBalancer.scala | 2 +-
.../org/apache/linkis/rpc/sender/SpringMVCRPCSender.scala | 2 +-
.../scala/org/apache/linkis/rpc/transform/RPCProduct.scala | 2 +-
.../src/main/scala/org/apache/linkis/rpc/utils/RPCUtils.scala | 2 +-
.../src/test/scala/org/apache/linkis/rpc/RPCFormatsTest.scala | 2 +-
.../scala/org/apache/linkis/scheduler/AbstractScheduler.scala | 2 +-
.../src/main/scala/org/apache/linkis/scheduler/queue/Job.scala | 8 ++++----
.../java/org/apache/linkis/storage/fs/impl/HDFSFileSystem.java | 4 ++--
.../org/apache/linkis/storage/fs/impl/LocalFileSystem.java | 2 +-
.../linkis/storage/resultset/DefaultResultSetFactory.scala | 2 +-
.../scala/org/apache/linkis/storage/utils/StorageUtils.scala | 2 +-
.../presenter/converter/LinkisJobInfoModelConverter.java | 2 +-
.../presenter/converter/LinkisJobKillModelConverter.java | 2 +-
.../apache/linkis/computation/client/LinkisJobBuilder.scala | 2 +-
.../computation/client/interactive/InteractiveJobBuilder.scala | 2 +-
.../client/operator/impl/EngineConnLogOperator.scala | 2 +-
.../apache/linkis/ujes/client/request/JobExecuteAction.scala | 2 +-
.../org/apache/linkis/ujes/client/request/JobInfoAction.scala | 2 +-
.../org/apache/linkis/ujes/client/request/JobListAction.scala | 2 +-
.../governance/common/entity/task/RequestPersistTask.java | 4 ++--
.../linkis/governance/common/entity/task/ResponsePersist.java | 4 ++--
.../org/apache/linkis/governance/common/paser/CodeParser.scala | 6 +++---
.../governance/common/protocol/job/JobRespProtocol.scala | 2 +-
.../linkis/governance/common/utils/EngineConnArguments.scala | 2 +-
.../linkis/ecm/core/launch/ProcessEngineConnLaunch.scala | 2 +-
.../org/apache/linkis/ecm/server/hook/JarUDFLoadECMHook.scala | 2 +-
.../linkis/ecm/server/operator/EngineConnLogOperator.scala | 2 +-
.../server/service/impl/AbstractEngineConnLaunchService.scala | 2 +-
.../ecm/server/service/impl/DefaultEngineConnKillService.java | 2 +-
.../linkis/ecm/server/service/impl/DefaultOperateService.scala | 2 +-
.../server/service/impl/ProcessEngineConnLaunchService.scala | 2 +-
.../apache/linkis/engineconn/once/executor/OnceExecutor.scala | 2 +-
.../engineconn/computation/executor/cs/CSResourceParser.scala | 2 +-
.../engineconn/computation/executor/cs/CSTableRegister.scala | 2 +-
.../computation/executor/execute/ComputationExecutor.scala | 4 ++--
.../computation/executor/execute/EngineExecutionContext.scala | 2 +-
.../computation/executor/hook/UDFLoadEngineConnHook.scala | 2 +-
.../executor/service/TaskExecutionServiceImpl.scala | 2 +-
.../apache/linkis/engineconn/common/conf/EngineConnConf.scala | 2 +-
.../apache/linkis/engineconn/common/hook/EngineConnHook.scala | 2 +-
.../engineconn/acessible/executor/log/MountLogCache.java | 2 +-
.../executor/execution/AccessibleEngineConnExecution.scala | 2 +-
.../acessible/executor/service/DefaultOperateService.scala | 2 +-
.../executor/service/EngineConnTimedLockService.scala | 2 +-
.../engineconn/acessible/executor/service/LockService.scala | 2 +-
.../engineconn/callback/hook/CallbackEngineConnHook.scala | 4 ++--
.../linkis/engineconn/executor/ExecutorExecutionContext.scala | 4 ++--
.../org/apache/linkis/engineconn/launch/EngineConnServer.scala | 2 +-
.../org/apache/linkis/entranceclient/EntranceClientImpl.scala | 2 +-
.../apache/linkis/entrance/parser/AbstractEntranceParser.java | 2 +-
.../java/org/apache/linkis/entrance/parser/ParserUtils.java | 2 +-
.../linkis/entrance/persistence/QueryPersistenceManager.java | 2 +-
.../org/apache/linkis/entrance/restful/EntranceRestfulApi.java | 2 +-
.../main/scala/org/apache/linkis/entrance/EntranceServer.scala | 2 +-
.../org/apache/linkis/entrance/EntranceWebSocketService.scala | 2 +-
.../scala/org/apache/linkis/entrance/cs/CSEntranceHelper.scala | 2 +-
.../linkis/entrance/execute/DefaultEntranceExecutor.scala | 4 ++--
.../scala/org/apache/linkis/entrance/execute/EntranceJob.scala | 2 +-
.../linkis/entrance/interceptor/impl/CustomVariableUtils.scala | 6 +++---
.../org/apache/linkis/entrance/interceptor/impl/Explain.scala | 2 +-
.../entrance/interceptor/impl/LabelCheckInterceptor.scala | 2 +-
.../entrance/interceptor/impl/PythonCodeCheckInterceptor.scala | 2 +-
.../interceptor/impl/StorePathEntranceInterceptor.scala | 2 +-
.../entrance/interceptor/impl/VarSubstitutionInterceptor.scala | 2 +-
.../scala/org/apache/linkis/entrance/log/CacheLogWriter.scala | 2 +-
.../org/apache/linkis/entrance/log/ErrorCodeListener.scala | 2 +-
.../main/scala/org/apache/linkis/entrance/log/LogReader.scala | 2 +-
.../main/scala/org/apache/linkis/entrance/log/LogWriter.scala | 2 +-
.../plugin/EntranceUserParallelOrchestratorPlugin.scala | 2 +-
.../apache/linkis/entrance/parser/CommonEntranceParser.scala | 2 +-
.../linkis/entrance/persistence/EntranceResultSetEngine.scala | 2 +-
.../linkis/entrance/scheduler/EntranceGroupFactory.scala | 2 +-
.../linkis/entrance/scheduler/cache/ReadCacheConsumer.scala | 2 +-
.../org/apache/linkis/entrance/utils/JobHistoryHelper.scala | 2 +-
.../scala/org/apache/linkis/ujes/jdbc/UJESClientFactory.scala | 2 +-
.../scala/org/apache/linkis/ujes/jdbc/UJESSQLConnection.scala | 2 +-
.../org/apache/linkis/ujes/jdbc/UJESSQLDatabaseMetaData.scala | 2 +-
.../scala/org/apache/linkis/ujes/jdbc/UJESSQLDriverMain.scala | 2 +-
.../scala/org/apache/linkis/ujes/jdbc/UJESSQLResultSet.scala | 2 +-
.../manager/label/builder/DefaultGlobalLabelBuilder.java | 2 +-
.../label/builder/factory/LabelBuilderFactoryContext.java | 8 +++++---
.../apache/linkis/manager/label/entity/CombinedLabelImpl.java | 2 +-
.../apache/linkis/manager/label/entity/SerializableLabel.java | 2 +-
.../org/apache/linkis/manager/label/entity/TenantLabel.java | 2 +-
.../linkis/manager/label/entity/engine/EngineTypeLabel.java | 2 +-
.../linkis/manager/label/entity/engine/UserCreatorLabel.java | 2 +-
.../apache/linkis/manager/label/entity/route/RouteLabel.java | 2 +-
.../linkis/manager/label/utils/EngineTypeLabelCreator.java | 2 +-
.../java/org/apache/linkis/manager/label/utils/LabelUtils.java | 2 +-
.../org/apache/linkis/manager/am/restful/EMRestfulApi.java | 6 +++---
.../org/apache/linkis/manager/am/restful/EngineRestfulApi.java | 4 ++--
.../linkis/manager/am/converter/DefaultMetricsConverter.scala | 2 +-
.../manager/am/label/MultiUserEngineReuseLabelChooser.scala | 2 +-
.../manager/am/service/em/DefaultEMRegisterService.scala | 4 ++--
.../am/service/engine/DefaultEngineAskEngineService.scala | 2 +-
.../engine/DefaultEngineConnStatusCallbackService.scala | 2 +-
.../manager/am/service/engine/DefaultEngineCreateService.scala | 2 +-
.../manager/am/service/engine/DefaultEngineReuseService.scala | 2 +-
.../org/apache/linkis/manager/common/utils/ManagerUtils.java | 2 +-
.../linkis/manager/common/entity/resource/Resource.scala | 2 +-
.../persistence/impl/DefaultResourceLabelPersistence.java | 2 +-
.../external/service/impl/ExternalResourceServiceImpl.java | 2 +-
.../linkis/resourcemanager/service/ResourceLockService.scala | 2 +-
.../flink/client/deployment/ClusterDescriptorAdapter.java | 2 +-
.../deployment/YarnApplicationClusterDescriptorAdapter.java | 2 +-
.../engineconnplugin/flink/client/result/ChangelogResult.java | 2 +-
.../engineconnplugin/flink/context/EnvironmentContext.scala | 2 +-
.../flink/executor/FlinkCodeOnceExecutor.scala | 2 +-
.../engineconnplugin/flink/executor/FlinkJarOnceExecutor.scala | 2 +-
.../flink/factory/FlinkEngineConnFactory.scala | 2 +-
.../linkis/engineplugin/hive/hook/HiveAddJarsEngineHook.scala | 2 +-
.../engineplugin/hive/hook/HiveAddMetaTableNameHook.scala | 2 +-
.../manager/engineplugin/io/factory/IoEngineConnFactory.scala | 2 +-
.../linkis/manager/engineplugin/jdbc/ConnectionManager.java | 2 +-
.../manager/engineplugin/jdbc/executer/JDBCSQLCodeParser.scala | 2 +-
.../manager/engineplugin/python/executor/PythonSession.scala | 2 +-
.../apache/linkis/manager/engineplugin/python/utils/Kind.scala | 2 +-
.../engineplugin/shell/executor/ShellEngineConnExecutor.scala | 2 +-
.../org/apache/linkis/engineplugin/spark/common/Kind.scala | 2 +-
.../apache/linkis/engineplugin/spark/cs/CSTableParser.scala | 2 +-
.../apache/linkis/engineplugin/spark/executor/SQLSession.scala | 2 +-
.../engineplugin/spark/executor/SparkPythonExecutor.scala | 2 +-
.../engineplugin/spark/executor/SparkScalaExecutor.scala | 4 ++--
.../linkis/engineplugin/spark/executor/SparkSqlExecutor.scala | 2 +-
.../engineplugin/spark/factory/SparkEngineConnFactory.scala | 2 +-
.../spark/factory/SparkEngineConnResourceFactory.scala | 2 +-
.../apache/linkis/engineplugin/spark/imexport/LoadData.scala | 2 +-
.../spark/imexport/util/BackGroundServiceUtils.scala | 2 +-
.../launch/SparkSubmitProcessEngineConnLaunchBuilder.scala | 2 +-
.../linkis/engineplugin/spark/mdq/MDQPostExecutionHook.scala | 2 +-
.../linkis/engineplugin/spark/utils/JobProgressUtil.scala | 2 +-
.../engineplugin/common/launch/process/Environment.scala | 2 +-
.../launch/process/JavaProcessEngineConnLaunchBuilder.scala | 4 ++--
.../loaders/resource/BmlEngineConnPluginResourceLoader.java | 2 +-
.../engineplugin/manager/loaders/resource/PluginResource.java | 2 +-
.../engineplugin/manager/utils/EngineConnPluginUtils.java | 2 +-
.../localize/AbstractEngineConnBmlResourceGenerator.scala | 2 +-
.../server/service/DefaultEngineConnLaunchService.scala | 2 +-
.../server/service/DefaultEngineConnResourceService.scala | 2 +-
.../linkis/storage/io/iteraceptor/IOMethodInterceptor.scala | 2 +-
.../org/apache/linkis/storage/io/utils/IOClientUtils.scala | 2 +-
.../computation/ComputationOrchestratorSessionFactory.scala | 2 +-
.../ComputationOrchestratorSessionFactoryImpl.scala | 2 +-
.../catalyst/converter/ruler/CustomVariableUtils.scala | 6 +++---
.../computation/catalyst/converter/ruler/Explain.scala | 2 +-
.../catalyst/converter/ruler/JobReqParamCheckRuler.scala | 2 +-
.../converter/ruler/PythonCodeConverterCheckRuler.scala | 2 +-
.../converter/ruler/VarSubstitutionConverterCheckRuler.scala | 2 +-
.../computation/execute/CodeExecTaskExecutorManager.scala | 2 +-
.../execute/DefaultCodeExecTaskExecutorManager.scala | 2 +-
.../computation/physical/CodeLogicalUnitExecTask.scala | 2 +-
.../scala/org/apache/linkis/orchestrator/Orchestrator.scala | 2 +-
.../apache/linkis/orchestrator/execution/ExecTaskRunner.scala | 2 +-
.../linkis/orchestrator/execution/ExecutionFactory.scala | 2 +-
.../linkis/orchestrator/ecm/ComputationEngineConnManager.scala | 2 +-
.../orchestrator/ecm/cache/EngineAsyncResponseCache.scala | 2 +-
.../org/apache/linkis/orchestrator/ecm/entity/MarkReq.scala | 2 +-
.../org/apache/linkis/bml/client/impl/HttpBmlClient.scala | 2 +-
.../org/apache/linkis/bml/hook/BmlEnginePreExecuteHook.scala | 2 +-
.../java/org/apache/linkis/bml/common/HdfsResourceHelper.java | 2 +-
.../java/org/apache/linkis/bml/common/LocalResourceHelper.java | 2 +-
.../java/org/apache/linkis/bml/restful/BmlProjectRestful.java | 2 +-
.../main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java | 2 +-
.../apache/linkis/bml/service/impl/ResourceServiceImpl.java | 2 +-
.../org/apache/linkis/bml/service/impl/TaskServiceImpl.java | 2 +-
.../org/apache/linkis/bml/service/impl/VersionServiceImpl.java | 2 +-
.../java/org/apache/linkis/bml/util/HttpRequestHelper.java | 2 +-
.../linkis/cs/contextcache/DefaultContextCacheService.java | 2 +-
.../linkis/cs/contextcache/cache/DefaultContextCache.java | 2 +-
.../contextcache/cache/cskey/impl/ContextValueMapSetImpl.java | 2 +-
.../cache/cskey/impl/DefaultContextKeyValueContext.java | 2 +-
.../cs/contextcache/cache/guava/ContextIDRemoveListener.java | 2 +-
.../cs/contextcache/parser/DefaultContextKeyValueParser.java | 2 +-
.../org/apache/linkis/cs/client/service/CSMetaDataService.java | 2 +-
.../org/apache/linkis/cs/client/service/CSResourceService.java | 2 +-
.../linkis/cs/client/service/CSResultDataServiceImpl.java | 2 +-
.../org/apache/linkis/cs/client/service/CSTableService.java | 2 +-
.../org/apache/linkis/cs/client/service/CSVariableService.java | 2 +-
.../apache/linkis/cs/client/service/DefaultSearchService.java | 2 +-
.../linkis/cs/client/service/LinkisJobDataServiceImpl.java | 2 +-
.../org/apache/linkis/cs/client/utils/ContextServiceUtils.java | 2 +-
.../apache/linkis/cs/common/serialize/AbstractSerializer.java | 2 +-
.../common/serialize/helper/AbstractSerializationHelper.java | 2 +-
.../apache/linkis/cs/common/utils/CSHighAvailableUtils.java | 2 +-
.../org/apache/linkis/cs/storage/CSTableResultSetWriter.scala | 2 +-
.../linkis/cs/highavailable/DefaultContextHAManager.java | 2 +-
.../cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java | 2 +-
.../linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java | 2 +-
.../cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java | 2 +-
.../linkis/cs/highavailable/proxy/MethodInterceptorImpl.java | 2 +-
.../ha/instancealias/impl/DefaultInstanceAliasConverter.scala | 2 +-
.../ha/instancealias/impl/InstanceAliasManagerImpl.scala | 2 +-
.../instancealias/impl/RouteLabelInstanceAliasConverter.scala | 2 +-
.../linkis/cs/highavailable/test/TestContextHAManager.java | 2 +-
.../linkis/cs/condition/construction/ConditionBuilderImpl.java | 2 +-
.../linkis/cs/execution/ruler/NearestContextSearchRuler.java | 2 +-
.../apache/linkis/cs/server/parser/DefaultKeywordParser.java | 2 +-
.../apache/linkis/cs/server/protocol/RestResponseProtocol.java | 4 ++--
.../linkis/datasourcemanager/common/auth/AuthContext.java | 2 +-
.../linkis/datasourcemanager/common/domain/DataSource.java | 2 +-
.../linkis/datasourcemanager/common/domain/DataSourceEnv.java | 2 +-
.../datasourcemanager/common/domain/DatasourceVersion.java | 2 +-
.../linkis/datasourcemanager/common/util/CryptoUtils.java | 2 +-
.../datasourcemanager/common/util/PatternInjectUtils.java | 4 ++--
.../apache/linkis/datasourcemanager/common/util/json/Json.java | 2 +-
.../core/service/impl/DataSourceInfoServiceImpl.java | 2 +-
.../core/validate/DataSourceParameterValidator.java | 2 +-
.../validate/strategy/RegExpParameterValidateStrategy.java | 2 +-
.../apache/linkis/datasourcemanager/core/vo/DataSourceVo.java | 2 +-
.../metadatamanager/common/service/AbstractMetaService.java | 2 +-
.../metadatamanager/server/loader/MetaClassLoaderManager.java | 2 +-
.../metadatamanager/server/restful/MetadataCoreRestful.java | 2 +-
.../server/service/impl/MetadataAppServiceImpl.java | 2 +-
.../linkis/metadatamanager/server/utils/MetadataUtils.java | 2 +-
.../linkis/metadatamanager/service/ElasticConnection.java | 2 +-
.../apache/linkis/metadatamanager/service/HiveConnection.java | 2 +-
.../apache/linkis/metadatamanager/service/HiveMetaService.java | 2 +-
.../linkis/metadatamanager/service/KafkaMetaService.java | 2 +-
.../linkis/metadata/hive/config/LinkisMybatisConfig.java | 2 +-
.../linkis/metadata/restful/api/DataSourceRestfulApi.java | 2 +-
.../linkis/metadata/service/impl/DataSourceServiceImpl.java | 2 +-
.../apache/linkis/metadata/service/impl/MdqServiceImpl.java | 2 +-
.../main/java/org/apache/linkis/metadata/util/HiveUtils.java | 2 +-
.../org/apache/linkis/metadata/ddl/ImportDDLCreator.scala | 4 ++--
.../scala/org/apache/linkis/metadata/ddl/ScalaDDLCreator.scala | 2 +-
.../apache/linkis/configuration/util/LabelEntityParser.java | 2 +-
.../apache/linkis/configuration/service/CategoryService.scala | 2 +-
.../linkis/configuration/service/ConfigurationService.scala | 2 +-
.../apache/linkis/configuration/validate/RegexValidator.scala | 2 +-
.../errorcode/client/handler/LinkisErrorCodeHandler.java | 2 +-
.../apache/linkis/instance/label/restful/InstanceRestful.java | 2 +-
.../instance/label/service/impl/DefaultInsLabelService.java | 4 ++--
.../apache/linkis/jobhistory/conversions/TaskConversions.scala | 2 +-
.../service/impl/JobHistoryDetailQueryServiceImpl.scala | 2 +-
.../jobhistory/service/impl/JobHistoryQueryServiceImpl.scala | 2 +-
.../scala/org/apache/linkis/jobhistory/util/QueryUtils.scala | 2 +-
.../org/apache/linkis/udf/service/impl/UDFServiceImpl.java | 2 +-
.../apache/linkis/variable/service/VariableServiceImpl.scala | 2 +-
.../scala/org/apache/linkis/gateway/parser/GatewayParser.scala | 2 +-
.../scala/org/apache/linkis/gateway/route/GatewayRouter.scala | 4 ++--
.../org/apache/linkis/gateway/security/ProxyUserUtils.scala | 2 +-
.../org/apache/linkis/gateway/security/SecurityFilter.scala | 4 ++--
.../scala/org/apache/linkis/gateway/security/UserRestful.scala | 2 +-
.../linkis/gateway/security/token/TokenAuthentication.scala | 2 +-
.../scala/org/apache/linkis/httpclient/dws/DWSHttpClient.scala | 2 +-
.../dws/authentication/StaticAuthenticationStrategy.scala | 2 +-
.../linkis/httpclient/dws/config/DWSClientConfigBuilder.scala | 2 +-
.../linkis/httpclient/dws/response/DWSHttpMessageFactory.scala | 2 +-
.../linkis/gateway/ujes/route/AbstractLabelGatewayRouter.scala | 2 +-
.../linkis/gateway/ujes/route/DefaultLabelGatewayRouter.scala | 2 +-
.../linkis/gateway/ujes/route/EntranceGatewayRouter.scala | 2 +-
.../linkis/gateway/ujes/route/HaContextGatewayRouter.scala | 2 +-
.../ujes/route/contextservice/ContextIdParserImpl.scala | 2 +-
.../gateway/springcloud/http/GatewayAuthorizationFilter.java | 2 +-
.../springcloud/http/SpringCloudGatewayHttpRequest.scala | 2 +-
.../ruler/datasource/DatasourceGatewayRouterRuler.scala | 2 +-
282 files changed, 323 insertions(+), 321 deletions(-)
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/FsPath.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/FsPath.java
index 48bf8a6..6b29f6f 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/FsPath.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/FsPath.java
@@ -17,7 +17,7 @@
package org.apache.linkis.common.io;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.io.File;
import java.io.IOException;
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/DESUtil.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/DESUtil.java
index e10c10b..8012082 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/DESUtil.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/DESUtil.java
@@ -17,7 +17,7 @@
package org.apache.linkis.common.utils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import javax.crypto.Cipher;
import javax.crypto.SecretKey;
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/BDPConfiguration.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/BDPConfiguration.scala
index 12be538..c92254b 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/BDPConfiguration.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/BDPConfiguration.scala
@@ -21,7 +21,7 @@ import java.io.{File, FileInputStream, IOException, InputStream}
import java.util.Properties
import org.apache.linkis.common.utils.{Logging, Utils}
import org.apache.commons.io.IOUtils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.JavaConversions._
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/DWCArgumentsParser.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/DWCArgumentsParser.scala
index 2719aa9..a7ebd16 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/DWCArgumentsParser.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/DWCArgumentsParser.scala
@@ -17,7 +17,7 @@
package org.apache.linkis.common.conf
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.mutable.ArrayBuffer
import scala.collection.{JavaConversions, mutable}
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/ListenerEventBus.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/ListenerEventBus.scala
index 6ac3b1f..6776504 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/ListenerEventBus.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/ListenerEventBus.scala
@@ -21,7 +21,7 @@ import java.util.concurrent.atomic.{AtomicBoolean, AtomicLong}
import java.util.concurrent.{ArrayBlockingQueue, CopyOnWriteArrayList, Future, TimeoutException}
import org.apache.linkis.common.utils.{ByteTimeUtils, Logging, Utils}
-import org.apache.commons.lang.time.DateFormatUtils
+import org.apache.commons.lang3.time.DateFormatUtils
import scala.util.control.NonFatal
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/LDAPUtils.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/LDAPUtils.scala
index 39a661c..bfbd462 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/LDAPUtils.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/LDAPUtils.scala
@@ -22,7 +22,7 @@ import java.util.Hashtable
import org.apache.linkis.common.conf.CommonVars
import javax.naming.Context
import javax.naming.ldap.InitialLdapContext
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/RetryHandler.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/RetryHandler.scala
index 9de19b0..9d42e6e 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/RetryHandler.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/RetryHandler.scala
@@ -18,7 +18,7 @@
package org.apache.linkis.common.utils
import org.apache.linkis.common.exception.FatalException
-import org.apache.commons.lang.{ClassUtils => CommonClassUtils}
+import org.apache.commons.lang3.{ClassUtils => CommonClassUtils}
import scala.collection.mutable.ArrayBuffer
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/VariableUtils.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/VariableUtils.scala
index 8b259ee..db468a8 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/VariableUtils.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/VariableUtils.scala
@@ -22,8 +22,8 @@ import java.util
import java.util.{Calendar, Date}
import org.apache.linkis.common.exception.LinkisCommonErrorException
-import org.apache.commons.lang.StringUtils
-import org.apache.commons.lang.time.DateUtils
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.time.DateUtils
import scala.collection.mutable
import scala.collection.convert.WrapAsScala._
diff --git a/linkis-commons/linkis-hadoop-common/src/main/scala/org/apache/linkis/hadoop/common/utils/HDFSUtils.scala b/linkis-commons/linkis-hadoop-common/src/main/scala/org/apache/linkis/hadoop/common/utils/HDFSUtils.scala
index d73e739..e6cc507 100644
--- a/linkis-commons/linkis-hadoop-common/src/main/scala/org/apache/linkis/hadoop/common/utils/HDFSUtils.scala
+++ b/linkis-commons/linkis-hadoop-common/src/main/scala/org/apache/linkis/hadoop/common/utils/HDFSUtils.scala
@@ -27,7 +27,7 @@ import org.apache.linkis.hadoop.common.conf.HadoopConf
import org.apache.linkis.hadoop.common.conf.HadoopConf.{hadoopConfDir, _}
import org.apache.linkis.hadoop.common.entity.HDFSFileSystemContainer
import org.apache.commons.io.IOUtils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.hadoop.conf.Configuration
import org.apache.hadoop.fs.{FileSystem, Path}
import org.apache.hadoop.security.UserGroupInformation
diff --git a/linkis-commons/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/AbstractHttpClient.scala b/linkis-commons/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/AbstractHttpClient.scala
index a40fe4c..b6123b9 100644
--- a/linkis-commons/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/AbstractHttpClient.scala
+++ b/linkis-commons/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/AbstractHttpClient.scala
@@ -29,7 +29,7 @@ import org.apache.linkis.httpclient.loadbalancer.{AbstractLoadBalancer, DefaultL
import org.apache.linkis.httpclient.request._
import org.apache.linkis.httpclient.response._
import org.apache.commons.io.IOUtils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.http.client.CookieStore
import org.apache.http.client.config.RequestConfig
import org.apache.http.client.entity.{DeflateDecompressingEntity, GzipDecompressingEntity, UrlEncodedFormEntity}
diff --git a/linkis-commons/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/authentication/AbstractAuthenticationStrategy.scala b/linkis-commons/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/authentication/AbstractAuthenticationStrategy.scala
index 53e8aa9..2352f51 100644
--- a/linkis-commons/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/authentication/AbstractAuthenticationStrategy.scala
+++ b/linkis-commons/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/authentication/AbstractAuthenticationStrategy.scala
@@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap
import org.apache.linkis.httpclient.Client
import org.apache.linkis.httpclient.config.ClientConfig
import org.apache.linkis.httpclient.request.{Action, UserAction}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.http.HttpResponse
diff --git a/linkis-commons/linkis-message-scheduler/src/main/scala/org/apache/linkis/rpc/MessageRPCReceiveRestful.scala b/linkis-commons/linkis-message-scheduler/src/main/scala/org/apache/linkis/rpc/MessageRPCReceiveRestful.scala
index 232c862..425a9ad 100644
--- a/linkis-commons/linkis-message-scheduler/src/main/scala/org/apache/linkis/rpc/MessageRPCReceiveRestful.scala
+++ b/linkis-commons/linkis-message-scheduler/src/main/scala/org/apache/linkis/rpc/MessageRPCReceiveRestful.scala
@@ -25,7 +25,7 @@ import org.apache.linkis.rpc.transform.{RPCConsumer, RPCProduct}
import org.apache.linkis.server.{Message, catchIt}
import javax.annotation.PostConstruct
import javax.servlet.http.HttpServletRequest
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.context.annotation.{Import, Primary}
import org.springframework.stereotype.Component
diff --git a/linkis-commons/linkis-module/src/main/java/org/apache/linkis/DataWorkCloudApplication.java b/linkis-commons/linkis-module/src/main/java/org/apache/linkis/DataWorkCloudApplication.java
index 43847cb..dbc206b 100644
--- a/linkis-commons/linkis-module/src/main/java/org/apache/linkis/DataWorkCloudApplication.java
+++ b/linkis-commons/linkis-module/src/main/java/org/apache/linkis/DataWorkCloudApplication.java
@@ -26,7 +26,7 @@ import org.apache.linkis.server.BDPJettyServerHelper;
import org.apache.linkis.server.conf.DataWorkCloudCustomExcludeFilter;
import org.apache.linkis.server.conf.ServerConfiguration;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/linkis-commons/linkis-module/src/main/java/org/apache/linkis/LinkisBaseServerApp.java b/linkis-commons/linkis-module/src/main/java/org/apache/linkis/LinkisBaseServerApp.java
index d9cb9c6..f6b1c3a 100644
--- a/linkis-commons/linkis-module/src/main/java/org/apache/linkis/LinkisBaseServerApp.java
+++ b/linkis-commons/linkis-module/src/main/java/org/apache/linkis/LinkisBaseServerApp.java
@@ -20,8 +20,8 @@ package org.apache.linkis;
import org.apache.linkis.common.utils.Utils;
import org.apache.linkis.server.utils.LinkisMainHelper;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/Message.scala b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/Message.scala
index 5ea0d4a..5dcb595 100644
--- a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/Message.scala
+++ b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/Message.scala
@@ -20,8 +20,8 @@ package org.apache.linkis.server
import java.util
import javax.servlet.http.HttpServletRequest
-import org.apache.commons.lang.StringUtils
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
import org.slf4j.LoggerFactory
import org.springframework.web.context.request.{RequestContextHolder, ServletRequestAttributes}
@@ -95,13 +95,13 @@ object Message {
}
def error(msg: String): Message = error(msg, null)
implicit def error(t: Throwable): Message = {
- Message(status = 1).setMessage(ExceptionUtils.getRootCauseMessage(t)) << ("stack", ExceptionUtils.getFullStackTrace(t))
+ Message(status = 1).setMessage(ExceptionUtils.getRootCauseMessage(t)) << ("stack", ExceptionUtils.getStackTrace(t))
}
implicit def error(e: (String, Throwable)): Message = error(e._1, e._2)
implicit def error(msg: String, t: Throwable): Message = {
val message = Message(status = 1)
message.setMessage(msg)
- if(t != null) message << ("stack", ExceptionUtils.getFullStackTrace(t))
+ if(t != null) message << ("stack", ExceptionUtils.getStackTrace(t))
message
}
implicit def warn(msg: String): Message = {
@@ -124,7 +124,7 @@ object Message {
def noLogin(msg: String, t: Throwable): Message = {
val message = Message(status = -1)
message.setMessage(msg)
- if(t != null) message << ("stack", ExceptionUtils.getFullStackTrace(t))
+ if(t != null) message << ("stack", ExceptionUtils.getStackTrace(t))
message
}
def noLogin(msg: String): Message = noLogin(msg, null)
diff --git a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/DataWorkCloudCustomExcludeFilter.scala b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/DataWorkCloudCustomExcludeFilter.scala
index 9de27e2..9c7b74c 100644
--- a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/DataWorkCloudCustomExcludeFilter.scala
+++ b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/DataWorkCloudCustomExcludeFilter.scala
@@ -17,7 +17,7 @@
package org.apache.linkis.server.conf
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.core.`type`.classreading.{MetadataReader, MetadataReaderFactory}
import org.springframework.core.`type`.filter.TypeFilter
diff --git a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/ServerConfiguration.scala b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/ServerConfiguration.scala
index 6e077a2..32e30f6 100644
--- a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/ServerConfiguration.scala
+++ b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/ServerConfiguration.scala
@@ -23,7 +23,7 @@ import java.lang.Boolean
import org.apache.linkis.common.conf.{CommonVars, Configuration, TimeType}
import org.apache.linkis.common.utils.{DESUtil, Logging, Utils}
import org.apache.linkis.server.exception.BDPInitServerException
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import sun.misc.BASE64Encoder
diff --git a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/package.scala b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/package.scala
index 858b7e9..18a409b 100644
--- a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/package.scala
+++ b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/package.scala
@@ -24,8 +24,8 @@ import org.apache.linkis.common.utils.Utils
import org.apache.linkis.server.exception.{BDPServerErrorException, NonLoginException}
import org.apache.linkis.server.security.SecurityFilter
import javax.servlet.http.HttpServletRequest
-import org.apache.commons.lang.StringUtils
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
import org.slf4j.Logger
import scala.collection.{JavaConversions, mutable}
diff --git a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/SSOUtils.scala b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/SSOUtils.scala
index fbd32bd..07689c0 100644
--- a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/SSOUtils.scala
+++ b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/SSOUtils.scala
@@ -24,7 +24,7 @@ import org.apache.linkis.common.utils.{Logging, RSAUtils, Utils}
import org.apache.linkis.server.conf.ServerConfiguration
import org.apache.linkis.server.exception.{IllegalUserTicketException, LoginExpireException, NonLoginException}
import javax.servlet.http.Cookie
-import org.apache.commons.lang.time.DateFormatUtils
+import org.apache.commons.lang3.time.DateFormatUtils
import scala.collection.JavaConverters._
object SSOUtils extends Logging {
diff --git a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/SecurityFilter.scala b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/SecurityFilter.scala
index 159363a..8a52f5e 100644
--- a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/SecurityFilter.scala
+++ b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/SecurityFilter.scala
@@ -28,7 +28,7 @@ import org.apache.linkis.server.security.SSOUtils.sslEnable
import org.apache.linkis.server.{Message, _}
import javax.servlet._
import javax.servlet.http.{Cookie, HttpServletRequest, HttpServletResponse}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class SecurityFilter extends Filter {
diff --git a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/ControllerServer.scala b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/ControllerServer.scala
index f33f54d..47f2343 100644
--- a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/ControllerServer.scala
+++ b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/ControllerServer.scala
@@ -27,9 +27,9 @@ import org.apache.linkis.server.Message
import org.apache.linkis.server.conf.ServerConfiguration._
import org.apache.linkis.server.exception.BDPServerErrorException
import org.apache.linkis.server.socket.controller.{ServerListenerEventBus, SocketServerEvent}
-import org.apache.commons.lang.StringUtils
-import org.apache.commons.lang.exception.ExceptionUtils
-import org.apache.commons.lang.time.DateFormatUtils
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
+import org.apache.commons.lang3.time.DateFormatUtils
import org.eclipse.jetty.websocket.servlet._
import scala.collection.JavaConversions._
diff --git a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/controller/ServerListenerEventBus.scala b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/controller/ServerListenerEventBus.scala
index 0777c41..00b09a2 100644
--- a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/controller/ServerListenerEventBus.scala
+++ b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/controller/ServerListenerEventBus.scala
@@ -19,7 +19,7 @@ package org.apache.linkis.server.socket.controller
import org.apache.linkis.common.listener.ListenerEventBus
import org.apache.linkis.server.exception.BDPServerErrorException
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class ServerListenerEventBus(eventQueueCapacity: Int, name: String,
diff --git a/linkis-commons/linkis-mybatis/src/main/java/org/apache/linkis/mybatis/MybatisConfigurationFactory.java b/linkis-commons/linkis-mybatis/src/main/java/org/apache/linkis/mybatis/MybatisConfigurationFactory.java
index 18a24e9..3c2e478 100644
--- a/linkis-commons/linkis-mybatis/src/main/java/org/apache/linkis/mybatis/MybatisConfigurationFactory.java
+++ b/linkis-commons/linkis-mybatis/src/main/java/org/apache/linkis/mybatis/MybatisConfigurationFactory.java
@@ -21,7 +21,7 @@ import org.apache.linkis.common.utils.JavaLog;
import org.apache.linkis.mybatis.conf.MybatisConfiguration;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.plugin.Interceptor;
import org.apache.ibatis.session.SqlSessionFactory;
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/RPCReceiveRestful.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/RPCReceiveRestful.scala
index 0d9175e..e9b37eb 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/RPCReceiveRestful.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/RPCReceiveRestful.scala
@@ -26,7 +26,7 @@ import org.apache.linkis.rpc.exception.DWCURIException
import org.apache.linkis.rpc.transform.{RPCConsumer, RPCProduct}
import org.apache.linkis.server.{Message, catchIt}
import javax.annotation.PostConstruct
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
import org.springframework.web.bind.annotation.{RequestBody, RequestMapping, RequestMethod, RestController}
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCSpringConfiguration.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCSpringConfiguration.scala
index 3d94de6..488276c 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCSpringConfiguration.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCSpringConfiguration.scala
@@ -24,7 +24,7 @@ import org.apache.linkis.rpc.RPCReceiveRestful
import org.apache.linkis.rpc.interceptor.RPCServerLoader
import org.apache.linkis.rpc.sender.eureka.EurekaRPCServerLoader
import org.apache.linkis.server.conf.ServerConfiguration
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.boot.autoconfigure.condition.{ConditionalOnClass, ConditionalOnMissingBean}
import org.springframework.boot.context.event.ApplicationPreparedEvent
import org.springframework.cloud.openfeign.EnableFeignClients
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/common/RetryableRPCInterceptor.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/common/RetryableRPCInterceptor.scala
index dac8e97..941162e 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/common/RetryableRPCInterceptor.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/common/RetryableRPCInterceptor.scala
@@ -27,7 +27,7 @@ import org.apache.linkis.rpc.exception.DWCRPCRetryException
import org.apache.linkis.rpc.interceptor.{RPCInterceptor, RPCInterceptorChain, RPCInterceptorExchange, ServiceInstanceRPCInterceptorChain}
import org.apache.linkis.rpc.utils.RPCUtils
import feign.RetryableException
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.stereotype.Component
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/common/SingleInstanceRPCLoadBalancer.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/common/SingleInstanceRPCLoadBalancer.scala
index c45a208..96fa495 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/common/SingleInstanceRPCLoadBalancer.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/common/SingleInstanceRPCLoadBalancer.scala
@@ -22,7 +22,7 @@ import org.apache.linkis.common.ServiceInstance
import org.apache.linkis.common.utils.Logging
import org.apache.linkis.protocol.{Protocol, SingleInstanceProtocol}
import org.apache.linkis.rpc.interceptor.RPCLoadBalancer
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.stereotype.Component
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/SpringMVCRPCSender.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/SpringMVCRPCSender.scala
index 28df35f..c1d241c 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/SpringMVCRPCSender.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/SpringMVCRPCSender.scala
@@ -30,7 +30,7 @@ import org.apache.linkis.rpc.transform.RPCConsumer
import org.apache.linkis.rpc.{BaseRPCSender, RPCMessageEvent, RPCSpringBeanCache}
import org.apache.linkis.server.{BDPJettyServerHelper, Message}
import feign._
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.cloud.netflix.ribbon.ServerIntrospector
import org.springframework.cloud.openfeign.ribbon.{CachingSpringLoadBalancerFactory, FeignLoadBalancer, LoadBalancerFeignClient}
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/transform/RPCProduct.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/transform/RPCProduct.scala
index 1186f4b..3880c03 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/transform/RPCProduct.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/transform/RPCProduct.scala
@@ -27,7 +27,7 @@ import org.apache.linkis.rpc.errorcode.RPCErrorConstants
import org.apache.linkis.rpc.exception.DWCURIException
import org.apache.linkis.rpc.serializer.ProtostuffSerializeUtil
import org.apache.linkis.server.{EXCEPTION_MSG, Message}
-import org.apache.commons.lang.ClassUtils
+import org.apache.commons.lang3.ClassUtils
import org.json4s.{DefaultFormats, Formats, Serializer}
import scala.collection.JavaConversions
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/utils/RPCUtils.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/utils/RPCUtils.scala
index babe3a5..de0c314 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/utils/RPCUtils.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/utils/RPCUtils.scala
@@ -26,7 +26,7 @@ import org.apache.linkis.rpc.exception.NoInstanceExistsException
import org.apache.linkis.rpc.sender.{SpringCloudFeignConfigurationCache, SpringMVCRPCSender}
import org.apache.linkis.rpc.{BaseRPCSender, Sender}
import feign.RetryableException
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.JavaConversions._
diff --git a/linkis-commons/linkis-rpc/src/test/scala/org/apache/linkis/rpc/RPCFormatsTest.scala b/linkis-commons/linkis-rpc/src/test/scala/org/apache/linkis/rpc/RPCFormatsTest.scala
index 89951b8..1066c2e 100644
--- a/linkis-commons/linkis-rpc/src/test/scala/org/apache/linkis/rpc/RPCFormatsTest.scala
+++ b/linkis-commons/linkis-rpc/src/test/scala/org/apache/linkis/rpc/RPCFormatsTest.scala
@@ -21,7 +21,7 @@ import java.lang.reflect.ParameterizedType
import java.util
import org.apache.linkis.rpc.transform.{JavaCollectionSerializer, JavaMapSerializer}
-import org.apache.commons.lang.ClassUtils
+import org.apache.commons.lang3.ClassUtils
import org.json4s.JsonAST.JObject
import org.json4s.JsonDSL._
import org.json4s.jackson.Serialization
diff --git a/linkis-commons/linkis-scheduler/src/main/scala/org/apache/linkis/scheduler/AbstractScheduler.scala b/linkis-commons/linkis-scheduler/src/main/scala/org/apache/linkis/scheduler/AbstractScheduler.scala
index 1cabbe9..edc8837 100644
--- a/linkis-commons/linkis-scheduler/src/main/scala/org/apache/linkis/scheduler/AbstractScheduler.scala
+++ b/linkis-commons/linkis-scheduler/src/main/scala/org/apache/linkis/scheduler/AbstractScheduler.scala
@@ -20,7 +20,7 @@ package org.apache.linkis.scheduler
import org.apache.linkis.common.utils.Utils
import org.apache.linkis.scheduler.exception.SchedulerErrorException
import org.apache.linkis.scheduler.queue.SchedulerEvent
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
abstract class AbstractScheduler extends Scheduler {
diff --git a/linkis-commons/linkis-scheduler/src/main/scala/org/apache/linkis/scheduler/queue/Job.scala b/linkis-commons/linkis-scheduler/src/main/scala/org/apache/linkis/scheduler/queue/Job.scala
index d5c4682..56fa7e5 100644
--- a/linkis-commons/linkis-scheduler/src/main/scala/org/apache/linkis/scheduler/queue/Job.scala
+++ b/linkis-commons/linkis-scheduler/src/main/scala/org/apache/linkis/scheduler/queue/Job.scala
@@ -31,8 +31,8 @@ import org.apache.linkis.scheduler.executer._
import org.apache.linkis.scheduler.future.BDPFuture
import org.apache.linkis.scheduler.listener._
import org.apache.commons.io.IOUtils
-import org.apache.commons.lang.StringUtils
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
@@ -96,7 +96,7 @@ abstract class Job extends Runnable with SchedulerEvent with Closeable with Logg
Utils.tryAndWarn {
logListener.foreach(_.onLogUpdate(this, LogUtils.generateERROR(errorMsg)))
if(t != null) {
- logListener.foreach(_.onLogUpdate(this, LogUtils.generateERROR(ExceptionUtils.getFullStackTrace(t))))
+ logListener.foreach(_.onLogUpdate(this, LogUtils.generateERROR(ExceptionUtils.getStackTrace(t))))
}
}
errorExecuteResponse = ErrorExecuteResponse(errorMsg, t)
@@ -206,7 +206,7 @@ abstract class Job extends Runnable with SchedulerEvent with Closeable with Logg
case e: ErrorExecuteResponse =>
val canRetry = Utils.tryCatch(isJobShouldRetry(e)) {t =>
error(s"Job $toString failed to get the retry information!", t)
- Utils.tryAndWarn(logListener.foreach(_.onLogUpdate(this, LogUtils.generateERROR("failed to get the retry information! " + ExceptionUtils.getFullStackTrace(t)))))
+ Utils.tryAndWarn(logListener.foreach(_.onLogUpdate(this, LogUtils.generateERROR("failed to get the retry information! " + ExceptionUtils.getStackTrace(t)))))
if(e.t == null) errorExecuteResponse = ErrorExecuteResponse(e.message, t)
false
}
diff --git a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/HDFSFileSystem.java b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/HDFSFileSystem.java
index f658b11..339bf0b 100644
--- a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/HDFSFileSystem.java
+++ b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/HDFSFileSystem.java
@@ -25,8 +25,8 @@ import org.apache.linkis.storage.utils.StorageConfiguration;
import org.apache.linkis.storage.utils.StorageUtils;
import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileStatus;
diff --git a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/LocalFileSystem.java b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/LocalFileSystem.java
index edee4eb..840613d 100644
--- a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/LocalFileSystem.java
+++ b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/LocalFileSystem.java
@@ -27,7 +27,7 @@ import org.apache.linkis.storage.utils.StorageUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/resultset/DefaultResultSetFactory.scala b/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/resultset/DefaultResultSetFactory.scala
index e6f5739..8e5992d 100644
--- a/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/resultset/DefaultResultSetFactory.scala
+++ b/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/resultset/DefaultResultSetFactory.scala
@@ -26,7 +26,7 @@ import org.apache.linkis.storage.FSFactory
import org.apache.linkis.storage.domain.Dolphin
import org.apache.linkis.storage.exception.{StorageErrorException, StorageWarnException}
import org.apache.linkis.storage.utils.{StorageConfiguration, StorageUtils}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class DefaultResultSetFactory extends ResultSetFactory with Logging{
diff --git a/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/utils/StorageUtils.scala b/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/utils/StorageUtils.scala
index 9e002ca..a7241e8 100644
--- a/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/utils/StorageUtils.scala
+++ b/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/utils/StorageUtils.scala
@@ -26,7 +26,7 @@ import org.apache.linkis.hadoop.common.conf.HadoopConf
import org.apache.linkis.storage.exception.StorageFatalException
import org.apache.linkis.storage.resultset.{ResultSetFactory, ResultSetReader, ResultSetWriter}
import org.apache.linkis.storage.{LineMetaData, LineRecord}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.mutable
diff --git a/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-application/src/main/java/org/apache/linkis/cli/application/presenter/converter/LinkisJobInfoModelConverter.java b/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-application/src/main/java/org/apache/linkis/cli/application/presenter/converter/LinkisJobInfoModelConverter.java
index b45d902..a0edbbd 100644
--- a/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-application/src/main/java/org/apache/linkis/cli/application/presenter/converter/LinkisJobInfoModelConverter.java
+++ b/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-application/src/main/java/org/apache/linkis/cli/application/presenter/converter/LinkisJobInfoModelConverter.java
@@ -25,7 +25,7 @@ import org.apache.linkis.cli.core.exception.error.CommonErrMsg;
import org.apache.linkis.cli.core.presenter.model.ModelConverter;
import org.apache.linkis.cli.core.presenter.model.PresenterModel;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
public class LinkisJobInfoModelConverter implements ModelConverter {
@Override
diff --git a/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-application/src/main/java/org/apache/linkis/cli/application/presenter/converter/LinkisJobKillModelConverter.java b/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-application/src/main/java/org/apache/linkis/cli/application/presenter/converter/LinkisJobKillModelConverter.java
index 90fa834..869db65 100644
--- a/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-application/src/main/java/org/apache/linkis/cli/application/presenter/converter/LinkisJobKillModelConverter.java
+++ b/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-application/src/main/java/org/apache/linkis/cli/application/presenter/converter/LinkisJobKillModelConverter.java
@@ -25,7 +25,7 @@ import org.apache.linkis.cli.core.exception.error.CommonErrMsg;
import org.apache.linkis.cli.core.presenter.model.ModelConverter;
import org.apache.linkis.cli.core.presenter.model.PresenterModel;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
public class LinkisJobKillModelConverter implements ModelConverter {
@Override
diff --git a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/LinkisJobBuilder.scala b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/LinkisJobBuilder.scala
index 8ec2f66..238c2b7 100644
--- a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/LinkisJobBuilder.scala
+++ b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/LinkisJobBuilder.scala
@@ -29,7 +29,7 @@ import org.apache.linkis.protocol.utils.TaskUtils
import org.apache.linkis.ujes.client.exception.{UJESClientBuilderException, UJESJobException}
import org.apache.linkis.ujes.client.{UJESClient, UJESClientImpl}
import org.apache.linkis.ujes.client.request.JobSubmitAction
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
trait LinkisJobBuilder[Job <: LinkisJob] {
diff --git a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/interactive/InteractiveJobBuilder.scala b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/interactive/InteractiveJobBuilder.scala
index 90ca613..bf7aabf 100644
--- a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/interactive/InteractiveJobBuilder.scala
+++ b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/interactive/InteractiveJobBuilder.scala
@@ -22,7 +22,7 @@ import org.apache.linkis.computation.client.utils.LabelKeyUtils
import org.apache.linkis.manager.label.entity.engine.RunType.RunType
import org.apache.linkis.ujes.client.UJESClient
import org.apache.linkis.ujes.client.request.JobSubmitAction
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class InteractiveJobBuilder private[interactive]()
diff --git a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/operator/impl/EngineConnLogOperator.scala b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/operator/impl/EngineConnLogOperator.scala
index f6a3047..14b9ba7 100644
--- a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/operator/impl/EngineConnLogOperator.scala
+++ b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/operator/impl/EngineConnLogOperator.scala
@@ -28,7 +28,7 @@ import org.apache.linkis.computation.client.once.simple.SubmittableSimpleOnceJob
import org.apache.linkis.computation.client.operator.OnceJobOperator
import org.apache.linkis.computation.client.utils.LabelKeyUtils
import org.apache.linkis.ujes.client.exception.UJESJobException
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class EngineConnLogOperator extends OnceJobOperator[EngineConnLogs] {
diff --git a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobExecuteAction.scala b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobExecuteAction.scala
index fdf52a7..d7246f4 100644
--- a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobExecuteAction.scala
+++ b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobExecuteAction.scala
@@ -24,7 +24,7 @@ import org.apache.linkis.httpclient.request.POSTAction
import org.apache.linkis.protocol.constants.TaskConstant
import org.apache.linkis.protocol.utils.TaskUtils
import org.apache.linkis.ujes.client.exception.UJESClientBuilderException
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class JobExecuteAction private() extends POSTAction with UJESJobAction {
override def suffixURLs: Array[String] = Array("entrance", "execute")
diff --git a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobInfoAction.scala b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobInfoAction.scala
index 970e8cd..77c81df 100644
--- a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobInfoAction.scala
+++ b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobInfoAction.scala
@@ -20,7 +20,7 @@ package org.apache.linkis.ujes.client.request
import org.apache.linkis.httpclient.request.GetAction
import org.apache.linkis.ujes.client.exception.UJESClientBuilderException
import org.apache.linkis.ujes.client.response.JobExecuteResult
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class JobInfoAction extends GetAction with UJESJobAction {
private var taskId: String = _
diff --git a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobListAction.scala b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobListAction.scala
index 2774a31..f096b11 100644
--- a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobListAction.scala
+++ b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobListAction.scala
@@ -18,7 +18,7 @@
package org.apache.linkis.ujes.client.request
import org.apache.linkis.httpclient.request.GetAction
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.mutable.ArrayBuffer
diff --git a/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/common/entity/task/RequestPersistTask.java b/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/common/entity/task/RequestPersistTask.java
index 060ba51..6dd8eb1 100644
--- a/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/common/entity/task/RequestPersistTask.java
+++ b/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/common/entity/task/RequestPersistTask.java
@@ -20,8 +20,8 @@ package org.apache.linkis.governance.common.entity.task;
import org.apache.linkis.manager.label.entity.Label;
import org.apache.linkis.protocol.task.Task;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
import java.util.Date;
import java.util.List;
diff --git a/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/common/entity/task/ResponsePersist.java b/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/common/entity/task/ResponsePersist.java
index 22a009a..161cf82 100644
--- a/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/common/entity/task/ResponsePersist.java
+++ b/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/common/entity/task/ResponsePersist.java
@@ -19,8 +19,8 @@ package org.apache.linkis.governance.common.entity.task;
import org.apache.linkis.protocol.query.QueryProtocol;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
import java.util.Map;
diff --git a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/paser/CodeParser.scala b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/paser/CodeParser.scala
index d8662a1..fa35255 100644
--- a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/paser/CodeParser.scala
+++ b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/paser/CodeParser.scala
@@ -20,7 +20,7 @@ package org.apache.linkis.governance.common.paser
import org.apache.linkis.common.utils.Logging
import org.apache.linkis.governance.common.conf.GovernanceCommonConf
import org.apache.linkis.governance.common.paser.CodeType.CodeType
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.slf4j.{Logger, LoggerFactory}
import scala.collection.mutable
@@ -165,7 +165,7 @@ class PythonCodeParser extends SingleCodeParser {
def recordBrackets(bracketStack: mutable.Stack[String], l: String): Unit = {
val real = l.replace("\"\"\"", "").replace("'''", "").trim
- if (StringUtils.endsWithAny(real, openBrackets)) {
+ if (StringUtils.endsWithAny(real, openBrackets: _*)) {
for (i <- (0 to real.length - 1).reverse) {
val token = real.substring(i, i + 1)
if (openBrackets.contains(token)) {
@@ -173,7 +173,7 @@ class PythonCodeParser extends SingleCodeParser {
}
}
}
- if (StringUtils.startsWithAny(real, closeBrackets)) {
+ if (StringUtils.startsWithAny(real, closeBrackets: _*)) {
for (i <- 0 to real.length - 1) {
val token = real.substring(i, i + 1)
if (closeBrackets.contains(token)) {
diff --git a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/protocol/job/JobRespProtocol.scala b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/protocol/job/JobRespProtocol.scala
index aee232e..905d38d 100644
--- a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/protocol/job/JobRespProtocol.scala
+++ b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/protocol/job/JobRespProtocol.scala
@@ -17,7 +17,7 @@
package org.apache.linkis.governance.common.protocol.job
-import org.apache.commons.lang.builder.{EqualsBuilder, HashCodeBuilder}
+import org.apache.commons.lang3.builder.{EqualsBuilder, HashCodeBuilder}
import java.util
import scala.beans.BeanProperty
diff --git a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/EngineConnArguments.scala b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/EngineConnArguments.scala
index 4918b23..c677ae7 100644
--- a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/EngineConnArguments.scala
+++ b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/EngineConnArguments.scala
@@ -17,7 +17,7 @@
package org.apache.linkis.governance.common.utils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.mutable
import scala.collection.mutable.ArrayBuffer
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/launch/ProcessEngineConnLaunch.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/launch/ProcessEngineConnLaunch.scala
index e3432b7..a8af91d 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/launch/ProcessEngineConnLaunch.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/launch/ProcessEngineConnLaunch.scala
@@ -32,7 +32,7 @@ import org.apache.linkis.manager.engineplugin.common.launch.process.Environment.
import org.apache.linkis.manager.engineplugin.common.launch.process.LaunchConstants._
import org.apache.linkis.manager.engineplugin.common.launch.process.{Environment, ProcessEngineConnLaunchRequest}
import org.apache.commons.io.{FileUtils, IOUtils}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.JavaConversions._
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/hook/JarUDFLoadECMHook.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/hook/JarUDFLoadECMHook.scala
index aedabe8..4a84142 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/hook/JarUDFLoadECMHook.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/hook/JarUDFLoadECMHook.scala
@@ -21,7 +21,7 @@ import org.apache.linkis.ecm.core.engineconn.EngineConn
import org.apache.linkis.manager.engineplugin.common.launch.entity.EngineConnLaunchRequest
import org.apache.linkis.manager.engineplugin.common.launch.process.{LaunchConstants, ProcessEngineConnLaunchRequest}
import org.apache.linkis.udf.UDFClient
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class JarUDFLoadECMHook extends ECMHook with Logging {
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/operator/EngineConnLogOperator.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/operator/EngineConnLogOperator.scala
index bd1e3c6..d0403d2 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/operator/EngineConnLogOperator.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/operator/EngineConnLogOperator.scala
@@ -29,7 +29,7 @@ import org.apache.linkis.ecm.server.service.{EngineConnListService, LocalDirsHan
import org.apache.linkis.manager.common.operator.Operator
import org.apache.linkis.manager.common.protocol.em.ECMOperateRequest
import org.apache.commons.io.IOUtils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.JavaConverters.asScalaBufferConverter
import scala.util.matching.Regex
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/AbstractEngineConnLaunchService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/AbstractEngineConnLaunchService.scala
index 79a8667..bd2ec0e 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/AbstractEngineConnLaunchService.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/AbstractEngineConnLaunchService.scala
@@ -37,7 +37,7 @@ import org.apache.linkis.manager.common.entity.node.{AMEngineNode, EngineNode}
import org.apache.linkis.manager.common.protocol.engine.EngineConnStatusCallbackToAM
import org.apache.linkis.manager.engineplugin.common.launch.entity.EngineConnLaunchRequest
import org.apache.linkis.rpc.Sender
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
import scala.concurrent.duration.Duration
import scala.concurrent.{Await, ExecutionContextExecutorService, Future}
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultEngineConnKillService.java b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultEngineConnKillService.java
index 0e38151..34ce1bc 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultEngineConnKillService.java
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultEngineConnKillService.java
@@ -27,7 +27,7 @@ import org.apache.linkis.manager.common.protocol.engine.EngineStopResponse;
import org.apache.linkis.manager.common.protocol.engine.EngineSuicideRequest;
import org.apache.linkis.message.annotation.Receiver;
import org.apache.linkis.rpc.Sender;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultOperateService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultOperateService.scala
index bae6a26..76804c9 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultOperateService.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultOperateService.scala
@@ -17,7 +17,7 @@
package org.apache.linkis.ecm.server.service.impl
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
import org.apache.linkis.common.utils.{Logging, Utils}
import org.apache.linkis.ecm.server.service.OperateService
import org.apache.linkis.manager.common.operator.OperatorFactory
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/ProcessEngineConnLaunchService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/ProcessEngineConnLaunchService.scala
index 2c30a13..56c3b44 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/ProcessEngineConnLaunchService.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/ProcessEngineConnLaunchService.scala
@@ -35,7 +35,7 @@ import org.apache.linkis.manager.common.protocol.engine.EngineConnStatusCallback
import org.apache.linkis.manager.engineplugin.common.launch.entity.EngineConnLaunchRequest
import org.apache.linkis.rpc.Sender
import org.apache.commons.io.IOUtils
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
import scala.concurrent.duration.Duration
import scala.concurrent.{Future, TimeoutException}
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/src/main/scala/org/apache/linkis/engineconn/once/executor/OnceExecutor.scala b/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/src/main/scala/org/apache/linkis/engineconn/once/executor/OnceExecutor.scala
index 97dfc2b..3942dff 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/src/main/scala/org/apache/linkis/engineconn/once/executor/OnceExecutor.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/src/main/scala/org/apache/linkis/engineconn/once/executor/OnceExecutor.scala
@@ -33,7 +33,7 @@ import org.apache.linkis.manager.label.builder.factory.LabelBuilderFactoryContex
import org.apache.linkis.manager.label.entity.{JobLabel, Label}
import org.apache.linkis.scheduler.executer.{AsynReturnExecuteResponse, ErrorExecuteResponse, ExecuteResponse, SuccessExecuteResponse}
import org.apache.commons.io.IOUtils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.linkis.engineconn.core.hook.ShutdownHook
import scala.collection.convert.wrapAsScala._
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSResourceParser.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSResourceParser.scala
index 820fbbd..4ec4ebd 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSResourceParser.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSResourceParser.scala
@@ -21,7 +21,7 @@ import java.util
import java.util.regex.Pattern
import org.apache.linkis.cs.client.service.CSResourceService
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.JavaConversions._
import scala.collection.mutable.ArrayBuffer
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSTableRegister.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSTableRegister.scala
index 4b2fd01..387d0e8 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSTableRegister.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSTableRegister.scala
@@ -31,7 +31,7 @@ import org.apache.linkis.cs.common.utils.CSCommonUtils
import org.apache.linkis.engineconn.computation.executor.execute.EngineExecutionContext
import org.apache.linkis.storage.domain.Column
import org.apache.linkis.storage.utils.StorageUtils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
object CSTableRegister extends Logging{
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala
index 08f6c74..fd7b37c 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala
@@ -45,8 +45,8 @@ import org.apache.linkis.manager.label.entity.engine.UserCreatorLabel
import org.apache.linkis.manager.label.entity.entrance.ExecuteOnceLabel
import org.apache.linkis.protocol.engine.JobProgressInfo
import org.apache.linkis.scheduler.executer._
-import org.apache.commons.lang.StringUtils
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
abstract class ComputationExecutor(val outputPrintLimit: Int = 1000) extends AccessibleExecutor with ResourceExecutor with LabelExecutor with Logging {
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala
index 2fad052..9b229ef 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala
@@ -37,7 +37,7 @@ import org.apache.linkis.storage.resultset.table.TableResultSet
import org.apache.linkis.storage.resultset.{ResultSetFactory, ResultSetWriter}
import org.apache.linkis.storage.{LineMetaData, LineRecord}
import org.apache.commons.io.IOUtils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class EngineExecutionContext(executor: ComputationExecutor, executorUser: String = Utils.getJvmUser) extends
ExecutorExecutionContext with Logging {
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/hook/UDFLoadEngineConnHook.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/hook/UDFLoadEngineConnHook.scala
index 4700c81..b61cd06 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/hook/UDFLoadEngineConnHook.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/hook/UDFLoadEngineConnHook.scala
@@ -32,7 +32,7 @@ import org.apache.linkis.udf.UDFClient
import org.apache.linkis.udf.entity.UDFInfo
import org.apache.linkis.udf.utils.ConstantVar
import org.apache.commons.io.FileUtils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.JavaConversions._
import scala.collection.mutable.ArrayBuffer
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala
index 2589c20..6713b69 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala
@@ -48,7 +48,7 @@ import org.apache.linkis.rpc.utils.RPCUtils
import org.apache.linkis.scheduler.executer.{ErrorExecuteResponse, ExecuteResponse, IncompleteExecuteResponse, SubmitResponse}
import org.apache.linkis.server.BDPJettyServerHelper
import javax.annotation.PostConstruct
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.stereotype.Component
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/conf/EngineConnConf.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/conf/EngineConnConf.scala
index d2cb8d6..0b0d405 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/conf/EngineConnConf.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/conf/EngineConnConf.scala
@@ -20,7 +20,7 @@ package org.apache.linkis.engineconn.common.conf
import java.io.File
import org.apache.linkis.common.conf.{CommonVars, TimeType}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/hook/EngineConnHook.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/hook/EngineConnHook.scala
index 086777e..92092c7 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/hook/EngineConnHook.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/hook/EngineConnHook.scala
@@ -21,7 +21,7 @@ import org.apache.linkis.common.utils.{Logging, Utils}
import org.apache.linkis.engineconn.common.conf.EngineConnConf
import org.apache.linkis.engineconn.common.creation.EngineCreationContext
import org.apache.linkis.engineconn.common.engineconn.EngineConn
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
trait EngineConnHook {
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/java/org/apache/linkis/engineconn/acessible/executor/log/MountLogCache.java b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/java/org/apache/linkis/engineconn/acessible/executor/log/MountLogCache.java
index e9ac3e8..c4d16b5 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/java/org/apache/linkis/engineconn/acessible/executor/log/MountLogCache.java
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/java/org/apache/linkis/engineconn/acessible/executor/log/MountLogCache.java
@@ -19,7 +19,7 @@ package org.apache.linkis.engineconn.acessible.executor.log;
import org.apache.linkis.engineconn.acessible.executor.conf.AccessibleExecutorConfiguration;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/execution/AccessibleEngineConnExecution.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/execution/AccessibleEngineConnExecution.scala
index 63a303e..53495ad 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/execution/AccessibleEngineConnExecution.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/execution/AccessibleEngineConnExecution.scala
@@ -35,7 +35,7 @@ import org.apache.linkis.manager.common.entity.enumeration.NodeStatus
import org.apache.linkis.manager.common.protocol.engine.EngineConnReleaseRequest
import org.apache.linkis.manager.common.protocol.resource.ResourceUsedProtocol
import org.apache.linkis.rpc.Sender
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
class AccessibleEngineConnExecution extends EngineConnExecution with Logging {
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/DefaultOperateService.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/DefaultOperateService.scala
index 35e723c..445ad0f 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/DefaultOperateService.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/DefaultOperateService.scala
@@ -16,7 +16,7 @@
*/
package org.apache.linkis.engineconn.acessible.executor.service
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
import org.apache.linkis.common.utils.{Logging, Utils}
import org.apache.linkis.manager.common.operator.OperatorFactory
import org.apache.linkis.manager.common.protocol.engine.{EngineOperateRequest, EngineOperateResponse}
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/EngineConnTimedLockService.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/EngineConnTimedLockService.scala
index 5d13cbc..612b23b 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/EngineConnTimedLockService.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/EngineConnTimedLockService.scala
@@ -30,7 +30,7 @@ import org.apache.linkis.manager.common.protocol.engine.EngineLockType
import org.apache.linkis.manager.common.protocol.{RequestEngineLock, RequestEngineUnlock, ResponseEngineLock, ResponseEngineUnlock}
import org.apache.linkis.message.annotation.Receiver
import org.apache.linkis.server.BDPJettyServerHelper
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class EngineConnTimedLockService extends LockService with Logging {
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/LockService.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/LockService.scala
index 0edabba..e981b89 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/LockService.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/LockService.scala
@@ -21,7 +21,7 @@ import org.apache.linkis.common.utils.Logging
import org.apache.linkis.engineconn.acessible.executor.listener.ExecutorLockListener
import org.apache.linkis.manager.common.protocol.{RequestEngineLock, RequestEngineUnlock, ResponseEngineLock, ResponseEngineUnlock}
import org.apache.linkis.server.BDPJettyServerHelper
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
trait LockService extends ExecutorLockListener with Logging {
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/callback-service/src/main/scala/org/apache/linkis/engineconn/callback/hook/CallbackEngineConnHook.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/callback-service/src/main/scala/org/apache/linkis/engineconn/callback/hook/CallbackEngineConnHook.scala
index eb1c9f3..b88c3d6 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/callback-service/src/main/scala/org/apache/linkis/engineconn/callback/hook/CallbackEngineConnHook.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/callback-service/src/main/scala/org/apache/linkis/engineconn/callback/hook/CallbackEngineConnHook.scala
@@ -30,8 +30,8 @@ import org.apache.linkis.manager.common.entity.enumeration.NodeStatus
import org.apache.linkis.manager.common.protocol.engine.EngineConnStatusCallback
import org.apache.linkis.rpc.Sender
import org.apache.linkis.server.conf.ServerConfiguration
-import org.apache.commons.lang.StringUtils
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
import scala.collection.mutable
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/executor-core/src/main/scala/org/apache/linkis/engineconn/executor/ExecutorExecutionContext.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/executor-core/src/main/scala/org/apache/linkis/engineconn/executor/ExecutorExecutionContext.scala
index d36c39f..a785a26 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/executor-core/src/main/scala/org/apache/linkis/engineconn/executor/ExecutorExecutionContext.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/executor-core/src/main/scala/org/apache/linkis/engineconn/executor/ExecutorExecutionContext.scala
@@ -24,8 +24,8 @@ import org.apache.linkis.common.io.{FsPath, MetaData, Record}
import org.apache.linkis.common.utils.Utils
import org.apache.linkis.governance.common.conf.GovernanceCommonConf
import org.apache.linkis.manager.label.entity.Label
-import org.apache.commons.lang.StringUtils
-import org.apache.commons.lang.time.DateFormatUtils
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.time.DateFormatUtils
import scala.collection.mutable.ArrayBuffer
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-launch/src/main/scala/org/apache/linkis/engineconn/launch/EngineConnServer.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-launch/src/main/scala/org/apache/linkis/engineconn/launch/EngineConnServer.scala
index fd256e3..1b276ca 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-launch/src/main/scala/org/apache/linkis/engineconn/launch/EngineConnServer.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-launch/src/main/scala/org/apache/linkis/engineconn/launch/EngineConnServer.scala
@@ -34,7 +34,7 @@ import org.apache.linkis.governance.common.utils.EngineConnArgumentsParser
import org.apache.linkis.manager.engineplugin.common.launch.process.Environment
import org.apache.linkis.manager.label.builder.factory.{LabelBuilderFactory, LabelBuilderFactoryContext}
import org.apache.linkis.manager.label.entity.Label
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
import scala.collection.JavaConversions._
import scala.collection.mutable.ArrayBuffer
diff --git a/linkis-computation-governance/linkis-entrance-client/src/main/scala/org/apache/linkis/entranceclient/EntranceClientImpl.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/org/apache/linkis/entranceclient/EntranceClientImpl.scala
index f29a2b0..7ec719d 100644
--- a/linkis-computation-governance/linkis-entrance-client/src/main/scala/org/apache/linkis/entranceclient/EntranceClientImpl.scala
+++ b/linkis-computation-governance/linkis-entrance-client/src/main/scala/org/apache/linkis/entranceclient/EntranceClientImpl.scala
@@ -30,7 +30,7 @@ import org.apache.linkis.entranceclient.execute._
import org.apache.linkis.protocol.constants.TaskConstant
import org.apache.linkis.scheduler.queue.parallelqueue.ParallelScheduler
import org.apache.linkis.server.JMap
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class EntranceClientImpl private() extends EntranceClient with EngineApplicationNameFactory
with EngineManagerApplicationNameFactory with Logging {
diff --git a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/parser/AbstractEntranceParser.java b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/parser/AbstractEntranceParser.java
index 7a5f1d3..6cc46fd 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/parser/AbstractEntranceParser.java
+++ b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/parser/AbstractEntranceParser.java
@@ -37,7 +37,7 @@ import org.apache.linkis.protocol.utils.TaskUtils;
import org.apache.linkis.scheduler.queue.Job;
import org.apache.linkis.server.BDPJettyServerHelper;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/parser/ParserUtils.java b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/parser/ParserUtils.java
index 1ef3eb5..2f1edc6 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/parser/ParserUtils.java
+++ b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/parser/ParserUtils.java
@@ -24,7 +24,7 @@ import org.apache.linkis.governance.common.entity.job.JobRequest;
import org.apache.linkis.manager.label.utils.LabelUtil;
import org.apache.linkis.storage.utils.StorageUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.text.SimpleDateFormat;
import java.util.Date;
diff --git a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/persistence/QueryPersistenceManager.java b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/persistence/QueryPersistenceManager.java
index cddd368..876a499 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/persistence/QueryPersistenceManager.java
+++ b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/persistence/QueryPersistenceManager.java
@@ -29,7 +29,7 @@ import org.apache.linkis.scheduler.executer.OutputExecuteResponse;
import org.apache.linkis.scheduler.queue.Job;
import org.apache.linkis.server.BDPJettyServerHelper;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/restful/EntranceRestfulApi.java b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/restful/EntranceRestfulApi.java
index 905734d..f05b8f2 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/restful/EntranceRestfulApi.java
+++ b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/restful/EntranceRestfulApi.java
@@ -36,7 +36,7 @@ import org.apache.linkis.server.Message;
import org.apache.linkis.server.security.SecurityFilter;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.*;
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala
index f0024cc..eab95c1 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala
@@ -27,7 +27,7 @@ import org.apache.linkis.governance.common.entity.job.JobRequest
import org.apache.linkis.rpc.Sender
import org.apache.linkis.scheduler.queue.{Job, SchedulerEventState}
import org.apache.linkis.server.conf.ServerConfiguration
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
abstract class EntranceServer extends Logging {
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceWebSocketService.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceWebSocketService.scala
index 7b44891..4de176a 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceWebSocketService.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceWebSocketService.scala
@@ -42,7 +42,7 @@ import org.apache.linkis.scheduler.queue.{Job, SchedulerEventState}
import org.apache.linkis.server._
import org.apache.linkis.server.conf.ServerConfiguration
import org.apache.linkis.server.socket.controller.{ServerEvent, ServerEventService, SocketServerEvent}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class EntranceWebSocketService extends ServerEventService with EntranceEventListener with EntranceLogListener {
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/cs/CSEntranceHelper.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/cs/CSEntranceHelper.scala
index 385e0b5..e3d8368 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/cs/CSEntranceHelper.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/cs/CSEntranceHelper.scala
@@ -35,7 +35,7 @@ import org.apache.linkis.manager.label.utils.LabelUtil
import org.apache.linkis.protocol.constants.TaskConstant
import org.apache.linkis.protocol.utils.TaskUtils
import org.apache.linkis.scheduler.queue.Job
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.JavaConversions._
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/DefaultEntranceExecutor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/DefaultEntranceExecutor.scala
index 0f0323e..094681b 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/DefaultEntranceExecutor.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/DefaultEntranceExecutor.scala
@@ -41,7 +41,7 @@ import org.apache.linkis.server.BDPJettyServerHelper
import java.util
import java.util.Date
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
import org.apache.linkis.governance.common.entity.job.SubJobInfo
import org.apache.linkis.protocol.constants.TaskConstant
import org.apache.linkis.orchestrator.computation.operation.progress.{DefaultProgressOperation, ProgressProcessor}
@@ -285,7 +285,7 @@ class DefaultEntranceExecutor(id: Long, mark: MarkReq, entranceExecutorManager:
} { t: Throwable =>
if (getEngineExecuteAsyncReturn.isEmpty) {
- val msg = s"task submit failed,reason, ${ExceptionUtils.getFullStackTrace(t)}"
+ val msg = s"task submit failed,reason, ${ExceptionUtils.getStackTrace(t)}"
entranceExecuteRequest.getJob.getLogListener.foreach(_.onLogUpdate(entranceExecuteRequest.getJob, LogUtils.generateERROR(msg)))
ErrorExecuteResponse(msg, t)
} else {
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/EntranceJob.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/EntranceJob.scala
index 5935ac5..ab53376 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/EntranceJob.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/EntranceJob.scala
@@ -38,7 +38,7 @@ import org.apache.linkis.rpc.utils.RPCUtils
import org.apache.linkis.scheduler.executer.{CompletedExecuteResponse, ErrorExecuteResponse, SuccessExecuteResponse}
import org.apache.linkis.scheduler.queue.SchedulerEventState._
import org.apache.linkis.scheduler.queue.{Job, SchedulerEventState}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.beans.BeanProperty
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/CustomVariableUtils.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/CustomVariableUtils.scala
index c3adda9..9cd1c97 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/CustomVariableUtils.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/CustomVariableUtils.scala
@@ -29,8 +29,8 @@ import org.apache.linkis.manager.label.utils.LabelUtil
import org.apache.linkis.protocol.utils.TaskUtils
import org.apache.linkis.protocol.variable.{RequestQueryAppVariable, RequestQueryGlobalVariable, ResponseQueryVariable}
import org.apache.linkis.rpc.Sender
-import org.apache.commons.lang.StringUtils
-import org.apache.commons.lang.time.DateUtils
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.time.DateUtils
import org.apache.linkis.common.utils.{Logging, Utils}
import scala.collection.JavaConversions._
@@ -254,7 +254,7 @@ object CustomVariableUtils extends Logging {
parseCode ++= codes(i)
}
val parsedCode = deleteUselessSemicolon(parseCode)
- org.apache.commons.lang.StringUtils.strip(parsedCode)
+ org.apache.commons.lang3.StringUtils.strip(parsedCode)
// Utils.trimBlank()
}
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/Explain.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/Explain.scala
index 341774b..ad067b9 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/Explain.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/Explain.scala
@@ -25,7 +25,7 @@ import org.apache.linkis.common.utils.{Logging, Utils}
import org.apache.linkis.entrance.conf.EntranceConfiguration
import org.apache.linkis.entrance.interceptor.exception.{PythonCodeCheckException, ScalaCodeCheckException}
import org.apache.linkis.governance.common.entity.job.JobRequest
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.slf4j.{Logger, LoggerFactory}
import scala.collection.mutable.ArrayBuffer
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/LabelCheckInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/LabelCheckInterceptor.scala
index cb80d16..a876a10 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/LabelCheckInterceptor.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/LabelCheckInterceptor.scala
@@ -25,7 +25,7 @@ import org.apache.linkis.governance.common.entity.task.RequestPersistTask
import org.apache.linkis.manager.label.entity.Label
import org.apache.linkis.manager.label.entity.engine.{EngineTypeLabel, UserCreatorLabel}
import org.apache.linkis.protocol.task.Task
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.JavaConversions._
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/PythonCodeCheckInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/PythonCodeCheckInterceptor.scala
index d9fa1df..04c0df9 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/PythonCodeCheckInterceptor.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/PythonCodeCheckInterceptor.scala
@@ -22,7 +22,7 @@ import org.apache.linkis.entrance.interceptor.EntranceInterceptor
import org.apache.linkis.entrance.interceptor.exception.PythonCodeCheckException
import org.apache.linkis.governance.common.entity.job.JobRequest
import org.apache.linkis.manager.label.utils.LabelUtil
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
/**
* Description: Check for python code, prohibiting the use of sys, os, and creating processes(用于python代码的检查，禁止使用sys、os以及创建进程等行为)
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/StorePathEntranceInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/StorePathEntranceInterceptor.scala
index 337bd5c..2cbabdb 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/StorePathEntranceInterceptor.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/StorePathEntranceInterceptor.scala
@@ -26,7 +26,7 @@ import org.apache.linkis.governance.common.entity.job.JobRequest
import org.apache.linkis.manager.label.utils.LabelUtil
import org.apache.linkis.protocol.utils.TaskUtils
import org.apache.linkis.server.BDPJettyServerHelper
-import org.apache.commons.lang.time.DateFormatUtils
+import org.apache.commons.lang3.time.DateFormatUtils
import java.util
import scala.collection.JavaConverters.{asScalaBufferConverter, mapAsScalaMapConverter}
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/VarSubstitutionInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/VarSubstitutionInterceptor.scala
index 6aff2a0..836d4c4 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/VarSubstitutionInterceptor.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/VarSubstitutionInterceptor.scala
@@ -24,7 +24,7 @@ import org.apache.linkis.entrance.interceptor.EntranceInterceptor
import org.apache.linkis.entrance.interceptor.exception.VarSubstitutionException
import org.apache.linkis.governance.common.entity.job.JobRequest
import org.apache.linkis.manager.label.utils.LabelUtil
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
/**
* Description: For variable substitution(用于变量替换)
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/CacheLogWriter.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/CacheLogWriter.scala
index 9418c62..b261942 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/CacheLogWriter.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/CacheLogWriter.scala
@@ -17,7 +17,7 @@
package org.apache.linkis.entrance.log
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class CacheLogWriter(logPath:String,
charset:String,
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/ErrorCodeListener.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/ErrorCodeListener.scala
index edd1a25..af6e5ea 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/ErrorCodeListener.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/ErrorCodeListener.scala
@@ -23,7 +23,7 @@ import org.apache.linkis.governance.common.entity.job.JobRequest
import org.apache.linkis.governance.common.entity.task.RequestPersistTask
import org.apache.linkis.protocol.task.Task
import org.apache.linkis.scheduler.queue.Job
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.slf4j.{Logger, LoggerFactory}
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/LogReader.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/LogReader.scala
index e888fe8..c0de88b 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/LogReader.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/LogReader.scala
@@ -22,7 +22,7 @@ import java.io.{Closeable, IOException, InputStream}
import org.apache.linkis.common.utils.{Logging, Utils}
import org.apache.linkis.entrance.exception.LogReadFailedException
import org.apache.commons.io.{IOUtils, LineIterator}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.linkis.entrance.utils.LogHelper
import scala.util.matching.Regex
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/LogWriter.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/LogWriter.scala
index 513ad76..9655624 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/LogWriter.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/LogWriter.scala
@@ -25,7 +25,7 @@ import org.apache.linkis.common.utils.{Logging, Utils}
import org.apache.linkis.entrance.exception.EntranceErrorException
import org.apache.linkis.storage.FSFactory
import org.apache.linkis.storage.utils.FileSystemUtils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.hadoop.hdfs.client.HdfsDataOutputStream
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/orchestrator/plugin/EntranceUserParallelOrchestratorPlugin.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/orchestrator/plugin/EntranceUserParallelOrchestratorPlugin.scala
index 50ce2c2..d03d308 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/orchestrator/plugin/EntranceUserParallelOrchestratorPlugin.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/orchestrator/plugin/EntranceUserParallelOrchestratorPlugin.scala
@@ -31,7 +31,7 @@ import org.apache.linkis.manager.label.entity.Label
import org.apache.linkis.manager.label.entity.engine.{EngineTypeLabel, UserCreatorLabel}
import org.apache.linkis.orchestrator.plugin.UserParallelOrchestratorPlugin
import org.apache.linkis.rpc.Sender
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.linkis.server.BDPJettyServerHelper
import scala.collection.JavaConverters._
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/parser/CommonEntranceParser.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/parser/CommonEntranceParser.scala
index 56a1bee..bf20818 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/parser/CommonEntranceParser.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/parser/CommonEntranceParser.scala
@@ -29,7 +29,7 @@ import org.apache.linkis.manager.label.entity.engine.{CodeLanguageLabel, UserCre
import org.apache.linkis.manager.label.utils.EngineTypeLabelCreator
import org.apache.linkis.protocol.constants.TaskConstant
import org.apache.linkis.scheduler.queue.SchedulerEventState
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import java.util
import java.util.Date
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/persistence/EntranceResultSetEngine.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/persistence/EntranceResultSetEngine.scala
index a84ebf9..769f47b 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/persistence/EntranceResultSetEngine.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/persistence/EntranceResultSetEngine.scala
@@ -30,7 +30,7 @@ import org.apache.linkis.scheduler.queue.Job
import org.apache.linkis.storage.resultset.{ResultSetFactory, ResultSetWriter}
import org.apache.linkis.storage.utils.FileSystemUtils
import org.apache.commons.io.IOUtils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class EntranceResultSetEngine extends ResultSetEngine with Logging {
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/EntranceGroupFactory.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/EntranceGroupFactory.scala
index 6e92571..ad38372 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/EntranceGroupFactory.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/EntranceGroupFactory.scala
@@ -33,7 +33,7 @@ import org.apache.linkis.rpc.Sender
import org.apache.linkis.scheduler.queue.parallelqueue.ParallelGroup
import org.apache.linkis.scheduler.queue.{Group, GroupFactory, SchedulerEvent}
import org.apache.linkis.server.JMap
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.JavaConversions._
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/cache/ReadCacheConsumer.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/cache/ReadCacheConsumer.scala
index 8e13f69..284d595 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/cache/ReadCacheConsumer.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/cache/ReadCacheConsumer.scala
@@ -39,7 +39,7 @@ import org.apache.linkis.server.BDPJettyServerHelper
import org.apache.linkis.storage.FSFactory
import org.apache.linkis.storage.fs.FileSystem
import org.apache.commons.io.FilenameUtils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.JavaConversions._
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala
index 0405a52..ea9d309 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala
@@ -32,7 +32,7 @@ import java.util
import java.util.Date
import javax.servlet.http.HttpServletRequest
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import sun.net.util.IPAddressUtil
import scala.collection.JavaConversions._
diff --git a/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESClientFactory.scala b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESClientFactory.scala
index a19ec24..6b66fbc 100644
--- a/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESClientFactory.scala
+++ b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESClientFactory.scala
@@ -24,7 +24,7 @@ import org.apache.linkis.httpclient.dws.authentication.StaticAuthenticationStrat
import org.apache.linkis.httpclient.dws.config.DWSClientConfigBuilder
import org.apache.linkis.ujes.client.UJESClient
import org.apache.linkis.ujes.jdbc.UJESSQLDriverMain._
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
object UJESClientFactory {
diff --git a/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLConnection.scala b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLConnection.scala
index de7507a..f9cd298 100644
--- a/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLConnection.scala
+++ b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLConnection.scala
@@ -26,7 +26,7 @@ import org.apache.linkis.common.utils.{Logging, Utils}
import org.apache.linkis.ujes.client.UJESClient
import org.apache.linkis.ujes.client.request.JobExecuteAction.EngineType
import org.apache.linkis.ujes.jdbc.UJESSQLDriverMain._
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.{JavaConversions, mutable}
diff --git a/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLDatabaseMetaData.scala b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLDatabaseMetaData.scala
index cb6859d..3de4105 100644
--- a/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLDatabaseMetaData.scala
+++ b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLDatabaseMetaData.scala
@@ -23,7 +23,7 @@ import java.util
import org.apache.linkis.ujes.client.request.{GetColumnsAction, GetDBSAction, GetTablesAction}
import org.apache.linkis.ujes.jdbc.entity.JdbcColumn
import org.apache.linkis.ujes.jdbc.utils.JDBCUtils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.JavaConversions._
diff --git a/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLDriverMain.scala b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLDriverMain.scala
index 18872b1..02dd5d3 100644
--- a/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLDriverMain.scala
+++ b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLDriverMain.scala
@@ -23,7 +23,7 @@ import java.util.logging.Logger
import org.apache.linkis.common.utils.Logging
import org.apache.linkis.ujes.jdbc.UJESSQLDriverMain._
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.JavaConversions
diff --git a/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLResultSet.scala b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLResultSet.scala
index a642e8d..8ca1ef9 100644
--- a/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLResultSet.scala
+++ b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLResultSet.scala
@@ -26,7 +26,7 @@ import java.{sql, util}
import org.apache.linkis.ujes.client.request.ResultSetAction
import org.apache.linkis.ujes.client.response.ResultSetResult
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
diff --git a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/builder/DefaultGlobalLabelBuilder.java b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/builder/DefaultGlobalLabelBuilder.java
index 0474432..42dba8b 100644
--- a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/builder/DefaultGlobalLabelBuilder.java
+++ b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/builder/DefaultGlobalLabelBuilder.java
@@ -26,7 +26,7 @@ import org.apache.linkis.manager.label.entity.annon.KeyMethod;
import org.apache.linkis.manager.label.exception.LabelErrorException;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/builder/factory/LabelBuilderFactoryContext.java b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/builder/factory/LabelBuilderFactoryContext.java
index c7d704b..fcfe304 100644
--- a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/builder/factory/LabelBuilderFactoryContext.java
+++ b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/builder/factory/LabelBuilderFactoryContext.java
@@ -20,8 +20,8 @@ package org.apache.linkis.manager.label.builder.factory;
import org.apache.linkis.manager.label.builder.LabelBuilder;
import org.apache.linkis.manager.label.conf.LabelCommonConfig;
-import org.apache.commons.lang.ClassUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ClassUtils;
+import org.apache.commons.lang3.StringUtils;
import org.reflections.Reflections;
import org.slf4j.Logger;
@@ -49,7 +49,9 @@ public class LabelBuilderFactoryContext {
if (clazz == StdLabelBuilderFactory.class
&& StringUtils.isNotBlank(className)) {
try {
- clazz = ClassUtils.getClass(className);
+ clazz =
+ (Class<? extends LabelBuilderFactory>)
+ ClassUtils.getClass(className);
} catch (ClassNotFoundException e) {
throw new RuntimeException("find class + " + className + " failed!", e);
}
diff --git a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/CombinedLabelImpl.java b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/CombinedLabelImpl.java
index 3cc09de..35212a4 100644
--- a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/CombinedLabelImpl.java
+++ b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/CombinedLabelImpl.java
@@ -20,7 +20,7 @@ package org.apache.linkis.manager.label.entity;
import org.apache.linkis.manager.label.constant.LabelKeyConstant;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.util.Collections;
import java.util.Comparator;
diff --git a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/SerializableLabel.java b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/SerializableLabel.java
index 581cf5b..d6610eb 100644
--- a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/SerializableLabel.java
+++ b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/SerializableLabel.java
@@ -19,7 +19,7 @@ package org.apache.linkis.manager.label.entity;
import org.apache.linkis.manager.label.utils.LabelUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.slf4j.Logger;
diff --git a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/TenantLabel.java b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/TenantLabel.java
index 9c85a9f..2e669d5 100644
--- a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/TenantLabel.java
+++ b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/TenantLabel.java
@@ -22,7 +22,7 @@ import org.apache.linkis.manager.label.constant.LabelKeyConstant;
import org.apache.linkis.manager.label.entity.annon.ValueSerialNum;
import org.apache.linkis.manager.label.exception.LabelErrorException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.util.HashMap;
diff --git a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabel.java b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabel.java
index ea7ca70..faa5ca1 100644
--- a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabel.java
+++ b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabel.java
@@ -21,7 +21,7 @@ import org.apache.linkis.manager.label.constant.LabelKeyConstant;
import org.apache.linkis.manager.label.entity.*;
import org.apache.linkis.manager.label.entity.annon.ValueSerialNum;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.util.HashMap;
diff --git a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/UserCreatorLabel.java b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/UserCreatorLabel.java
index cf89dac..dc868a3 100644
--- a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/UserCreatorLabel.java
+++ b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/UserCreatorLabel.java
@@ -23,7 +23,7 @@ import org.apache.linkis.manager.label.entity.*;
import org.apache.linkis.manager.label.entity.annon.ValueSerialNum;
import org.apache.linkis.manager.label.exception.LabelErrorException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.util.HashMap;
diff --git a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/route/RouteLabel.java b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/route/RouteLabel.java
index 5bd2f12..b323cfb 100644
--- a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/route/RouteLabel.java
+++ b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/entity/route/RouteLabel.java
@@ -25,7 +25,7 @@ import org.apache.linkis.manager.label.entity.UserModifiable;
import org.apache.linkis.manager.label.entity.annon.ValueSerialNum;
import org.apache.linkis.manager.label.exception.LabelErrorException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
public class RouteLabel extends InheritableLabel<String> implements UserModifiable {
diff --git a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/utils/EngineTypeLabelCreator.java b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/utils/EngineTypeLabelCreator.java
index 00d96aa..ec4e9a7 100644
--- a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/utils/EngineTypeLabelCreator.java
+++ b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/utils/EngineTypeLabelCreator.java
@@ -23,7 +23,7 @@ import org.apache.linkis.manager.label.conf.LabelCommonConfig;
import org.apache.linkis.manager.label.entity.engine.EngineType;
import org.apache.linkis.manager.label.entity.engine.EngineTypeLabel;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.util.HashMap;
import java.util.Map;
diff --git a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/utils/LabelUtils.java b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/utils/LabelUtils.java
index 209aae9..1137e66 100644
--- a/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/utils/LabelUtils.java
+++ b/linkis-computation-governance/linkis-manager/label-common/src/main/java/org/apache/linkis/manager/label/utils/LabelUtils.java
@@ -25,7 +25,7 @@ import org.apache.linkis.manager.label.exception.LabelRuntimeException;
import org.apache.linkis.protocol.util.ImmutablePair;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java
index d78ebec..b182b3a 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java
@@ -46,9 +46,9 @@ import org.apache.linkis.server.Message;
import org.apache.linkis.server.security.SecurityFilter;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java
index 1e13ebb..f9c3f1f 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java
@@ -47,8 +47,8 @@ import org.apache.linkis.server.Message;
import org.apache.linkis.server.security.SecurityFilter;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/converter/DefaultMetricsConverter.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/converter/DefaultMetricsConverter.scala
index 6dd228c..e29f0cd 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/converter/DefaultMetricsConverter.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/converter/DefaultMetricsConverter.scala
@@ -23,7 +23,7 @@ import org.apache.linkis.manager.common.entity.metrics.{NodeHealthyInfo, NodeMet
import org.apache.linkis.manager.common.entity.node.AMNode
import org.apache.linkis.manager.service.common.metrics.MetricsConverter
import org.apache.linkis.server.BDPJettyServerHelper
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.stereotype.Component
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/label/MultiUserEngineReuseLabelChooser.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/label/MultiUserEngineReuseLabelChooser.scala
index 9ca2ab9..8b1f840 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/label/MultiUserEngineReuseLabelChooser.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/label/MultiUserEngineReuseLabelChooser.scala
@@ -25,7 +25,7 @@ import org.apache.linkis.manager.am.exception.{AMErrorCode, AMErrorException}
import org.apache.linkis.manager.label.entity.Label
import org.apache.linkis.manager.label.entity.engine.{EngineTypeLabel, UserCreatorLabel}
import org.apache.linkis.server.BDPJettyServerHelper
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.stereotype.Component
import scala.collection.JavaConverters._
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/em/DefaultEMRegisterService.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/em/DefaultEMRegisterService.scala
index dabda47..14ff2d1 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/em/DefaultEMRegisterService.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/em/DefaultEMRegisterService.scala
@@ -31,8 +31,8 @@ import org.apache.linkis.message.annotation.{Order, Receiver}
import org.apache.linkis.message.builder.ServiceMethodContext
import org.apache.linkis.message.publisher.MessagePublisher
import org.apache.linkis.protocol.label.NodeLabelAddRequest
-import org.apache.commons.lang.StringUtils
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
import org.apache.linkis.manager.label.service.NodeLabelAddService
import org.apache.linkis.resourcemanager.message.RMMessageService
import org.springframework.beans.factory.annotation.Autowired
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineAskEngineService.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineAskEngineService.scala
index 8c1bb21..3d49ad5 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineAskEngineService.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineAskEngineService.scala
@@ -29,7 +29,7 @@ import org.apache.linkis.manager.label.constant.LabelKeyConstant
import org.apache.linkis.message.annotation.Receiver
import org.apache.linkis.message.builder.ServiceMethodContext
import org.apache.linkis.rpc.Sender
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.stereotype.Service
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineConnStatusCallbackService.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineConnStatusCallbackService.scala
index cef3aeb..69f37f2 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineConnStatusCallbackService.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineConnStatusCallbackService.scala
@@ -17,7 +17,7 @@
package org.apache.linkis.manager.am.service.engine
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import java.util
import org.apache.linkis.common.utils.Logging
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineCreateService.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineCreateService.scala
index 34db07b..ae50e0d 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineCreateService.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineCreateService.scala
@@ -51,7 +51,7 @@ import org.apache.linkis.message.builder.ServiceMethodContext
import org.apache.linkis.resourcemanager.service.ResourceManager
import org.apache.linkis.resourcemanager.{AvailableResource, NotEnoughResource}
import org.apache.linkis.server.BDPJettyServerHelper
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.stereotype.Service
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineReuseService.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineReuseService.scala
index 5a23370..4807d87 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineReuseService.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineReuseService.scala
@@ -17,7 +17,7 @@
package org.apache.linkis.manager.am.service.engine
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
import java.util
import java.util.concurrent.{TimeUnit, TimeoutException}
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-commons/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/utils/ManagerUtils.java b/linkis-computation-governance/linkis-manager/linkis-manager-commons/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/utils/ManagerUtils.java
index c4f0ddf..7bdac24 100644
--- a/linkis-computation-governance/linkis-manager/linkis-manager-commons/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/utils/ManagerUtils.java
+++ b/linkis-computation-governance/linkis-manager/linkis-manager-commons/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/utils/ManagerUtils.java
@@ -22,7 +22,7 @@ import org.apache.linkis.manager.label.builder.factory.LabelBuilderFactory;
import org.apache.linkis.manager.label.builder.factory.LabelBuilderFactoryContext;
import org.apache.linkis.manager.label.entity.Label;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.util.Map;
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-commons/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/entity/resource/Resource.scala b/linkis-computation-governance/linkis-manager/linkis-manager-commons/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/entity/resource/Resource.scala
index e1b594f..89a524e 100644
--- a/linkis-computation-governance/linkis-manager/linkis-manager-commons/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/entity/resource/Resource.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-manager-commons/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/entity/resource/Resource.scala
@@ -20,7 +20,7 @@ package org.apache.linkis.manager.common.entity.resource
import org.apache.linkis.common.utils.{ByteTimeUtils, Logging}
import org.apache.linkis.manager.common.entity.resource.ResourceType._
import org.apache.linkis.manager.common.exception.ResourceWarnException
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.json4s.JsonAST.JObject
import org.json4s.JsonDSL._
import org.json4s.jackson.Serialization
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultResourceLabelPersistence.java b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultResourceLabelPersistence.java
index 77a4131..f0d0b32 100644
--- a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultResourceLabelPersistence.java
+++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultResourceLabelPersistence.java
@@ -29,7 +29,7 @@ import org.apache.linkis.manager.persistence.ResourceLabelPersistence;
import org.apache.linkis.manager.util.PersistenceUtils;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import com.google.common.collect.Iterables;
import org.slf4j.Logger;
diff --git a/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/org/apache/linkis/resourcemanager/external/service/impl/ExternalResourceServiceImpl.java b/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/org/apache/linkis/resourcemanager/external/service/impl/ExternalResourceServiceImpl.java
index d4409b8..9ed00b3 100644
--- a/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/org/apache/linkis/resourcemanager/external/service/impl/ExternalResourceServiceImpl.java
+++ b/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/org/apache/linkis/resourcemanager/external/service/impl/ExternalResourceServiceImpl.java
@@ -36,7 +36,7 @@ import org.apache.linkis.resourcemanager.external.yarn.YarnResourceRequester;
import org.apache.linkis.resourcemanager.utils.RMConfiguration;
import org.apache.linkis.resourcemanager.utils.RMUtils;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/service/ResourceLockService.scala b/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/service/ResourceLockService.scala
index 159d61b..ad8b1db 100644
--- a/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/service/ResourceLockService.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/service/ResourceLockService.scala
@@ -24,7 +24,7 @@ import org.apache.linkis.manager.common.entity.persistence.PersistenceLock
import org.apache.linkis.manager.label.entity.{EngineNodeLabel, ResourceLabel}
import org.apache.linkis.manager.persistence.LockManagerPersistence
import org.apache.linkis.resourcemanager.domain.RMLabelContainer
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.stereotype.Component
diff --git a/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/deployment/ClusterDescriptorAdapter.java b/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/deployment/ClusterDescriptorAdapter.java
index 38ae70b..b868482 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/deployment/ClusterDescriptorAdapter.java
+++ b/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/deployment/ClusterDescriptorAdapter.java
@@ -21,7 +21,7 @@ import org.apache.linkis.engineconnplugin.flink.client.context.ExecutionContext;
import org.apache.linkis.engineconnplugin.flink.config.FlinkEnvConfiguration;
import org.apache.linkis.engineconnplugin.flink.exception.JobExecutionException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.flink.api.common.JobID;
import org.apache.flink.api.common.JobStatus;
import org.apache.flink.client.deployment.ClusterRetrieveException;
diff --git a/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/deployment/YarnApplicationClusterDescriptorAdapter.java b/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/deployment/YarnApplicationClusterDescriptorAdapter.java
index e46bd70..0b1fc64 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/deployment/YarnApplicationClusterDescriptorAdapter.java
+++ b/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/deployment/YarnApplicationClusterDescriptorAdapter.java
@@ -20,7 +20,7 @@ package org.apache.linkis.engineconnplugin.flink.client.deployment;
import org.apache.linkis.engineconnplugin.flink.client.context.ExecutionContext;
import org.apache.linkis.engineconnplugin.flink.exception.JobExecutionException;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.flink.client.deployment.ClusterSpecification;
import org.apache.flink.client.deployment.application.ApplicationConfiguration;
import org.apache.flink.client.program.ClusterClientProvider;
diff --git a/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/result/ChangelogResult.java b/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/result/ChangelogResult.java
index cf1ad8c..160a1f8 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/result/ChangelogResult.java
+++ b/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/result/ChangelogResult.java
@@ -20,7 +20,7 @@ package org.apache.linkis.engineconnplugin.flink.client.result;
import org.apache.linkis.engineconnplugin.flink.exception.SqlExecutionException;
import org.apache.linkis.engineconnplugin.flink.listener.RowsType;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.flink.api.common.ExecutionConfig;
import org.apache.flink.api.common.JobExecutionResult;
import org.apache.flink.api.common.typeinfo.TypeInformation;
diff --git a/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/context/EnvironmentContext.scala b/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/context/EnvironmentContext.scala
index 119bdd4..bfff2f8 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/context/EnvironmentContext.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/context/EnvironmentContext.scala
@@ -24,7 +24,7 @@ import java.util.Objects
import com.google.common.collect.Lists
import org.apache.linkis.engineconnplugin.flink.client.config.Environment
import org.apache.linkis.engineconnplugin.flink.client.factory.LinkisYarnClusterClientFactory
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.flink.configuration.{Configuration, DeploymentOptionsInternal, GlobalConfiguration}
import org.apache.flink.yarn.configuration.{YarnConfigOptions, YarnDeploymentTarget}
diff --git a/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/executor/FlinkCodeOnceExecutor.scala b/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/executor/FlinkCodeOnceExecutor.scala
index f0c6d8f..0875a2c 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/executor/FlinkCodeOnceExecutor.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/executor/FlinkCodeOnceExecutor.scala
@@ -22,7 +22,7 @@ import java.util.concurrent.Future
import java.util.function.Supplier
import org.apache.calcite.rel.metadata.{JaninoRelMetadataProvider, RelMetadataQueryBase}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.flink.client.deployment.ClusterClientJobClientAdapter
import org.apache.flink.client.program.{ClusterClient, ClusterClientProvider}
import org.apache.flink.table.api.{ResultKind, TableResult}
diff --git a/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/executor/FlinkJarOnceExecutor.scala b/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/executor/FlinkJarOnceExecutor.scala
index 20e3539..7cbc9e1 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/executor/FlinkJarOnceExecutor.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/executor/FlinkJarOnceExecutor.scala
@@ -22,7 +22,7 @@ import org.apache.linkis.engineconn.once.executor.OnceExecutorExecutionContext
import org.apache.linkis.engineconnplugin.flink.client.deployment.YarnApplicationClusterDescriptorAdapter
import org.apache.linkis.engineconnplugin.flink.config.FlinkEnvConfiguration._
import org.apache.linkis.engineconnplugin.flink.context.FlinkEngineConnContext
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.concurrent.duration.Duration
diff --git a/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/factory/FlinkEngineConnFactory.scala b/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/factory/FlinkEngineConnFactory.scala
index d357eeb..a1f6086 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/factory/FlinkEngineConnFactory.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/factory/FlinkEngineConnFactory.scala
@@ -39,7 +39,7 @@ import org.apache.linkis.manager.engineplugin.common.creation.{ExecutorFactory,
import org.apache.linkis.manager.label.entity.Label
import org.apache.linkis.manager.label.entity.engine.EngineType.EngineType
import org.apache.linkis.manager.label.entity.engine._
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.flink.configuration._
import org.apache.flink.runtime.jobgraph.SavepointRestoreSettings
import org.apache.flink.streaming.api.CheckpointingMode
diff --git a/linkis-engineconn-plugins/engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/hook/HiveAddJarsEngineHook.scala b/linkis-engineconn-plugins/engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/hook/HiveAddJarsEngineHook.scala
index 77b6bfd..06bda85 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/hook/HiveAddJarsEngineHook.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/hook/HiveAddJarsEngineHook.scala
@@ -26,7 +26,7 @@ import org.apache.linkis.engineconn.core.executor.ExecutorManager
import org.apache.linkis.engineplugin.hive.executor.HiveEngineConnExecutor
import org.apache.linkis.manager.label.entity.Label
import org.apache.linkis.manager.label.entity.engine.{CodeLanguageLabel, RunType}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.linkis.common.conf.CommonVars
import org.apache.linkis.manager.engineplugin.common.launch.process.Environment
diff --git a/linkis-engineconn-plugins/engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/hook/HiveAddMetaTableNameHook.scala b/linkis-engineconn-plugins/engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/hook/HiveAddMetaTableNameHook.scala
index 8c4191b..2a55c81 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/hook/HiveAddMetaTableNameHook.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/hook/HiveAddMetaTableNameHook.scala
@@ -22,7 +22,7 @@ import org.apache.linkis.engineconn.common.creation.EngineCreationContext
import org.apache.linkis.engineconn.computation.executor.execute.EngineExecutionContext
import org.apache.linkis.engineconn.computation.executor.hook.ComputationExecutorHook
import org.apache.linkis.engineplugin.hive.exception.HiveQueryFailedException
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.hadoop.hive.conf.HiveConf.ConfVars
import java.util
diff --git a/linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/scala/org/apache/linkis/manager/engineplugin/io/factory/IoEngineConnFactory.scala b/linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/scala/org/apache/linkis/manager/engineplugin/io/factory/IoEngineConnFactory.scala
index 883c5d0..f360395 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/scala/org/apache/linkis/manager/engineplugin/io/factory/IoEngineConnFactory.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/scala/org/apache/linkis/manager/engineplugin/io/factory/IoEngineConnFactory.scala
@@ -27,7 +27,7 @@ import org.apache.linkis.manager.engineplugin.io.executor.IoEngineConnExecutor
import org.apache.linkis.manager.label.entity.engine.EngineType.EngineType
import org.apache.linkis.manager.label.entity.engine.RunType.RunType
import org.apache.linkis.manager.label.entity.engine.{EngineType, EngineTypeLabel, RunType}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class IoEngineConnFactory extends ComputationSingleExecutorEngineConnFactory with Logging {
diff --git a/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/java/org/apache/linkis/manager/engineplugin/jdbc/ConnectionManager.java b/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/java/org/apache/linkis/manager/engineplugin/jdbc/ConnectionManager.java
index 9d9ae3b..c90b2df 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/java/org/apache/linkis/manager/engineplugin/jdbc/ConnectionManager.java
+++ b/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/java/org/apache/linkis/manager/engineplugin/jdbc/ConnectionManager.java
@@ -22,7 +22,7 @@ import org.apache.linkis.manager.engineplugin.jdbc.conf.JDBCConfiguration;
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.commons.dbcp.BasicDataSourceFactory;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import javax.sql.DataSource;
diff --git a/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCSQLCodeParser.scala b/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCSQLCodeParser.scala
index ce3d940..7c9885b 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCSQLCodeParser.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCSQLCodeParser.scala
@@ -18,7 +18,7 @@
package org.apache.linkis.manager.engineplugin.jdbc.executer
import org.apache.linkis.manager.engineplugin.jdbc.conf.JDBCConfiguration
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.mutable.ArrayBuffer
diff --git a/linkis-engineconn-plugins/engineconn-plugins/python/src/main/scala/org/apache/linkis/manager/engineplugin/python/executor/PythonSession.scala b/linkis-engineconn-plugins/engineconn-plugins/python/src/main/scala/org/apache/linkis/manager/engineplugin/python/executor/PythonSession.scala
index ed55220..0c254b8 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/python/src/main/scala/org/apache/linkis/manager/engineplugin/python/executor/PythonSession.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/python/src/main/scala/org/apache/linkis/manager/engineplugin/python/executor/PythonSession.scala
@@ -36,7 +36,7 @@ import org.apache.linkis.storage.resultset.{ResultSetFactory, ResultSetWriter}
import org.apache.linkis.storage.{LineMetaData, LineRecord}
import org.apache.commons.exec.CommandLine
import org.apache.commons.io.IOUtils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import py4j.GatewayServer
import scala.collection.JavaConverters._
diff --git a/linkis-engineconn-plugins/engineconn-plugins/python/src/main/scala/org/apache/linkis/manager/engineplugin/python/utils/Kind.scala b/linkis-engineconn-plugins/engineconn-plugins/python/src/main/scala/org/apache/linkis/manager/engineplugin/python/utils/Kind.scala
index d0185d8..2ff0f92 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/python/src/main/scala/org/apache/linkis/manager/engineplugin/python/utils/Kind.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/python/src/main/scala/org/apache/linkis/manager/engineplugin/python/utils/Kind.scala
@@ -17,7 +17,7 @@
package org.apache.linkis.manager.engineplugin.python.utils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
trait Kind
diff --git a/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/org/apache/linkis/manager/engineplugin/shell/executor/ShellEngineConnExecutor.scala b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/org/apache/linkis/manager/engineplugin/shell/executor/ShellEngineConnExecutor.scala
index e77ecbd..9edcb4d 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/org/apache/linkis/manager/engineplugin/shell/executor/ShellEngineConnExecutor.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/org/apache/linkis/manager/engineplugin/shell/executor/ShellEngineConnExecutor.scala
@@ -30,7 +30,7 @@ import org.apache.linkis.protocol.engine.JobProgressInfo
import org.apache.linkis.rpc.Sender
import org.apache.linkis.scheduler.executer.{ErrorExecuteResponse, ExecuteResponse, SuccessExecuteResponse}
import org.apache.commons.io.IOUtils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.linkis.engineconn.acessible.executor.log.LogHelper
import scala.collection.mutable.ArrayBuffer
diff --git a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/common/Kind.scala b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/common/Kind.scala
index 1b1a948..b5d0d9b 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/common/Kind.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/common/Kind.scala
@@ -17,7 +17,7 @@
package org.apache.linkis.engineplugin.spark.common
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
/**
*
diff --git a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/cs/CSTableParser.scala b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/cs/CSTableParser.scala
index 47ebf40..4d55ac2 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/cs/CSTableParser.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/cs/CSTableParser.scala
@@ -25,7 +25,7 @@ import org.apache.linkis.cs.common.entity.metadata.CSTable
import org.apache.linkis.cs.common.utils.CSCommonUtils
import org.apache.linkis.engineconn.computation.executor.execute.EngineExecutionContext
import org.apache.linkis.engineplugin.spark.exception.ExecuteError
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.execution.datasources.csv.DolphinToSpark
diff --git a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SQLSession.scala b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SQLSession.scala
index 9d03e14..0aa9c72 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SQLSession.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SQLSession.scala
@@ -29,7 +29,7 @@ import org.apache.linkis.storage.domain.{Column, DataType}
import org.apache.linkis.storage.resultset.ResultSetFactory
import org.apache.linkis.storage.resultset.table.{TableMetaData, TableRecord}
import org.apache.linkis.storage.{LineMetaData, LineRecord}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.spark.SparkContext
import org.apache.spark.sql.DataFrame
import org.apache.spark.sql.types.{StructField, StructType}
diff --git a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkPythonExecutor.scala b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkPythonExecutor.scala
index 6a9fbb1..902c45b 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkPythonExecutor.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkPythonExecutor.scala
@@ -39,7 +39,7 @@ import org.apache.linkis.scheduler.executer.{ExecuteResponse, SuccessExecuteResp
import org.apache.linkis.storage.resultset.ResultSetWriter
import org.apache.commons.exec.CommandLine
import org.apache.commons.io.IOUtils
-import org.apache.commons.lang.{RandomStringUtils, StringUtils}
+import org.apache.commons.lang3.{RandomStringUtils, StringUtils}
import org.apache.spark.api.java.JavaSparkContext
import org.apache.spark.sql.execution.datasources.csv.UDF
import org.apache.spark.sql.{DataFrame, SparkSession}
diff --git a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkScalaExecutor.scala b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkScalaExecutor.scala
index 47748b3..f9814bf 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkScalaExecutor.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkScalaExecutor.scala
@@ -32,8 +32,8 @@ import org.apache.linkis.governance.common.paser.ScalaCodeParser
import org.apache.linkis.scheduler.executer.{ErrorExecuteResponse, ExecuteResponse, IncompleteExecuteResponse, SuccessExecuteResponse}
import org.apache.linkis.storage.resultset.ResultSetWriter
import org.apache.commons.io.IOUtils
-import org.apache.commons.lang.StringUtils
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
import org.apache.spark.repl.SparkILoop
import org.apache.spark.sql.{SQLContext, SparkSession}
import org.apache.spark.util.SparkUtils
diff --git a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkSqlExecutor.scala b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkSqlExecutor.scala
index 1eb99d6..70c8f3e 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkSqlExecutor.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkSqlExecutor.scala
@@ -27,7 +27,7 @@ import org.apache.linkis.engineplugin.spark.extension.SparkSqlExtension
import org.apache.linkis.engineplugin.spark.utils.EngineUtils
import org.apache.linkis.scheduler.executer.{CompletedExecuteResponse, ErrorExecuteResponse, ExecuteResponse, SuccessExecuteResponse}
import org.apache.linkis.governance.common.paser.SQLCodeParser
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
class SparkSqlExecutor(sparkEngineSession: SparkEngineSession, id: Long) extends SparkEngineConnExecutor(sparkEngineSession.sparkContext, id) {
diff --git a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/factory/SparkEngineConnFactory.scala b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/factory/SparkEngineConnFactory.scala
index f15bbd8..898712f 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/factory/SparkEngineConnFactory.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/factory/SparkEngineConnFactory.scala
@@ -31,7 +31,7 @@ import org.apache.linkis.manager.engineplugin.common.creation.{ExecutorFactory,
import org.apache.linkis.manager.label.entity.engine.EngineType
import org.apache.linkis.manager.label.entity.engine.EngineType.EngineType
import org.apache.linkis.server.JMap
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.spark.sql.{SQLContext, SparkSession}
import org.apache.spark.util.SparkUtils
import org.apache.spark.{SparkConf, SparkContext}
diff --git a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/factory/SparkEngineConnResourceFactory.scala b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/factory/SparkEngineConnResourceFactory.scala
index 1e86187..176a1bb 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/factory/SparkEngineConnResourceFactory.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/factory/SparkEngineConnResourceFactory.scala
@@ -23,7 +23,7 @@ import org.apache.linkis.common.utils.{ByteTimeUtils, Logging}
import org.apache.linkis.engineplugin.spark.config.SparkResourceConfiguration._
import org.apache.linkis.manager.common.entity.resource.{DriverAndYarnResource, LoadInstanceResource, Resource, YarnResource}
import org.apache.linkis.manager.engineplugin.common.resource.AbstractEngineResourceFactory
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class SparkEngineConnResourceFactory extends AbstractEngineResourceFactory with Logging {
diff --git a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/imexport/LoadData.scala b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/imexport/LoadData.scala
index 7f3f994..cc2a97b 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/imexport/LoadData.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/imexport/LoadData.scala
@@ -25,7 +25,7 @@ import org.apache.linkis.engineplugin.spark.imexport.util.{BackGroundServiceUtil
import org.apache.linkis.hadoop.common.conf.HadoopConf
import org.apache.linkis.hadoop.common.utils.HDFSUtils
import org.apache.linkis.storage.excel.XlsUtils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.hadoop.fs.{FileSystem, Path}
import org.apache.hadoop.io.IOUtils
import org.apache.spark.sql.SparkSession
diff --git a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/imexport/util/BackGroundServiceUtils.scala b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/imexport/util/BackGroundServiceUtils.scala
index d401ecb..1ec8ff6 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/imexport/util/BackGroundServiceUtils.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/imexport/util/BackGroundServiceUtils.scala
@@ -27,7 +27,7 @@ import org.apache.linkis.storage.FSFactory
import org.apache.linkis.storage.fs.FileSystem
import org.apache.linkis.storage.utils.FileSystemUtils
import org.apache.commons.io.IOUtils
-import org.apache.commons.lang.time.DateFormatUtils
+import org.apache.commons.lang3.time.DateFormatUtils
import scala.util.control._
diff --git a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/launch/SparkSubmitProcessEngineConnLaunchBuilder.scala b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/launch/SparkSubmitProcessEngineConnLaunchBuilder.scala
index 5147c81..771fb64 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/launch/SparkSubmitProcessEngineConnLaunchBuilder.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/launch/SparkSubmitProcessEngineConnLaunchBuilder.scala
@@ -32,7 +32,7 @@ import org.apache.linkis.manager.engineplugin.common.launch.process.JavaProcessE
import org.apache.linkis.manager.label.entity.Label
import org.apache.linkis.manager.label.entity.engine.UserCreatorLabel
import org.apache.linkis.protocol.UserWithCreator
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.JavaConverters._
import scala.collection.mutable.ArrayBuffer
diff --git a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/mdq/MDQPostExecutionHook.scala b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/mdq/MDQPostExecutionHook.scala
index 980147a..2077ba8 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/mdq/MDQPostExecutionHook.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/mdq/MDQPostExecutionHook.scala
@@ -29,7 +29,7 @@ import org.apache.linkis.scheduler.executer.{ExecuteResponse, SuccessExecuteResp
import org.apache.linkis.storage.utils.StorageUtils
import javax.annotation.PostConstruct
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.stereotype.Component
diff --git a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/utils/JobProgressUtil.scala b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/utils/JobProgressUtil.scala
index aa1cd31..93c6dd6 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/utils/JobProgressUtil.scala
+++ b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/utils/JobProgressUtil.scala
@@ -21,7 +21,7 @@ import java.text.NumberFormat
import org.apache.linkis.common.utils.Logging
import org.apache.linkis.protocol.engine.JobProgressInfo
-import org.apache.commons.lang.time.DateFormatUtils
+import org.apache.commons.lang3.time.DateFormatUtils
import org.apache.spark.{JobExecutionStatus, SparkContext, SparkJobInfo}
/**
diff --git a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/launch/process/Environment.scala b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/launch/process/Environment.scala
index db2966f..b10b4dc 100644
--- a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/launch/process/Environment.scala
+++ b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/launch/process/Environment.scala
@@ -17,7 +17,7 @@
package org.apache.linkis.manager.engineplugin.common.launch.process
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
object Environment extends Enumeration {
diff --git a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/launch/process/JavaProcessEngineConnLaunchBuilder.scala b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/launch/process/JavaProcessEngineConnLaunchBuilder.scala
index bfcb63c..07d07ba 100644
--- a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/launch/process/JavaProcessEngineConnLaunchBuilder.scala
+++ b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/launch/process/JavaProcessEngineConnLaunchBuilder.scala
@@ -31,8 +31,8 @@ import org.apache.linkis.manager.engineplugin.common.launch.entity.{EngineConnBu
import org.apache.linkis.manager.engineplugin.common.launch.process.Environment.{variable, _}
import org.apache.linkis.manager.engineplugin.common.launch.process.LaunchConstants._
import org.apache.linkis.manager.label.entity.engine.EngineTypeLabel
-import org.apache.commons.lang.StringUtils
-import org.apache.commons.lang.time.DateFormatUtils
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.time.DateFormatUtils
import scala.collection.JavaConversions._
import scala.collection.mutable.ArrayBuffer
diff --git a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/resource/BmlEngineConnPluginResourceLoader.java b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/resource/BmlEngineConnPluginResourceLoader.java
index 651bc7b..003a38b 100644
--- a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/resource/BmlEngineConnPluginResourceLoader.java
+++ b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/resource/BmlEngineConnPluginResourceLoader.java
@@ -32,7 +32,7 @@ import org.apache.linkis.manager.label.entity.engine.EngineTypeLabel;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/resource/PluginResource.java b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/resource/PluginResource.java
index 10e1756..f2010be 100644
--- a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/resource/PluginResource.java
+++ b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/resource/PluginResource.java
@@ -17,7 +17,7 @@
package org.apache.linkis.manager.engineplugin.manager.loaders.resource;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.net.URL;
diff --git a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/utils/EngineConnPluginUtils.java b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/utils/EngineConnPluginUtils.java
index 73c6c8f..abd0d77 100644
--- a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/utils/EngineConnPluginUtils.java
+++ b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/utils/EngineConnPluginUtils.java
@@ -20,7 +20,7 @@ package org.apache.linkis.manager.engineplugin.manager.utils;
import org.apache.linkis.manager.engineplugin.common.EngineConnPlugin;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala
index f76757a..7716a7f 100644
--- a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala
+++ b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala
@@ -25,7 +25,7 @@ import org.apache.linkis.engineplugin.server.localize.EngineConnBmlResourceGener
import org.apache.linkis.manager.engineplugin.common.exception.EngineConnPluginErrorException
import org.apache.linkis.manager.label.entity.engine.EngineTypeLabel
import org.apache.linkis.server.conf.ServerConfiguration
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
abstract class AbstractEngineConnBmlResourceGenerator extends EngineConnBmlResourceGenerator {
diff --git a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnLaunchService.scala b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnLaunchService.scala
index df6a79b..3b0d617 100644
--- a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnLaunchService.scala
+++ b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnLaunchService.scala
@@ -25,7 +25,7 @@ import org.apache.linkis.manager.engineplugin.common.launch.entity.{EngineConnBu
import org.apache.linkis.manager.engineplugin.common.launch.process.{EngineConnResourceGenerator, JavaProcessEngineConnLaunchBuilder}
import org.apache.linkis.manager.label.entity.engine.EngineTypeLabel
import org.apache.linkis.message.annotation.Receiver
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.stereotype.Component
diff --git a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceService.scala b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceService.scala
index 12857cb..a3522b8 100644
--- a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceService.scala
+++ b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceService.scala
@@ -31,7 +31,7 @@ import org.apache.linkis.manager.engineplugin.common.exception.EngineConnPluginE
import org.apache.linkis.manager.engineplugin.common.launch.process.{EngineConnResource, LaunchConstants}
import org.apache.linkis.message.annotation.Receiver
import javax.annotation.PostConstruct
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.stereotype.Component
diff --git a/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/iteraceptor/IOMethodInterceptor.scala b/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/iteraceptor/IOMethodInterceptor.scala
index 55b54a1..2e0642f 100644
--- a/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/iteraceptor/IOMethodInterceptor.scala
+++ b/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/iteraceptor/IOMethodInterceptor.scala
@@ -38,7 +38,7 @@ import org.apache.linkis.storage.resultset.{ResultSetFactory, ResultSetReader, R
import org.apache.linkis.storage.utils.{StorageConfiguration, StorageUtils}
import org.apache.linkis.storage.io.conf.IOFileClientConf
import net.sf.cglib.proxy.{MethodInterceptor, MethodProxy}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.beans.BeanProperty
import scala.collection.JavaConversions._
diff --git a/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/utils/IOClientUtils.scala b/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/utils/IOClientUtils.scala
index d96ca5f..c36d1a2 100644
--- a/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/utils/IOClientUtils.scala
+++ b/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/utils/IOClientUtils.scala
@@ -34,7 +34,7 @@ import org.apache.linkis.storage.domain.{MethodEntity, MethodEntitySerializer}
import org.apache.linkis.storage.io.conf.IOFileClientConf
import org.apache.linkis.storage.utils.StorageConfiguration.IO_USER
import org.apache.linkis.storage.utils.{StorageConfiguration, StorageUtils}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.JavaConverters._
object IOClientUtils {
diff --git a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/ComputationOrchestratorSessionFactory.scala b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/ComputationOrchestratorSessionFactory.scala
index b91d3d8..208dbdd 100644
--- a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/ComputationOrchestratorSessionFactory.scala
+++ b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/ComputationOrchestratorSessionFactory.scala
@@ -21,7 +21,7 @@ import org.apache.linkis.common.utils.ClassUtils
import org.apache.linkis.orchestrator.computation.conf.ComputationOrchestratorConf
import org.apache.linkis.orchestrator.core.OrchestratorSessionBuilder
import org.apache.linkis.orchestrator.{Orchestrator, OrchestratorSession}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
/**
*
diff --git a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/ComputationOrchestratorSessionFactoryImpl.scala b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/ComputationOrchestratorSessionFactoryImpl.scala
index 6dbe713..70efb6b 100644
--- a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/ComputationOrchestratorSessionFactoryImpl.scala
+++ b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/ComputationOrchestratorSessionFactoryImpl.scala
@@ -40,7 +40,7 @@ import org.apache.linkis.orchestrator.extensions.catalyst._
import org.apache.linkis.orchestrator.extensions.operation.CancelOperationBuilder
import org.apache.linkis.orchestrator.extensions.{CatalystExtensions, CheckRulerExtensions, OperationExtensions}
import org.apache.linkis.orchestrator.{Orchestrator, OrchestratorSession}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
/**
*
*
diff --git a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/CustomVariableUtils.scala b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/CustomVariableUtils.scala
index e6b0771..e2819d3 100644
--- a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/CustomVariableUtils.scala
+++ b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/CustomVariableUtils.scala
@@ -29,8 +29,8 @@ import org.apache.linkis.orchestrator.plans.unit.CodeLogicalUnit
import org.apache.linkis.protocol.utils.TaskUtils
import org.apache.linkis.protocol.variable.{RequestQueryAppVariable, RequestQueryGlobalVariable, ResponseQueryVariable}
import org.apache.linkis.rpc.Sender
-import org.apache.commons.lang.StringUtils
-import org.apache.commons.lang.time.DateUtils
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.time.DateUtils
import scala.collection.JavaConversions._
import scala.collection.mutable
@@ -208,7 +208,7 @@ object CustomVariableUtils extends Logging {
parseCode ++= codes(i)
}
val parsedCode = deleteUselessSemicolon(parseCode)
- org.apache.commons.lang.StringUtils.strip(parsedCode)
+ org.apache.commons.lang3.StringUtils.strip(parsedCode)
// Utils.trimBlank()
}
diff --git a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/Explain.scala b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/Explain.scala
index 52c287f..941fca5 100644
--- a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/Explain.scala
+++ b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/Explain.scala
@@ -23,7 +23,7 @@ import org.apache.linkis.common.exception.ErrorException
import org.apache.linkis.common.log.LogUtils
import org.apache.linkis.common.utils.{Logging, Utils}
import org.apache.linkis.orchestrator.computation.catalyst.converter.exception.{CodeCheckException, PythonCodeCheckException, ScalaCodeCheckException}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.slf4j.{Logger, LoggerFactory}
import scala.collection.mutable.ArrayBuffer
diff --git a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/JobReqParamCheckRuler.scala b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/JobReqParamCheckRuler.scala
index fa59f6a..9f7566e 100644
--- a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/JobReqParamCheckRuler.scala
+++ b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/JobReqParamCheckRuler.scala
@@ -22,7 +22,7 @@ import org.apache.linkis.orchestrator.domain.JobReq
import org.apache.linkis.orchestrator.exception.{OrchestratorErrorCodeSummary, OrchestratorErrorException}
import org.apache.linkis.orchestrator.extensions.catalyst.ConverterCheckRuler
import org.apache.linkis.orchestrator.plans.ast.ASTContext
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
/**
*
*
diff --git a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/PythonCodeConverterCheckRuler.scala b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/PythonCodeConverterCheckRuler.scala
index 230baf6..5a8e73f 100644
--- a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/PythonCodeConverterCheckRuler.scala
+++ b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/PythonCodeConverterCheckRuler.scala
@@ -23,7 +23,7 @@ import org.apache.linkis.orchestrator.computation.entity.ComputationJobReq
import org.apache.linkis.orchestrator.domain.JobReq
import org.apache.linkis.orchestrator.extensions.catalyst.ConverterCheckRuler
import org.apache.linkis.orchestrator.plans.ast.ASTContext
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
class PythonCodeConverterCheckRuler extends ConverterCheckRuler {
diff --git a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/VarSubstitutionConverterCheckRuler.scala b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/VarSubstitutionConverterCheckRuler.scala
index c2deca1..d721284 100644
--- a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/VarSubstitutionConverterCheckRuler.scala
+++ b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/VarSubstitutionConverterCheckRuler.scala
@@ -25,7 +25,7 @@ import org.apache.linkis.orchestrator.domain.JobReq
import org.apache.linkis.orchestrator.extensions.catalyst.ConverterCheckRuler
import org.apache.linkis.orchestrator.log.LogManager
import org.apache.linkis.orchestrator.plans.ast.ASTContext
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
class VarSubstitutionConverterCheckRuler extends ConverterCheckRuler {
diff --git a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/execute/CodeExecTaskExecutorManager.scala b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/execute/CodeExecTaskExecutorManager.scala
index 7e5bdb9..9ee18f9 100644
--- a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/execute/CodeExecTaskExecutorManager.scala
+++ b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/execute/CodeExecTaskExecutorManager.scala
@@ -21,7 +21,7 @@ import org.apache.linkis.common.ServiceInstance
import org.apache.linkis.common.utils.{ClassUtils, Logging}
import org.apache.linkis.orchestrator.computation.conf.ComputationOrchestratorConf
import org.apache.linkis.orchestrator.computation.physical.CodeLogicalUnitExecTask
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.mutable
import scala.concurrent.duration.Duration
diff --git a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/execute/DefaultCodeExecTaskExecutorManager.scala b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/execute/DefaultCodeExecTaskExecutorManager.scala
index efa5299..215437e 100644
--- a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/execute/DefaultCodeExecTaskExecutorManager.scala
+++ b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/execute/DefaultCodeExecTaskExecutorManager.scala
@@ -33,7 +33,7 @@ import org.apache.linkis.orchestrator.ecm.entity.{DefaultMarkReq, LoadBanlanceMa
import org.apache.linkis.orchestrator.ecm.{EngineConnManager, EngineConnManagerBuilder}
import org.apache.linkis.orchestrator.exception.{OrchestratorLabelConflictException, OrchestratorUseSameEngineException}
import org.apache.linkis.orchestrator.listener.task.TaskLogEvent
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.JavaConverters._
import scala.collection.mutable
diff --git a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/physical/CodeLogicalUnitExecTask.scala b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/physical/CodeLogicalUnitExecTask.scala
index 78359a9..b5a8d95 100644
--- a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/physical/CodeLogicalUnitExecTask.scala
+++ b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/physical/CodeLogicalUnitExecTask.scala
@@ -39,7 +39,7 @@ import org.apache.linkis.orchestrator.strategy.async.AsyncExecTask
import org.apache.linkis.orchestrator.strategy.{ResultSetExecTask, StatusInfoExecTask}
import org.apache.linkis.orchestrator.utils.OrchestratorIDCreator
import org.apache.linkis.scheduler.executer.{ErrorExecuteResponse, SubmitResponse}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.concurrent.duration.Duration
import scala.collection.convert.decorateAsScala._
diff --git a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/Orchestrator.scala b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/Orchestrator.scala
index d870fff..6a1c570 100644
--- a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/Orchestrator.scala
+++ b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/Orchestrator.scala
@@ -23,7 +23,7 @@ import org.apache.linkis.common.utils.{ClassUtils, Logging}
import org.apache.linkis.orchestrator.conf.OrchestratorConfiguration.ORCHESTRATOR_BUILDER_CLASS
import org.apache.linkis.orchestrator.core.OrchestratorSessionBuilder
import org.apache.linkis.orchestrator.core.impl.OrchestratorImpl
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
/**
*
diff --git a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/execution/ExecTaskRunner.scala b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/execution/ExecTaskRunner.scala
index 06d0b4a..44cf632 100644
--- a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/execution/ExecTaskRunner.scala
+++ b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/execution/ExecTaskRunner.scala
@@ -22,7 +22,7 @@ import org.apache.linkis.governance.common.entity.ExecutionNodeStatus
import org.apache.linkis.orchestrator.conf.OrchestratorConfiguration
import org.apache.linkis.orchestrator.plans.physical.ExecTask
import org.apache.linkis.orchestrator.strategy.DefaultExecTaskRunnerFactory
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
/**
*
diff --git a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/execution/ExecutionFactory.scala b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/execution/ExecutionFactory.scala
index ecb5984..b8f8b8d 100644
--- a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/execution/ExecutionFactory.scala
+++ b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/execution/ExecutionFactory.scala
@@ -22,7 +22,7 @@ import org.apache.linkis.common.utils.{ClassUtils, Logging}
import org.apache.linkis.orchestrator.conf.OrchestratorConfiguration
import org.apache.linkis.orchestrator.core.SessionState
import org.apache.linkis.orchestrator.exception.OrchestratorErrorCodeSummary
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
/**
*
diff --git a/linkis-orchestrator/plugin/linkis-orchestrator-ecm-plugin/src/main/scala/org/apache/linkis/orchestrator/ecm/ComputationEngineConnManager.scala b/linkis-orchestrator/plugin/linkis-orchestrator-ecm-plugin/src/main/scala/org/apache/linkis/orchestrator/ecm/ComputationEngineConnManager.scala
index 3e7f957..fa24faf 100644
--- a/linkis-orchestrator/plugin/linkis-orchestrator-ecm-plugin/src/main/scala/org/apache/linkis/orchestrator/ecm/ComputationEngineConnManager.scala
+++ b/linkis-orchestrator/plugin/linkis-orchestrator-ecm-plugin/src/main/scala/org/apache/linkis/orchestrator/ecm/ComputationEngineConnManager.scala
@@ -38,7 +38,7 @@ import org.apache.linkis.orchestrator.ecm.service.EngineConnExecutor
import org.apache.linkis.orchestrator.ecm.service.impl.{ComputationConcurrentEngineConnExecutor, ComputationEngineConnExecutor}
import org.apache.linkis.rpc.Sender
import org.apache.linkis.rpc.exception.DWCRPCRetryException
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
import scala.collection.JavaConversions._
import scala.concurrent.duration.Duration
diff --git a/linkis-orchestrator/plugin/linkis-orchestrator-ecm-plugin/src/main/scala/org/apache/linkis/orchestrator/ecm/cache/EngineAsyncResponseCache.scala b/linkis-orchestrator/plugin/linkis-orchestrator-ecm-plugin/src/main/scala/org/apache/linkis/orchestrator/ecm/cache/EngineAsyncResponseCache.scala
index 8803c5f..72453b7 100644
--- a/linkis-orchestrator/plugin/linkis-orchestrator-ecm-plugin/src/main/scala/org/apache/linkis/orchestrator/ecm/cache/EngineAsyncResponseCache.scala
+++ b/linkis-orchestrator/plugin/linkis-orchestrator-ecm-plugin/src/main/scala/org/apache/linkis/orchestrator/ecm/cache/EngineAsyncResponseCache.scala
@@ -26,7 +26,7 @@ import org.apache.linkis.manager.common.protocol.engine.{EngineAsyncResponse, En
import org.apache.linkis.orchestrator.ecm.conf.ECMPluginConf
import org.apache.linkis.orchestrator.ecm.exception.ECMPluginCacheException
import org.apache.linkis.rpc.Sender
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
import scala.collection.mutable.ArrayBuffer
import scala.concurrent.duration.Duration
diff --git a/linkis-orchestrator/plugin/linkis-orchestrator-ecm-plugin/src/main/scala/org/apache/linkis/orchestrator/ecm/entity/MarkReq.scala b/linkis-orchestrator/plugin/linkis-orchestrator-ecm-plugin/src/main/scala/org/apache/linkis/orchestrator/ecm/entity/MarkReq.scala
index fa7be7a..2683632 100644
--- a/linkis-orchestrator/plugin/linkis-orchestrator-ecm-plugin/src/main/scala/org/apache/linkis/orchestrator/ecm/entity/MarkReq.scala
+++ b/linkis-orchestrator/plugin/linkis-orchestrator-ecm-plugin/src/main/scala/org/apache/linkis/orchestrator/ecm/entity/MarkReq.scala
@@ -25,7 +25,7 @@ import org.apache.linkis.manager.label.builder.factory.{LabelBuilderFactoryConte
import org.apache.linkis.manager.label.constant.LabelKeyConstant
import org.apache.linkis.manager.label.entity.Label
import org.apache.linkis.manager.label.entity.entrance.LoadBalanceLabel
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.linkis.orchestrator.ecm.utils.ECMPUtils
import scala.beans.BeanProperty
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala
index 0576cdb..8619aca 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala
@@ -37,7 +37,7 @@ import org.apache.linkis.httpclient.dws.authentication.TokenAuthenticationStrate
import org.apache.linkis.httpclient.dws.config.DWSClientConfig
import org.apache.linkis.storage.FSFactory
import org.apache.commons.io.IOUtils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.http.client.methods.CloseableHttpResponse
class HttpBmlClient(clientConfig: DWSClientConfig,
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook/src/main/scala/org/apache/linkis/bml/hook/BmlEnginePreExecuteHook.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook/src/main/scala/org/apache/linkis/bml/hook/BmlEnginePreExecuteHook.scala
index d804cdc..de8cc8d 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook/src/main/scala/org/apache/linkis/bml/hook/BmlEnginePreExecuteHook.scala
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook/src/main/scala/org/apache/linkis/bml/hook/BmlEnginePreExecuteHook.scala
@@ -30,7 +30,7 @@ import org.apache.linkis.engineconn.computation.executor.hook.ComputationExecuto
import org.apache.linkis.engineconn.computation.executor.utlis.ComputationEngineConstant
import org.apache.linkis.engineconn.core.util.EngineConnUtils
import org.apache.linkis.governance.common.utils.GovernanceConstant
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.JavaConversions.asScalaBuffer
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/HdfsResourceHelper.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/HdfsResourceHelper.java
index 1ca71fe..d5d6331 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/HdfsResourceHelper.java
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/HdfsResourceHelper.java
@@ -26,7 +26,7 @@ import org.apache.linkis.storage.utils.FileSystemUtils;
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/LocalResourceHelper.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/LocalResourceHelper.java
index db5e308..e998ea3 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/LocalResourceHelper.java
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/LocalResourceHelper.java
@@ -26,7 +26,7 @@ import org.apache.linkis.storage.utils.FileSystemUtils;
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java
index 0311a05..a8fe9f5 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java
@@ -30,7 +30,7 @@ import org.apache.linkis.server.Message;
import org.apache.linkis.server.security.SecurityFilter;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java
index 068714a..4728bc5 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java
@@ -38,7 +38,7 @@ import org.apache.linkis.common.exception.ErrorException;
import org.apache.linkis.server.Message;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/ResourceServiceImpl.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/ResourceServiceImpl.java
index c15b3e2..3a001d4 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/ResourceServiceImpl.java
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/ResourceServiceImpl.java
@@ -26,7 +26,7 @@ import org.apache.linkis.bml.dao.ResourceDao;
import org.apache.linkis.bml.dao.VersionDao;
import org.apache.linkis.bml.service.ResourceService;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/TaskServiceImpl.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/TaskServiceImpl.java
index e1c4270..de87b7d 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/TaskServiceImpl.java
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/TaskServiceImpl.java
@@ -30,7 +30,7 @@ import org.apache.linkis.bml.service.VersionService;
import org.apache.linkis.bml.threading.TaskState;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java
index 51d549c..2b1cde9 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java
@@ -30,7 +30,7 @@ import org.apache.linkis.common.io.FsPath;
import org.apache.linkis.storage.FSFactory;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/HttpRequestHelper.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/HttpRequestHelper.java
index 3d15543..b8086ab 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/HttpRequestHelper.java
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/HttpRequestHelper.java
@@ -17,7 +17,7 @@
package org.apache.linkis.bml.util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import javax.servlet.http.HttpServletRequest;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/DefaultContextCacheService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/DefaultContextCacheService.java
index d0d1c9a..e4546e1 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/DefaultContextCacheService.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/DefaultContextCacheService.java
@@ -27,7 +27,7 @@ import org.apache.linkis.cs.contextcache.cache.ContextCache;
import org.apache.linkis.cs.contextcache.cache.csid.ContextIDValue;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java
index 662abbd..ce95551 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java
@@ -31,7 +31,7 @@ import org.apache.linkis.cs.listener.event.ContextIDEvent;
import org.apache.linkis.cs.listener.event.impl.DefaultContextIDEvent;
import org.apache.linkis.cs.listener.manager.imp.DefaultContextListenerManager;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java
index 3a23e09..b3de0b4 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java
@@ -24,7 +24,7 @@ import org.apache.linkis.cs.contextcache.cache.cskey.ContextValueMapSet;
import org.apache.linkis.cs.contextcache.index.ContextInvertedIndexSetImpl;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java
index fac9d31..f3db418 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java
@@ -33,7 +33,7 @@ import org.apache.linkis.cs.listener.event.impl.DefaultContextKeyEvent;
import org.apache.linkis.cs.listener.manager.imp.DefaultContextListenerManager;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java
index 4cd2928..dd2f433 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java
@@ -23,7 +23,7 @@ import org.apache.linkis.cs.listener.ListenerBus.ContextAsyncListenerBus;
import org.apache.linkis.cs.listener.event.impl.DefaultContextIDEvent;
import org.apache.linkis.cs.listener.manager.imp.DefaultContextListenerManager;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java
index 50fa794..938a28f 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java
@@ -21,7 +21,7 @@ import org.apache.linkis.cs.common.entity.source.ContextKeyValue;
import org.apache.linkis.cs.contextcache.conf.ContextCacheConf;
import org.apache.linkis.server.BDPJettyServerHelper;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java
index 016f2de..f4fd7f0 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java
@@ -25,7 +25,7 @@ import org.apache.linkis.cs.common.entity.source.ContextKey;
import org.apache.linkis.cs.common.exception.CSErrorException;
import org.apache.linkis.cs.common.exception.ErrorCode;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java
index cb2afb1..b33b12b 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java
@@ -25,7 +25,7 @@ import org.apache.linkis.cs.common.entity.source.ContextKey;
import org.apache.linkis.cs.common.exception.CSErrorException;
import org.apache.linkis.cs.common.exception.ErrorCode;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java
index b149171..9a005e1 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java
@@ -29,7 +29,7 @@ import org.apache.linkis.cs.common.entity.source.ContextValue;
import org.apache.linkis.cs.common.exception.CSErrorException;
import org.apache.linkis.cs.common.exception.ErrorCode;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java
index d66aaa4..18ef6c9 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java
@@ -29,7 +29,7 @@ import org.apache.linkis.cs.common.exception.CSErrorException;
import org.apache.linkis.cs.common.exception.ErrorCode;
import org.apache.linkis.cs.common.utils.CSCommonUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java
index 6c3ae6c..289830d 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java
@@ -29,7 +29,7 @@ import org.apache.linkis.cs.common.entity.source.ContextValue;
import org.apache.linkis.cs.common.exception.CSErrorException;
import org.apache.linkis.cs.common.exception.ErrorCode;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/DefaultSearchService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/DefaultSearchService.java
index 7f2852d..f0370ac 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/DefaultSearchService.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/DefaultSearchService.java
@@ -29,7 +29,7 @@ import org.apache.linkis.cs.common.exception.CSErrorException;
import org.apache.linkis.cs.common.exception.ErrorCode;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import com.google.gson.Gson;
import org.slf4j.Logger;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java
index 18217e1..9050f78 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java
@@ -29,7 +29,7 @@ import org.apache.linkis.cs.common.entity.source.ContextValue;
import org.apache.linkis.cs.common.exception.CSErrorException;
import org.apache.linkis.cs.common.exception.ErrorCode;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/utils/ContextServiceUtils.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/utils/ContextServiceUtils.java
index 5d4b06f..dbe7136 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/utils/ContextServiceUtils.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/utils/ContextServiceUtils.java
@@ -29,7 +29,7 @@ import org.apache.linkis.cs.common.entity.source.ContextID;
import org.apache.linkis.cs.common.entity.source.ContextKey;
import org.apache.linkis.cs.common.utils.CSCommonUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/AbstractSerializer.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/AbstractSerializer.java
index b34fbfc..9b0a430 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/AbstractSerializer.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/AbstractSerializer.java
@@ -20,7 +20,7 @@ package org.apache.linkis.cs.common.serialize;
import org.apache.linkis.cs.common.exception.CSErrorException;
import org.apache.linkis.cs.common.utils.CSCommonUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.util.HashMap;
import java.util.Map;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/AbstractSerializationHelper.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/AbstractSerializationHelper.java
index 6584245..986ac7e 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/AbstractSerializationHelper.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/AbstractSerializationHelper.java
@@ -21,7 +21,7 @@ import org.apache.linkis.cs.common.exception.CSErrorException;
import org.apache.linkis.cs.common.serialize.ContextSerializer;
import org.apache.linkis.cs.common.utils.CSCommonUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.util.HashMap;
import java.util.Map;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtils.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtils.java
index b3bcd47..edda2d4 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtils.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtils.java
@@ -22,7 +22,7 @@ import org.apache.linkis.cs.common.entity.source.HAContextID;
import org.apache.linkis.cs.common.exception.CSErrorException;
import org.apache.linkis.cs.common.exception.ErrorCode;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import com.google.gson.Gson;
import org.slf4j.Logger;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-engine-support/src/main/scala/org/apache/linkis/cs/storage/CSTableResultSetWriter.scala b/linkis-public-enhancements/linkis-context-service/linkis-cs-engine-support/src/main/scala/org/apache/linkis/cs/storage/CSTableResultSetWriter.scala
index 641f0a8..988e28f 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-engine-support/src/main/scala/org/apache/linkis/cs/storage/CSTableResultSetWriter.scala
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-engine-support/src/main/scala/org/apache/linkis/cs/storage/CSTableResultSetWriter.scala
@@ -26,7 +26,7 @@ import org.apache.linkis.cs.common.entity.metadata.{CSColumn, CSTable}
import org.apache.linkis.storage.resultset.StorageResultSetWriter
import org.apache.linkis.storage.resultset.table.{TableMetaData, TableRecord, TableResultSet}
import org.apache.linkis.storage.utils.StorageUtils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class CSTableResultSetWriter(tableResult: TableResultSet, maxCacheSize: Long,
storePath: FsPath, contextIDStr: String, nodeName: String, alias: String) extends StorageResultSetWriter[TableMetaData, TableRecord](tableResult, maxCacheSize, storePath) with Logging {
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java
index aab4419..09c5307 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java
@@ -25,7 +25,7 @@ import org.apache.linkis.cs.highavailable.ha.ContextHAChecker;
import org.apache.linkis.cs.highavailable.ha.ContextHAIDGenerator;
import org.apache.linkis.cs.highavailable.proxy.MethodInterceptorImpl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java
index 021e95c..f06884d 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java
@@ -24,7 +24,7 @@ import org.apache.linkis.cs.highavailable.ha.BackupInstanceGenerator;
import org.apache.linkis.cs.highavailable.ha.ContextHAChecker;
import org.apache.linkis.cs.highavailable.ha.instancealias.InstanceAliasManager;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java
index 10a59ae..546a99a 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java
@@ -27,7 +27,7 @@ import org.apache.linkis.cs.highavailable.exception.CSErrorCode;
import org.apache.linkis.cs.highavailable.ha.ContextHAChecker;
import org.apache.linkis.cs.highavailable.ha.instancealias.impl.InstanceAliasManagerImpl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java
index cbe5b37..930aed0 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java
@@ -28,7 +28,7 @@ import org.apache.linkis.cs.highavailable.ha.BackupInstanceGenerator;
import org.apache.linkis.cs.highavailable.ha.ContextHAIDGenerator;
import org.apache.linkis.cs.highavailable.ha.instancealias.InstanceAliasConverter;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java
index f3288cc..5d6c349 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java
@@ -23,7 +23,7 @@ import org.apache.linkis.cs.common.exception.CSErrorException;
import org.apache.linkis.cs.highavailable.AbstractContextHAManager;
import org.apache.linkis.cs.highavailable.exception.CSErrorCode;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import net.sf.cglib.proxy.MethodInterceptor;
import org.slf4j.Logger;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/DefaultInstanceAliasConverter.scala b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/DefaultInstanceAliasConverter.scala
index 12f6690..3d65197 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/DefaultInstanceAliasConverter.scala
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/DefaultInstanceAliasConverter.scala
@@ -21,7 +21,7 @@ import java.util.Base64
import java.util.regex.Pattern
import org.apache.linkis.cs.highavailable.ha.instancealias.InstanceAliasConverter
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.stereotype.Component
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala
index 2b6291a..df8d9b9 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala
@@ -24,7 +24,7 @@ import org.apache.linkis.rpc.conf.RPCConfiguration
import org.apache.linkis.cs.highavailable.ha.instancealias.{InstanceAliasConverter, InstanceAliasManager}
import org.apache.linkis.rpc.sender.eureka.EurekaRPCServerLoader
import org.apache.linkis.rpc.utils.RPCUtils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.stereotype.Component
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala
index ea508e9..b411021 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala
@@ -30,7 +30,7 @@ import org.apache.linkis.manager.label.constant.LabelKeyConstant
import org.apache.linkis.manager.label.entity.Label
import org.apache.linkis.manager.label.entity.route.RouteLabel
import org.apache.linkis.rpc.Sender
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.stereotype.Component
import java.util
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/java/org/apache/linkis/cs/highavailable/test/TestContextHAManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/java/org/apache/linkis/cs/highavailable/test/TestContextHAManager.java
index a19bcef..ad819ef 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/java/org/apache/linkis/cs/highavailable/test/TestContextHAManager.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/java/org/apache/linkis/cs/highavailable/test/TestContextHAManager.java
@@ -31,7 +31,7 @@ import org.apache.linkis.cs.highavailable.test.persist.TestPersistence;
import org.apache.linkis.server.BDPJettyServerHelper;
import org.apache.linkis.server.conf.ServerConfiguration;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilderImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilderImpl.java
index 140839d..9cd06eb 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilderImpl.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilderImpl.java
@@ -26,7 +26,7 @@ import org.apache.linkis.cs.condition.impl.ContextTypeCondition;
import org.apache.linkis.cs.condition.impl.RegexCondition;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.util.Collection;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java
index 1cb0e08..5566957 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java
@@ -29,7 +29,7 @@ import org.apache.linkis.cs.contextcache.ContextCacheService;
import org.apache.linkis.cs.execution.matcher.ContextSearchMatcher;
import org.apache.linkis.server.BDPJettyServerHelper;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import com.google.common.collect.Lists;
import org.slf4j.Logger;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/DefaultKeywordParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/DefaultKeywordParser.java
index dfa1bdc..c0fcb0a 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/DefaultKeywordParser.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/DefaultKeywordParser.java
@@ -20,7 +20,7 @@ package org.apache.linkis.cs.server.parser;
import org.apache.linkis.cs.common.annotation.KeywordMethod;
import org.apache.linkis.cs.server.conf.ContextServerConf;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/RestResponseProtocol.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/RestResponseProtocol.java
index 96b7c4b..b8949a7 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/RestResponseProtocol.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/RestResponseProtocol.java
@@ -19,7 +19,7 @@ package org.apache.linkis.cs.server.protocol;
import org.apache.linkis.server.Message;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.springframework.util.StringUtils;
@@ -97,7 +97,7 @@ public class RestResponseProtocol implements HttpResponseProtocol<Message> {
}
message.setMessage(msg);
if (t != null) {
- message.$less$less("stack", ExceptionUtils.getFullStackTrace(t));
+ message.$less$less("stack", ExceptionUtils.getStackTrace(t));
}
}
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/auth/AuthContext.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/auth/AuthContext.java
index e852c96..007579b 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/auth/AuthContext.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/auth/AuthContext.java
@@ -21,7 +21,7 @@ import org.apache.linkis.common.conf.CommonVars;
import org.apache.linkis.datasourcemanager.common.domain.DataSource;
import org.apache.linkis.server.security.SecurityFilter;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import javax.servlet.http.HttpServletRequest;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSource.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSource.java
index 7b68ccf..e3987fd 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSource.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSource.java
@@ -20,7 +20,7 @@ package org.apache.linkis.datasourcemanager.common.domain;
import org.apache.linkis.datasourcemanager.common.exception.JsonErrorException;
import org.apache.linkis.datasourcemanager.common.util.json.Json;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceEnv.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceEnv.java
index d12dce3..055eefd 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceEnv.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceEnv.java
@@ -20,7 +20,7 @@ package org.apache.linkis.datasourcemanager.common.domain;
import org.apache.linkis.datasourcemanager.common.exception.JsonErrorException;
import org.apache.linkis.datasourcemanager.common.util.json.Json;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DatasourceVersion.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DatasourceVersion.java
index cd7a6e5..b1373b5 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DatasourceVersion.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DatasourceVersion.java
@@ -20,7 +20,7 @@ package org.apache.linkis.datasourcemanager.common.domain;
import org.apache.linkis.datasourcemanager.common.exception.JsonErrorException;
import org.apache.linkis.datasourcemanager.common.util.json.Json;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/CryptoUtils.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/CryptoUtils.java
index 4990b14..2127785 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/CryptoUtils.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/CryptoUtils.java
@@ -18,7 +18,7 @@
package org.apache.linkis.datasourcemanager.common.util;
import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.io.*;
import java.security.MessageDigest;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/PatternInjectUtils.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/PatternInjectUtils.java
index 5db039b..1fc27df 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/PatternInjectUtils.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/PatternInjectUtils.java
@@ -20,8 +20,8 @@ package org.apache.linkis.datasourcemanager.common.util;
import org.apache.linkis.datasourcemanager.common.exception.JsonErrorException;
import org.apache.linkis.datasourcemanager.common.util.json.Json;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
import java.util.Map;
import java.util.regex.Matcher;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/json/Json.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/json/Json.java
index d1762a0..6281d39 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/json/Json.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/json/Json.java
@@ -19,7 +19,7 @@ package org.apache.linkis.datasourcemanager.common.util.json;
import org.apache.linkis.datasourcemanager.common.exception.JsonErrorException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/service/impl/DataSourceInfoServiceImpl.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/service/impl/DataSourceInfoServiceImpl.java
index b97e431..d6c8562 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/service/impl/DataSourceInfoServiceImpl.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/service/impl/DataSourceInfoServiceImpl.java
@@ -31,7 +31,7 @@ import org.apache.linkis.datasourcemanager.core.service.DataSourceInfoService;
import org.apache.linkis.datasourcemanager.core.vo.DataSourceEnvVo;
import org.apache.linkis.datasourcemanager.core.vo.DataSourceVo;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/validate/DataSourceParameterValidator.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/validate/DataSourceParameterValidator.java
index 1acad29..7d30931 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/validate/DataSourceParameterValidator.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/validate/DataSourceParameterValidator.java
@@ -21,7 +21,7 @@ import org.apache.linkis.datasourcemanager.common.domain.DataSourceParamKeyDefin
import org.apache.linkis.datasourcemanager.core.validate.strategy.RegExpParameterValidateStrategy;
import org.apache.linkis.datasourcemanager.core.validate.strategy.TypeParameterValidateStrategy;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/validate/strategy/RegExpParameterValidateStrategy.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/validate/strategy/RegExpParameterValidateStrategy.java
index 4f242d8..269ba66 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/validate/strategy/RegExpParameterValidateStrategy.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/validate/strategy/RegExpParameterValidateStrategy.java
@@ -21,7 +21,7 @@ import org.apache.linkis.datasourcemanager.common.domain.DataSourceParamKeyDefin
import org.apache.linkis.datasourcemanager.core.validate.ParameterValidateException;
import org.apache.linkis.datasourcemanager.core.validate.ParameterValidateStrategy;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.util.List;
import java.util.regex.Pattern;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/vo/DataSourceVo.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/vo/DataSourceVo.java
index ea271d2..e336b86 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/vo/DataSourceVo.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/vo/DataSourceVo.java
@@ -17,7 +17,7 @@
package org.apache.linkis.datasourcemanager.core.vo;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/service/AbstractMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/service/AbstractMetaService.java
index d62bf15..e2f9108 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/service/AbstractMetaService.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/service/AbstractMetaService.java
@@ -26,7 +26,7 @@ import org.apache.linkis.metadatamanager.common.domain.MetaColumnInfo;
import org.apache.linkis.metadatamanager.common.domain.MetaPartitionInfo;
import org.apache.linkis.metadatamanager.common.exception.MetaRuntimeException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import javax.annotation.PostConstruct;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/loader/MetaClassLoaderManager.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/loader/MetaClassLoaderManager.java
index ff80814..220c40a 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/loader/MetaClassLoaderManager.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/loader/MetaClassLoaderManager.java
@@ -25,7 +25,7 @@ import org.apache.linkis.metadatamanager.common.service.AbstractMetaService;
import org.apache.linkis.metadatamanager.common.service.MetadataService;
import org.apache.linkis.metadatamanager.server.utils.MetadataUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestful.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestful.java
index ebcb9cb..be91c92 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestful.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestful.java
@@ -26,7 +26,7 @@ import org.apache.linkis.metadatamanager.server.service.MetadataAppService;
import org.apache.linkis.server.Message;
import org.apache.linkis.server.security.SecurityFilter;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/service/impl/MetadataAppServiceImpl.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/service/impl/MetadataAppServiceImpl.java
index 8c78d98..d688aad 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/service/impl/MetadataAppServiceImpl.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/service/impl/MetadataAppServiceImpl.java
@@ -31,7 +31,7 @@ import org.apache.linkis.metadatamanager.server.loader.MetaClassLoaderManager;
import org.apache.linkis.metadatamanager.server.service.MetadataAppService;
import org.apache.linkis.rpc.Sender;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/utils/MetadataUtils.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/utils/MetadataUtils.java
index 7416511..bd5bfec 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/utils/MetadataUtils.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/utils/MetadataUtils.java
@@ -21,7 +21,7 @@ import org.apache.linkis.metadatamanager.common.exception.MetaRuntimeException;
import org.apache.linkis.metadatamanager.common.service.MetadataService;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/java/org/apache/linkis/metadatamanager/service/ElasticConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/java/org/apache/linkis/metadatamanager/service/ElasticConnection.java
index f8da934..2fa0b8f 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/java/org/apache/linkis/metadatamanager/service/ElasticConnection.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/java/org/apache/linkis/metadatamanager/service/ElasticConnection.java
@@ -19,7 +19,7 @@ package org.apache.linkis.metadatamanager.service;
import org.apache.linkis.datasourcemanager.common.util.json.Json;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/java/org/apache/linkis/metadatamanager/service/HiveConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/java/org/apache/linkis/metadatamanager/service/HiveConnection.java
index 94b96ce..7a1b2f0 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/java/org/apache/linkis/metadatamanager/service/HiveConnection.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/java/org/apache/linkis/metadatamanager/service/HiveConnection.java
@@ -19,7 +19,7 @@ package org.apache.linkis.metadatamanager.service;
import org.apache.linkis.common.conf.CommonVars;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.metastore.IMetaStoreClient;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/java/org/apache/linkis/metadatamanager/service/HiveMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/java/org/apache/linkis/metadatamanager/service/HiveMetaService.java
index 797d88c..7829547 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/java/org/apache/linkis/metadatamanager/service/HiveMetaService.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/java/org/apache/linkis/metadatamanager/service/HiveMetaService.java
@@ -29,7 +29,7 @@ import org.apache.linkis.metadatamanager.common.service.AbstractMetaService;
import org.apache.linkis.metadatamanager.common.service.MetadataConnection;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.hive.metastore.api.FieldSchema;
import org.apache.hadoop.hive.ql.metadata.Hive;
import org.apache.hadoop.hive.ql.metadata.HiveException;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/java/org/apache/linkis/metadatamanager/service/KafkaMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/java/org/apache/linkis/metadatamanager/service/KafkaMetaService.java
index 2d3b755..fa31ade 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/java/org/apache/linkis/metadatamanager/service/KafkaMetaService.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/java/org/apache/linkis/metadatamanager/service/KafkaMetaService.java
@@ -26,7 +26,7 @@ import org.apache.linkis.metadatamanager.common.service.AbstractMetaService;
import org.apache.linkis.metadatamanager.common.service.MetadataConnection;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/hive/config/LinkisMybatisConfig.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/hive/config/LinkisMybatisConfig.java
index baaf40e..509b317 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/hive/config/LinkisMybatisConfig.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/hive/config/LinkisMybatisConfig.java
@@ -21,7 +21,7 @@ import org.apache.linkis.hadoop.common.conf.HadoopConf;
import org.apache.linkis.metadata.util.DWSConfig;
import org.apache.linkis.metadata.util.HiveUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/restful/api/DataSourceRestfulApi.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/restful/api/DataSourceRestfulApi.java
index c5f1e04..a925034 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/restful/api/DataSourceRestfulApi.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/restful/api/DataSourceRestfulApi.java
@@ -22,7 +22,7 @@ import org.apache.linkis.metadata.service.DataSourceService;
import org.apache.linkis.server.Message;
import org.apache.linkis.server.security.SecurityFilter;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/DataSourceServiceImpl.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/DataSourceServiceImpl.java
index cc30ff0..e66ea9e 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/DataSourceServiceImpl.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/DataSourceServiceImpl.java
@@ -26,7 +26,7 @@ import org.apache.linkis.metadata.service.DataSourceService;
import org.apache.linkis.metadata.service.HiveMetaWithPermissionService;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/MdqServiceImpl.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/MdqServiceImpl.java
index 24c15e5..6ae1d57 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/MdqServiceImpl.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/MdqServiceImpl.java
@@ -41,7 +41,7 @@ import org.apache.linkis.metadata.service.HiveMetaWithPermissionService;
import org.apache.linkis.metadata.service.MdqService;
import org.apache.linkis.metadata.type.MdqImportType;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/util/HiveUtils.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/util/HiveUtils.java
index ace81bb..4a111da 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/util/HiveUtils.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/util/HiveUtils.java
@@ -17,7 +17,7 @@
package org.apache.linkis.metadata.util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.log4j.Logger;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/org/apache/linkis/metadata/ddl/ImportDDLCreator.scala b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/org/apache/linkis/metadata/ddl/ImportDDLCreator.scala
index f6c0f32..cb88fde 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/org/apache/linkis/metadata/ddl/ImportDDLCreator.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/org/apache/linkis/metadata/ddl/ImportDDLCreator.scala
@@ -32,8 +32,8 @@ import org.apache.linkis.storage.FSFactory
import org.apache.linkis.storage.fs.FileSystem
import org.apache.linkis.storage.utils.FileSystemUtils
import org.apache.commons.io.IOUtils
-import org.apache.commons.lang.StringUtils
-import org.apache.commons.lang.time.DateFormatUtils
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.time.DateFormatUtils
import scala.collection.JavaConversions._
import scala.collection.mutable.ArrayBuffer
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/org/apache/linkis/metadata/ddl/ScalaDDLCreator.scala b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/org/apache/linkis/metadata/ddl/ScalaDDLCreator.scala
index de2fb3a..dc6a40a 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/org/apache/linkis/metadata/ddl/ScalaDDLCreator.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/org/apache/linkis/metadata/ddl/ScalaDDLCreator.scala
@@ -22,7 +22,7 @@ import org.apache.linkis.common.utils.Logging
import org.apache.linkis.metadata.conf.MdqConfiguration
import org.apache.linkis.metadata.domain.mdq.bo.{MdqTableBO, MdqTableFieldsInfoBO}
import org.apache.linkis.metadata.exception.MdqIllegalParamException
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.JavaConversions._
import scala.collection.mutable.ArrayBuffer
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-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/util/LabelEntityParser.java
index f68d611..d10fa93 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/util/LabelEntityParser.java
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/util/LabelEntityParser.java
@@ -26,7 +26,7 @@ import org.apache.linkis.manager.label.entity.engine.EngineTypeLabel;
import org.apache.linkis.manager.label.entity.engine.UserCreatorLabel;
import org.apache.linkis.manager.label.utils.EngineTypeLabelCreator;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
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-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/CategoryService.scala
index 6362d8e..bccdaf4 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/CategoryService.scala
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/CategoryService.scala
@@ -27,7 +27,7 @@ import org.apache.linkis.configuration.util.LabelEntityParser
import org.apache.linkis.manager.label.builder.CombinedLabelBuilder
import org.apache.linkis.manager.label.entity.CombinedLabel
import org.apache.linkis.manager.label.entity.engine.{EngineTypeLabel, UserCreatorLabel}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.linkis.configuration.conf.Configuration
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.stereotype.Service
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-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala
index a63fc21..403c765 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala
@@ -36,7 +36,7 @@ import org.apache.linkis.manager.label.entity.engine.{EngineTypeLabel, UserCreat
import org.apache.linkis.manager.label.entity.{CombinedLabel, CombinedLabelImpl, Label, SerializableLabel}
import org.apache.linkis.manager.label.utils.{EngineTypeLabelCreator, LabelUtils}
import org.apache.linkis.rpc.Sender
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.stereotype.Service
import org.springframework.transaction.annotation.Transactional
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-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/RegexValidator.scala
index ca24fed..2131078 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/RegexValidator.scala
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/validate/RegexValidator.scala
@@ -17,7 +17,7 @@
package org.apache.linkis.configuration.validate
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class RegexValidator extends Validator{
override var kind: String = "Regex"
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-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java
index 997181d..92cb17f 100644
--- 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-publicservice/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java
@@ -24,7 +24,7 @@ import org.apache.linkis.errorcode.common.ErrorCode;
import org.apache.linkis.errorcode.common.LinkisErrorCode;
import org.apache.commons.io.Charsets;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.slf4j.Logger;
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-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java
index e33b5ea..f244b05 100644
--- 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-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java
@@ -31,7 +31,7 @@ import org.apache.linkis.manager.label.utils.LabelUtils;
import org.apache.linkis.server.Message;
import org.apache.linkis.server.security.SecurityFilter;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java
index ce3f393..5d69593 100644
--- 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-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java
@@ -37,7 +37,7 @@ import org.apache.linkis.manager.label.entity.Label;
import org.apache.linkis.manager.label.utils.LabelUtils;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.aop.framework.AopContext;
import org.springframework.beans.factory.annotation.Autowired;
@@ -58,7 +58,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
import java.util.stream.Collectors;
-import static org.apache.commons.lang.math.NumberUtils.isNumber;
+import static org.apache.commons.lang3.math.NumberUtils.isNumber;
@AdapterMode
@EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
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-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conversions/TaskConversions.scala
index c92f67a..7b64b36 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conversions/TaskConversions.scala
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conversions/TaskConversions.scala
@@ -29,7 +29,7 @@ import org.apache.linkis.manager.label.entity.Label
import org.apache.linkis.manager.label.utils.LabelUtil
import org.apache.linkis.protocol.utils.ZuulEntranceUtils
import org.apache.linkis.server.{BDPJettyServerHelper, toScalaBuffer, toScalaMap}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.beans.BeanUtils
import java.util
import java.util.Date
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-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryDetailQueryServiceImpl.scala
index 10cc478..0081115 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryDetailQueryServiceImpl.scala
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryDetailQueryServiceImpl.scala
@@ -26,7 +26,7 @@ import org.apache.linkis.jobhistory.service.JobHistoryDetailQueryService
import org.apache.linkis.message.annotation.Receiver
import java.util
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
import org.apache.linkis.common.errorcode.LinkisPublicEnhancementErrorCodeSummary
import org.apache.linkis.common.exception.LinkisRetryException
import org.apache.linkis.governance.common.constant.job.JobRequestConstants
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-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala
index e673bf3..4b524f8 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala
@@ -32,7 +32,7 @@ import scala.collection.JavaConverters.asScalaBufferConverter
import java.util
import java.util.Date
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
import org.apache.linkis.common.errorcode.LinkisPublicEnhancementErrorCodeSummary
import org.apache.linkis.common.exception.LinkisRetryException
import org.apache.linkis.governance.common.constant.job.JobRequestConstants
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-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/util/QueryUtils.scala
index 0ef6853..728fd65 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/util/QueryUtils.scala
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/util/QueryUtils.scala
@@ -33,7 +33,7 @@ import org.apache.linkis.storage.FSFactory
import org.apache.linkis.storage.fs.FileSystem
import org.apache.linkis.storage.utils.{FileSystemUtils, StorageUtils}
import org.apache.commons.io.IOUtils
-import org.apache.commons.lang.time.DateFormatUtils
+import org.apache.commons.lang3.time.DateFormatUtils
object QueryUtils extends Logging {
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-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java
index d8a21d0..eef98b8 100644
--- 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-publicservice/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java
@@ -36,7 +36,7 @@ import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
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-publicservice/linkis-variable/src/main/scala/org/apache/linkis/variable/service/VariableServiceImpl.scala
index f900765..ba66229 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/scala/org/apache/linkis/variable/service/VariableServiceImpl.scala
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-variable/src/main/scala/org/apache/linkis/variable/service/VariableServiceImpl.scala
@@ -26,7 +26,7 @@ import org.apache.linkis.server.BDPJettyServerHelper
import org.apache.linkis.variable.dao.VarMapper
import org.apache.linkis.variable.entity.{VarKey, VarKeyUser, VarKeyValueVO}
import org.apache.linkis.variable.exception.VariableException
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.stereotype.Service
import org.springframework.transaction.annotation.Transactional
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/parser/GatewayParser.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/parser/GatewayParser.scala
index b11a3f4..29a4b9e 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/parser/GatewayParser.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/parser/GatewayParser.scala
@@ -25,7 +25,7 @@ import org.apache.linkis.rpc.conf.RPCConfiguration
import org.apache.linkis.rpc.interceptor.ServiceInstanceUtils
import org.apache.linkis.server.Message
import org.apache.linkis.server.conf.ServerConfiguration
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
trait GatewayParser {
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/route/GatewayRouter.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/route/GatewayRouter.scala
index c2c746b..5c1b332 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/route/GatewayRouter.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/route/GatewayRouter.scala
@@ -27,8 +27,8 @@ import org.apache.linkis.rpc.interceptor.ServiceInstanceUtils
import org.apache.linkis.rpc.sender.SpringCloudFeignConfigurationCache
import org.apache.linkis.server.Message
import org.apache.linkis.server.exception.NoApplicationExistsException
-import org.apache.commons.lang.StringUtils
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
trait GatewayRouter {
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/ProxyUserUtils.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/ProxyUserUtils.scala
index 49cafb8..177bf70 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/ProxyUserUtils.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/ProxyUserUtils.scala
@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit
import org.apache.linkis.common.utils.{Logging, Utils}
import org.apache.linkis.gateway.config.GatewayConfiguration._
import org.apache.commons.io.{FileUtils, IOUtils}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
object ProxyUserUtils extends Logging {
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/SecurityFilter.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/SecurityFilter.scala
index cadba87..81ff2b5 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/SecurityFilter.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/SecurityFilter.scala
@@ -34,8 +34,8 @@ import org.apache.linkis.gateway.security.token.TokenAuthentication
import org.apache.linkis.server.conf.ServerConfiguration
import org.apache.linkis.server.exception.{LoginExpireException, NonLoginException}
import org.apache.linkis.server.{Message, validateFailed}
-import org.apache.commons.lang.StringUtils
-import org.apache.commons.lang.exception.ExceptionUtils
+import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
import java.util.regex.Pattern
object SecurityFilter extends Logging {
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/UserRestful.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/UserRestful.scala
index 20ce4d2..1fb4bfb 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/UserRestful.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/UserRestful.scala
@@ -39,7 +39,7 @@ import org.apache.linkis.rpc.Sender
import org.apache.linkis.server.conf.ServerConfiguration
import org.apache.linkis.server.security.SSOUtils
import org.apache.linkis.server.{Message, _}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.commons.net.util.Base64
import org.apache.http.client.methods.HttpGet
import org.apache.http.impl.client.HttpClients
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/token/TokenAuthentication.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/token/TokenAuthentication.scala
index 416b0f7..a26ed08 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/token/TokenAuthentication.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/token/TokenAuthentication.scala
@@ -27,7 +27,7 @@ import org.apache.linkis.gateway.http.GatewayContext
import org.apache.linkis.gateway.security.{GatewaySSOUtils, SecurityFilter}
import org.apache.linkis.server.Message
import org.apache.commons.io.{FileUtils, IOUtils}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
object TokenAuthentication extends Logging {
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/DWSHttpClient.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/DWSHttpClient.scala
index 92a9de1..6c6a5e7 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/DWSHttpClient.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/DWSHttpClient.scala
@@ -31,7 +31,7 @@ import org.apache.linkis.httpclient.request.HttpAction
import org.apache.linkis.httpclient.response.impl.DefaultHttpResult
import org.apache.linkis.httpclient.response.{HttpResult, ListResult, Result}
import org.apache.commons.beanutils.BeanUtils
-import org.apache.commons.lang.{ClassUtils, StringUtils}
+import org.apache.commons.lang3.{ClassUtils, StringUtils}
import org.apache.http.{HttpException, HttpResponse}
import scala.collection.JavaConversions
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/authentication/StaticAuthenticationStrategy.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/authentication/StaticAuthenticationStrategy.scala
index 8af1946..116467e 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/authentication/StaticAuthenticationStrategy.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/authentication/StaticAuthenticationStrategy.scala
@@ -23,7 +23,7 @@ import org.apache.linkis.httpclient.dws.exception.AuthenticationFailedException
import org.apache.linkis.httpclient.dws.request.DWSAuthenticationAction
import org.apache.linkis.httpclient.dws.response.DWSAuthenticationResult
import org.apache.linkis.httpclient.request.{Action, UserAction, UserPwdAction}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.apache.http.HttpResponse
class StaticAuthenticationStrategy(override protected val sessionMaxAliveTime: Long) extends AbstractAuthenticationStrategy {
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/config/DWSClientConfigBuilder.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/config/DWSClientConfigBuilder.scala
index acd9e23..19981d3 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/config/DWSClientConfigBuilder.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/config/DWSClientConfigBuilder.scala
@@ -19,7 +19,7 @@ package org.apache.linkis.httpclient.dws.config
import org.apache.linkis.httpclient.config.ClientConfigBuilder
import org.apache.linkis.httpclient.dws.exception.UnknownVersionException
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class DWSClientConfigBuilder private() extends ClientConfigBuilder {
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/response/DWSHttpMessageFactory.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/response/DWSHttpMessageFactory.scala
index 1423624..2f155ef 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/response/DWSHttpMessageFactory.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/org/apache/linkis/httpclient/dws/response/DWSHttpMessageFactory.scala
@@ -19,7 +19,7 @@ package org.apache.linkis.httpclient.dws.response
import org.apache.linkis.httpclient.dws.annotation.DWSHttpMessageResult
import org.apache.linkis.httpclient.response.Result
-import org.apache.commons.lang.ClassUtils
+import org.apache.commons.lang3.ClassUtils
import scala.collection.JavaConversions._
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/AbstractLabelGatewayRouter.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/AbstractLabelGatewayRouter.scala
index 4ef1d1d..a1b7078 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/AbstractLabelGatewayRouter.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/AbstractLabelGatewayRouter.scala
@@ -27,7 +27,7 @@ import org.apache.linkis.gateway.route.AbstractGatewayRouter
import org.apache.linkis.instance.label.service.InsLabelService
import org.apache.linkis.manager.label.entity.route.RouteLabel
import javax.annotation.Resource
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
abstract class AbstractLabelGatewayRouter extends AbstractGatewayRouter with Logging {
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/DefaultLabelGatewayRouter.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/DefaultLabelGatewayRouter.scala
index 48b84fe..6171c2a 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/DefaultLabelGatewayRouter.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/DefaultLabelGatewayRouter.scala
@@ -23,7 +23,7 @@ import org.apache.linkis.gateway.exception.GatewayErrorException
import org.apache.linkis.gateway.http.GatewayContext
import org.apache.linkis.gateway.ujes.route.label.RouteLabelParser
import org.apache.linkis.manager.label.entity.route.RouteLabel
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import scala.collection.JavaConversions._
import scala.util.Random
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/EntranceGatewayRouter.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/EntranceGatewayRouter.scala
index dd12cc7..aaf62b7 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/EntranceGatewayRouter.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/EntranceGatewayRouter.scala
@@ -24,7 +24,7 @@ import org.apache.linkis.gateway.http.GatewayContext
import org.apache.linkis.gateway.route.AbstractGatewayRouter
import org.apache.linkis.gateway.ujes.parser.EntranceExecutionGatewayParser
import org.apache.linkis.protocol.constants.TaskConstant
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class EntranceGatewayRouter extends AbstractGatewayRouter {
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 930b136..08a8e1f 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,7 +27,7 @@ import org.apache.linkis.gateway.http.GatewayContext
import org.apache.linkis.gateway.route.AbstractGatewayRouter
import org.apache.linkis.gateway.springcloud.SpringCloudGatewayConfiguration.{API_URL_PREFIX, normalPath}
import org.apache.linkis.rpc.interceptor.ServiceInstanceUtils
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.stereotype.Component
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/contextservice/ContextIdParserImpl.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/contextservice/ContextIdParserImpl.scala
index e7dcb56..b9c1c71 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/contextservice/ContextIdParserImpl.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/contextservice/ContextIdParserImpl.scala
@@ -26,7 +26,7 @@ import org.apache.linkis.manager.label.builder.factory.LabelBuilderFactoryContex
import org.apache.linkis.manager.label.constant.LabelKeyConstant
import org.apache.linkis.manager.label.entity.Label
import org.apache.linkis.protocol.label.LabelInsQueryRequest
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.stereotype.Component
import java.util
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/java/org/apache/linkis/gateway/springcloud/http/GatewayAuthorizationFilter.java b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/java/org/apache/linkis/gateway/springcloud/http/GatewayAuthorizationFilter.java
index 9b81b7b..48950f7 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/java/org/apache/linkis/gateway/springcloud/http/GatewayAuthorizationFilter.java
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/java/org/apache/linkis/gateway/springcloud/http/GatewayAuthorizationFilter.java
@@ -30,7 +30,7 @@ import org.apache.linkis.gateway.security.SecurityFilter;
import org.apache.linkis.gateway.springcloud.SpringCloudGatewayConfiguration;
import org.apache.linkis.server.Message;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.cloud.gateway.config.GatewayProperties;
import org.springframework.cloud.gateway.filter.GatewayFilterChain;
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/org/apache/linkis/gateway/springcloud/http/SpringCloudGatewayHttpRequest.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/org/apache/linkis/gateway/springcloud/http/SpringCloudGatewayHttpRequest.scala
index 9023291..79b4d68 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/org/apache/linkis/gateway/springcloud/http/SpringCloudGatewayHttpRequest.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/org/apache/linkis/gateway/springcloud/http/SpringCloudGatewayHttpRequest.scala
@@ -22,7 +22,7 @@ import java.net.{InetSocketAddress, URI}
import org.apache.linkis.gateway.http.GatewayHttpRequest
import org.apache.linkis.server._
import javax.servlet.http.Cookie
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.http.server.reactive.AbstractServerHttpRequest
import scala.collection.JavaConversions
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/src/main/scala/org/apache/linkis/gateway/ruler/datasource/DatasourceGatewayRouterRuler.scala b/linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/src/main/scala/org/apache/linkis/gateway/ruler/datasource/DatasourceGatewayRouterRuler.scala
index 84907b3..1fdaec0 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/src/main/scala/org/apache/linkis/gateway/ruler/datasource/DatasourceGatewayRouterRuler.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/src/main/scala/org/apache/linkis/gateway/ruler/datasource/DatasourceGatewayRouterRuler.scala
@@ -27,7 +27,7 @@ import org.apache.linkis.protocol.constants.TaskConstant
import org.apache.linkis.protocol.utils.TaskUtils
import org.apache.linkis.rpc.interceptor.ServiceInstanceUtils
import org.apache.linkis.server.{BDPJettyServerHelper, JMap}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.stereotype.Component
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org