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 4b6175e2b5263a81f3c99ecd5a60a55d2d2278ea Merge: a7b0a0820 cffb246cb Author: peacewong <[email protected]> AuthorDate: Tue Nov 29 11:56:32 2022 +0800 Merge dev-1.3.1 into dev-1.3.2 Merge dev-1.3.1 into dev-1.3.2 .asf.yaml | 9 +- LICENSE | 2 +- README.md | 4 +- .../linkis-gateway-authentication-errorcode.md | 2 +- docs/errorcode/linkis-gateway-authentication.md | 2 +- .../linkis/httpclient/AbstractHttpClient.scala | 10 +- .../entrance/execute/DefaultEntranceExecutor.scala | 8 +- .../server/restful/EnginePluginRestful.java | 32 +- .../service/DefaultEngineConnResourceService.scala | 57 +- .../server/service/EngineConnResourceService.scala | 10 +- .../linkis/manager/rm/restful/RMMonitorRest.scala | 11 +- .../label/builder/CombinedLabelBuilderTest.java | 53 ++ .../factory/StdLabelBuilderFactoryTest.java | 76 ++ .../label/utils/EngineTypeLabelCreatorTest.java | 26 +- .../linkis/manager/label/utils/LabelUtilsTest.java | 58 ++ linkis-dist/package/db/linkis_ddl.sql | 13 +- linkis-dist/package/db/linkis_dml.sql | 117 ++- .../db/upgrade/1.3.1_schema/mysql/linkis_dml.sql | 91 +- .../hive/executor/HiveEngineConnExecutor.scala | 4 - .../presto/TestPrestoEngineConnPlugin.scala | 35 +- .../TestPrestoProcessEngineConnLaunchBuilder.scala | 24 +- .../presto/conf/TestPrestoConfiguration.scala | 42 + .../presto/exception/TestPrestoException.scala | 26 +- .../factory/TestPrestoEngineConnFactory.scala | 42 + .../presto/utils/testPrestoSQLHook.scala | 37 +- .../client/LinkisSeatunnelFlinkClient.java | 2 +- .../client/LinkisSeatunnelFlinkSQLClient.java | 2 +- .../org/apache/seatunnel/common/config/Common.java | 1 - .../seatunnel/core/base/config/ConfigBuilder.java | 8 +- .../seatunnel/core/base/config/PluginFactory.java | 7 +- .../apache/seatunnel/core/flink/FlinkStarter.java | 7 +- .../apache/seatunnel/core/spark/SparkStarter.java | 7 +- .../apache/seatunnel/core/sql/FlinkSqlStarter.java | 7 +- .../executor/SeatunnelFlinkOnceCodeExecutor.scala | 2 +- .../executor/SeatunnelSparkOnceCodeExecutor.scala | 7 +- .../seatunnel/util/SeatunnelUtils.scala | 11 +- .../server/dao/DatasourceTypeKeyMapper.java | 22 +- .../server/dao/mapper/DatasourceTypeKeyMapper.xml | 64 ++ .../server/dao/mapper/UdfTreeMapper.xml | 1 + .../server/domain/DatasourceAccessEntity.java | 2 + .../server/domain/DatasourceEnvEntity.java | 2 + .../server/domain/DatasourceTypeEntity.java | 2 + .../server/domain/DatasourceTypeKeyEntity.java | 375 ++++++++ .../server/domain/ErrorCodeEntity.java | 2 + .../server/domain/GatewayAuthTokenEntity.java | 2 + .../domain/RmExternalResourceProviderEntity.java | 2 + .../server/domain/UdfManagerEntity.java | 2 + .../server/domain/UdfTreeEntity.java | 2 + ...ulApi.java => DatasourceTypeKeyRestfulApi.java} | 82 +- .../server/restful/GatewayAuthTokenRestfulApi.java | 4 +- .../server/restful/UdfManagerRestfulApi.java | 12 +- .../server/restful/UdfTreeRestfulApi.java | 11 + .../server/service/DatasourceTypeKeyService.java | 26 +- .../service/impl/DatasourceTypeKeyServiceImpl.java | 52 ++ .../core/restful/DataSourceCoreRestfulApi.java | 40 +- .../query/service/sqlserver/SqlConnection.java | 2 +- .../gateway/authentication/dao/TokenDao.java | 5 - .../LinkisGwAuthenticationErrorCodeSummary.java | 2 +- linkis-web/install.sh | 43 +- linkis-web/package.json | 2 +- linkis-web/src/apps/URM/router.js | 2 +- linkis-web/src/apps/URM/view/urm/index.vue | 10 +- .../src/apps/linkis/components/cardList/index.vue | 76 +- .../src/apps/linkis/components/progress/index.vue | 8 +- .../src/apps/linkis/components/tag/index.vue | 18 +- linkis-web/src/apps/linkis/i18n/common/en.json | 130 ++- linkis-web/src/apps/linkis/i18n/common/zh.json | 979 ++++++++++++--------- .../src/apps/linkis/module/ECM/engineConn.vue | 48 +- linkis-web/src/apps/linkis/module/ECM/index.vue | 70 +- linkis-web/src/apps/linkis/module/ECM/log.vue | 10 +- .../src/apps/linkis/module/datasource/index.vue | 12 +- .../linkis/module/datasourceEnv/EditForm/index.vue | 49 +- .../src/apps/linkis/module/datasourceEnv/index.vue | 165 ++-- .../module/datasourceType/EditForm/index.vue | 79 +- .../apps/linkis/module/datasourceType/index.vue | 124 +-- .../module/datasourceTypeKey/EditForm/index.vue | 265 ++++++ .../linkis/module/datasourceTypeKey/index.js} | 24 +- .../linkis/module/datasourceTypeKey/index.scss} | 71 +- .../apps/linkis/module/datasourceTypeKey/index.vue | 359 ++++++++ .../{udfTree => datasourceTypeKey}/service.js | 18 +- .../module/errorCode/errorCodeForm/index.vue | 12 +- .../src/apps/linkis/module/errorCode/index.vue | 90 +- .../module/gatewayAuthToken/EditForm/index.vue | 82 +- .../apps/linkis/module/gatewayAuthToken/index.vue | 125 +-- .../module/globalHistoryManagement/index.vue | 12 +- .../module/globalHistoryManagement/viewHistory.vue | 32 +- .../apps/linkis/module/globalValiable/index.vue | 10 +- linkis-web/src/apps/linkis/module/header/index.vue | 2 +- .../src/apps/linkis/module/header/userMenu.vue | 8 +- .../linkis/module/microServiceManagement/index.vue | 32 +- .../module/resourceManagement/engineConn.vue | 40 +- .../linkis/module/resourceManagement/index.vue | 62 +- .../apps/linkis/module/resourceManagement/log.vue | 10 +- .../rmExternalResourceProvider/EditForm/index.vue | 21 +- .../module/rmExternalResourceProvider/index.vue | 91 +- .../src/apps/linkis/module/setting/setting.vue | 100 +-- .../linkis/module/udfManager/EditForm/index.vue | 20 +- .../src/apps/linkis/module/udfManager/index.vue | 87 +- .../apps/linkis/module/udfTree/EditForm/index.vue | 56 +- .../src/apps/linkis/module/udfTree/index.vue | 103 ++- .../src/apps/linkis/module/udfTree/service.js | 9 +- linkis-web/src/apps/linkis/router.js | 12 +- linkis-web/src/apps/linkis/view/linkis/index.vue | 13 +- .../src/apps/scriptis/module/webSocket/index.js | 9 +- linkis-web/src/common/config/const.js | 18 +- linkis-web/src/common/config/db.js | 8 +- linkis-web/src/common/helper/elementResizeEvent.js | 8 +- linkis-web/src/common/helper/emitter.js | 8 +- linkis-web/src/common/helper/eventbus.js | 38 +- linkis-web/src/common/helper/fesx.js | 28 +- linkis-web/src/common/i18n/index.js | 8 +- linkis-web/src/common/service/api.js | 40 +- linkis-web/src/common/service/apiCache.js | 18 +- linkis-web/src/common/service/db/index.js | 10 +- linkis-web/src/common/service/execute.js | 84 +- linkis-web/src/common/service/layoutMixin.js | 14 +- linkis-web/src/common/service/mixin.js | 11 +- linkis-web/src/common/service/moduleMixin.js | 26 +- linkis-web/src/common/service/socket.js | 8 +- linkis-web/src/common/service/timeToCronMixin.js | 18 +- linkis-web/src/common/util/convert.js | 20 +- linkis-web/src/common/util/currentModules.js | 10 +- linkis-web/src/common/util/debug.js | 12 +- linkis-web/src/common/util/index.js | 8 +- linkis-web/src/common/util/object.js | 10 +- linkis-web/src/common/util/type.js | 24 +- .../src/components/consoleComponent/console.vue | 22 +- .../src/components/consoleComponent/filter.vue | 8 +- linkis-web/src/components/consoleComponent/log.vue | 4 +- .../src/components/consoleComponent/modal.js | 24 +- .../src/components/consoleComponent/progress.vue | 12 +- .../src/components/consoleComponent/result.vue | 40 +- .../components/consoleComponent/resultsExport.vue | 12 +- .../src/components/consoleComponent/steps.vue | 30 +- .../src/components/consoleComponent/toolbar.vue | 10 +- linkis-web/src/components/editor/editor.vue | 64 +- linkis-web/src/components/editor/index.scss | 8 +- linkis-web/src/components/editor/keyword/hql.js | 10 +- linkis-web/src/components/editor/keyword/python.js | 8 +- linkis-web/src/components/editor/keyword/sas.js | 8 +- linkis-web/src/components/editor/languages/hql.js | 8 +- linkis-web/src/components/editor/languages/sas.js | 10 +- linkis-web/src/components/editor/monaco-loader.js | 12 +- linkis-web/src/components/editor/util.js | 34 +- linkis-web/src/components/log/index.vue | 10 +- linkis-web/src/components/menu/index.vue | 8 +- linkis-web/src/components/navbar/nav.js | 16 +- linkis-web/src/components/navbar/navbar.vue | 8 +- linkis-web/src/components/panel/panel.vue | 14 +- linkis-web/src/components/table/table.vue | 140 +-- .../src/components/tree/functionView/index.vue | 8 +- linkis-web/src/components/tree/model/store.js | 8 +- linkis-web/src/components/tree/node.vue | 18 +- .../virtualTable/historyTable/historyTable.vue | 4 +- .../components/virtualTable/resultTable/body.vue | 8 +- .../components/virtualTable/resultTable/header.vue | 2 +- linkis-web/src/components/virtualTree/tree.vue | 38 +- linkis-web/src/dss/assets/styles/app.scss | 6 +- linkis-web/src/dss/module/footer/index.vue | 24 +- linkis-web/src/dss/module/header/userMenu.vue | 4 +- linkis-web/src/dss/module/index.js | 16 +- .../src/dss/module/resourceSimple/engine.vue | 10 +- .../src/dss/module/resourceSimple/index.scss | 8 +- linkis-web/src/dss/module/resourceSimple/job.vue | 18 +- linkis-web/src/dss/module/resourceSimple/queue.vue | 16 +- linkis-web/src/dss/router.js | 18 +- linkis-web/src/dss/view/commonIframe/index.vue | 10 +- linkis-web/src/dss/view/icon.vue | 10 +- linkis-web/src/dss/view/layout.vue | 2 +- linkis-web/src/dss/view/login/index.vue | 12 +- linkis-web/src/dynamic-apps.js | 16 +- linkis-web/src/router.js | 12 +- .../util/debug.js => utils/string-format.js} | 30 +- 173 files changed, 4286 insertions(+), 2127 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
