Commit Graph

14 Commits

Author SHA1 Message Date
weiye
9b3664717f git过滤打包文件 2020-06-15 13:54:25 +08:00
weiye
b5bb0214b2 iml文件删除 2020-06-15 13:52:49 +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
weiye
34044f52a4 用户权限代码恢复 2020-03-25 14:18:18 +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
walkerJing
f2ada5591f 更新mongodb构建json 2020-03-16 23:19:17 +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
weiye
1f8dc980b6 任务接口、日志接口参数调整
Security method过滤
登录返回参数修改
2019-12-09 22:30:15 +08:00
weiye
23d20c7f70 整合xxl-job 2019-11-18 15:42:55 +08:00
景文凯
10927238dd 执行方式修改 2019-08-29 10:49:19 +08:00
huzekang
2d42156793 change:
1. update test controller
2. merge origin
2019-05-05 16:41:50 +08:00
云时
53aea51289 add .gitignore 2018-05-15 17:12:05 +08:00