CodeCow/datax-web
1
0
Fork 0
mirror of https://github.com/WeiYe-Jing/datax-web.git synced 2026-06-30 21:17:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
340 Commits 6 Branches 6 Tags 292 MiB
d34bc318bb
Commit Graph

104 Commits

Author SHA1 Message Date
weiye
e51130f9e8 2.1.1版本提交 2020-03-23 18:52:29 +08:00
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
weiye
98f9070f2d mongodb json 构建更新 2020-03-23 13:28:48 +08:00
walkerJing
ed87072703 mongodb数据源测试更新 2020-03-22 22:38:59 +08:00
walkerJing
d0b2a74adc 更新mongodb构建json 2020-03-22 12:37:39 +08:00
walkerJing
29b3defbad 更新mongodb构建json 2020-03-22 12:15:23 +08:00
walkerJing
532ccf701c 更新mongodb构建json 2020-03-22 12:10:18 +08:00
weiye
6a588b6141 mongodb json 构建更新 2020-03-21 12:28:03 +08:00
water
f0ce59f136 1，添加功能：按照流程构建datax json时候将json中的账密进行加密，在执行同步任务的时候解密。这样保证用户在任务地方看到的数据库连接信息都是密文； 2020-03-20 20:11:24 +08:00
weiye
8d8ceb93c3 #57功能优化 2020-03-20 19:27:17 +08:00
water
3bd95eae34 #54 2020-03-20 15:25:08 +08:00
water
4e2e035e21 #54 2020-03-20 13:44:15 +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
weiye
2747f94689 删除弃用代码 2020-03-19 20:26:57 +08:00
water
56ca50a6e1 Merge branch 'feature#55' of https://github.com/waterWang/datax-web into feature#54 2020-03-19 19:58:31 +08:00
water
7ec39d0186 delï¼元数据加密 2020-03-19 19:51:55 +08:00
water
4664f1f679 #55 2020-03-19 19:42:42 +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
weiye
6d7ea38a36 执行器资源列表接口更新 2020-03-18 20:07:26 +08:00
景文凯
d4b4fee700 删除json column中拼接的``符 2020-03-18 13:50:53 +08:00
景文凯
8058b69376 mongodb json 构建更新 2020-03-18 13:45:36 +08:00
walkerJing
b28914d602 增加执行器资源监控 2020-03-17 23:48:38 +08:00
景文凯
07f299e5a8 mongodb json 构建更新 2020-03-17 22:31:33 +08:00
water
c21abdb2e5 #52 2020-03-17 19:50:37 +08:00
walkerJing
f2ada5591f 更新mongodb构建json 2020-03-16 23:19:17 +08:00
water
292fca98af #49 2020-03-16 20:38:10 +08:00
water
23b5a963aa #47 2020-03-16 17:32:34 +08:00
walkerJing
ae012f1756 删除druid jar包 2020-03-14 23:29:26 +08:00
walkerJing
4d75eaabfa json数据源构建支持mongodb 2020-03-14 23:22:40 +08:00
景文凯
a90647ce60 hikari缓存连接进行校验 
集成mongodb数据源
 2020-03-13 20:15:34 +08:00
water
a1eff2a362 del:删除dev yml 2020-03-13 19:20:49 +08:00
water
e9b9d5c554 #42 2020-03-13 19:17:35 +08:00
water
fe606866d1 fix:1.logback从yml中获取配置路径，2，添加dev-yml 2020-03-13 15:20:15 +08:00
water
959bd32044 add: 添加切面控制每个ç监控er的输入输出耗时 2020-03-13 09:50:35 +08:00
water
d8062519fe #40 2020-03-12 22:28:44 +08:00
walkerJing
72ea157cd9 hive column去掉``符号 2020-03-12 22:21:54 +08:00
water
1ff1911198 #36 2020-03-11 15:55:58 +08:00
water
e6aa86f2b9 #35 2020-03-11 15:10:13 +08:00
water
aeb916dbf8 merge:merge from origin 2020-03-10 20:51:56 +08:00
water
371ea6246b update:1,合并重复函数，2去掉无用泛型 2020-03-10 20:39:22 +08:00
fantasticKe
521485afb0 update: 避免column中包含SQL关键字导致DataX抛出SQLException 2020-03-10 16:56:11 +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-Jing
2c3b8b1e13 DataX设置超时时间对于超时任务kill该进程 2020-03-05 09:40:35 +08:00
water
3307fbc8d3 Merge branch 'master' of https://github.com/WeiYe-Jing/datax-web 2020-03-04 14:51:22 +08:00
water
1b74021a5e update 2020-03-04 14:50:50 +08:00