1. 08 10月, 2019 6 次提交
    • Q
      modify the package in pom to hit the resource file into the class (#964) · 25695ff2
      qiaozhanwei 提交于
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      25695ff2
    • L
      change escheduler to dolphinscheduler (#963) · 7e815b44
      lgcareer 提交于
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      7e815b44
    • Q
      running through the big process error modify (#962) · ed04835c
      qiaozhanwei 提交于
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      ed04835c
    • L
      change escheduler to dolphinscheduler (#961) · 31f9fbf3
      lgcareer 提交于
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      31f9fbf3
    • Q
      running through the big process (#959) · be59cda0
      qiaozhanwei 提交于
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      be59cda0
    • L
      change escheduler to dolphinscheduler (#958) · c377d7d8
      lgcareer 提交于
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      c377d7d8
  2. 30 9月, 2019 11 次提交
    • B
      Merge remote-tracking branch 'upstream/dev-db' into dev-db (#951) · b725a958
      bao liang 提交于
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      b725a958
    • B
      update ut for mybatisplus (#950) · b5636b04
      bao liang 提交于
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      b5636b04
    • L
      change table name in mysql ddl (#949) · e5862afe
      lgcareer 提交于
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      e5862afe
    • Q
      logback log name modify (#947) · 12e21aa7
      qiaozhanwei 提交于
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      12e21aa7
    • Q
      entity title table name modify (#946) · e17f4345
      qiaozhanwei 提交于
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      e17f4345
    • Q
      table name modify (#945) · fe521723
      qiaozhanwei 提交于
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      fe521723
    • L
      cal duration in processInstancesList (#944) · 4ea0466b
      lgcareer 提交于
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      4ea0466b
    • L
      cal duration in processInstancesList (#943) · 60a13bf5
      lgcareer 提交于
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      60a13bf5
    • Q
      dao yml assembly to conf directory (#942) · d3e04c3c
      qiaozhanwei 提交于
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      d3e04c3c
    • Q
      .escheduler_env.sh to dolphinscheduler_env.sh (#941) · 070fd511
      qiaozhanwei 提交于
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      070fd511
    • L
      add unit test in UdfFuncMapperTest (#940) · 58b55d40
      lgcareer 提交于
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      58b55d40
  3. 29 9月, 2019 4 次提交
    • Q
    • L
      change escheduler to dolphinscheduler (#928) · 0798b7d1
      lgcareer 提交于
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      0798b7d1
    • Q
      rename project and doc · d09a2d07
      qiaozhanwei 提交于
      d09a2d07
    • B
      add ut for dao ... (#923) · e84c6adc
      bao liang 提交于
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      e84c6adc
  4. 27 9月, 2019 1 次提交
  5. 26 9月, 2019 3 次提交
    • L
      df87dd08
    • B
      refactor dao interface. (#897) · 730cf310
      bao liang 提交于
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      730cf310
    • B
      refactor dao interface for mybatisplus (#895) · 46672d6b
      bao liang 提交于
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      46672d6b
  6. 25 9月, 2019 2 次提交
    • B
      add mybatis plus (#881) · ef4ec213
      bao liang 提交于
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      ef4ec213
    • Update pom.xml (#876) · 24740522
      张章章 提交于
      [BUG][#860] jar包冲突Correct the classpath of your application so that it contains a single, compatible version of javax.servlet.ServletContext
      24740522
  7. 24 9月, 2019 2 次提交
    • L
      add spring boot on alert server (#872) · 5a13c4cb
      lgcareer 提交于
      * Remove useless dependencies and add jsp-2.1-6.1.14
      
      * Determine if principal is empty in getJdbcUrl method
      
      * fix bug  when register worker but create master node in zookeeper
      
      * Remove useless dependencies such as hive-shims and log4j
      
      * upgrade commons-email from 1.2 to 1.5 and remove mail-1.4.5.jar
      
      * add support for postgresql in upgrade database
      
      * add support for postgresql in upgrade database
      
      * update mysql in upgrade from 1.1.0 to next version
      
      * add table name change ddl
      
      * add spring boot on alert server
      5a13c4cb
    • [FEATURE][#841]Add HTTP components(添加HTTP组件) (#842) · 6525440c
      黄聪 提交于
      * Add HTTP components(添加HTTP组件)
      
      * HTTP组件的相关代码优化
      
      * Repair HTTP Component Related Code Based on Optimized Recommendations
      (基于优化建议的http组件相关代码修复)
      
      * Repair HTTP connection leak problem
      (修复http连接泄漏问题)
      6525440c
  8. 23 9月, 2019 5 次提交
  9. 20 9月, 2019 2 次提交
    • Q
      appliction_worker.properties logging.config bug fix (#840) · caf3f9e2
      qiaozhanwei 提交于
      * service start exception modify
      
      * master,worker start modify
      
      * .env update
      
      * install-escheduler-ui.sh,monitor_server.py and install.sh scripts comment change to english and install-escheduler-ui.sh use escheduler change to dolphinscheduler
      
      * scripts name standardization
      
      * appliction_worker.properties logging.config bug fix
      caf3f9e2
    • B
      Daily optimization (#837) · 49b8f63e
      break60 提交于
      * package
      
      * 修改工作流实例页面状态为运行时,禁止删除,删除package.json包里面的babel-runtime和jasmine-core
      
      * bugfix-user-specified queue takes precedence over tenant queue (#769)
      
      Solve the problem that the user queue setting does not take effect
      
      * update markdown docs which can not display images normally (#806)
      
      * issue#728 (#746)
      
      The mailSender in PasswordAuthentication() and setFrom() may not be the same in actual use, and it's best to set it up separately. please add a example about this.
      
      * install-escheduler-ui.sh,monitor_server.py and install.sh scripts comment change to english and install-escheduler-ui.sh use escheduler change to dolphinscheduler (#812)
      
      * service start exception modify
      
      * master,worker start modify
      
      * .env update
      
      * install-escheduler-ui.sh,monitor_server.py and install.sh scripts comment change to english and install-escheduler-ui.sh use escheduler change to dolphinscheduler
      
      * scripts name standardization (#813)
      
      * service start exception modify
      
      * master,worker start modify
      
      * .env update
      
      * install-escheduler-ui.sh,monitor_server.py and install.sh scripts comment change to english and install-escheduler-ui.sh use escheduler change to dolphinscheduler
      
      * scripts name standardization
      
      * [BUG][#731]repair swagger annotation,interface path:/escheduler/projects/{projectName}/process/batch-delete and /escheduler/projects/{projectName}/process/delete  (#764)
      
      * 增加工作流导出导入功能,前端定时器表达式的秒和分钟的默认值从*修改成0
      
      * 修改工作流导出导入功能由excel改为json减少依赖
      
      * [BUG][#731]repair swagger annotation ,interface path:/escheduler/projects/{projectName}/process/batch-delete and /escheduler/projects/{projectName}/process/delete
      
      * [BUG][#771] The edit timer did not assign the original data
      
      * [FEATURE][#236] Cross-project dependency
      
      * [FEATURE][#236] Cross-project dependency(增加跨项目依赖)
      
      * misspell  words (#817)
      
      * (Docs): Fixed some typo errors (#811)
      
      * Update EasyScheduler Proposal.md
      
      * Update frontend-deployment.md
      
      * Update frontend-development.md
      
      * Update 前端开发文档.md
      
      * Update system-manual.md
      
      * Update HttpClientTest.java
      
      * Update 系统使用手册.md
      
      * fix singleton with volatile (#818)
      
      * Replace StringBuffer with StringBuilder inside the method (#816)
      
      * flink task support(flink 任务支持) (#711)
      
      * flink任务支持
      
      * flink任务支持
      
      * Update zh_CN.js
      
      * Update FlinkArgsUtils.java
      
      * Update .escheduler_env.sh
      
      * 1.Delete the page section console.log;
      2.Change project name;
      3.Production configuration packaging clears console.log
      49b8f63e
  10. 19 9月, 2019 4 次提交