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 c8d545474177c559f36a8cf142da9bcede3784f4 Merge: fc6461c 047b0a3 Author: lenboo <[email protected]> AuthorDate: Sun Jan 31 16:45:54 2021 +0800 merge form dev .github/ISSUE_TEMPLATE/bug_report.md | 1 - .github/ISSUE_TEMPLATE/feature_request.md | 1 - .github/ISSUE_TEMPLATE/improvement_suggestion.md | 1 - .github/ISSUE_TEMPLATE/question.md | 1 - README.md | 54 +- .../DOLPHIN/1.3.3/configuration/dolphin-worker.xml | 109 ++-- .../alert/dingtalk/DingTalkParamsConstants.java | 44 +- .../plugin/alert/dingtalk/DingTalkSender.java | 132 ++--- .../plugin/alert/dingtalk/DingTalkSenderTest.java | 2 +- .../dolphinscheduler-alert-feishu/pom.xml | 82 +++ .../plugin/alert/feishu/FeiShuAlertChannel.java | 28 +- .../alert/feishu/FeiShuAlertChannelFactory.java | 82 +++ .../plugin/alert/feishu/FeiShuAlertPlugin.java | 43 +- .../plugin/alert/feishu/FeiShuParamsConstants.java | 49 ++ .../plugin/alert/feishu/FeiShuSender.java | 223 ++++++++ .../plugin/alert/feishu/HttpRequestUtil.java | 50 ++ .../feishu/FeiShuAlertChannelFactoryTest.java | 45 ++ .../plugin/alert/feishu/FeiShuSenderTest.java | 75 +++ dolphinscheduler-alert-plugin/pom.xml | 1 + .../api/service/WorkerGroupService.java | 12 +- .../dolphinscheduler/common/utils/StringUtils.java | 4 + .../src/main/provisio/dolphinscheduler.xml | 5 + .../remote/NettyRemotingClient.java | 150 +++-- .../remote/NettyRemotingServer.java | 64 ++- .../remote/codec/NettyEncoder.java | 12 +- .../remote/command/TaskKillResponseCommand.java | 6 +- .../Pair.java => exceptions/RemoteException.java} | 51 +- .../remote/future/ResponseFuture.java | 63 ++- .../remote/handler/NettyClientHandler.java | 34 +- .../remote/handler/NettyServerHandler.java | 40 +- .../remote/utils/ChannelUtils.java | 31 +- .../dolphinscheduler/remote/utils/Constants.java | 4 + .../dolphinscheduler/remote/utils/IPUtils.java | 25 +- .../apache/dolphinscheduler/remote/utils/Pair.java | 5 +- .../service/bean/SpringApplicationContext.java | 5 +- .../service/exceptions/ServiceException.java | 57 +- .../service/permission/PermissionCheck.java | 48 +- .../service/process/ProcessService.java | 307 +++++------ .../service/quartz/ProcessScheduleJob.java | 15 +- .../service/quartz/QuartzExecutors.java | 614 +++++++++++---------- .../service/quartz/cron/AbstractCycle.java | 302 +++++----- .../service/zk/AbstractZKClient.java | 611 ++++++++++---------- .../service/zk/CuratorZookeeperClient.java | 22 +- .../dolphinscheduler/service/zk/ZKServer.java | 37 +- .../service/zk/ZookeeperCachedOperator.java | 20 +- .../service/zk/ZookeeperOperator.java | 45 +- .../home/pages/datasource/pages/list/index.vue | 1 + pom.xml | 2 + .../postgresql/dolphinscheduler_ddl.sql | 7 +- .../postgresql/dolphinscheduler_ddl.sql | 12 +- 50 files changed, 2121 insertions(+), 1513 deletions(-) diff --cc dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/StringUtils.java index c0df6e6,362c613..47c709c --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/StringUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/StringUtils.java @@@ -64,29 -62,7 +64,33 @@@ public class StringUtils return str == null ? null : str.trim(); } + public static String join(final Iterable<?> iterable, final String separator) { + if (iterable == null) { + return null; + } + Iterator<?> iterator = iterable.iterator(); + if (!iterator.hasNext()) { + return EMPTY; + } + final Object first = iterator.next(); + if (!iterator.hasNext()) { + return String.valueOf(first); + } + // two or more elements + final StringBuilder buf = new StringBuilder(256); + while (iterator.hasNext()) { + if (separator != null) { + buf.append(separator); + } + final Object obj = iterator.next(); + if (obj != null) { + buf.append(obj); + } + } + return buf.toString(); + } ++ + public static boolean equalsIgnoreCase(String str1, String str2) { + return str1 == null ? str2 == null : str1.equalsIgnoreCase(str2); + } }
