Browse code Merge branch 'master' into dev master
commit 94eeade64cbf67e26a9c6d6e653d5ae225d99ee5 2 parents 015253f + 60eb190 thinking_fioa authored on 4 Mar 2018

Showing 86 changed files

• README.md
• doc/XXL-JOB-English-Documentation.md
• doc/XXL-JOB官方文档.md
• doc/XXL-JOB架构图.pptx
• pom.xml
• xxl-job-admin/pom.xml
• xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.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/JobInfoController.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.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/enums/ExecutorFailStrategyEnum.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.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/thread/JobFailMonitorHelper.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/core/util/FtlUtil.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/LocalCacheUtil.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/MailUtil.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/PropertiesUtil.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/XxlJobLogDao.java
• xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.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/i18n/message.properties
• xxl-job-admin/src/main/resources/i18n/message_en.properties
• xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml
• xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml
• xxl-job-admin/src/main/resources/quartz.properties
• xxl-job-admin/src/main/resources/spring/applicationcontext-base.xml
• xxl-job-admin/src/main/resources/xxl-job-admin.properties
• xxl-job-admin/src/main/webapp/500.html
• xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.exception.ftl
• xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
• xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.result.ftl
• xxl-job-admin/src/main/webapp/WEB-INF/template/help.ftl
• xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl
• xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/jobcode.index.ftl
• xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl
• xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
• xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl
• xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl
• xxl-job-admin/src/main/webapp/WEB-INF/template/login.ftl
• xxl-job-admin/src/main/webapp/static/js/common.1.js
• xxl-job-admin/src/main/webapp/static/js/index.js
• xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js
• xxl-job-admin/src/main/webapp/static/js/jobgroup.index.1.js
• xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js
• xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js
• xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
• xxl-job-admin/src/main/webapp/static/js/login.1.js
• xxl-job-admin/src/main/webapp/static/plugins/layer/mobile/layer.js
• xxl-job-admin/src/main/webapp/static/plugins/layer/mobile/need/layer.css
• xxl-job-admin/src/test/java/com/xxl/job/admin/controller/JobInfoControllerTest.java
• xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java
• xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobLogDaoTest.java
• xxl-job-admin/src/test/java/com/xxl/job/admin/util/I18nUtilTest.java
• xxl-job-admin/src/test/java/com/xxl/job/admin/util/MailUtilTest.java
• xxl-job-admin/src/test/java/com/xxl/job/admin/util/PropertiesUtilTest.java
• xxl-job-core/pom.xml
• xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java
• xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java
• xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java
• xxl-job-core/src/main/java/com/xxl/job/core/thread/JobLogFileCleanThread.java
• xxl-job-core/src/main/java/com/xxl/job/core/util/FileUtil.java
• xxl-job-core/src/main/java/com/xxl/job/core/util/ScriptUtil.java
• xxl-job-executor-samples/pom.xml
• xxl-job-executor-samples/xxl-job-executor-sample-jfinal/pom.xml
• xxl-job-executor-samples/xxl-job-executor-sample-jfinal/src/main/java/com/xuxueli/executor/sample/jfinal/config/JFinalCoreConfig.java
• xxl-job-executor-samples/xxl-job-executor-sample-jfinal/src/main/resources/xxl-job-executor.properties
• xxl-job-executor-samples/xxl-job-executor-sample-nutz/pom.xml
• xxl-job-executor-samples/xxl-job-executor-sample-nutz/src/main/java/com/xuxueli/executor/sample/nutz/config/NutzSetup.java
• xxl-job-executor-samples/xxl-job-executor-sample-nutz/src/main/resources/xxl-job-executor.properties
• xxl-job-executor-samples/xxl-job-executor-sample-spring/pom.xml
• xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/applicationcontext-xxl-job.xml
• xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/xxl-job-executor.properties
• xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml
• xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java
• xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/application.properties

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/XXL-JOB架构图.pptx
Not supported

Ignore Space Show notes View pom.xml

Ignore Space Show notes View xxl-job-admin/pom.xml

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.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/JobInfoController.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/controller/interceptor/CookieInterceptor.java

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

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

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

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

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.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/thread/JobFailMonitorHelper.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/core/util/FtlUtil.java 0 → 100644

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

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

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

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

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/XxlJobLogDao.java

Ignore Space Show notes View xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.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/i18n/message.properties 0 → 100644

Ignore Space Show notes View xxl-job-admin/src/main/resources/i18n/message_en.properties 0 → 100644

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/XxlJobLogMapper.xml

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

Ignore Space Show notes View xxl-job-admin/src/main/resources/spring/applicationcontext-base.xml

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

Ignore Space Show notes View xxl-job-admin/src/main/webapp/500.html

Ignore Space Show notes View xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.exception.ftl

Ignore Space Show notes View xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl

Show notes View xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.result.ftl 100644 → 0

Ignore Space Show notes View xxl-job-admin/src/main/webapp/WEB-INF/template/help.ftl

Ignore Space Show notes View xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl

Ignore Space Show notes View xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/jobcode.index.ftl

Ignore Space Show notes View xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl

Ignore Space Show notes View xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl

Ignore Space Show notes View xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl

Ignore Space Show notes View xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl

Ignore Space Show notes View xxl-job-admin/src/main/webapp/WEB-INF/template/login.ftl

Ignore Space Show notes View xxl-job-admin/src/main/webapp/static/js/common.1.js

Ignore Space Show notes View xxl-job-admin/src/main/webapp/static/js/index.js

Ignore Space Show notes View xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js

Ignore Space Show notes View xxl-job-admin/src/main/webapp/static/js/jobgroup.index.1.js

Ignore Space Show notes View xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js

Ignore Space Show notes View xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js

Ignore Space Show notes View xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js

Ignore Space Show notes View xxl-job-admin/src/main/webapp/static/js/login.1.js

Show notes View xxl-job-admin/src/main/webapp/static/plugins/layer/mobile/layer.js 100755 → 0

Show notes View xxl-job-admin/src/main/webapp/static/plugins/layer/mobile/need/layer.css 100755 → 0

Ignore Space Show notes View xxl-job-admin/src/test/java/com/xxl/job/admin/controller/JobInfoControllerTest.java

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/XxlJobLogDaoTest.java

Ignore Space Show notes View xxl-job-admin/src/test/java/com/xxl/job/admin/util/I18nUtilTest.java 0 → 100644

Ignore Space Show notes View xxl-job-admin/src/test/java/com/xxl/job/admin/util/MailUtilTest.java

Show notes View xxl-job-admin/src/test/java/com/xxl/job/admin/util/PropertiesUtilTest.java 100644 → 0

Ignore Space Show notes View xxl-job-core/pom.xml

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/handler/impl/ScriptJobHandler.java

Ignore Space Show notes View xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java

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

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

Ignore Space Show notes View xxl-job-core/src/main/java/com/xxl/job/core/util/ScriptUtil.java

Ignore Space Show notes View xxl-job-executor-samples/pom.xml

Ignore Space Show notes View xxl-job-executor-samples/xxl-job-executor-sample-jfinal/pom.xml

Ignore Space Show notes View xxl-job-executor-samples/xxl-job-executor-sample-jfinal/src/main/java/com/xuxueli/executor/sample/jfinal/config/JFinalCoreConfig.java

Ignore Space Show notes View xxl-job-executor-samples/xxl-job-executor-sample-jfinal/src/main/resources/xxl-job-executor.properties

Ignore Space Show notes View xxl-job-executor-samples/xxl-job-executor-sample-nutz/pom.xml

Ignore Space Show notes View xxl-job-executor-samples/xxl-job-executor-sample-nutz/src/main/java/com/xuxueli/executor/sample/nutz/config/NutzSetup.java

Ignore Space Show notes View xxl-job-executor-samples/xxl-job-executor-sample-nutz/src/main/resources/xxl-job-executor.properties

Ignore Space Show notes View xxl-job-executor-samples/xxl-job-executor-sample-spring/pom.xml

Ignore Space Show notes View xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/applicationcontext-xxl-job.xml

Ignore Space Show notes View xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/xxl-job-executor.properties

Ignore Space Show notes View xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml

Ignore Space Show notes View xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java

Ignore Space Show notes View xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/application.properties

Show line notes below