bao liang
57080c96e8
update application.yml to application.properties ( #980 )
...
* 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
* update some dao bugs
* update for some bugs
* update some bugs
* 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
* update
* update
* add multiply settings for application.yml
* add multiply settings for application.yml
* revert
* update configuration settings in task record dao...
* change application_master to application-master
* change application_master to application-master
* update application.yml to application.properties
* revert
5 years ago
lgcareer
b9157e1d8c
Add alertDao to spring management in master ( #976 )
...
* 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
* remove log4j-1.2-api and modify AlertMapperTest
* remove log4j-1.2-api
* Add alertDao to spring management
5 years ago
bao liang
6a48b98513
add multiply settings for application.yml ( #973 )
...
* 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
* update some dao bugs
* update for some bugs
* update some bugs
* 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
* update
* update
* add multiply settings for application.yml
* add multiply settings for application.yml
* revert
5 years ago
qiaozhanwei
25695ff21b
modify the package in pom to hit the resource file into the class ( #964 )
...
* 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
5 years ago
lgcareer
7e815b44ce
change escheduler to dolphinscheduler ( #963 )
...
* 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
5 years ago
qiaozhanwei
ed04835c95
running through the big process error modify ( #962 )
...
* 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
5 years ago
lgcareer
31f9fbf335
change escheduler to dolphinscheduler ( #961 )
...
* 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
5 years ago
qiaozhanwei
be59cda0da
running through the big process ( #959 )
...
* 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
5 years ago
bao liang
b5636b043f
update ut for mybatisplus ( #950 )
...
* 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
5 years ago
qiaozhanwei
12e21aa7a0
logback log name modify ( #947 )
...
* 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
5 years ago
lgcareer
60a13bf5ec
cal duration in processInstancesList ( #943 )
...
* 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
5 years ago
qiaozhanwei
d3e04c3caa
dao yml assembly to conf directory ( #942 )
...
* add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
* .escheduler_env.sh to dolphinscheduler_env.sh
* dao yml assembly to conf directory
5 years ago
qiaozhanwei
070fd51145
.escheduler_env.sh to dolphinscheduler_env.sh ( #941 )
...
* add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
* .escheduler_env.sh to dolphinscheduler_env.sh
5 years ago
lgcareer
0798b7d1e9
change escheduler to dolphinscheduler ( #928 )
...
* rename from DatasourceUserMapper to DataSourceUserMapper
* add unit test in UserMapper and WorkerGroupMapper
* change cn.escheduler to org.apache.dolphinscheduler
5 years ago
qiaozhanwei
d09a2d07c9
rename project and doc
5 years ago