This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a change to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
from a7b0a0820 [Linkis-3896][Linkis-common]Support task level custom
run_today_h variable (#3897)
add 4ce936221 fix typos in README.md (#3862)
add 4b602c78f fix:add datasource type key management and fix front bug
(#3863)
add 2dfa6d11f fix:optimize BaseDataManager frontend (#3867)
add d4498722f linkis-web Chinese-English translation (#3745)
add e7d2bd5c2 fix some sql bug and optimize web install.sh (#3868)
add 2fcf71e02 [presto]unit test (#3767)
add 736d082ba [linkis-label-common] unit test (#3731)
add 6e72c7daf fix:fix udf tree time error (#3877)
add 51b32bbaf sqlserver驱动类路径错误 (#3882)
add 6e250ece2 fix:fixed some BaseDataManager frontend error (#3878)
add 9219c2c0e format code in AbstractHttpClient (#3880)
add ef40b1c30 optimize:datasource add default key value (#3881)
add ee40ca1d6 [feat:3885]Datasource env add unique index (#3886)
add 0bd23e52d Fix seatunnel log conflicts (#3872)
add 0ba5ae6b7 fix:Parent tree display that implements UDF classification
(#3894)
add ebc4acef5 Feature bml refresh api support force parameter (#3895)
add 8837f2b53 Fix the Txn list invalidation caused by multiple
compilations under the transaction table query (#3906)
add 4e5ef7bfe fix:Restrict the minimum value to 0 (#3907)
add e8758800f fix typos in DefaultEntranceExecutor (#3909)
add cffb246cb Merge remote-tracking branch 'apache/dev-1.3.1' into
dev-1.3.2-tomerge
new 4b6175e2b Merge dev-1.3.1 into dev-1.3.2
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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 | 31 +-
.../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} | 8 +-
...TestPrestoProcessEngineConnLaunchBuilder.scala} | 14 +-
.../presto/conf/TestPrestoConfiguration.scala | 42 +
.../presto/exception/TestPrestoException.scala} | 14 +-
.../factory/TestPrestoEngineConnFactory.scala} | 12 +-
.../presto/utils/testPrestoSQLHook.scala} | 12 +-
.../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 +-
...ypeMapper.java => DatasourceTypeKeyMapper.java} | 13 +-
.../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} | 66 +-
.../server/restful/GatewayAuthTokenRestfulApi.java | 4 +-
.../server/restful/UdfManagerRestfulApi.java | 12 +-
.../server/restful/UdfTreeRestfulApi.java | 11 +
...sService.java => DatasourceTypeKeyService.java} | 11 +-
...Impl.java => DatasourceTypeKeyServiceImpl.java} | 23 +-
.../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 ++++++
.../index.js | 2 +-
.../{datasource => datasourceTypeKey}/index.scss | 0
.../apps/linkis/module/datasourceTypeKey/index.vue | 359 ++++++++
.../service.js | 10 +-
.../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, 4105 insertions(+), 2039 deletions(-)
create mode 100644
linkis-computation-governance/linkis-manager/linkis-label-common/src/test/java/org/apache/linkis/manager/label/builder/CombinedLabelBuilderTest.java
create mode 100644
linkis-computation-governance/linkis-manager/linkis-label-common/src/test/java/org/apache/linkis/manager/label/builder/factory/StdLabelBuilderFactoryTest.java
copy
linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/Scan.java
=>
linkis-computation-governance/linkis-manager/linkis-label-common/src/test/java/org/apache/linkis/manager/label/utils/EngineTypeLabelCreatorTest.java
(58%)
create mode 100644
linkis-computation-governance/linkis-manager/linkis-label-common/src/test/java/org/apache/linkis/manager/label/utils/LabelUtilsTest.java
copy
linkis-engineconn-plugins/{python/src/test/scala/org/apache/linkis/manager/engineplugin/python/TestPythonEngineConnPlugin.scala
=>
presto/src/test/scala/org/apache/linkis/engineplugin/presto/TestPrestoEngineConnPlugin.scala}
(81%)
copy
linkis-engineconn-plugins/presto/src/{main/scala/org/apache/linkis/engineplugin/presto/builder/PrestoProcessEngineConnLaunchBuilder.scala
=>
test/scala/org/apache/linkis/engineplugin/presto/builder/TestPrestoProcessEngineConnLaunchBuilder.scala}
(71%)
create mode 100644
linkis-engineconn-plugins/presto/src/test/scala/org/apache/linkis/engineplugin/presto/conf/TestPrestoConfiguration.scala
copy
linkis-engineconn-plugins/{shell/src/test/scala/org/apache/linkis/manager/engineplugin/shell/exception/TestNoCorrectUserException.scala
=>
presto/src/test/scala/org/apache/linkis/engineplugin/presto/exception/TestPrestoException.scala}
(77%)
copy
linkis-engineconn-plugins/{python/src/test/scala/org/apache/linkis/manager/engineplugin/python/factory/TestPythonEngineConnFactory.scala
=>
presto/src/test/scala/org/apache/linkis/engineplugin/presto/factory/TestPrestoEngineConnFactory.scala}
(82%)
copy
linkis-engineconn-plugins/{python/src/test/scala/org/apache/linkis/manager/engineplugin/python/TestPythonEngineConnPlugin.scala
=>
presto/src/test/scala/org/apache/linkis/engineplugin/presto/utils/testPrestoSQLHook.scala}
(76%)
copy
linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/{DatasourceTypeMapper.java
=> DatasourceTypeKeyMapper.java} (65%)
create mode 100644
linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/DatasourceTypeKeyMapper.xml
create mode 100644
linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceTypeKeyEntity.java
copy
linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/{DatasourceTypeRestfulApi.java
=> DatasourceTypeKeyRestfulApi.java} (60%)
copy
linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/{DatasourceAccessService.java
=> DatasourceTypeKeyService.java} (77%)
copy
linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/{DatasourceTypeServiceImpl.java
=> DatasourceTypeKeyServiceImpl.java} (70%)
create mode 100644
linkis-web/src/apps/linkis/module/datasourceTypeKey/EditForm/index.vue
copy linkis-web/src/apps/linkis/module/{datasourceAccess =>
datasourceTypeKey}/index.js (96%)
copy linkis-web/src/apps/linkis/module/{datasource =>
datasourceTypeKey}/index.scss (100%)
create mode 100644
linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue
copy linkis-web/src/apps/linkis/module/{datasourceType =>
datasourceTypeKey}/service.js (91%)
copy linkis-web/src/{common/util/debug.js => utils/string-format.js} (67%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
