[GitHub] [incubator-dolphinscheduler] zzq1314zll commented on issue #1371: Use the constant as the caller of the equals method to prevent null p…
zzq1314zll commented on issue #1371: Use the constant as the caller of the equals method to prevent null p… URL: https://github.com/apache/incubator-dolphinscheduler/pull/1371#issuecomment-561043764 This is my first PR, thank you very much friends This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-dolphinscheduler] qiaozhanwei opened a new pull request #1385: AlertGroupMapperTest UT modify
qiaozhanwei opened a new pull request #1385: AlertGroupMapperTest UT modify URL: https://github.com/apache/incubator-dolphinscheduler/pull/1385 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-dolphinscheduler] branch dev-db updated: 1，modify DateUtils，add getCurrentDate method 2，AccessTokenMapperTest UT modify (#1378)
This is an automated email from the ASF dual-hosted git repository.
lgcareer pushed a commit to branch dev-db
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev-db by this push:
new 5947fd5 1，modify DateUtils，add getCurrentDate method
2，AccessTokenMapperTest UT modify (#1378)
5947fd5 is described below
commit 5947fd526ed7ec46a90bd59a4effe0ef3941da4e
Author: qiaozhanwei
AuthorDate: Tue Dec 3 15:30:07 2019 +0800
1，modify DateUtils，add getCurrentDate method 2，AccessTokenMapperTest UT
modify (#1378)
* ConnectionFactory add paging intercepter
* remove spotbugs-annotations.jar LGPL protocol
* test
* catch exception transaction method does not take effect to modify
* .evn rollback
* DataSourceService rollback
* LogViewServiceGrpc rollback
* dockerfile add application-api.properties and change
application.properties to application-dao.properties
* server startup error modify
* data type convert error ，email send error bug fix
* Merge remote-tracking branch 'remotes/upstream/dev-db' into dev-db
# Conflicts:
#
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java
* revert sql.vue
* revert CommandType
* revert CommandType
* revert
* 1，modify DateUtils，add getCurrentDate method
2，AccessTokenMapperTest UT modify
---
.../dolphinscheduler/common/utils/DateUtils.java | 67 ---
.../dao/mapper/AccessTokenMapperTest.java | 204 -
2 files changed, 204 insertions(+), 67 deletions(-)
diff --git
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DateUtils.java
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DateUtils.java
index c0f99c8..0f30e7f 100644
---
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DateUtils.java
+++
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DateUtils.java
@@ -20,6 +20,7 @@ import org.apache.dolphinscheduler.common.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -35,20 +36,20 @@ public class DateUtils {
private static final Logger logger =
LoggerFactory.getLogger(DateUtils.class);
/**
- * java.util.Date to java.time.LocalDateTime
- * use default zone
- * @param date
- * @return
+ * date to local datetime
+ *
+ * @param date date
+ * @return local datetime
*/
private static LocalDateTime date2LocalDateTime(Date date) {
return LocalDateTime.ofInstant(date.toInstant(),
ZoneId.systemDefault());
}
/**
- * java.time.LocalDateTime to java.util.Date
- * use default zone
- * @param localDateTime
- * @return
+ * local datetime to date
+ *
+ * @param localDateTime local datetime
+ * @return date
*/
private static Date localDateTime2Date(LocalDateTime localDateTime) {
Instant instant =
localDateTime.atZone(ZoneId.systemDefault()).toInstant();
@@ -56,43 +57,51 @@ public class DateUtils {
}
/**
- * @return get the formatted date string for the current time
+ * get current date str
+ *
+ * @return date string
*/
public static String getCurrentTime() {
return getCurrentTime(Constants._MM_DD_HH_MM_SS);
}
/**
- * @param format format
- * @return get the date string in the specified format of the current time
+ * get the date string in the specified format of the current time
+ *
+ * @param format date format
+ * @return date string
*/
public static String getCurrentTime(String format) {
-//return new SimpleDateFormat(format).format(new Date());
return LocalDateTime.now().format(DateTimeFormatter.ofPattern(format));
}
/**
+ * get the formatted date string
+ *
* @param date date
* @param format e.g. -MM-dd HH:mm:ss
- * @return get the formatted date string
+ * @return date string
*/
public static String format(Date date, String format) {
-//return new SimpleDateFormat(format).format(date);
return format(date2LocalDateTime(date), format);
}
/**
+ * get the formatted date string
+ *
* @param localDateTime local data time
- * @param formate.g. -MM-dd HH:mm:ss
- * @return get the formatted date string
+ * @param format-MM-dd HH:mm:ss
+ * @return date string
*/
public static String format(LocalDateTime localDateTime, String format) {
return localDateTime.format(DateTimeFormatter.ofPattern(format));
}
[GitHub] [incubator-dolphinscheduler] lgcareer merged pull request #1378: 1，modify DateUtils，add getCurrentDate method 2，AccessTokenMapperTest UT modify
lgcareer merged pull request #1378: 1，modify DateUtils，add getCurrentDate method 2，AccessTokenMapperTest UT modify URL: https://github.com/apache/incubator-dolphinscheduler/pull/1378 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-dolphinscheduler] nauu commented on issue #1197: [BUG] wrong spell in lock implementation flow chart
nauu commented on issue #1197: [BUG] wrong spell in lock implementation flow chart URL: https://github.com/apache/incubator-dolphinscheduler/issues/1197#issuecomment-561033999 thx for reply @dailidong . i have been fixed the issue , and the pr is here : apache/incubator-dolphinscheduler-website#47 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-dolphinscheduler-website] nauu opened a new pull request #47: [dolphinscheduler-1197] [bug] wrong spell
nauu opened a new pull request #47: [dolphinscheduler-1197] [bug] wrong spell URL: https://github.com/apache/incubator-dolphinscheduler-website/pull/47 Changelog category: * Bug Detailed description: fix the wrong spell, and set the img src with static path This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-dolphinscheduler] nauu commented on issue #1219: Non compliant code
nauu commented on issue #1219: Non compliant code URL: https://github.com/apache/incubator-dolphinscheduler/issues/1219#issuecomment-561018797 i have a pr #1384 fixed this issue , can you review it ? @lenboo This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-dolphinscheduler] nauu opened a new pull request #1384: [dolphinscheduler- 1219] [newfeature] Non compliant code
nauu opened a new pull request #1384: [dolphinscheduler- 1219] [newfeature] Non compliant code URL: https://github.com/apache/incubator-dolphinscheduler/pull/1384 Changelog category : * New Feature Detailed description : change the camel-case with kebab This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-dolphinscheduler] dailidong merged pull request #1347: merge from 1.2.0-release
dailidong merged pull request #1347: merge from 1.2.0-release URL: https://github.com/apache/incubator-dolphinscheduler/pull/1347 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-dolphinscheduler-website] branch asf-site updated: Automated deployment: Tue Dec 3 05:44:50 UTC 2019 f6dba462fc08a0fe7f20ac5b6640786853718630
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-site
in repository
https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 9443803 Automated deployment: Tue Dec 3 05:44:50 UTC 2019
f6dba462fc08a0fe7f20ac5b6640786853718630
9443803 is described below
commit 9443803b5c65542f738a5309d2cfffed80822edf
Author: dailidong
AuthorDate: Tue Dec 3 05:44:50 2019 +
Automated deployment: Tue Dec 3 05:44:50 UTC 2019
f6dba462fc08a0fe7f20ac5b6640786853718630
---
build/documentation.js | 2 +-
zh-cn/docs/development/contribute.html | 2 +-
zh-cn/docs/development/contribute.json | 2 +-
zh-cn/docs/development/submit-bug.html | 27 ---
zh-cn/docs/development/submit-bug.json | 6 --
5 files changed, 3 insertions(+), 36 deletions(-)
diff --git a/build/documentation.js b/build/documentation.js
index 16ceb64..58044bf 100644
--- a/build/documentation.js
+++ b/build/documentation.js
@@ -32,4 +32,4 @@ Object.defineProperty(t,"__esModule",{value:!0});var
i="function"==typeof Symbol
* Copyright © 2012-2019 Faisal Salman
* Licensed under MIT License
*/
-return"string"==typeof e?e.replace(/[^\d\.]/g,"").split(".")[0]:void
0},trim:function(e){return
e.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")}},h={rgx:function(e,t){for(var
n,r,o,i,a,c,s=0;s0?2==i.length?"function"==typeof
i[1]?this[i[0]]=i[1].call(this,c):this[i[0]]=i[1]:3==i.length?"function"!=typeof
i[1]||i[1].exec&&i[1].test?this[i [...]
\ No newline at end of file
+return"string"==typeof e?e.replace(/[^\d\.]/g,"").split(".")[0]:void
0},trim:function(e){return
e.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")}},h={rgx:function(e,t){for(var
n,r,o,i,a,c,s=0;s0?2==i.length?"function"==typeof
i[1]?this[i[0]]=i[1].call(this,c):this[i[0]]=i[1]:3==i.length?"function"!=typeof
i[1]||i[1].exec&&i[1].test?this[i [...]
\ No newline at end of file
diff --git a/zh-cn/docs/development/contribute.html
b/zh-cn/docs/development/contribute.html
index c4b764a..57376ec 100644
--- a/zh-cn/docs/development/contribute.html
+++ b/zh-cn/docs/development/contribute.html
@@ -96,7 +96,7 @@ Priority分为四级: Critical、Major、Minor、Trivial
如果想要开发实现某个Feature功能，请先回复该功能所关联的Issue，表明您当前正在这个Issue上工作。
并在回复的时候为自己设置一个deadline，并添加的回复内容中。
最好在核心贡献者找到一个导师(指导者)，导师会在设计与功能实现上给予即时的反馈。
您应该新建一个分支来开始您的工作，分支的名字为Feature功能名称/issueId。 比如，您想完成依赖功能并提交了Issue
111，那么您的branch名字应为 dependency/111。 功能名称可与导师讨论后确定。
-完成后，发送一个pull request到incubator-dolphinscheduler，提交过程具体请参考下面《提交代码》。
+完成后，发送一个pull request到incubator-dolphinscheduler，提交过程具体请参考下面《提交代码流程》。
如果是想提交Pull
Request完成某一个Feature或者修复某个Bug，这里都建议大家从小处做起，完成一个小功能就提交一次，每次别改动太多文件(最好6个以下)，改动文件太多也会给Reviewer造成很大的心里压力，建议通过多次pr的方式完成。
DisclaimerApache DolphinScheduler (incubating) is an effort
undergoing incubation at The Apache Software Foundation (ASF), sponsored by
Incubator.
diff --git a/zh-cn/docs/development/contribute.json
b/zh-cn/docs/development/contribute.json
index 6e10b36..c5a9aee 100644
--- a/zh-cn/docs/development/contribute.json
+++ b/zh-cn/docs/development/contribute.json
@@ -1,6 +1,6 @@
{
"filename": "contribute.md",
- "__html": "贡献\n您可以提交一个bug，一个Feature建议或者直接提交改进。\n1.
如何提交Bug\n当您发现一个Bug时，请提交Bug，提交前：\n\n请先在issue列表里查找一下是否该bug已经提交，如果已经有此bug，请在此bug下接着回复。\n如果该Bug是可以复现的。请尽量提供完整的重现步骤。\n\n请在issues页面中提交Bug。\n一个高质量的Bug通常有以下特征：\n\n使用一个清晰并有描述性的标题来定义Bug。\n详细的描述复现Bug的步骤。包括您的配置情况，预计产生的结果，实际产生的结果。并附加详细的TRACE日志。\n如果程序抛出异常，请附加完整的堆栈日志。\n如有可能，请附上屏幕截图或动态的GIF图，这些图片能帮助演示整个问题的产生过程。\n哪个版本。\n需要修复的优�
�级( [...]
+ "__html": "贡献\n您可以提交一个bug，一个Feature建议或者直接提交改进。\n1.
如何提交Bug\n当您发现一个Bug时，请提交Bug，提交前：\n\n请先在issue列表里查找一下是否该bug已经提交，如果已经有此bug，请在此bug下接着回复。\n如果该Bug是可以复现的。请尽量提供完整的重现步骤。\n\n请在issues页面中提交Bug。\n一个高质量的Bug通常有以下特征：\n\n使用一个清晰并有描述性的标题来定义Bug。\n详细的描述复现Bug的步骤。包括您的配置情况，预计产生的结果，实际产生的结果。并附加详细的TRACE日志。\n如果程序抛出异常，请附加完整的堆栈日志。\n如有可能，请附上屏幕截图或动态的GIF图，这些图片能帮助演示整个问题的产生过程。\n哪个版本。\n需要修复的优�
�级( [...]
"link": "/zh-cn/docs/development/contribute.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/development/submit-bug.html
b/zh-cn/docs/development/submit-bug.html
deleted file mode 100644
index a01b98e..000
--- a/zh-cn/docs/development/submit-bug.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
- submit-bug
-
-
-
-
- En文档概览快速开始开发者指南ASFhttp://www.apache.org";
target="_self">基金会< [...]
- https://f.alicdn.com/react/15.4.1/react-with-addons.min.js";>
- https://f.alicdn.com/react/15.4.1/react-dom.min.js";>
-
- window.rootPath = '';
-
-
-
-
\ No newline at end of file
diff --git a/zh-cn/docs/development/submit-bug.json
b/zh-cn/docs/development/submit-bug.json
deleted file mode 100644
index f303569..000
--- a/zh-cn/docs/development/submit-bug.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "filename": "submit-bug.md",
- "__html": "",
-
[GitHub] [incubator-dolphinscheduler] samz406 closed pull request #1383: get new code
samz406 closed pull request #1383: get new code URL: https://github.com/apache/incubator-dolphinscheduler/pull/1383 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-dolphinscheduler-website] dailidong merged pull request #46: update document add contribute
dailidong merged pull request #46: update document add contribute URL: https://github.com/apache/incubator-dolphinscheduler-website/pull/46 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-dolphinscheduler-website] branch master updated: update document add contribute
This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler-website.git
The following commit(s) were added to refs/heads/master by this push:
new cd49229 update document add contribute
new f6dba46 Merge pull request #46 from dailidong/master
cd49229 is described below
commit cd49229b5325371753883657b1e3445d30195b41
Author: dailidong
AuthorDate: Tue Dec 3 12:44:38 2019 +0800
update document add contribute
---
docs/zh-cn/development/contribute.md | 2 +-
docs/zh-cn/development/submit-bug.md | 0
site_config/development.js | 26 +-
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/docs/zh-cn/development/contribute.md
b/docs/zh-cn/development/contribute.md
index 5db73df..751882b 100644
--- a/docs/zh-cn/development/contribute.md
+++ b/docs/zh-cn/development/contribute.md
@@ -90,7 +90,7 @@ Priority分为四级: Critical、Major、Minor、Trivial
* 如果想要开发实现某个Feature功能，请先回复该功能所关联的Issue，表明您当前正在这个Issue上工作。
并在回复的时候为自己设置一个deadline，并添加的回复内容中。
* 最好在核心贡献者找到一个导师(指导者)，导师会在设计与功能实现上给予即时的反馈。
* 您应该新建一个分支来开始您的工作，分支的名字为Feature功能名称/issueId。 比如，您想完成依赖功能并提交了Issue
111，那么您的branch名字应为 dependency/111。 功能名称可与导师讨论后确定。
-* 完成后，发送一个pull request到incubator-dolphinscheduler，提交过程具体请参考下面《提交代码》。
+* 完成后，发送一个pull
request到incubator-dolphinscheduler，提交过程具体请参考下面《[提交代码流程](submit-code.md)》。
如果是想提交Pull
Request完成某一个Feature或者修复某个Bug，这里都建议大家从小处做起，完成一个小功能就提交一次，每次别改动太多文件(最好6个以下)，改动文件太多也会给Reviewer造成很大的心里压力，建议通过多次pr的方式完成。
diff --git a/docs/zh-cn/development/submit-bug.md
b/docs/zh-cn/development/submit-bug.md
deleted file mode 100644
index e69de29..000
diff --git a/site_config/development.js b/site_config/development.js
index e60d32d..156dd93 100755
--- a/site_config/development.js
+++ b/site_config/development.js
@@ -2,23 +2,23 @@ export default {
'en-us': {
sidemenu: [
{
-title: 'Developer guide',
+title: 'Contribution Guide',
children: [
{
-title: 'Contribution Guide',
-children: [
-{
-title: 'Subscribe mail list',
-target: '_blank',
-link: '/en-us/docs/user_doc/subscribe.html',
-},
-{
-title: 'Participate in contributing',
-link:
'/en-us/docs/development/contribute.html',
-}
-],
+title: 'Subscribe mail list',
+target: '_blank',
+link: '/en-us/docs/user_doc/subscribe.html',
},
{
+title: 'Participate in contributing',
+link: '/en-us/docs/development/contribute.html',
+}
+],
+},
+{
+title: 'Developer guide',
+children: [
+{
title: 'Architecture Design',
link:
'/en-us/docs/development/architecture-design.html',
},
[GitHub] [incubator-dolphinscheduler] samz406 removed a comment on issue #1383: get new code
samz406 removed a comment on issue #1383: get new code URL: https://github.com/apache/incubator-dolphinscheduler/pull/1383#issuecomment-561007691 get new code This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-dolphinscheduler] samz406 commented on issue #1383: get new code
samz406 commented on issue #1383: get new code URL: https://github.com/apache/incubator-dolphinscheduler/pull/1383#issuecomment-561007691 get new code This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [incubator-dolphinscheduler] samz406 opened a new pull request #1383: get new code
samz406 opened a new pull request #1383: get new code URL: https://github.com/apache/incubator-dolphinscheduler/pull/1383 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
