This is an automated email from the ASF dual-hosted git repository. leonbao pushed a commit to branch json_split in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 26c457a4289c17f90d80ce6d4bb375dcff6ee7d9 Merge: c3d1812 8c47dcb Author: lenboo <[email protected]> AuthorDate: Sat Jan 16 19:47:15 2021 +0800 Merge remote-tracking branch 'upstream/dev' into json-split .github/workflows/ci_backend.yml | 12 +- .github/workflows/ci_e2e.yml | 10 +- .github/workflows/ci_frontend.yml | 24 +- .github/workflows/ci_ut.yml | 22 +- .licenserc.yaml | 43 ++++ docker/build/hooks/build | 7 +- docker/build/hooks/push | 2 +- .../apache/dolphinscheduler/alert/AlertServer.java | 13 +- .../alert/manager/DingTalkManager.java | 17 +- .../alert/plugin/EmailAlertPlugin.java | 18 +- .../alert/template/AlertTemplateFactory.java | 9 +- .../alert/template/impl/DefaultHTMLTemplate.java | 73 +++--- .../dolphinscheduler/alert/utils/Constants.java | 14 +- .../alert/utils/DingTalkUtils.java | 57 ++--- .../alert/utils/EnterpriseWeChatUtils.java | 30 +-- .../dolphinscheduler/alert/utils/ExcelUtils.java | 163 +++++++------ .../dolphinscheduler/alert/utils/FuncUtils.java | 7 +- .../dolphinscheduler/alert/utils/MailUtils.java | 125 ++++++---- .../alert/utils/PropertyUtils.java | 55 +++-- .../alert/utils/DingTalkUtilsTest.java | 8 +- .../alert/utils/ExcelUtilsTest.java | 10 +- .../alert/utils/PropertyUtilsTest.java | 50 ++-- .../api/service/ProcessInstanceService.java | 4 +- .../src/js/module/visibility/index.js | 2 +- mvnw | 258 +++++++++++---------- pom.xml | 44 ---- 26 files changed, 569 insertions(+), 508 deletions(-)
