weiye
|
c05b17a924
|
Merge branch 'dev' into v2.1.1
# Conflicts:
# datax-admin/src/main/java/com/wugui/datax/admin/config/SecurityConfig.java
# datax-admin/src/main/java/com/wugui/datax/admin/controller/JobInfoController.java
# datax-admin/src/main/java/com/wugui/datax/admin/exception/JWTAuthenticationEntryPoint.java
# datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobJdbcDatasourceMapper.java
# datax-admin/src/main/java/com/wugui/datax/admin/service/IJobJdbcDatasourceService.java
# datax-admin/src/main/java/com/wugui/datax/admin/service/impl/JobJdbcDatasourceServiceImpl.java
# datax-admin/src/main/java/com/wugui/datax/admin/service/impl/LoginService.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
|
2020-03-23 13:41:08 +08:00 |
|
water
|
f0ce59f136
|
1，添加功能：按照流程构建datax json时候将json中的账密进行加密，在执行同步任务的时候解密。这样保证用户在任务地方看到的数据库连接信息都是密文；
|
2020-03-20 20:11:24 +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 |
|
景文凯
|
8058b69376
|
mongodb json 构建更新
|
2020-03-18 13:45:36 +08:00 |
|
walkerJing
|
b28914d602
|
增加执行器资源监控
|
2020-03-17 23:48:38 +08:00 |
|
water
|
23b5a963aa
|
#47
|
2020-03-16 17:32:34 +08:00 |
|
water
|
a1eff2a362
|
del:删除dev yml
|
2020-03-13 19:20:49 +08:00 |
|
water
|
d0f16f50bd
|
#42
|
2020-03-13 19:18:14 +08:00 |
|
water
|
fe606866d1
|
fix:1.logback从yml中获取配置路径，2，添加dev-yml
|
2020-03-13 15:20:15 +08:00 |
|
water
|
3893240972
|
Merge branch 'master' of https://github.com/waterWang/datax-web
|
2020-03-10 16:53:15 +08:00 |
|
water
|
48a50d43cf
|
update:去掉无用的泛型，简化代码
|
2020-03-10 16:26:15 +08:00 |
|
fantasticKe
|
c6c592e422
|
update: 指定maven编译插件jdk版本。修改日志位置
|
2020-03-09 22:37:15 +08:00 |
|
weiye
|
3fc4da9054
|
hive构建json修改index获取方式
支持shell、python、powershell任务
支持分区动态传参，可配合增量同时使用
|
2020-01-17 18:57:59 +08:00 |
|
weiye
|
925bf6d1f1
|
Merge branch 'v2.1.1'
|
2020-01-13 14:01:37 +08:00 |
|
weiye
|
5f75e47565
|
jdbc连接测试
jdbc添加hive数据源支持
json构建模块代码重构
json构建支持hive
|
2020-01-10 18:19:53 +08:00 |
|
maokeluo
|
66ce81c188
|
update: 优先通过环境变量获取DataX文件目录
|
2020-01-07 21:54:22 +08:00 |
|
weiye
|
6eaa6cd8d1
|
datax执行器日志输出优化
killjob失败重试序列化失败修复
|
2019-12-31 13:41:30 +08:00 |
|
weiye
|
cdf0c05e83
|
修复增量更新失败重试时的currentTime传参为任务触发时间，导致重试成功后增量更新时间跳跃
|
2019-12-31 09:46:15 +08:00 |
|
weiye
|
a4070fe4cd
|
增量更新记录起始时间，仅在成功时更新
取消时间偏移参数
|
2019-12-26 20:21:01 +08:00 |
|
weiye
|
a0a4f0fe1f
|
json临时文件名称修改
linux kill进程使用 kill PID
|
2019-12-25 19:59:07 +08:00 |
|
weiye
|
f91a6ca145
|
修复ubuntu下job失败问题
|
2019-12-24 17:06:06 +08:00 |
|
weiye
|
1da812d057
|
执行器命令添加参数更新
|
2019-12-20 20:01:13 +08:00 |
|
weiye
|
235671e207
|
执行器命令添加参数
添加连接数据源时用户名密码错误提醒
|
2019-12-20 19:28:43 +08:00 |
|
weiye
|
62dfa00477
|
执行器命令添加参数
|
2019-12-20 09:26:22 +08:00 |
|
walkerJing
|
8e77cfab6b
|
增量抽取
|
2019-12-19 22:45:37 +08:00 |
|
weiye
|
ba917f55d6
|
执行器命令添加参数
|
2019-12-19 21:50:12 +08:00 |
|
walkerJing
|
95685d95f3
|
增量抽取
|
2019-12-18 23:07:24 +08:00 |
|
weiye
|
fe4e0b4601
|
执行器命令添加参数
|
2019-12-18 18:28:22 +08:00 |
|
weiye
|
1c6bd8ae51
|
修复executorParams为null导致命令执行失败的问题
|
2019-12-17 15:28:21 +08:00 |
|
weiye
|
089f17a664
|
合并前端代码
更新说明文档
|
2019-12-16 19:50:47 +08:00 |
|
walkerJing
|
dba6fc17f7
|
datax进程终止更新
|
2019-12-15 18:33:35 +08:00 |
|
weiye
|
7e967e94bc
|
执行器进程信息回调
更新日志信息
admin添加日志配置
python启动命令添加自定义参数
|
2019-12-13 22:36:27 +08:00 |
|
weiye
|
f07fa15c01
|
调度中心、执行器更新
|
2019-11-26 21:11:18 +08:00 |
|
weiye
|
52cd5f7868
|
Merge branch 'master' of https://github.com/waterWang/datax-web into waterWang-master
# Conflicts:
# datax-admin/src/main/java/com/wugui/datax/admin/core/model/XxlJobLog.java
# datax-admin/src/main/java/com/wugui/datax/admin/core/model/XxlJobLogGlue.java
# datax-admin/src/main/java/com/wugui/datax/admin/core/model/XxlJobRegistry.java
# datax-admin/src/main/java/com/wugui/datax/admin/core/thread/JobScheduleHelper.java
# datax-core/src/main/java/com/wugui/datatx/core/executor/XxlJobExecutor.java
# datax-core/src/main/java/com/wugui/datatx/core/thread/JobThread.java
# datax-core/src/main/java/com/wugui/datatx/core/thread/TriggerCallbackThread.java
# datax-executor/src/main/java/com/wugui/datax/executor/service/jobhandler/CommandJobHandler.java
|
2019-11-23 11:20:40 +08:00 |
|
weiye
|
1488a11b62
|
更新执行器，更新调度中心
|
2019-11-22 23:05:51 +08:00 |
|
weiye
|
d975bc5e34
|
整合xxl-job
|
2019-11-19 09:09:52 +08:00 |
|
weiye
|
23d20c7f70
|
整合xxl-job
|
2019-11-18 15:42:55 +08:00 |
|