This is an automated email from the ASF dual-hosted git repository. leonbao pushed a commit to branch params-trans in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit ca0cfb27917cefae011f5967019f9be2aab97725 Merge: c1875e8 6a49d81 Author: lenboo <[email protected]> AuthorDate: Tue Feb 2 10:21:28 2021 +0800 Merge remote-tracking branch 'upstream/dev' into params-trans .../alert/dingtalk/DingTalkAlertChannel.java | 7 +- .../plugin/alert/email/EmailAlertChannel.java | 7 +- .../alert/email/EmailAlertChannelFactoryTest.java | 23 +---- .../plugin/alert/email/EmailAlertChannelTest.java | 6 +- .../plugin/alert/feishu/FeiShuAlertChannel.java | 7 +- .../plugin/alert/http/HttpAlertChannel.java | 7 +- .../plugin/alert/http/HttpAlertChannelTest.java | 7 +- .../plugin/alert/script/ScriptAlertChannel.java | 7 +- .../script/ScriptAlertChannelFactoryTest.java | 2 - .../plugin/alert/wechat/WeChatAlertChannel.java | 7 +- .../apache/dolphinscheduler/alert/AlertServer.java | 7 +- .../alert/manager/EmailManager.java | 55 ----------- .../dolphinscheduler/alert/manager/MsgManager.java | 40 -------- .../alert/plugin/AlertPluginManager.java | 13 ++- .../alert/processor/AlertRequestProcessor.java | 9 +- .../dolphinscheduler/alert/runner/AlertSender.java | 26 +++-- .../dolphinscheduler/alert/AlertServerTest.java | 9 +- .../alert/plugin/EmailAlertPluginTest.java | 2 +- .../alert/processor/AlertRequestProcessorTest.java | 11 +-- .../alert/runner/AlertSenderTest.java | 36 +++---- .../impl/AlertPluginInstanceServiceImpl.java | 65 ++++++++++-- .../service/AlertPluginInstanceServiceTest.java | 109 ++++++++++++++++++++- .../org/apache/dolphinscheduler/dao/PluginDao.java | 18 ++-- .../src/main/resources/logback-master.xml | 4 +- .../src/main/resources/logback-worker.xml | 9 +- .../dolphinscheduler/spi/alert/AlertInfo.java | 8 +- .../dolphinscheduler/spi/alert/AlertResult.java | 8 ++ .../spi/params/base/PluginParams.java | 4 + .../formModel/tasks/_source/dependItemList.vue | 30 +++--- .../formModel/tasks/_source/localParams.vue | 2 +- .../formModel/tasks/_source/warningGroups.vue | 76 ++++++++++++++ .../dag/_source/formModel/tasks/dependent.vue | 1 - .../home/pages/dag/_source/formModel/tasks/sql.vue | 80 ++++----------- .../home/pages/dag/_source/startingParam/index.vue | 2 +- .../js/conf/home/pages/dag/definitionDetails.vue | 4 +- .../src/js/conf/home/pages/dag/index.vue | 4 +- .../src/js/conf/home/pages/dag/instanceDetails.vue | 4 +- .../pages/servers/_source/zookeeperDirectories.vue | 8 +- .../home/pages/monitor/pages/servers/worker.vue | 2 +- .../pages/definition/pages/list/_source/list.vue | 1 + .../pages/definition/pages/list/_source/start.vue | 6 +- .../pages/definition/pages/list/_source/timing.vue | 7 +- .../projects/pages/definition/timing/index.vue | 4 +- .../resource/pages/file/pages/_source/common.js | 2 +- .../resource/pages/file/pages/details/index.vue | 10 +- .../pages/resource/pages/file/pages/edit/index.vue | 10 +- .../security/pages/warningGroups/_source/list.vue | 6 +- .../_source/createWarningInstance.vue | 10 +- .../pages/security/pages/warningInstance/index.vue | 6 +- .../src/js/conf/home/store/security/actions.js | 13 +++ .../src/js/conf/home/store/security/state.js | 1 + .../src/js/module/i18n/locale/en_US.js | 7 +- .../src/js/module/i18n/locale/zh_CN.js | 7 +- 53 files changed, 478 insertions(+), 338 deletions(-)
