Browse code Merge remote-tracking branch 'upstream/master' # Conflicts: # xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java # xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobScheduler.java # xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java master
commit 8512a34469bf574b199268d855f7fd86a18d8fcc 2 parents 4fa63e3 + 6659ce1 Zhouchuanwen authored on 20 Nov 2019

Showing 44 changed files

• .github/workflows/maven.yml
• .travis.yml
• README.md
• doc/XXL-JOB-English-Documentation.md
• doc/XXL-JOB官方文档.md
• doc/db/tables_xxl_job.sql
• pom.xml
• xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobScheduler.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogGlue.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobRegistryDao.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
• xxl-job-admin/src/main/resources/application.properties
• xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml
• xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml
• xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml
• xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml
• xxl-job-admin/src/main/resources/templates/common/common.macro.ftl
• xxl-job-admin/src/main/resources/templates/login.ftl
• xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java
• xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogGlueDaoTest.java
• xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobRegistryDaoTest.java
• xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java
• xxl-job-admin/src/test/java/com/xxl/job/executor/ExecutorBizTest.java
• xxl-job-core/src/main/java/com/xxl/job/core/biz/AdminBiz.java
• xxl-job-core/src/main/java/com/xxl/job/core/biz/client/AdminBizClient.java
• xxl-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java
• xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java
• xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java
• xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java
• xxl-job-core/src/test/java/com/xxl/job/core/biz/impl/ExecutorBizImplTest.java

Ignore Space Show notes View .github/workflows/maven.yml 0 → 100644

Show notes View .travis.yml 100644 → 0

Ignore Space Show notes View README.md

Ignore Space Show notes View doc/XXL-JOB-English-Documentation.md

Ignore Space Show notes View doc/XXL-JOB官方文档.md

Ignore Space Show notes View doc/db/tables_xxl_job.sql

Ignore Space Show notes View pom.xml

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java

Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobScheduler.java 100644 → 0

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogGlue.java

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java 0 → 100644

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobRegistryDao.java

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java

Ignore Space Show notes View xxl-job-admin/src/main/resources/application.properties

Ignore Space Show notes View xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml

Ignore Space Show notes View xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml

Ignore Space Show notes View xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml

Ignore Space Show notes View xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml

Ignore Space Show notes View xxl-job-admin/src/main/resources/templates/common/common.macro.ftl

Ignore Space Show notes View xxl-job-admin/src/main/resources/templates/login.ftl

Ignore Space Show notes View xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java

Ignore Space Show notes View xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogGlueDaoTest.java

Ignore Space Show notes View xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobRegistryDaoTest.java

Ignore Space Show notes View xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java

Ignore Space Show notes View xxl-job-admin/src/test/java/com/xxl/job/executor/ExecutorBizTest.java

Ignore Space Show notes View xxl-job-core/src/main/java/com/xxl/job/core/biz/AdminBiz.java

Ignore Space Show notes View xxl-job-core/src/main/java/com/xxl/job/core/biz/client/AdminBizClient.java 0 → 100644

Ignore Space Show notes View xxl-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java

Ignore Space Show notes View xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java

Ignore Space Show notes View xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java

Ignore Space Show notes View xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java 0 → 100644

Ignore Space Show notes View xxl-job-core/src/test/java/com/xxl/job/core/biz/impl/ExecutorBizImplTest.java

Show line notes below