This is an automated email from the ASF dual-hosted git repository. peacewong pushed a commit to branch dev-1.3.2 in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 9baadff98c7f5cda660b46c52cd5b97cd01a6da4 Merge: e00207276 965a96856 Author: peacewong <[email protected]> AuthorDate: Wed Dec 14 19:59:02 2022 +0800 merge dev-1.3.1 to dev-1.3.2 merge dev-1.3.1 to dev-1.3.2 .../linkis-computation-orchestrator.md | 2 +- docs/configuration/linkis-entrance.md | 2 +- .../apache/linkis/common/conf/Configuration.scala | 4 + .../common/entity/ExecutionNodeStatusTest.java | 63 ++++++++++ .../common/entity/NodeExistStatusTest.java | 38 ++++++ .../EngineConnExecutorErrorCodeTest.java | 42 +++++++ .../common/conf/GovernanceCommonConfTest.scala | 62 +++++++++ .../constant/job/JobRequestConstantsTest.scala | 41 ++++++ .../constant/job/TaskInfoConstantsTest.scala | 39 ++++++ .../exception/LinkisJobRetryExceptionTest.scala | 33 +++++ .../common/paser/EmptyCodeParserTest.scala | 35 ++++++ .../common/paser/JsonCodeParserTest.scala | 46 +++++++ .../common/paser/ScalaCodeParserTest.scala | 86 +++++++++++++ .../common/utils/GovernanceConstantTest.scala | 46 +++++++ .../utils/OnceExecutorContentUtilsTest.scala | 44 +++++++ .../impl/DefaultEngineConnKillServiceTest.java | 2 +- .../entrance/restful/EntranceLabelRestfulApi.java | 2 +- .../entrance/restful/EntranceMetricRestfulApi.java | 2 +- .../entrance/conf/EntranceConfiguration.scala | 5 +- .../impl/ShellDangerousGrammerInterceptor.scala | 6 +- .../TestShellDangerousGrammerInterceptor.scala | 41 ++++++ .../server/restful/EnginePluginRestful.java | 6 +- .../linkis/manager/am/restful/EMRestfulApi.java | 6 +- .../manager/am/restful/EngineRestfulApi.java | 14 ++- .../linkis/manager/am/conf/AMConfiguration.scala | 4 + linkis-dist/bin/common.sh | 2 +- linkis-dist/package/sbin/common.sh | 2 +- linkis-dist/package/sbin/linkis | 4 +- linkis-dist/package/sbin/linkis-start-all.sh | 10 +- .../client/impl/ElasticSearchExecutorImpl.scala | 2 +- .../executor/SeatunnelFlinkOnceCodeExecutor.scala | 13 +- .../SeatunnelFlinkSQLOnceCodeExecutor.scala | 13 +- .../executor/SeatunnelSparkOnceCodeExecutor.scala | 17 +-- .../conf/ComputationOrchestratorConf.scala | 5 +- .../server/restful/DatasourceAccessRestfulApi.java | 17 ++- .../server/restful/DatasourceEnvRestfulApi.java | 24 +++- .../restful/DatasourceTypeKeyRestfulApi.java | 17 ++- .../server/restful/DatasourceTypeRestfulApi.java | 17 ++- .../server/restful/ErrorCodeRestfulApi.java | 17 ++- .../server/restful/GatewayAuthTokenRestfulApi.java | 22 +++- .../RmExternalResourceProviderRestfulApi.java | 25 ++-- .../server/restful/UdfManagerRestfulApi.java | 17 ++- .../server/restful/UdfTreeRestfulApi.java | 16 ++- .../restful/api/ConfigurationRestfulApi.java | 2 +- .../cs/server/restful/ContextIDRestfulApi.java | 2 +- .../cs/server/restful/ContextRestfulApi.java | 2 +- .../core/restful/DataSourceAdminRestfulApi.java | 10 +- .../core/restful/RestfulApiHelper.java | 12 +- .../linkis-metadata-query/service/jdbc/pom.xml | 2 +- .../metadata/query/service/dm/SqlConnection.java | 2 +- .../query/service/oracle/SqlConnection.java | 2 +- .../instance/label/restful/InstanceRestful.java | 4 +- .../service/impl/JobHistoryQueryServiceImpl.scala | 26 ++-- linkis-web/src/apps/linkis/i18n/common/en.json | 11 +- linkis-web/src/apps/linkis/i18n/common/zh.json | 21 ++-- .../linkis/module/EnginePluginManagement/index.vue | 68 ++++++++-- .../apps/linkis/module/datasource/dataSourceApi.js | 4 +- .../linkis/module/datasourceEnv/EditForm/index.vue | 140 ++++++++++++++++----- .../src/apps/linkis/module/datasourceEnv/index.vue | 45 +++++-- .../module/datasourceType/EditForm/index.vue | 36 +++--- .../module/datasourceTypeKey/EditForm/index.vue | 48 +++---- .../module/gatewayAuthToken/EditForm/index.vue | 29 ++++- .../src/apps/linkis/module/udfManager/index.vue | 3 +- tool/dependencies/known-dependencies.txt | 2 +- 64 files changed, 1157 insertions(+), 225 deletions(-) diff --cc linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/Configuration.scala index b10a94423,bb7a8611a..8add24316 --- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/Configuration.scala +++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/Configuration.scala @@@ -61,9 -61,13 +61,13 @@@ object Configuration extends Logging private val adminUsers = GOVERNANCE_STATION_ADMIN.getValue.split(",") def isAdmin(username: String): Boolean = { - adminUsers.exists(username.equalsIgnoreCase) + adminUsers.exists(username.equals) } + def isNotAdmin(username: String): Boolean = { + !isAdmin(username) + } + def getGateWayURL(): String = { val url = GATEWAY_URL.getValue.trim val gatewayUr = if (url.endsWith("/")) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
