1. 24 4月, 2020 6 次提交
  2. 23 4月, 2020 18 次提交
    • Q
      Merge branch 'dev' into dev · 5cfb21ae
      qiaozhanwei 提交于
      5cfb21ae
    • B
      Add force not to cache、Modify style and fix jar instance of workflow instance not showing (#2507) · 1d76d0a9
      break60 提交于
      * Fix the problem of data echo in script edit box
      
      * [Refactor worker] simplify and optimize config (#2386)
      
      * simplify config
      
      * simplify config
      
      * simplify and optimize config
      
      * Optimize resource tree
      
      * Change the name of the shell node and modify the parameter transmission method of spark, mr, python, and flink nodes
      
      * Repair naming
      
      * Modify list style
      
      * Online editing is prohibited
      
      * Update HadoopUtils.java
      
      optimize HadoopUtils
      
      * Update HadoopUtilsTest.java
      
      * Change the background color of the disabled state of the radio button when the workflow goes online
      
      * Update HadoopUtilsTest.java
      
      * Update HadoopUtilsTest.java
      
      * Update HttpUtils.java
      
      * Update pom.xml
      
      * Update HadoopUtilsTest.java
      
      * Update HadoopUtilsTest.java
      
      * Update HadoopUtilsTest.java
      
      * Update HadoopUtilsTest.java
      
      * Update HadoopUtilsTest.java
      
      * Update HadoopUtilsTest.java
      
      * Modify worker parameters
      
      * delete img
      
      * Add force not to cache and fix jar instance of workflow instance not showing
      
      * Add force not to cache and fix jar instance of workflow instance not showing
      
      * disabled
      
      * fix style
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>
      1d76d0a9
    • K
      Merge branch 'dev' into dev · 4c91c83e
      Kevin 提交于
      4c91c83e
    • Q
      #2499 bug fix (#2505) · f2bfdc14
      qiaozhanwei 提交于
      * dispatch task fail will set task status failed
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * #2486 bug fix
      
      * host and workergroup compatible
      
      * EnterpriseWeChatUtils modify
      
      * EnterpriseWeChatUtils modify
      
      * EnterpriseWeChatUtils modify
      
      * #2499 bug fix
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      f2bfdc14
    • L
      Merge branch 'dev' into dev · c72f4f1c
      liwenhe1993 提交于
      c72f4f1c
    • L
      Modify README.md file · fc66499e
      liwenhe1993 提交于
      fc66499e
    • M
      fixed bug #2492 (#2497) · 21c10f88
      muzhongjiang 提交于
      Co-authored-by: Nmzjnumber1@163.com <mzjnumber1@163.com>
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      21c10f88
    • D
      Merge branch 'dev' into dev · 381ab72e
      dailidong 提交于
      381ab72e
    • L
      Modify config · 362e5f5f
      liwenhe1993 提交于
      362e5f5f
    • Q
      EnterpriseWeChatUtils modify (#2502) · e837a73f
      qiaozhanwei 提交于
      * dispatch task fail will set task status failed
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * #2486 bug fix
      
      * host and workergroup compatible
      
      * EnterpriseWeChatUtils modify
      
      * EnterpriseWeChatUtils modify
      
      * EnterpriseWeChatUtils modify
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      e837a73f
    • O
      fix showType in sql.vue · e4dad2ac
      oceanos 提交于
      e4dad2ac
    • L
      Modify config · b0aa3c23
      liwenhe1993 提交于
      b0aa3c23
    • O
      Merge remote-tracking branch 'origin/dev' into dev · 85619909
      oceanos 提交于
      85619909
    • O
      fix ui i18n issue · d4d31088
      oceanos 提交于
      d4d31088
    • O
      Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev · dc2836d1
      oceanos 提交于
       Conflicts:
      	install.sh
      dc2836d1
    • L
      [fix #2442] It will give a error tip that resource not exist exwhen update resources. (#2483) · 44770a87
      lgcareer 提交于
      * fix #2442 and remove unavailable code
      
      * revert verifyResourceName method
      
      * Add ServiceException
      
      * add ServiceExceptionTest
      
      * update ServiceExceptionTest
      
      * add ServiceExceptionTest in pom
      44770a87
    • L
      Delete 1.2.0 helm config · be81acde
      liwenhe1993 提交于
      be81acde
    • S
      fix #2450 (#2493) · b5fdce41
      Simon 提交于
      * fix #1441
      
      * support custom datax config
      
      * support datax custom config
      
      * support datax custom config
      
      * support datax custom config
      
      * fix #2450
      Co-authored-by: N张世鸣 <zhangshiming@cvte.com>
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      b5fdce41
  3. 22 4月, 2020 8 次提交
  4. 21 4月, 2020 6 次提交
    • O
    • Q
      #2486 bug fix (#2487) · 54fc32e2
      qiaozhanwei 提交于
      * dispatch task fail will set task status failed
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * #2486 bug fix
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      54fc32e2
    • Q
      send mail error, #2466 bug fix (#2470) · 28766df5
      qiaozhanwei 提交于
      * dispatch task fail will set task status failed
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,no worker condition , master will while ture wait for worker startup
      2,worker response task status sync wait for result
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * 1,task status statistics and process status statistics bug fix (#2357)
      2,worker group bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      
      * send mail error, #2466 bug fix
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      28766df5
    • Z
      resolve #2474 (#2477) · f3dc1c94
      zhangchunyang 提交于
      * In the dev branch, in order to the RPM package which is printed under the dist module contain configuration files: master.properties, worker.properties
      
      * Restore files deleted by mistake
      Co-authored-by: Nzhangchunyang <zhangchunyang@analysys.com.cn>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>
      f3dc1c94
    • B
      Modify worker parameters (#2479) · 3740b241
      break60 提交于
      * Fix the problem of data echo in script edit box
      
      * Optimize resource tree
      
      * Change the name of the shell node and modify the parameter transmission method of spark, mr, python, and flink nodes
      
      * Repair naming
      
      * Modify list style
      
      * Online editing is prohibited
      
      * Change the background color of the disabled state of the radio button when the workflow goes online
      
      * Modify worker parameters
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>
      3740b241
    • D
      simplify and optimize config (#2469) · eec92ed1
      dailidong 提交于
      * [Refactor worker] simplify and optimize config (#2386)
      
      * simplify config
      
      * simplify config
      
      * simplify and optimize config
      
      * Update HadoopUtils.java
      
      optimize HadoopUtils
      
      * Update HadoopUtilsTest.java
      
      * Update HadoopUtilsTest.java
      
      * Update HadoopUtilsTest.java
      
      * Update HttpUtils.java
      
      * Update pom.xml
      
      * Update HadoopUtilsTest.java
      
      * Update HadoopUtilsTest.java
      
      * Update HadoopUtilsTest.java
      
      * Update HadoopUtilsTest.java
      
      * Update HadoopUtilsTest.java
      
      * Update HadoopUtilsTest.java
      eec92ed1
  5. 20 4月, 2020 2 次提交