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.
omit 449cbbe [feature#3356] alert-spi support DingTalk&WeChat (#3869)
omit 20bc747 Replace the tenant management page ui with element-ui (#3891)
omit 1d25434 [Feature-3189][alert,spi,dao,plugin-api] base code of
dolphinscheduler spi and alert plugin implement (#3601)
omit 1618b98 [feature][ui]Alert plugin design (#3734)
omit a7a928b fix
omit 1057e6b fix
omit bbfe5c1 Modify node version
omit ab884df Add form-create plug-in and alarm group management add sample
demo
omit 543aac5 [feature-3665][ui]Add element-ui (#3666)
add 46b6d85 Merge remote-tracking branch 'upstream/dev' into dev
add a1892c8 Merge remote-tracking branch 'upstream/dev' into dev
add 26f2829 Merge remote-tracking branch 'upstream/dev' into dev
add b3dae19 update README about DolphinScheduler
add fb786d8 Update issue templates
add 1e540fb update
add c8b4749 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
add 6086749 update
add 5250ab0 regularize api pom xml update rpc maven compile to 1.8
add dcc2ff6 regularize api pom xml
add 68f1e7e Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
add 04f8fe8 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
add dd03d78 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
add be8aff3 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
add c60b7b7 Merge branch 'dev' into dev
add 6c4debe Merge remote-tracking branch 'origin/dev' into dev
add 5dbaa52 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
add 9169a7c change commons.lang3.StringUtils to common.utils.StringUtils
add 7c1b37a update pom.xml
add f425001 update
add ce330ca update
add a2555c1 Merge branch 'dev' into dev
add affe665 Merge remote-tracking branch 'origin/dev' into dev
add 293039f Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
add aa191c2 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
add f9afc0a correct equals method
add c6d1557 update code
add c3ea38f Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
add 39e98b2 jasper-runtime is needed when api server start
add db45500 jasper-runtime jar is needed when api server start
add 8353831 combine logback config of master/worker/alert/api server to
one logback.xml
add 8b5c99e remove tomcat runtime jar
add 7729e0b add UT
add 8ab680f add license
add d24d687 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
add 03ce394 remove jasper-runtime jar, not need anymore
add 5f24225 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
add 292a63a Merge remote-tracking branch 'upstream/dev' into origin/dev
add 9dae1ae Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into origin/dev
add 264a8d2 sovle jar conflict， remove servlet-api 2.5 jar
add 63e055a Merge branch 'origin/dev' of
https://github.com/dailidong/DolphinScheduler into dev
add cd52040 remove servlet 2.5
add 321c0d9 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
add 25bedfe Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
add 076af88 Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler into dev
add 139805b add embedded database h2 and update embedded zookeeper
add de0ea19 delete logs
add 2fd5898 add license
add 6bd797f change log level to INFO
add 34db3ca Merge remote-tracking branch 'upstream/dev' into dev
add 731c7a7 Merge remote-tracking branch 'upstream/dev' into dev
add 5e043c3 simplify and optimize config
add 9199114 Merge remote-tracking branch 'upstream/dev' into dev update PR
add 2f49ad2 Merge remote-tracking branch 'upstream/dev' into dev
add cec62e3 Merge remote-tracking branch 'upstream/dev' into dev
add 64a371a Merge remote-tracking branch 'upstream/dev' into dev
add a1ff5a6 Merge remote-tracking branch 'upstream/dev' into dev
add 3320486 Merge remote-tracking branch 'upstream/dev' into dev
add 0d0d844 add development state
add 175475e simplify common config
add 9e0f42f Merge remote-tracking branch 'upstream/dev' into dev
add edab659 add worker group config
add 12405be Merge branch 'dev' into dev
add 87730fe Merge branch 'dev' into dev
add e3ed11a Merge branch 'dev' into dev
add 5575f7f Merge remote-tracking branch 'origin/dev' into dev
add 43f1e83 add worker group config
add ae14c1b add worker group config
add 4aca133 this command just for getting a quick experience，not
recommended for production. this operation will start a standalone zookeeper
server
add 13468aa Merge branch 'dev' into dev
add d9f8a5c Merge branch 'dev' into dev
add 58263c1 Merge branch 'dev' into dev
add bbeb03e Merge remote-tracking branch 'origin/dev' into dev
add 6f36c6c Merge remote-tracking branch 'upstream/dev' into dev
add 58d6a1e Merge remote-tracking branch 'upstream/dev' into dev
add 34082f1 add logback for zookeeper
add 0f42af8 Merge remote-tracking branch 'upstream/dev' into dev
add dea855f Update logback-zookeeper.xml
add 5f34adf Merge remote-tracking branch 'origin/dev' into dev
add d64127b optimize TheadUtils test
add 2713991 Merge remote-tracking branch 'upstream/dev' into dev
add 2ee5df4 fix Zookeeper does not start, printed logs have no error
messages, Api services can start but cannot be accessed
add 08dc691 [FIX_BUG_1.3#3789][remote]support netty heart beat (#3868)
add d32300b add process define name verify. (#3864)
add 1303050 [FIX-3836][dev-API] process definition validation name
interface prompt information error (#3908)
add 2fbbf96 [Improvement-3686][service] ProcessService method name meets
naming convention. (#3687)
add 5b4a8fd [fix-3788][pom]spring framework Security breach (#3882)
add 62fb2fd fix service comment (#3901)
add 6564e96 [Fix][ui] Fix the problem that all pre-tasks are lost after
dag reformatting #3823
add 60bf3f8 Merge pull request #3824 from
elonlo/bugfix-dag-reformat-miss-pretask
add f430fed Merge remote-tracking branch 'upstream/dev' into dev
add 8e0fb35 Update
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/threadutils/ThreadUtilsTest.java
add 29a083c Update ThreadUtilsTest.java
add ed3f089 Update ThreadUtilsTest.java
add 15436cf Delete ThreadUtilsTest.java
add 7878455 Merge remote-tracking branch 'origin/dev' into dev
add 8afc0cc Merge pull request #3402 from dailidong/dev
add d565892 fixed queryProcessInstanceListPaging query slow (#3893)
add de11a21 fixed queryTaskInstanceListPaging query slow (#3892)
add 3d4238f add verify tenant name cannot contain special characters.
(#3865)
add 3fdc557 [Fix][Docker] fix startup.sh variables cannot reference in
single quotes. (#3895)
add fa355b2 [CodeClean][DAO]Remove redundant comments (#3939)
add e53bd98 [fix-3843][api] When update workflow definition,if name
already exists, the prompt is not friendly
add 4425968 Merge pull request #3923 from lgcareer/dev-fix
add 8fd3932 [Fix][api] Add queryProjectCreatedAndAuthorizedByUser
function (#3658)
add d62c98e fix bug
add 2c059f9 fix bug
add bc98ab5 fix bug
add 1fdb8a2 Merge pull request #1 from apache/dev
add 5fec36c Merge branch 'dev' into dev
add 9d01a10 Merge branch 'dev' into dev
add 0332693 Merge branch 'dev' into dev
add 090c32e Merge branch 'dev' into dev
add 038beff dag add close button
add 50f33a1 reset last version
add 9193cea reset last version
add e4d76c5 Merge branch 'dev' of
https://github.com/BoYiZhang/incubator-dolphinscheduler into dev
add 4fc8144 dag add close buttion
add 259a644 Merge branch 'dev' of
https://github.com/BoYiZhang/incubator-dolphinscheduler into dev
add 7949b67 Merge pull request #1 from apache/dev
add 4bf187c update CLICK_SAVE_WORKFLOW_BUTTON xpath
add 3ccb355 Merge remote-tracking branch 'origin/dev' into dev
add 16a4735 updae CLICK_SAVE_WORKFLOW_BUTTON xpath
add e6bd0e3 updae CLICK_SAVE_WORKFLOW_BUTTON xpath
add 3c41fbe updae CLICK_SAVE_WORKFLOW_BUTTON xpath
add 5a3df2e Update CreateWorkflowLocator.java
add 290d22d Update CreateWorkflowLocator.java
add 19462dd Update CreateWorkflowLocator.java
add 295aead Update CreateWorkflowLocator.java
add 89ec911 Update CreateWorkflowLocator.java
add 3a2cba7 Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
add c7b87fa Update CreateWorkflowLocator.java
add 15e64ea Update dag.vue
add f22adad Update dag.vue
add c0ba1dc Update dag.vue
add b2fab57 Update CreateWorkflowLocator.java
add 49f3398 Merge remote-tracking branch 'origin/dev' into dev
add 06404f5 Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory
leaks"
add b21aca8 Merge pull request #2 from apache/dev
add deb19ee Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
add a655e1c Merge pull request #3 from apache/dev
add 3823a08 Merge branch 'dev' into dev
add b11714b Update dolphinscheduler-daemon.sh
add 0e11365 Merge pull request #7 from apache/dev
add d329914 Merge pull request #8 from apache/dev
add a7cbfb1 Merge pull request #9 from apache/dev
add c3666f3 Merge pull request #12 from apache/dev
add dffcf1e Merge pull request #13 from apache/dev
add a26724c Merge pull request #14 from apache/dev
add 5ea4022 Merge pull request #15 from apache/dev
add 5480a65 Merge pull request #16 from apache/dev
add 622bce6 Merge pull request #19 from apache/dev
add 6521601 Merge pull request #20 from apache/dev
add 5f817f2 Merge pull request #21 from apache/dev
add fc56581 When running a task, the resource file is lost, which results
in an error
add aace551 When running a task, the resource file is lost, which results
in an error
add ef6cc62 When running a task, the resource file is lost, which results
in an error
add 48177b6 When running a task, the resource file is lost, which results
in an error
add 7dd717a When running a task, the resource file is lost, which results
in an error
add 05b248f Merge pull request #3957 from BoYiZhang/pr_3956
add e9479e4 [fix-#3962][api] Avoid ClassCastException for
LoggerService.queryLog(). (#3963)
add afd0e6a [Test-3557][API] full cover DataAnalysisServiceImpl (#3605)
add c7b5956 [Feature-3941][ui] Remove tenant name (#3949)
add c54d096 [Improvement][script] daemon script usage (#3968)
add 187c5c1 Merge pull request #22 from apache/dev
add d520cef Merge pull request #23 from apache/dev
add c86ff41 Merge pull request #24 from apache/dev
add c614bd3 the resources API document does not match the interface
parameters
add 584a787 fix bug
add a6266b7 reset code
add 83cc289 Update udfs.vue
add f4c14de Merge pull request #4009 from BoYiZhang/pr_4008
new 735a859 [feature-3665][ui]Add element-ui (#3666)
new d6096aa Add form-create plug-in and alarm group management add sample
demo
new 52771c5 Modify node version
new d1287ee fix
new a42a368 fix
new 8977a12 [feature][ui]Alert plugin design (#3734)
new eae302e [Feature-3189][alert,spi,dao,plugin-api] base code of
dolphinscheduler spi and alert plugin implement (#3601)
new 57e21a2 Replace the tenant management page ui with element-ui (#3891)
new ce3d7d5 [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 (449cbbe)
\
N -- N -- N refs/heads/alert_plugin_design (ce3d7d5)
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.
The 9 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:
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, 1186 insertions(+), 1155 deletions(-)
delete mode 100644
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/TaskParams.java
delete mode 100644
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/threadutils/ThreadUtilsTest.java
