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
..
src	Merge branch 'master' of https://github.com/waterWang/datax-web into waterWang-master	2019-11-23 11:20:40 +08:00
pom.xml	整合xxl-job	2019-11-18 15:42:55 +08:00