You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ga...@apache.org on 2021/01/22 09:35:12 UTC
[incubator-dolphinscheduler] branch dev updated (34b0f30 -> ab95b16)
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from 34b0f30 fix alert property utils init properties. (#4527)
add ab95b16 Revert "[Feature-#3049] Alert Plugin Design(merge alert_plugin_design to dev) (#4495)" (#4535)
No new revisions were added by this update.
Summary of changes:
LICENSE | 4 -
.../dolphinscheduler/requirements.yaml~HEAD | 25 --
.../dolphinscheduler/requirements.yaml~dev | 25 --
.../dolphinscheduler-alert-dingtalk/pom.xml | 82 ----
.../alert/dingtalk/DingTalkAlertChannel.java | 41 --
.../dingtalk/DingTalkAlertChannelFactory.java | 89 -----
.../plugin/alert/dingtalk/DingTalkAlertPlugin.java | 34 --
.../alert/dingtalk/DingTalkParamsConstants.java | 57 ---
.../plugin/alert/dingtalk/DingTalkSender.java | 204 ----------
.../dingtalk/DingTalkAlertChannelFactoryTest.java | 48 ---
.../plugin/alert/dingtalk/DingTalkSenderTest.java | 57 ---
.../dolphinscheduler-alert-email/pom.xml | 128 ------
.../plugin/alert/email/EmailAlertChannel.java | 69 ----
.../alert/email/EmailAlertChannelFactory.java | 137 -------
.../plugin/alert/email/EmailAlertPlugin.java | 33 --
.../plugin/alert/email/EmailConstants.java | 75 ----
.../plugin/alert/email/MailParamsConstants.java | 65 ----
.../plugin/alert/email/MailSender.java | 429 ---------------------
.../alert/email/EmailAlertChannelFactoryTest.java | 75 ----
.../plugin/alert/email/EmailAlertChannelTest.java | 161 --------
.../plugin/alert/email/MailUtilsTest.java | 136 -------
.../email/template/DefaultHTMLTemplateTest.java | 105 -----
.../dolphinscheduler-alert-http/pom.xml | 76 ----
.../plugin/alert/http/HttpAlertChannel.java | 41 --
.../plugin/alert/http/HttpAlertChannelFactory.java | 78 ----
.../plugin/alert/http/HttpAlertConstants.java | 35 --
.../plugin/alert/http/HttpAlertPlugin.java | 34 --
.../plugin/alert/http/HttpSender.java | 166 --------
.../alert/http/HttpAlertChannelFactoryTest.java | 54 ---
.../plugin/alert/http/HttpAlertChannelTest.java | 104 -----
.../plugin/alert/http/HttpAlertPluginTest.java | 38 --
.../plugin/alert/http/HttpSenderTest.java | 46 ---
.../dolphinscheduler-alert-script/pom.xml | 79 ----
.../plugin/alert/script/OSUtils.java | 32 --
.../plugin/alert/script/ProcessUtils.java | 62 ---
.../plugin/alert/script/ScriptAlertChannel.java | 40 --
.../alert/script/ScriptAlertChannelFactory.java | 71 ----
.../plugin/alert/script/ScriptAlertPlugin.java | 35 --
.../plugin/alert/script/ScriptParamsConstants.java | 40 --
.../plugin/alert/script/ScriptSender.java | 74 ----
.../plugin/alert/script/ScriptType.java | 62 ---
.../plugin/alert/script/ProcessUtilsTest.java | 37 --
.../script/ScriptAlertChannelFactoryTest.java | 48 ---
.../plugin/alert/script/ScriptSenderTest.java | 58 ---
.../src/test/script/shell/example.sh | 25 --
.../dolphinscheduler-alert-wechat/pom.xml | 78 ----
.../plugin/alert/wechat/WeChatAlertChannel.java | 41 --
.../alert/wechat/WeChatAlertChannelFactory.java | 94 -----
.../plugin/alert/wechat/WeChatAlertConstants.java | 34 --
.../alert/wechat/WeChatAlertParamsConstants.java | 56 ---
.../plugin/alert/wechat/WeChatAlertPlugin.java | 34 --
.../plugin/alert/wechat/WeChatSender.java | 335 ----------------
.../wechat/WeChatAlertChannelFactoryTest.java | 48 ---
.../plugin/alert/wechat/WeChatSenderTest.java | 89 -----
dolphinscheduler-alert-plugin/pom.xml | 41 --
dolphinscheduler-alert/pom.xml | 79 ++--
.../apache/dolphinscheduler/alert/AlertServer.java | 126 ++----
.../alert/manager/DingTalkManager.java | 53 ++-
.../alert/manager/EmailManager.java | 110 +++---
.../alert/manager/EnterpriseWeChatManager.java | 59 +++
.../dolphinscheduler/alert/manager/MsgManager.java | 10 +-
.../alert/plugin/AbstractDolphinPluginManager.java | 29 --
.../alert/plugin/AlertPluginManager.java | 99 -----
.../alert/plugin/DolphinPluginClassLoader.java | 139 -------
.../alert/plugin/DolphinPluginDiscovery.java | 139 -------
.../alert/plugin/DolphinPluginLoader.java | 194 ----------
.../alert/plugin/DolphinPluginManagerConfig.java | 121 ------
.../alert/plugin/EmailAlertPlugin.java | 147 +++++++
.../alert/processor/AlertRequestProcessor.java | 67 ----
.../dolphinscheduler/alert/runner/AlertSender.java | 174 +++------
.../alert}/template/AlertTemplate.java | 21 +-
.../AlertTemplateFactory.java} | 22 +-
.../alert/template/impl}/DefaultHTMLTemplate.java | 53 +--
.../dolphinscheduler/alert/utils/Constants.java | 172 ++++++++-
.../alert/utils/DingTalkUtils.java | 141 +++++++
.../alert/utils/EnterpriseWeChatUtils.java | 286 ++++++++++++++
.../dolphinscheduler/alert/utils}/ExcelUtils.java | 24 +-
.../dolphinscheduler/alert/utils/MailUtils.java | 375 ++++++++++++++++++
.../alert/utils/PropertyUtils.java | 2 +-
.../src/main/resources/alert.properties | 49 ++-
.../dolphinscheduler/alert/AlertServerTest.java | 91 -----
.../alert/plugin/AlertPluginManagerTest.java | 65 ----
.../alert/plugin/DolphinPluginLoaderTest.java | 60 ---
.../alert/plugin/EmailAlertPluginTest.java | 253 +++---------
.../alert/processor/AlertRequestProcessorTest.java | 61 ---
.../alert/runner/AlertSenderTest.java | 181 ---------
.../alert/template/AlertTemplateFactoryTest.java | 65 ++++
.../template/impl/DefaultHTMLTemplateTest.java | 96 +++++
.../alert/utils/DingTalkUtilsTest.java | 120 ++++++
.../alert/utils/EnterpriseWeChatUtilsTest.java | 283 ++++++++++++++
.../alert/utils}/ExcelUtilsTest.java | 10 +-
.../alert/utils/FuncUtilsTest.java | 10 +-
.../alert/utils/MailUtilsTest.java | 190 +++++++++
.../api/controller/AlertGroupController.java | 113 +++---
.../controller/AlertPluginInstanceController.java | 240 ------------
.../api/controller/ExecutorController.java | 113 +++---
.../api/controller/SchedulerController.java | 132 +++----
.../api/controller/UiPluginController.java | 93 -----
.../apache/dolphinscheduler/api/enums/Status.java | 17 +-
.../api/service/AlertGroupService.java | 84 +++-
.../api/service/AlertPluginInstanceService.java | 89 -----
.../api/service/ExecutorService.java | 47 ++-
.../api/service/ProcessInstanceService.java | 3 +-
.../api/service/SchedulerService.java | 97 ++---
.../api/service/UserAlertGroupService.java | 27 +-
.../dolphinscheduler/api/service/UsersService.java | 10 +-
.../impl/AlertPluginInstanceServiceImpl.java | 208 ----------
.../service/impl/ProcessDefinitionServiceImpl.java | 7 +-
.../impl/ProcessDefinitionVersionServiceImpl.java | 23 +-
.../api/service/impl/UiPluginServiceImpl.java | 85 ----
.../api/vo/AlertPluginInstanceVO.java | 117 ------
.../src/main/resources/i18n/messages.properties | 5 -
.../main/resources/i18n/messages_en_US.properties | 5 -
.../api/controller/ExecutorControllerTest.java | 100 ++---
.../api/controller/TaskInstanceControllerTest.java | 1 -
.../api/security/SecurityConfigLDAPTest.java~HEAD | 45 ---
.../api/security/SecurityConfigLDAPTest.java~dev | 45 ---
.../api/service/AlertGroupServiceTest.java | 129 ++++---
.../api/service/ExecutorService2Test.java | 147 +++----
.../ProcessDefinitionVersionServiceTest.java | 23 +-
.../api/service/ProcessInstanceServiceTest.java | 2 +
.../api/service/UiPluginServiceTest.java | 86 -----
.../api/service/UserAlertGroupServiceTest.java | 53 +++
dolphinscheduler-common/pom.xml | 5 +
.../apache/dolphinscheduler/common/Constants.java | 8 +-
.../dolphinscheduler/common/enums/PluginType.java | 70 ----
.../dolphinscheduler/common/enums}/ShowType.java | 8 +-
.../common/plugin/FilePluginManager.java | 107 +++++
.../common/plugin/PluginClassLoader.java | 154 ++++++++
.../common/plugin/PluginManager.java | 14 +-
.../common/task/sql/SqlParameters.java | 67 ++--
.../common/plugin/FilePluginManagerTest.java | 72 ++++
.../common/plugin/PluginClassLoaderTest.java | 61 +++
.../org/apache/dolphinscheduler/dao/AlertDao.java | 102 +++--
.../org/apache/dolphinscheduler/dao/PluginDao.java | 96 -----
.../apache/dolphinscheduler/dao/entity/Alert.java | 121 ++++--
.../dolphinscheduler/dao/entity/AlertGroup.java | 71 ++--
.../dolphinscheduler/dao/entity/PluginDefine.java | 125 ------
.../dao/entity/ProcessDefinition.java | 93 +++--
.../dao/entity/ProcessDefinitionVersion.java | 88 +++--
.../dao/entity/ProcessInstance.java | 36 +-
...lertPluginInstance.java => UserAlertGroup.java} | 104 ++---
.../dao/mapper/AlertGroupMapper.java | 13 +-
.../dao/mapper/PluginDefineMapper.java | 61 ---
...stanceMapper.java => UserAlertGroupMapper.java} | 32 +-
.../src/main/resources/datasource.properties | 8 +-
.../dao/mapper/AlertGroupMapper.xml | 19 +-
.../dolphinscheduler/dao/mapper/AlertMapper.xml | 5 +-
.../dao/mapper/AlertPluginInstanceMapper.xml | 46 ---
.../dao/mapper/PluginDefineMapper.xml | 45 ---
.../dao/mapper/ProcessDefinitionMapper.xml | 13 +-
.../dao/mapper/ProcessDefinitionVersionMapper.xml | 5 +-
.../dolphinscheduler/dao/mapper/ProjectMapper.xml | 1 -
...jectUserMapper.xml => UserAlertGroupMapper.xml} | 30 +-
.../apache/dolphinscheduler/dao/AlertDaoTest.java | 21 +-
.../dao/mapper/AlertGroupMapperTest.java | 189 ++++++---
.../dao/mapper/AlertMapperTest.java | 67 ++--
.../dao/mapper/AlertPluginInstanceMapperTest.java | 112 ------
.../dao/mapper/PluginDefineTest.java | 77 ----
.../dao/mapper/ProcessDefinitionMapperTest.java | 4 +
.../mapper/ProcessDefinitionVersionMapperTest.java | 4 +
.../dao/mapper/UserAlertGroupMapperTest.java | 196 ++++++++++
.../dao/mapper/UserMapperTest.java | 122 ++++--
dolphinscheduler-dist/pom.xml | 2 +-
dolphinscheduler-dist/release-docs/LICENSE | 12 +-
dolphinscheduler-dist/release-docs/NOTICE | 23 ++
.../release-docs/licenses/LICENSE-aether-api.txt | 86 -----
.../LICENSE-animal-sniffer-annotations.txt | 21 -
.../licenses/LICENSE-checker-compat-qual.txt | 22 --
.../licenses/LICENSE-j2objc-annotations.txt | 201 ----------
...ENSE-jersey-core.txt => LICENSE-javax.mail.txt} | 4 +-
.../release-docs/licenses/LICENSE-resolver.txt | 202 ----------
.../ui-licenses/LICENSE-@form-create-element-ui | 21 -
.../src/main/provisio/dolphinscheduler.xml | 67 ----
.../pom.xml | 36 +-
.../dolphinscheduler/plugin/api/AlertPlugin.java | 27 +-
.../dolphinscheduler/plugin/model}/AlertData.java | 56 ++-
.../dolphinscheduler/plugin/model}/AlertInfo.java | 37 +-
.../dolphinscheduler/plugin/model/PluginName.java | 30 +-
.../plugin/spi/AlertPluginProvider.java | 14 +-
.../plugin}/utils/PropertyUtils.java | 136 ++++---
.../plugin/model/AlertDataTest.java | 80 ++++
.../plugin/model/AlertInfoTest.java | 40 +-
.../plugin/utils/PropertyUtilsTest.java | 83 ++++
.../src/test/resources/plugin.properties | 13 +-
.../remote/command/CommandType.java | 12 +-
.../command/alert/AlertSendRequestCommand.java | 80 ----
.../command/alert/AlertSendResponseCommand.java | 75 ----
.../command/alert/AlertSendResponseResult.java | 52 ---
.../remote/utils/JsonSerializer.java | 96 -----
.../command/alert/AlertSendRequestCommandTest.java | 42 --
.../alert/AlertSendResponseCommandTest.java | 48 ---
dolphinscheduler-server/pom.xml | 325 ++++++++--------
.../server/log/TaskLogAppender.java | 8 +-
.../master/runner/MasterBaseTaskExecThread.java | 64 ++-
.../server/master/runner/MasterTaskExecThread.java | 59 ++-
.../server/utils/AlertManager.java | 14 +-
.../server/worker/WorkerServer.java | 23 +-
.../server/worker/config/WorkerConfig.java | 19 +-
.../worker/processor/TaskExecuteProcessor.java | 18 +-
.../server/worker/runner/TaskExecuteThread.java | 11 +-
.../server/worker/task/TaskManager.java | 6 +-
.../server/worker/task/sql/SqlTask.java | 103 ++---
.../src/main/resources/worker.properties | 3 -
.../server/registry/DependencyConfig.java | 84 ++--
.../processor/TaskCallbackServiceTestConfig.java | 71 ++--
.../worker/runner/TaskExecuteThreadTest.java | 17 +-
.../server/worker/task/TaskManagerTest.java | 27 +-
.../server/worker/task/sql/SqlTaskTest.java | 111 ------
.../service/alert/AlertClientService.java | 120 ------
.../service/process/ProcessService.java | 5 +-
.../service/alert/AlertClientServiceTest.java | 152 --------
.../spi/DolphinSchedulerPlugin.java | 38 --
.../dolphinscheduler/spi/alert/AlertChannel.java | 28 --
.../spi/alert/AlertChannelFactory.java | 52 ---
.../dolphinscheduler/spi/alert/AlertConstants.java | 24 --
.../dolphinscheduler/spi/params/InputParam.java | 94 -----
.../dolphinscheduler/spi/params/PasswordParam.java | 87 -----
.../spi/params/PluginParamsTransfer.java | 51 ---
.../dolphinscheduler/spi/params/RadioParam.java | 106 -----
.../dolphinscheduler/spi/params/base/DataType.java | 39 --
.../dolphinscheduler/spi/params/base/FormType.java | 38 --
.../spi/params/base/ParamsOptions.java | 72 ----
.../spi/params/base/ParamsProps.java | 50 ---
.../spi/params/base/PluginParams.java | 170 --------
.../spi/params/base/PropsType.java | 37 --
.../spi/params/base/TriggerType.java | 36 --
.../dolphinscheduler/spi/params/base/Validate.java | 137 -------
.../dolphinscheduler/spi/utils/JSONUtils.java | 156 --------
.../dolphinscheduler/spi/utils/StringUtils.java | 41 --
.../spi/params/PluginParamsTransferTest.java | 201 ----------
install.sh | 2 -
pom.xml | 124 +-----
sql/dolphinscheduler-postgre.sql | 95 ++---
sql/dolphinscheduler_mysql.sql | 91 +++--
.../1.4.0_schema/mysql/dolphinscheduler_ddl.sql | 69 ----
.../1.4.0_schema/mysql/dolphinscheduler_dml.sql | 18 -
.../postgresql/dolphinscheduler_ddl.sql | 65 ----
.../postgresql/dolphinscheduler_dml.sql | 16 -
style/checkstyle.xml | 8 +-
style/intellij-java-code-style.xml | 2 +
tools/dependencies/known-dependencies.txt | 13 +-
242 files changed, 5214 insertions(+), 12662 deletions(-)
delete mode 100644 docker/kubernetes/dolphinscheduler/requirements.yaml~HEAD
delete mode 100644 docker/kubernetes/dolphinscheduler/requirements.yaml~dev
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/pom.xml
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannel.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannelFactory.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertPlugin.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkParamsConstants.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkSender.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/test/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannelFactoryTest.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/test/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkSenderTest.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/pom.xml
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactory.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertPlugin.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailConstants.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailParamsConstants.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailSender.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactoryTest.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelTest.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/MailUtilsTest.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/template/DefaultHTMLTemplateTest.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/pom.xml
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannel.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannelFactory.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertConstants.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertPlugin.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpSender.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/test/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannelFactoryTest.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/test/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannelTest.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/test/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertPluginTest.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/test/java/org/apache/dolphinscheduler/plugin/alert/http/HttpSenderTest.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/pom.xml
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/OSUtils.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ProcessUtils.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannel.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannelFactory.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertPlugin.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptParamsConstants.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptSender.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptType.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/java/org/apache/dolphinscheduler/plugin/alert/script/ProcessUtilsTest.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannelFactoryTest.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptSenderTest.java
delete mode 100755 dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/script/shell/example.sh
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/pom.xml
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannel.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannelFactory.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertConstants.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertParamsConstants.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertPlugin.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatSender.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/test/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannelFactoryTest.java
delete mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/test/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatSenderTest.java
delete mode 100644 dolphinscheduler-alert-plugin/pom.xml
rename dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/StreamGobbler.java => dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/DingTalkManager.java (50%)
create mode 100644 dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EnterpriseWeChatManager.java
delete mode 100644 dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AbstractDolphinPluginManager.java
delete mode 100644 dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java
delete mode 100644 dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginClassLoader.java
delete mode 100644 dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginDiscovery.java
delete mode 100644 dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginLoader.java
delete mode 100644 dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginManagerConfig.java
create mode 100644 dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPlugin.java
delete mode 100644 dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/processor/AlertRequestProcessor.java
rename {dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email => dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert}/template/AlertTemplate.java (72%)
copy dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/{manager/MsgManager.java => template/AlertTemplateFactory.java} (65%)
rename {dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/template => dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/impl}/DefaultHTMLTemplate.java (66%)
create mode 100644 dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/DingTalkUtils.java
create mode 100644 dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtils.java
rename {dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email => dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils}/ExcelUtils.java (87%)
create mode 100644 dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/MailUtils.java
delete mode 100644 dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/AlertServerTest.java
delete mode 100644 dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManagerTest.java
delete mode 100644 dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginLoaderTest.java
delete mode 100644 dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/processor/AlertRequestProcessorTest.java
delete mode 100644 dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderTest.java
create mode 100644 dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/template/AlertTemplateFactoryTest.java
create mode 100644 dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/template/impl/DefaultHTMLTemplateTest.java
create mode 100644 dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/DingTalkUtilsTest.java
create mode 100644 dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtilsTest.java
rename {dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email => dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils}/ExcelUtilsTest.java (89%)
create mode 100644 dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/MailUtilsTest.java
delete mode 100644 dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertPluginInstanceController.java
delete mode 100644 dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UiPluginController.java
delete mode 100644 dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceService.java
rename dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/classloader/ThreadContextClassLoader.java => dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UserAlertGroupService.java (58%)
delete mode 100644 dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
delete mode 100644 dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UiPluginServiceImpl.java
delete mode 100644 dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/vo/AlertPluginInstanceVO.java
delete mode 100644 dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/security/SecurityConfigLDAPTest.java~HEAD
delete mode 100644 dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/security/SecurityConfigLDAPTest.java~dev
delete mode 100644 dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UiPluginServiceTest.java
create mode 100644 dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UserAlertGroupServiceTest.java
delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/PluginType.java
rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert => dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums}/ShowType.java (89%)
create mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/FilePluginManager.java
create mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/PluginClassLoader.java
rename dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UiPluginService.java => dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/PluginManager.java (74%)
create mode 100644 dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/plugin/FilePluginManagerTest.java
create mode 100644 dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/plugin/PluginClassLoaderTest.java
delete mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/PluginDao.java
delete mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/PluginDefine.java
rename dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/{AlertPluginInstance.java => UserAlertGroup.java} (51%)
delete mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/PluginDefineMapper.java
rename dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/{AlertPluginInstanceMapper.java => UserAlertGroupMapper.java} (62%)
delete mode 100644 dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertPluginInstanceMapper.xml
delete mode 100644 dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/PluginDefineMapper.xml
copy dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/{ProjectUserMapper.xml => UserAlertGroupMapper.xml} (56%)
delete mode 100644 dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertPluginInstanceMapperTest.java
delete mode 100644 dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/PluginDefineTest.java
create mode 100644 dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapperTest.java
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-aether-api.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-animal-sniffer-annotations.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-checker-compat-qual.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-j2objc-annotations.txt
copy dolphinscheduler-dist/release-docs/licenses/{LICENSE-jersey-core.txt => LICENSE-javax.mail.txt} (99%)
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-resolver.txt
delete mode 100644 dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-@form-create-element-ui
delete mode 100644 dolphinscheduler-dist/src/main/provisio/dolphinscheduler.xml
rename {dolphinscheduler-spi => dolphinscheduler-plugin-api}/pom.xml (64%)
copy dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/IParameters.java => dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/api/AlertPlugin.java (63%)
rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert => dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/model}/AlertData.java (61%)
rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert => dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/model}/AlertInfo.java (58%)
rename dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert/AlertResult.java => dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/model/PluginName.java (63%)
copy dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/future/InvokeCallback.java => dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/spi/AlertPluginProvider.java (76%)
copy {dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao => dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin}/utils/PropertyUtils.java (56%)
create mode 100644 dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/model/AlertDataTest.java
copy dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/enums/StatusTest.java => dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/model/AlertInfoTest.java (56%)
create mode 100644 dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/utils/PropertyUtilsTest.java
rename dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/script/shell/scriptTest.sh => dolphinscheduler-plugin-api/src/test/resources/plugin.properties (91%)
mode change 100755 => 100644
delete mode 100644 dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendRequestCommand.java
delete mode 100644 dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponseCommand.java
delete mode 100644 dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponseResult.java
delete mode 100644 dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/JsonSerializer.java
delete mode 100644 dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendRequestCommandTest.java
delete mode 100644 dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponseCommandTest.java
mode change 100755 => 100644 dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/log/TaskLogAppender.java
delete mode 100644 dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTaskTest.java
delete mode 100644 dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/alert/AlertClientService.java
delete mode 100644 dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/alert/AlertClientServiceTest.java
delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/DolphinSchedulerPlugin.java
delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert/AlertChannel.java
delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert/AlertChannelFactory.java
delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert/AlertConstants.java
delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/InputParam.java
delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/PasswordParam.java
delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/PluginParamsTransfer.java
delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/RadioParam.java
delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/DataType.java
delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/FormType.java
delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/ParamsOptions.java
delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/ParamsProps.java
delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/PluginParams.java
delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/PropsType.java
delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/TriggerType.java
delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/Validate.java
delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/utils/JSONUtils.java
delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/utils/StringUtils.java
delete mode 100644 dolphinscheduler-spi/src/test/java/org/apache/dolphinscheduler/spi/params/PluginParamsTransferTest.java
delete mode 100644 sql/upgrade/1.4.0_schema/mysql/dolphinscheduler_ddl.sql
delete mode 100644 sql/upgrade/1.4.0_schema/mysql/dolphinscheduler_dml.sql
delete mode 100644 sql/upgrade/1.4.0_schema/postgresql/dolphinscheduler_ddl.sql
delete mode 100644 sql/upgrade/1.4.0_schema/postgresql/dolphinscheduler_dml.sql