Commit Graph

36 Commits

Author SHA1 Message Date
Locki
8c14130cb6 增加DB2的任务构建 2020-09-14 11:42:59 +08:00
weiye
ee391a0b76 bug fixed 2020-06-23 10:16:03 +08:00
weiye
102dc18194 pom排除servlet-api jar 2020-06-22 11:48:10 +08:00
weiye
f1229c4c17 #153 bug fixed 2020-06-19 11:43:24 +08:00
weiye
e02e5096bf #153 bug fixed 2020-06-19 09:55:10 +08:00
weiye
237d6ba644 文档更新 2020-06-16 08:24:27 +08:00
weiye
93b08d848d jar包冲突解决 2020-06-15 13:28:42 +08:00
jack
399bcc6123 phoenix 2020-06-13 21:29:06 +08:00
koala
b452e77494 auto deploy 2020-06-12 20:12:30 +08:00
weiye
04363e6469 artifactId修改 2020-04-08 13:03:25 +08:00
weiye
26429b3cc3 删除加密异常解决引入的jar包 2020-04-08 09:41:55 +08:00
weiye
eb42fdd6f1 文件恢复 2020-03-31 14:37:23 +08:00
WeiYe
d6e9b4a9ca
Revert "Feature#61" 2020-03-30 09:44:00 +08:00
water
2ed42b7d93 fix:java.security.InvalidKeyException: Illegal key size 2020-03-27 17:56:08 +08:00
weiye
392d22d45b 删除弃用代码 2020-03-19 22:59:46 +08:00
weiye
d93cb82606 Merge branch 'dev' into v2.1.1
# Conflicts:
#	datax-admin/pom.xml
#	datax-admin/src/main/java/com/wugui/datax/admin/util/JasyptUtil.java
2020-03-19 20:31:22 +08:00
water
7ec39d0186 delï¼元数据加密 2020-03-19 19:51:55 +08:00
weiye
15f6ab30a5 合并dev分支 2020-03-19 15:03:10 +08:00
weiye
3090e02c19 Merge branch 'dev' into v2.1.1
# Conflicts:
#	.gitignore
#	datax-admin/src/main/java/com/wugui/datax/admin/controller/JobDatasourceController.java
#	datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobGroupMapper.java
#	datax-admin/src/main/java/com/wugui/datax/admin/service/impl/JdbcDatasourceQueryServiceImpl.java
#	datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/DataxJsonHelper.java
#	datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/reader/BaseReaderPlugin.java
#	datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/writer/BaseWriterPlugin.java
#	datax-admin/src/main/java/com/wugui/datax/admin/tool/query/BaseQueryTool.java
#	datax-executor/src/main/java/com/wugui/datax/executor/service/jobhandler/ExecutorJobHandler.java
2020-03-19 10:08:46 +08:00
weiye
3d68cef3d7 Merge branch 'master' into v2.1.1
# Conflicts:
#	README.md
#	pom.xml
2020-03-19 09:24:49 +08:00
water
292fca98af #49 2020-03-16 20:38:10 +08:00
walkerJing
ae012f1756 删除druid jar包 2020-03-14 23:29:26 +08:00
景文凯
a90647ce60 hikari缓存连接进行校验
集成mongodb数据源
2020-03-13 20:15:34 +08:00
water
959bd32044 add: 添加切面控制每个ç监控er的输入输出耗时 2020-03-13 09:50:35 +08:00
fantasticKe
c6c592e422 update: 指定maven编译插件jdk版本。修改日志位置 2020-03-09 22:37:15 +08:00
景文凯
c004eb8680 hbase数据源更新 2020-03-01 13:33:08 +08:00
weiye
8909ec35f0 hbase数据源更新 2020-02-17 16:36:13 +08:00
weiye
3fc4da9054 hive构建json修改index获取方式
支持shell、python、powershell任务
支持分区动态传参,可配合增量同时使用
2020-01-17 18:57:59 +08:00
weiye
5f75e47565 jdbc连接测试
jdbc添加hive数据源支持
json构建模块代码重构
json构建支持hive
2020-01-10 18:19:53 +08:00
weiye
120bf58907 修复打包本地lib丢失问题
修复终止任务时状态显示错误问题
2019-12-18 10:22:51 +08:00
weiye
089f17a664 合并前端代码
更新说明文档
2019-12-16 19:50:47 +08:00
weiye
86e24b07b4 pom更新 2019-12-15 20:35:49 +08:00
weiye
71368ab294 pom版本格式修改 2019-11-27 10:41:57 +08:00
weiye
f07fa15c01 调度中心、执行器更新 2019-11-26 21:11:18 +08:00
weiye
1488a11b62 更新执行器,更新调度中心 2019-11-22 23:05:51 +08:00
weiye
23d20c7f70 整合xxl-job 2019-11-18 15:42:55 +08:00