Commit Graph

78 Commits

Author SHA1 Message Date
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
2019-10-09 18:47:42 +08:00
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
2019-10-08 19:13:39 +08:00
lgcareer
c377d7d878 change escheduler to dolphinscheduler (#958)
* 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
2019-10-08 16:06:00 +08:00
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
2019-09-30 15:21:59 +08:00
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
2019-09-29 19:39:01 +08:00
qiaozhanwei
d09a2d07c9 rename project and doc 2019-09-29 15:14:10 +08:00
lgcareer
5a13c4cb2d add spring boot on alert server (#872)
* 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
2019-09-24 16:43:13 +08:00
Love EvenWong
02598a7b45 flink task support(flink 任务支持) (#711)
* flink任务支持

* flink任务支持

* Update zh_CN.js

* Update FlinkArgsUtils.java

* Update .escheduler_env.sh
2019-09-19 12:28:13 +08:00
qiaozhanwei
bbe7a256a8 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
2019-09-18 18:21:47 +08:00
qiaozhanwei
8ee233f082 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
2019-09-18 18:01:34 +08:00
lgcareer
d5f17f579c add support for postgresql in upgrade database (#801)
* 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
2019-09-17 19:04:45 +08:00
乔占卫
0877e35efa service start exception modify (#787)
* service start exception modify

* master,worker start modify

* .env update
2019-09-12 11:24:55 +08:00
ligang
d442acb15b update monitor_server.py 2019-05-23 11:18:18 +08:00
ligang
9b206778ea remove annotation 2019-05-22 16:22:34 +08:00
ligang
39f94615b2 remove annotation 2019-05-22 16:19:29 +08:00
ligang
5739eb0de2 add monitorServerState 2019-05-22 16:16:01 +08:00
qiaozhanwei
1e742eed2c .escheduler_env.sh update 2019-05-20 15:16:15 +08:00
ligang
404d134f5c remove tab in line 11 2019-04-28 14:00:45 +08:00
qiaozhanwei
41315f9b1b script move 2019-04-25 19:48:11 +08:00
ligang
f5f4a6b01b update upgrade and create script 2019-04-25 19:04:09 +08:00
乔占卫
cd60898a61
Merge pull request #1 from qiaozhanwei/branch-1.0.0
Branch 1.0.0 merge dev
2019-04-18 16:49:21 +08:00
ligang
94f10977a8 add upgrade and create script 2019-04-17 20:14:42 +08:00
qiaozhanwei
10ba69db5d Python task specifies path execution update 2019-04-16 18:05:14 +08:00
baoliang
6c44ac3afa update install document 2019-04-12 10:13:04 +08:00
baoliang
0dc1f45a16 delete tar
update install document
2019-04-11 13:39:21 +08:00
dailidong
ffdab1baf8 修改sh 2019-03-29 18:30:03 +08:00
qiaozhanwei
3c615d0b0c update tar project name 2019-03-29 16:04:41 +08:00
ligang
0a514ceb33 Initial install config,script and sql commit 2019-03-29 14:37:07 +08:00