This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a change to branch alert_plugin_design
in repository
https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
discard a9a49db 删除不用的依赖包
discard 1a4080f 删除不用的依赖包
discard ce3d7d5 [feature#3356] alert-spi support DingTalk&WeChat (#3869)
discard 57e21a2 Replace the tenant management page ui with element-ui (#3891)
discard eae302e [Feature-3189][alert,spi,dao,plugin-api] base code of
dolphinscheduler spi and alert plugin implement (#3601)
discard 8977a12 [feature][ui]Alert plugin design (#3734)
discard a42a368 fix
discard d1287ee fix
discard 52771c5 Modify node version
discard d6096aa Add form-create plug-in and alarm group management add sample
demo
discard 735a859 [feature-3665][ui]Add element-ui (#3666)
omit f4c14de Merge pull request #4009 from BoYiZhang/pr_4008
omit c54d096 [Improvement][script] daemon script usage (#3968)
omit c7b5956 [Feature-3941][ui] Remove tenant name (#3949)
omit 83cc289 Update udfs.vue
omit a6266b7 reset code
omit 584a787 fix bug
omit c614bd3 the resources API document does not match the interface
parameters
omit c86ff41 Merge pull request #24 from apache/dev
omit afd0e6a [Test-3557][API] full cover DataAnalysisServiceImpl (#3605)
omit e9479e4 [fix-#3962][api] Avoid ClassCastException for
LoggerService.queryLog(). (#3963)
omit d520cef Merge pull request #23 from apache/dev
omit 05b248f Merge pull request #3957 from BoYiZhang/pr_3956
omit 187c5c1 Merge pull request #22 from apache/dev
omit 7dd717a When running a task, the resource file is lost, which results
in an error
omit 48177b6 When running a task, the resource file is lost, which results
in an error
omit 8fd3932 [Fix][api] Add queryProjectCreatedAndAuthorizedByUser
function (#3658)
omit ef6cc62 When running a task, the resource file is lost, which results
in an error
omit aace551 When running a task, the resource file is lost, which results
in an error
omit fc56581 When running a task, the resource file is lost, which results
in an error
omit 5f817f2 Merge pull request #21 from apache/dev
omit 4425968 Merge pull request #3923 from lgcareer/dev-fix
omit fa355b2 [CodeClean][DAO]Remove redundant comments (#3939)
omit 3fdc557 [Fix][Docker] fix startup.sh variables cannot reference in
single quotes. (#3895)
omit 3d4238f add verify tenant name cannot contain special characters.
(#3865)
omit de11a21 fixed queryTaskInstanceListPaging query slow (#3892)
omit d565892 fixed queryProcessInstanceListPaging query slow (#3893)
omit 6521601 Merge pull request #20 from apache/dev
omit 8afc0cc Merge pull request #3402 from dailidong/dev
omit 7878455 Merge remote-tracking branch 'origin/dev' into dev
omit f430fed Merge remote-tracking branch 'upstream/dev' into dev
omit 2ee5df4 fix Zookeeper does not start, printed logs have no error
messages, Api services can start but cannot be accessed
omit 15436cf Delete ThreadUtilsTest.java
omit ed3f089 Update ThreadUtilsTest.java
omit e53bd98 [fix-3843][api] When update workflow definition,if name
already exists, the prompt is not friendly
omit 29a083c Update ThreadUtilsTest.java
omit 60bf3f8 Merge pull request #3824 from
elonlo/bugfix-dag-reformat-miss-pretask
omit 62fb2fd fix service comment (#3901)
omit 5b4a8fd [fix-3788][pom]spring framework Security breach (#3882)
omit 2fbbf96 [Improvement-3686][service] ProcessService method name meets
naming convention. (#3687)
omit 1303050 [FIX-3836][dev-API] process definition validation name
interface prompt information error (#3908)
omit 622bce6 Merge pull request #19 from apache/dev
omit d32300b add process define name verify. (#3864)
omit 08dc691 [FIX_BUG_1.3#3789][remote]support netty heart beat (#3868)
omit 8e0fb35 Update
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/threadutils/ThreadUtilsTest.java
omit 5480a65 Merge pull request #16 from apache/dev
omit 6564e96 [Fix][ui] Fix the problem that all pre-tasks are lost after
dag reformatting #3823
omit 5ea4022 Merge pull request #15 from apache/dev
omit a26724c Merge pull request #14 from apache/dev
omit dffcf1e Merge pull request #13 from apache/dev
omit 2713991 Merge remote-tracking branch 'upstream/dev' into dev
omit c3666f3 Merge pull request #12 from apache/dev
omit a7cbfb1 Merge pull request #9 from apache/dev
omit d329914 Merge pull request #8 from apache/dev
omit 0e11365 Merge pull request #7 from apache/dev
omit d64127b optimize TheadUtils test
omit 5f34adf Merge remote-tracking branch 'origin/dev' into dev
omit 0f42af8 Merge remote-tracking branch 'upstream/dev' into dev
omit dea855f Update logback-zookeeper.xml
omit 34082f1 add logback for zookeeper
omit 58d6a1e Merge remote-tracking branch 'upstream/dev' into dev
omit 6f36c6c Merge remote-tracking branch 'upstream/dev' into dev
omit bbeb03e Merge remote-tracking branch 'origin/dev' into dev
omit 4aca133 this command just for getting a quick experience，not
recommended for production. this operation will start a standalone zookeeper
server
omit b11714b Update dolphinscheduler-daemon.sh
omit 3823a08 Merge branch 'dev' into dev
omit a655e1c Merge pull request #3 from apache/dev
omit deb19ee Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
omit b21aca8 Merge pull request #2 from apache/dev
omit 06404f5 Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory
leaks"
omit 49f3398 Merge remote-tracking branch 'origin/dev' into dev
omit b2fab57 Update CreateWorkflowLocator.java
omit c0ba1dc Update dag.vue
omit f22adad Update dag.vue
omit 15e64ea Update dag.vue
omit 3a2cba7 Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
omit c7b87fa Update CreateWorkflowLocator.java
omit 89ec911 Update CreateWorkflowLocator.java
omit 295aead Update CreateWorkflowLocator.java
omit 19462dd Update CreateWorkflowLocator.java
omit 290d22d Update CreateWorkflowLocator.java
omit 5a3df2e Update CreateWorkflowLocator.java
omit 3c41fbe updae CLICK_SAVE_WORKFLOW_BUTTON xpath
omit e6bd0e3 updae CLICK_SAVE_WORKFLOW_BUTTON xpath
omit 16a4735 updae CLICK_SAVE_WORKFLOW_BUTTON xpath
omit 3ccb355 Merge remote-tracking branch 'origin/dev' into dev
omit 4bf187c update CLICK_SAVE_WORKFLOW_BUTTON xpath
omit 7949b67 Merge pull request #1 from apache/dev
omit 259a644 Merge branch 'dev' of
https://github.com/BoYiZhang/incubator-dolphinscheduler into dev
omit 4fc8144 dag add close buttion
omit e4d76c5 Merge branch 'dev' of
https://github.com/BoYiZhang/incubator-dolphinscheduler into dev
omit 9193cea reset last version
omit 50f33a1 reset last version
omit 038beff dag add close button
omit 090c32e Merge branch 'dev' into dev
omit 0332693 Merge branch 'dev' into dev
omit 9d01a10 Merge branch 'dev' into dev
omit 5fec36c Merge branch 'dev' into dev
omit 1fdb8a2 Merge pull request #1 from apache/dev
omit bc98ab5 fix bug
omit 2c059f9 fix bug
omit d62c98e fix bug
omit 58263c1 Merge branch 'dev' into dev
omit d9f8a5c Merge branch 'dev' into dev
omit 13468aa Merge branch 'dev' into dev
omit ae14c1b add worker group config
omit 43f1e83 add worker group config
omit 5575f7f Merge remote-tracking branch 'origin/dev' into dev
omit edab659 add worker group config
omit e3ed11a Merge branch 'dev' into dev
omit 87730fe Merge branch 'dev' into dev
omit 9e0f42f Merge remote-tracking branch 'upstream/dev' into dev
omit 12405be Merge branch 'dev' into dev
omit 175475e simplify common config
omit 0d0d844 add development state
omit 3320486 Merge remote-tracking branch 'upstream/dev' into dev
omit a1ff5a6 Merge remote-tracking branch 'upstream/dev' into dev
omit 64a371a Merge remote-tracking branch 'upstream/dev' into dev
omit cec62e3 Merge remote-tracking branch 'upstream/dev' into dev
omit 2f49ad2 Merge remote-tracking branch 'upstream/dev' into dev
omit 9199114 Merge remote-tracking branch 'upstream/dev' into dev update PR
omit 5e043c3 simplify and optimize config
omit 731c7a7 Merge remote-tracking branch 'upstream/dev' into dev
omit 34db3ca Merge remote-tracking branch 'upstream/dev' into dev
omit 6bd797f change log level to INFO
omit 2fd5898 add license
omit de0ea19 delete logs
omit 139805b add embedded database h2 and update embedded zookeeper
omit 076af88 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
omit 25bedfe Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
omit 321c0d9 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
omit cd52040 remove servlet 2.5
omit 63e055a Merge branch 'origin/dev' of
https://github.com/dailidong/DolphinScheduler into dev
omit 5f24225 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
omit 264a8d2 sovle jar conflict， remove servlet-api 2.5 jar
omit 9dae1ae Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into origin/dev
omit 292a63a Merge remote-tracking branch 'upstream/dev' into origin/dev
omit 03ce394 remove jasper-runtime jar, not need anymore
omit d24d687 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
omit 8ab680f add license
omit 7729e0b add UT
omit 8b5c99e remove tomcat runtime jar
omit 8353831 combine logback config of master/worker/alert/api server to
one logback.xml
omit db45500 jasper-runtime jar is needed when api server start
omit 39e98b2 jasper-runtime is needed when api server start
omit c3ea38f Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
omit c6d1557 update code
omit f9afc0a correct equals method
omit aa191c2 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
omit 293039f Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
omit affe665 Merge remote-tracking branch 'origin/dev' into dev
omit ce330ca update
omit f425001 update
omit a2555c1 Merge branch 'dev' into dev
omit 7c1b37a update pom.xml
omit 9169a7c change commons.lang3.StringUtils to common.utils.StringUtils
omit 5dbaa52 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
omit 6c4debe Merge remote-tracking branch 'origin/dev' into dev
omit be8aff3 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
omit c60b7b7 Merge branch 'dev' into dev
omit dd03d78 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
omit 04f8fe8 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
omit 68f1e7e Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
omit dcc2ff6 regularize api pom xml
omit 5250ab0 regularize api pom xml update rpc maven compile to 1.8
omit 6086749 update
omit c8b4749 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
omit 1e540fb update
omit fb786d8 Update issue templates
omit b3dae19 update README about DolphinScheduler
omit 26f2829 Merge remote-tracking branch 'upstream/dev' into dev
omit a1892c8 Merge remote-tracking branch 'upstream/dev' into dev
omit 46b6d85 Merge remote-tracking branch 'upstream/dev' into dev
add 543aac5 [feature-3665][ui]Add element-ui (#3666)
add ab884df Add form-create plug-in and alarm group management add sample
demo
add bbfe5c1 Modify node version
add 1057e6b fix
add a7a928b fix
add 1618b98 [feature][ui]Alert plugin design (#3734)
add 1d25434 [Feature-3189][alert,spi,dao,plugin-api] base code of
dolphinscheduler spi and alert plugin implement (#3601)
add 20bc747 Replace the tenant management page ui with element-ui (#3891)
add 449cbbe [feature#3356] alert-spi support DingTalk&WeChat (#3869)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (a9a49db)
\
N -- N -- N refs/heads/alert_plugin_design (449cbbe)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
docker/build/Dockerfile | 2 +-
docker/build/startup.sh | 4 +-
.../api/controller/ProjectController.java | 17 +-
.../api/controller/ResourcesController.java | 207 +++++------
.../api/controller/TenantController.java | 23 +-
.../api/dto/CommandStateCount.java | 28 --
.../dolphinscheduler/api/dto/TaskCountDto.java | 81 ++++-
.../dolphinscheduler/api/dto/TaskStateCount.java | 24 --
.../apache/dolphinscheduler/api/enums/Status.java | 10 +-
.../api/service/ProcessInstanceService.java | 4 +-
.../api/service/ProjectService.java | 7 -
.../api/service/TenantService.java | 5 +-
.../api/service/impl/DataAnalysisServiceImpl.java | 169 +++++++--
.../service/impl/ProcessDefinitionServiceImpl.java | 22 +-
.../api/service/impl/ProjectServiceImpl.java | 22 --
.../api/service/impl/TenantServiceImpl.java | 12 +-
.../src/main/resources/i18n/messages.properties | 2 +-
.../main/resources/i18n/messages_en_US.properties | 2 +-
.../main/resources/i18n/messages_zh_CN.properties | 2 +-
.../ProcessDefinitionControllerTest.java | 4 +-
.../api/controller/TenantControllerTest.java | 8 +-
.../api/service/DataAnalysisServiceTest.java | 137 -------
.../api/service/ProcessDefinitionServiceTest.java | 6 +-
.../api/service/ProjectServiceTest.java | 24 +-
.../api/service/TenantServiceTest.java | 13 +-
.../dolphinscheduler/common/task/TaskParams.java | 78 ++++
.../common/utils/VarPoolUtils.java | 56 +--
.../common/threadutils/ThreadUtilsTest.java | 190 ++++++++++
.../common/utils/VarPoolUtilsTest.java | 61 ++--
.../apache/dolphinscheduler/dao/entity/Tenant.java | 14 +
.../apache/dolphinscheduler/dao/entity/User.java | 15 +
.../dao/mapper/ProcessDefinitionMapper.java | 9 -
.../dao/mapper/ProcessInstanceMapper.java | 15 +-
.../dolphinscheduler/dao/mapper/ProjectMapper.java | 7 -
.../dao/mapper/ProcessDefinitionMapper.xml | 8 +-
.../dao/mapper/ProcessInstanceMapper.xml | 7 +-
.../dolphinscheduler/dao/mapper/ProjectMapper.xml | 4 -
.../dao/mapper/TaskInstanceMapper.xml | 3 +-
.../dolphinscheduler/dao/mapper/TenantMapper.xml | 2 +-
.../dolphinscheduler/dao/mapper/UserMapper.xml | 4 +-
.../dao/mapper/ResourceMapperTest.java | 1 +
.../dao/mapper/TenantMapperTest.java | 4 +-
.../dao/mapper/UserMapperTest.java | 2 +
dolphinscheduler-dist/release-docs/LICENSE | 40 +-
dolphinscheduler-dist/release-docs/NOTICE | 4 +-
.../src/main/assembly/dolphinscheduler-binary.xml | 6 +-
.../remote/NettyRemotingClient.java | 51 ++-
.../remote/NettyRemotingServer.java | 12 +-
.../remote/command/CommandType.java | 106 +-----
.../remote/handler/NettyClientHandler.java | 75 ++--
.../remote/handler/NettyServerHandler.java | 67 ++--
.../dolphinscheduler/remote/utils/Constants.java | 5 +-
.../master/consumer/TaskPriorityQueueConsumer.java | 2 +-
.../consumer/TaskPriorityQueueConsumerTest.java | 1 +
.../service/process/ProcessService.java | 403 +++++++++++----------
.../service/zk/CuratorZookeeperClient.java | 19 +-
.../service/zk/CuratorZookeeperClientTest.java | 3 +-
.../src/js/conf/home/pages/dag/_source/dag.js | 4 +-
.../pages/dag/_source/udp/_source/selectTenant.vue | 2 +-
.../pages/tenement/_source/createTenement.vue | 22 +-
.../pages/security/pages/tenement/_source/list.vue | 81 -----
.../security/pages/users/_source/createUser.vue | 2 +-
.../pages/security/pages/users/_source/list.vue | 2 +-
.../home/pages/user/pages/account/_source/info.vue | 2 +-
.../src/js/conf/home/store/dag/actions.js | 2 +-
.../src/js/conf/home/store/security/actions.js | 2 +-
.../src/js/module/i18n/locale/en_US.js | 1 +
.../src/js/module/i18n/locale/zh_CN.js | 1 +
.../locator/security/TenantManageLocator.java | 2 +
.../page/security/TenantManagePage.java | 1 +
e2e/src/test/resources/testData/security_zh_cn.yml | 1 +
pom.xml | 7 +-
script/dolphinscheduler-daemon.sh | 2 +-
.../mysql/dolphinscheduler_ddl.sql | 1 +
.../postgresql/dolphinscheduler_ddl.sql | 1 +
sql/dolphinscheduler-postgre.sql | 1 +
sql/dolphinscheduler_mysql.sql | 1 +
tools/dependencies/known-dependencies.txt | 94 +++--
78 files changed, 1155 insertions(+), 1186 deletions(-)
create mode 100644
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/TaskParams.java
create mode 100644
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/threadutils/ThreadUtilsTest.java
