diff --git a/README.md b/README.md index 6c96a726..3de35d2c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,25 @@ git.osc地址：http://git.oschina.net/xuxueli0323/xxl-job 博客地址(内附使用教程)：http://www.cnblogs.com/xuxueli/p/5021979.html -# 基于quartz封装实现的的集群任务调度管理平台 - 1、简单：支持通过Web页面对任务进行CRUD操作，操作简单，一分钟上手 - 2、动态：支持动态修改任务状态，动态暂停/恢复任务，即时生效. - 3、集群：任务信息持久化到mysql中，支持Job服务器集群(高可用)，一个任务只会在其中一台服务器上执行 +# 特点：基于quartz封装实现的的集群任务调度管理平台 + 1、简单：支持通过Web页面对任务进行CRUD操作，操作简单，一分钟上手； + 2、动态：支持动态修改任务状态，动态暂停/恢复任务，即时生效； + 3、服务HA：任务信息持久化到mysql中，Job服务天然支持集群，保证服务HA； + 4、任务HA：某台Job服务挂掉，任务会平滑分配给其他的某一台存活服务，即使所有服务挂掉，重启时或补偿执行丢失任务； + 5、一个任务只会在其中一台服务器上执行； + 6、任务串行执行； + 7、支持任务执行日志； + 8、支持自定义参数； + +# 新版本 V1.2.x ：架构模块化 【开发中...】 + 说明：V1.2版本将系统架构按功能拆分为： + 调度模块[xxl-job-admin]：负责管理调度信息，按照调度配置发出调度请求； + 任务模块[xxl-job-client-demo]：负责接收调度请求并执行任务逻辑；任务模块可以方便的嵌入web项目，可以参考此demo； + 通讯模块[xxl-job-client]：负责调度模块和任务模块之间的信息通讯； + 优点： + 解耦：任务模块提供任务接口，调度模块维护调度信息，业务相互独立； + 高扩展性； + 稳定性； + + Tips：如果您追求一个简单调度服务，这里也提供了一个简洁分支[xxl-job-simple]，它针对旧版调度框架做了细微完善； + diff --git a/branch-dianping/README.md b/branch-dianping/README.md deleted file mode 100644 index 89fa00ed..00000000 --- a/branch-dianping/README.md +++ /dev/null @@ -1,11 +0,0 @@ -## dianping-job[任务调度平台] - - 分层： 调度和任务拆分, 支持动态扩充, 管理任务 - 1. 调度模块：dianping-job-web, 维护任务的调度信息，负责定时/周期性的发出调度请求. - 2. 任务模块：dianping-job-client, 具体的任务逻辑，负责接收调度模块的调度请求，执行任务逻辑. - 3. 通讯模块：dianping-job-client, 负责调度模块和任务模块之间的通讯. - - 说明： - 1. 调度模块集群部署[HA]. - 2. 任务串行执行. - 3. 记录调度日系. \ No newline at end of file diff --git a/branch-dianping/dianping-job-client-demo/src/main/resources/log4j.properties b/branch-dianping/dianping-job-client-demo/src/main/resources/log4j.properties deleted file mode 100644 index b02f63d0..00000000 --- a/branch-dianping/dianping-job-client-demo/src/main/resources/log4j.properties +++ /dev/null @@ -1,10 +0,0 @@ -log4j.rootLogger=info,console - -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d - dianping-job-client-demo - %p [%c] - <%m>%n - -log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender -log4j.appender.logFile.File=${catalina.base}/logs/dianping-job-client-demo.log -log4j.appender.logFile.layout=org.apache.log4j.PatternLayout -log4j.appender.logFile.layout.ConversionPattern=%d - dianping-job-client-demo - %p [%c] - <%m>%n diff --git a/branch-dianping/dianping-job-web/src/main/resources/log4j.properties b/branch-dianping/dianping-job-web/src/main/resources/log4j.properties deleted file mode 100644 index 7ae3b799..00000000 --- a/branch-dianping/dianping-job-web/src/main/resources/log4j.properties +++ /dev/null @@ -1,10 +0,0 @@ -log4j.rootLogger=info,console,logFile - -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d - dianping-job-web - %p [%c] - <%m>%n - -log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender -log4j.appender.logFile.File=${catalina.base}/logs/dianping-job-web.log -log4j.appender.logFile.layout=org.apache.log4j.PatternLayout -log4j.appender.logFile.layout.ConversionPattern=%d - dianping-job-web - %p [%c] - <%m>%n diff --git a/branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/job/help.ftl b/branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/job/help.ftl deleted file mode 100644 index ac18df2f..00000000 --- a/branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/job/help.ftl +++ /dev/null @@ -1,76 +0,0 @@ - - - - 调度中心 - <#import "/common/common.macro.ftl" as netCommon> - <@netCommon.commonStyle /> - - -
- - <@netCommon.commonHeader /> - - <@netCommon.commonLeft /> - - -
- -
-

使用教程调度管理平台

-
    -
  1. 调度中心
    2. -
  2. 使用教程
    3. -
-
- - -
-
-

简介：DIANPING_CLOCK

-

基于quartz封装实现的的集群任务调度管理平台.

-

-
-
-

特点：

-

1、简单：支持通过Web页面对任务进行CRUD操作，操作简单，一分钟上手.

-

2、动态：支持动态修改任务状态，动态暂停/恢复任务，即时生效.

-

3、集群：任务信息持久化到mysql中，支持Job服务器集群(高可用)，一个任务只会在其中一台服务器上执行.

-
- -
-

分层模型：

-

1、基础：基于quartz封装底层调度层，通过CORN自定义任务执行周期，最终执行自定义JobBean的execute方法，如需多个任务，需要开发多个JobBean实现.

-

2、分层：上述基础调度模型存在一定局限，调度层和任务层耦合，当新任务上线势必影响任务的正常调度，因此规划将调度系统分层为：调度层 + 任务层 + 通讯层.

-

-

-
-

》调度模块：维护任务的调度信息，负责定时/周期性的发出调度请求.

-

》任务模块：具体的任务逻辑，负责接收调度模块的调度请求，执行任务逻辑.

-

》通讯模块：负责调度模块和任务模块之间的通讯.

-

(总而言之，一条完整任务由 “调度信息” 和 “任务信息” 组成.)

-
-
-

-
- -
-

调度属性解析 : 发出HTTP调度请求

-

1、调度Key【必填】：调度信息的全局唯一标识.

-

2、调度Corn【必填】：调度执行的时间表达式.

-

3、调度描述【必填】：调度的简述.

-

4、调度URL【必填】：调度执行时发出HTTP请求的目标URL地址.

-

5、+args【选填】：调度执行时发出HTTP请求的附带的POST参数.

-
-
- -
- - - - <@netCommon.commonFooter /> - - <@netCommon.commonControl /> -
-<@netCommon.commonScript /> - - diff --git a/branch-dianping/doc/db/tables_mysql.sql b/branch-dianping/doc/db/tables_mysql.sql deleted file mode 100644 index ba85d2c5..00000000 --- a/branch-dianping/doc/db/tables_mysql.sql +++ /dev/null @@ -1,168 +0,0 @@ -# -# Quartz seems to work best with the driver mm.mysql-2.0.7-bin.jar -# -# PLEASE consider using mysql with innodb tables to avoid locking issues -# -# In your Quartz properties file, you'll need to set -# org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate -# - -DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS; -DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE; -DROP TABLE IF EXISTS QRTZ_LOCKS; -DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_SIMPROP_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_JOB_DETAILS; -DROP TABLE IF EXISTS QRTZ_CALENDARS; - - -CREATE TABLE QRTZ_JOB_DETAILS - ( - SCHED_NAME VARCHAR(120) NOT NULL, - JOB_NAME VARCHAR(200) NOT NULL, - JOB_GROUP VARCHAR(200) NOT NULL, - DESCRIPTION VARCHAR(250) NULL, - JOB_CLASS_NAME VARCHAR(250) NOT NULL, - IS_DURABLE VARCHAR(1) NOT NULL, - IS_NONCONCURRENT VARCHAR(1) NOT NULL, - IS_UPDATE_DATA VARCHAR(1) NOT NULL, - REQUESTS_RECOVERY VARCHAR(1) NOT NULL, - JOB_DATA BLOB NULL, - PRIMARY KEY (SCHED_NAME,JOB_NAME,JOB_GROUP) -); - -CREATE TABLE QRTZ_TRIGGERS - ( - SCHED_NAME VARCHAR(120) NOT NULL, - TRIGGER_NAME VARCHAR(200) NOT NULL, - TRIGGER_GROUP VARCHAR(200) NOT NULL, - JOB_NAME VARCHAR(200) NOT NULL, - JOB_GROUP VARCHAR(200) NOT NULL, - DESCRIPTION VARCHAR(250) NULL, - NEXT_FIRE_TIME BIGINT(13) NULL, - PREV_FIRE_TIME BIGINT(13) NULL, - PRIORITY INTEGER NULL, - TRIGGER_STATE VARCHAR(16) NOT NULL, - TRIGGER_TYPE VARCHAR(8) NOT NULL, - START_TIME BIGINT(13) NOT NULL, - END_TIME BIGINT(13) NULL, - CALENDAR_NAME VARCHAR(200) NULL, - MISFIRE_INSTR SMALLINT(2) NULL, - JOB_DATA BLOB NULL, - PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), - FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP) - REFERENCES QRTZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP) -); - -CREATE TABLE QRTZ_SIMPLE_TRIGGERS - ( - SCHED_NAME VARCHAR(120) NOT NULL, - TRIGGER_NAME VARCHAR(200) NOT NULL, - TRIGGER_GROUP VARCHAR(200) NOT NULL, - REPEAT_COUNT BIGINT(7) NOT NULL, - REPEAT_INTERVAL BIGINT(12) NOT NULL, - TIMES_TRIGGERED BIGINT(10) NOT NULL, - PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), - FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) - REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) -); - -CREATE TABLE QRTZ_CRON_TRIGGERS - ( - SCHED_NAME VARCHAR(120) NOT NULL, - TRIGGER_NAME VARCHAR(200) NOT NULL, - TRIGGER_GROUP VARCHAR(200) NOT NULL, - CRON_EXPRESSION VARCHAR(200) NOT NULL, - TIME_ZONE_ID VARCHAR(80), - PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), - FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) - REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) -); - -CREATE TABLE QRTZ_SIMPROP_TRIGGERS - ( - SCHED_NAME VARCHAR(120) NOT NULL, - TRIGGER_NAME VARCHAR(200) NOT NULL, - TRIGGER_GROUP VARCHAR(200) NOT NULL, - STR_PROP_1 VARCHAR(512) NULL, - STR_PROP_2 VARCHAR(512) NULL, - STR_PROP_3 VARCHAR(512) NULL, - INT_PROP_1 INT NULL, - INT_PROP_2 INT NULL, - LONG_PROP_1 BIGINT NULL, - LONG_PROP_2 BIGINT NULL, - DEC_PROP_1 NUMERIC(13,4) NULL, - DEC_PROP_2 NUMERIC(13,4) NULL, - BOOL_PROP_1 VARCHAR(1) NULL, - BOOL_PROP_2 VARCHAR(1) NULL, - PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), - FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) - REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) -); - -CREATE TABLE QRTZ_BLOB_TRIGGERS - ( - SCHED_NAME VARCHAR(120) NOT NULL, - TRIGGER_NAME VARCHAR(200) NOT NULL, - TRIGGER_GROUP VARCHAR(200) NOT NULL, - BLOB_DATA BLOB NULL, - PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), - FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) - REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) -); - -CREATE TABLE QRTZ_CALENDARS - ( - SCHED_NAME VARCHAR(120) NOT NULL, - CALENDAR_NAME VARCHAR(200) NOT NULL, - CALENDAR BLOB NOT NULL, - PRIMARY KEY (SCHED_NAME,CALENDAR_NAME) -); - -CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS - ( - SCHED_NAME VARCHAR(120) NOT NULL, - TRIGGER_GROUP VARCHAR(200) NOT NULL, - PRIMARY KEY (SCHED_NAME,TRIGGER_GROUP) -); - -CREATE TABLE QRTZ_FIRED_TRIGGERS - ( - SCHED_NAME VARCHAR(120) NOT NULL, - ENTRY_ID VARCHAR(95) NOT NULL, - TRIGGER_NAME VARCHAR(200) NOT NULL, - TRIGGER_GROUP VARCHAR(200) NOT NULL, - INSTANCE_NAME VARCHAR(200) NOT NULL, - FIRED_TIME BIGINT(13) NOT NULL, - SCHED_TIME BIGINT(13) NOT NULL, - PRIORITY INTEGER NOT NULL, - STATE VARCHAR(16) NOT NULL, - JOB_NAME VARCHAR(200) NULL, - JOB_GROUP VARCHAR(200) NULL, - IS_NONCONCURRENT VARCHAR(1) NULL, - REQUESTS_RECOVERY VARCHAR(1) NULL, - PRIMARY KEY (SCHED_NAME,ENTRY_ID) -); - -CREATE TABLE QRTZ_SCHEDULER_STATE - ( - SCHED_NAME VARCHAR(120) NOT NULL, - INSTANCE_NAME VARCHAR(200) NOT NULL, - LAST_CHECKIN_TIME BIGINT(13) NOT NULL, - CHECKIN_INTERVAL BIGINT(13) NOT NULL, - PRIMARY KEY (SCHED_NAME,INSTANCE_NAME) -); - -CREATE TABLE QRTZ_LOCKS - ( - SCHED_NAME VARCHAR(120) NOT NULL, - LOCK_NAME VARCHAR(40) NOT NULL, - PRIMARY KEY (SCHED_NAME,LOCK_NAME) -); - - -commit; diff --git a/branch-dianping/pom.xml b/branch-dianping/pom.xml deleted file mode 100644 index b7659262..00000000 --- a/branch-dianping/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - 4.0.0 - com.dianping - dianping-job - 0.0.1-SNAPSHOT - pom - - - dianping-job-web - dianping-job-client - dianping-job-client-demo - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.6 - 1.6 - UTF8 - - - - - - \ No newline at end of file diff --git a/branch-dianping/doc/db/tables_mysql-for-dianping-wed.sql b/doc/db/tables_mysql-for-dianping-wed.sql similarity index 100% rename from branch-dianping/doc/db/tables_mysql-for-dianping-wed.sql rename to doc/db/tables_mysql-for-dianping-wed.sql diff --git a/pom.xml b/pom.xml index 09f37cb3..83db59fd 100644 --- a/pom.xml +++ b/pom.xml @@ -3,10 +3,13 @@ 4.0.0 com.xxl xxl-job - 0.0.1-SNAPSHOT + 1.1.1-SNAPSHOT pom xxl-job-admin + xxl-job-client + xxl-job-client-demo + xxl-job-simple diff --git a/xxl-job-admin/.classpath b/xxl-job-admin/.classpath new file mode 100644 index 00000000..803d7e0d --- /dev/null +++ b/xxl-job-admin/.classpath @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xxl-job-admin/.gitignore b/xxl-job-admin/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/xxl-job-admin/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/xxl-job-admin/.project b/xxl-job-admin/.project new file mode 100644 index 00000000..6d8ec400 --- /dev/null +++ b/xxl-job-admin/.project @@ -0,0 +1,42 @@ + + + xxl-job-admin + + + + + + org.eclipse.wst.jsdt.core.javascriptValidator + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.jsdt.core.jsNature + + diff --git a/xxl-job-admin/.settings/.jsdtscope b/xxl-job-admin/.settings/.jsdtscope new file mode 100644 index 00000000..a2d71f4f --- /dev/null +++ b/xxl-job-admin/.settings/.jsdtscope @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/xxl-job-admin/.settings/org.eclipse.core.resources.prefs b/xxl-job-admin/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..8fd0b3a2 --- /dev/null +++ b/xxl-job-admin/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF8 diff --git a/xxl-job-admin/.settings/org.eclipse.jdt.core.prefs b/xxl-job-admin/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..62a317c8 --- /dev/null +++ b/xxl-job-admin/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/xxl-job-admin/.settings/org.eclipse.m2e.core.prefs b/xxl-job-admin/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..14b697b7 --- /dev/null +++ b/xxl-job-admin/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/xxl-job-admin/.settings/org.eclipse.wst.common.component b/xxl-job-admin/.settings/org.eclipse.wst.common.component new file mode 100644 index 00000000..31b4fad4 --- /dev/null +++ b/xxl-job-admin/.settings/org.eclipse.wst.common.component @@ -0,0 +1,13 @@ + + + + + + + + uses + + + + + diff --git a/xxl-job-admin/.settings/org.eclipse.wst.common.project.facet.core.xml b/xxl-job-admin/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 00000000..6f361dd8 --- /dev/null +++ b/xxl-job-admin/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/xxl-job-admin/.settings/org.eclipse.wst.jsdt.ui.superType.container b/xxl-job-admin/.settings/org.eclipse.wst.jsdt.ui.superType.container new file mode 100644 index 00000000..3bd5d0a4 --- /dev/null +++ b/xxl-job-admin/.settings/org.eclipse.wst.jsdt.ui.superType.container @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/xxl-job-admin/.settings/org.eclipse.wst.jsdt.ui.superType.name b/xxl-job-admin/.settings/org.eclipse.wst.jsdt.ui.superType.name new file mode 100644 index 00000000..05bd71b6 --- /dev/null +++ b/xxl-job-admin/.settings/org.eclipse.wst.jsdt.ui.superType.name @@ -0,0 +1 @@ +Window \ No newline at end of file diff --git a/xxl-job-admin/.settings/org.eclipse.wst.validation.prefs b/xxl-job-admin/.settings/org.eclipse.wst.validation.prefs new file mode 100644 index 00000000..6f1cba68 --- /dev/null +++ b/xxl-job-admin/.settings/org.eclipse.wst.validation.prefs @@ -0,0 +1,2 @@ +disabled=06target +eclipse.preferences.version=1 diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml index bd3e2f6d..4fd7a6df 100644 --- a/xxl-job-admin/pom.xml +++ b/xxl-job-admin/pom.xml @@ -4,11 +4,12 @@ com.xxl xxl-job - 0.0.1-SNAPSHOT + 1.1.1-SNAPSHOT xxl-job-admin + 1.1.2-SNAPSHOT war - + 3.2.14.RELEASE @@ -128,13 +129,20 @@ quartz 2.2.1 - + + org.apache.httpcomponents + httpclient + 4.3.6 + + + com.xxl - xxl-job-core - 0.0.1-SNAPSHOT + xxl-job-client + 1.1.2-SNAPSHOT - --> diff --git a/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/controller/IndexController.java b/xxl-job-admin/src/main/java/com/xxl/job/controller/IndexController.java similarity index 92% rename from branch-dianping/dianping-job-web/src/main/java/com/dianping/job/controller/IndexController.java rename to xxl-job-admin/src/main/java/com/xxl/job/controller/IndexController.java index fb2036c5..fc7fd83f 100644 --- a/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/controller/IndexController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/controller/IndexController.java @@ -1,4 +1,4 @@ -package com.dianping.job.controller; +package com.xxl.job.controller; import java.io.UnsupportedEncodingException; import java.util.HashMap; @@ -18,10 +18,10 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.dianping.job.client.handler.HandlerRepository; -import com.dianping.job.core.model.ReturnT; -import com.dianping.job.core.util.DynamicSchedulerUtil; -import com.dianping.job.service.job.HttpJobBean; +import com.xxl.job.client.handler.HandlerRepository; +import com.xxl.job.core.model.ReturnT; +import com.xxl.job.core.util.DynamicSchedulerUtil; +import com.xxl.job.service.job.HttpJobBean; /** * index controller diff --git a/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/model/ReturnT.java b/xxl-job-admin/src/main/java/com/xxl/job/core/model/ReturnT.java similarity index 91% rename from branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/model/ReturnT.java rename to xxl-job-admin/src/main/java/com/xxl/job/core/model/ReturnT.java index b09d49f1..aaeb3f51 100644 --- a/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/model/ReturnT.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/core/model/ReturnT.java @@ -1,4 +1,4 @@ -package com.dianping.job.core.model; +package com.xxl.job.core.model; /** * common return diff --git a/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/model/DianpingJobLog.java b/xxl-job-admin/src/main/java/com/xxl/job/core/model/XxlJobLog.java similarity index 86% rename from branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/model/DianpingJobLog.java rename to xxl-job-admin/src/main/java/com/xxl/job/core/model/XxlJobLog.java index 00671ad0..144a2e1c 100644 --- a/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/model/DianpingJobLog.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/core/model/XxlJobLog.java @@ -1,12 +1,12 @@ -package com.dianping.job.core.model; +package com.xxl.job.core.model; import java.util.Date; /** - * dianping job log, used to track trigger process + * xxl-job log, used to track trigger process * @author xuxueli 2015-12-19 23:19:09 */ -public class DianpingJobLog { +public class XxlJobLog { private String jobTriggerUuid; private String jobHandleName; @@ -70,7 +70,7 @@ public class DianpingJobLog { @Override public String toString() { - return "DianpingJobLog [jobTriggerUuid=" + jobTriggerUuid + ", jobHandleName=" + jobHandleName + return "XxlJobLog [jobTriggerUuid=" + jobTriggerUuid + ", jobHandleName=" + jobHandleName + ", triggerTime=" + triggerTime + ", triggerStatus=" + triggerStatus + ", triggerDetailLog=" + triggerDetailLog + ", handleTime=" + handleTime + ", handleStatus=" + handleStatus + ", handleDetailLog=" + handleDetailLog + "]"; diff --git a/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/util/DynamicSchedulerUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/core/util/DynamicSchedulerUtil.java similarity index 97% rename from branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/util/DynamicSchedulerUtil.java rename to xxl-job-admin/src/main/java/com/xxl/job/core/util/DynamicSchedulerUtil.java index c995b5c9..b1b696c0 100644 --- a/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/core/util/DynamicSchedulerUtil.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/core/util/DynamicSchedulerUtil.java @@ -1,4 +1,4 @@ -package com.dianping.job.core.util; +package com.xxl.job.core.util; import java.util.ArrayList; import java.util.Date; diff --git a/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/ITriggerService.java b/xxl-job-admin/src/main/java/com/xxl/job/service/ITriggerService.java similarity index 77% rename from branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/ITriggerService.java rename to xxl-job-admin/src/main/java/com/xxl/job/service/ITriggerService.java index a7ce637c..642aae86 100644 --- a/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/ITriggerService.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/service/ITriggerService.java @@ -1,4 +1,4 @@ -package com.dianping.job.service; +package com.xxl.job.service; /** * local trigger, only exists in local jvm diff --git a/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/impl/TriggerServiceImpl.java b/xxl-job-admin/src/main/java/com/xxl/job/service/impl/TriggerServiceImpl.java similarity index 70% rename from branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/impl/TriggerServiceImpl.java rename to xxl-job-admin/src/main/java/com/xxl/job/service/impl/TriggerServiceImpl.java index 361c2a44..1f92eaa5 100644 --- a/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/impl/TriggerServiceImpl.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/service/impl/TriggerServiceImpl.java @@ -1,10 +1,10 @@ -package com.dianping.job.service.impl; +package com.xxl.job.service.impl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import com.dianping.job.service.ITriggerService; +import com.xxl.job.service.ITriggerService; /** * local trigger, only exists in local jvm @@ -15,7 +15,7 @@ public class TriggerServiceImpl implements ITriggerService { private static transient Logger logger = LoggerFactory.getLogger(TriggerServiceImpl.class); public void beat() { - logger.info(">>>>>>>>>>> dianping-clock beat success."); + logger.info(">>>>>>>>>>> xxl-job beat success."); } } diff --git a/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/job/HttpJobBean.java b/xxl-job-admin/src/main/java/com/xxl/job/service/job/HttpJobBean.java similarity index 80% rename from branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/job/HttpJobBean.java rename to xxl-job-admin/src/main/java/com/xxl/job/service/job/HttpJobBean.java index 101cc396..d148ae77 100644 --- a/branch-dianping/dianping-job-web/src/main/java/com/dianping/job/service/job/HttpJobBean.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/service/job/HttpJobBean.java @@ -1,4 +1,4 @@ -package com.dianping.job.service.job; +package com.xxl.job.service.job; import java.io.IOException; import java.io.PrintWriter; @@ -27,10 +27,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.quartz.QuartzJobBean; -import com.dianping.job.client.handler.HandlerRepository; -import com.dianping.job.client.handler.IJobHandler.JobTriggerStatus; -import com.dianping.job.core.model.DianpingJobLog; -import com.dianping.job.core.util.DynamicSchedulerUtil; +import com.xxl.job.client.handler.HandlerRepository; +import com.xxl.job.client.handler.IJobHandler.JobTriggerStatus; +import com.xxl.job.core.model.XxlJobLog; +import com.xxl.job.core.util.DynamicSchedulerUtil; /** * http job bean @@ -58,17 +58,17 @@ public class HttpJobBean extends QuartzJobBean { String job_url = params.get(DynamicSchedulerUtil.job_url); triggerPost(job_url, params); - logger.info(">>>>>>>>>>> dianping-clock run :jobId:{}, group:{}, jobDataMap:{}", + logger.info(">>>>>>>>>>> xxl-job run :jobId:{}, group:{}, jobDataMap:{}", new Object[]{triggerKey, triggerGroup, jobDataMap}); } public static void triggerPost(String reqURL, Map params){ // save log - DianpingJobLog jobLog = new DianpingJobLog(); + XxlJobLog jobLog = new XxlJobLog(); jobLog.setJobTriggerUuid(UUID.randomUUID().toString()); jobLog.setJobHandleName(params.get(HandlerRepository.handleName)); jobLog.setTriggerTime(new Date()); - logger.info(">>>>>>>>>>> dianping-clock trigger start :jobLog:{}", jobLog); + logger.info(">>>>>>>>>>> xxl-job trigger start :jobLog:{}", jobLog); // post String responseContent = null; @@ -91,7 +91,7 @@ public class HttpJobBean extends QuartzJobBean { responseContent = EntityUtils.toString(entity, "UTF-8"); EntityUtils.consume(entity); } - logger.info(">>>>>>>>>>> dianping-clock trigger ing :jobLog:{}, response:{}, responseContent:{}", jobLog, response, responseContent); + logger.info(">>>>>>>>>>> xxl-job trigger ing :jobLog:{}, response:{}, responseContent:{}", jobLog, response, responseContent); } catch (Exception e) { e.printStackTrace(); @@ -117,17 +117,17 @@ public class HttpJobBean extends QuartzJobBean { jobLog.setTriggerDetailLog(jobLog.getTriggerDetailLog().substring(0, 1000)); } - logger.info(">>>>>>>>>>> dianping-clock trigger end :jobLog:{}", jobLog); + logger.info(">>>>>>>>>>> xxl-job trigger end :jobLog:{}", jobLog); } } public static void main(String[] args) { - String url = "http://localhost:8080/dianping-job-client-demo/dianpingJobServlet"; + String url = "http://localhost:8080/xxl-job-client-demo/xxlJobServlet"; for (int i = 0; i < 3; i++) { Map params = new HashMap(); - params.put(HandlerRepository.handleName, "com.dianping.job.service.handler.DemoJobHandler"); + params.put(HandlerRepository.handleName, "com.xxl.job.service.handler.DemoJobHandler"); params.put(HandlerRepository.triggerUuid, i+""); params.put("key", i+""); diff --git a/xxl-job-admin/src/main/resources/applicationcontext-base.xml b/xxl-job-admin/src/main/resources/applicationcontext-base.xml index e63b7982..a05aeeea 100644 --- a/xxl-job-admin/src/main/resources/applicationcontext-base.xml +++ b/xxl-job-admin/src/main/resources/applicationcontext-base.xml @@ -10,7 +10,7 @@ http://www.springframework.org/schema/util/spring-util.xsd"> - + @@ -19,11 +19,6 @@ - - - - - diff --git a/xxl-job-admin/src/main/resources/applicationcontext-database.xml b/xxl-job-admin/src/main/resources/applicationcontext-database.xml index cdb291a1..a72057d1 100644 --- a/xxl-job-admin/src/main/resources/applicationcontext-database.xml +++ b/xxl-job-admin/src/main/resources/applicationcontext-database.xml @@ -15,7 +15,6 @@ - @@ -35,7 +34,7 @@ - + diff --git a/xxl-job-admin/src/main/resources/applicationcontext-trigger-db.xml b/xxl-job-admin/src/main/resources/applicationcontext-trigger-db.xml index f3ba1019..58e268f7 100644 --- a/xxl-job-admin/src/main/resources/applicationcontext-trigger-db.xml +++ b/xxl-job-admin/src/main/resources/applicationcontext-trigger-db.xml @@ -9,37 +9,16 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/xxl-job-admin/src/main/resources/applicationcontext-trigger-local.xml b/xxl-job-admin/src/main/resources/applicationcontext-trigger-local.xml index cf0f3c8d..911aba64 100644 --- a/xxl-job-admin/src/main/resources/applicationcontext-trigger-local.xml +++ b/xxl-job-admin/src/main/resources/applicationcontext-trigger-local.xml @@ -20,11 +20,11 @@ - - + + - + diff --git a/xxl-job-admin/src/main/resources/applicationcontext-tx.xml b/xxl-job-admin/src/main/resources/applicationcontext-tx.xml index 2511344b..709ad8ca 100644 --- a/xxl-job-admin/src/main/resources/applicationcontext-tx.xml +++ b/xxl-job-admin/src/main/resources/applicationcontext-tx.xml @@ -12,15 +12,12 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd"> - - - @@ -33,11 +30,8 @@ - - - diff --git a/xxl-job-admin/src/main/resources/log4j.properties b/xxl-job-admin/src/main/resources/log4j.properties index 60ca14ad..f31fe38f 100644 --- a/xxl-job-admin/src/main/resources/log4j.properties +++ b/xxl-job-admin/src/main/resources/log4j.properties @@ -1,10 +1,10 @@ -log4j.rootLogger=info,console +log4j.rootLogger=info,console,logFile log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d - xxl-job-demo - %p [%c] - <%m>%n +log4j.appender.console.layout.ConversionPattern=%d - xxl-job-admin - %p [%c] - <%m>%n log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender -log4j.appender.logFile.File=${catalina.base}/logs/xxl-job-demo.log +log4j.appender.logFile.File=${catalina.base}/logs/xxl-job-admin.log log4j.appender.logFile.layout=org.apache.log4j.PatternLayout -log4j.appender.logFile.layout.ConversionPattern=%d - xxl-job-demo - %p [%c] - <%m>%n +log4j.appender.logFile.layout.ConversionPattern=%d - xxl-job-admin - %p [%c] - <%m>%n diff --git a/xxl-job-admin/src/main/resources/quartz.properties b/xxl-job-admin/src/main/resources/quartz.properties index a1e68509..ecda6e90 100644 --- a/xxl-job-admin/src/main/resources/quartz.properties +++ b/xxl-job-admin/src/main/resources/quartz.properties @@ -18,6 +18,7 @@ org.quartz.jobStore.misfireThreshold: 60000 #org.quartz.jobStore.class: org.quartz.simpl.RAMJobStore # for cluster +#org.quartz.jobStore.tablePrefix = WED_qrtz_ org.quartz.scheduler.instanceId: AUTO org.quartz.jobStore.class: org.quartz.impl.jdbcjobstore.JobStoreTX org.quartz.jobStore.isClustered: true diff --git a/xxl-job-admin/src/main/resources/springmvc-context.xml b/xxl-job-admin/src/main/resources/springmvc-context.xml index b44ff95f..6d7548c3 100644 --- a/xxl-job-admin/src/main/resources/springmvc-context.xml +++ b/xxl-job-admin/src/main/resources/springmvc-context.xml @@ -18,34 +18,35 @@ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd"> - Spring-web MVC配置 - - + - - + + - - + + - - - - - + + + + + - + + --> \ No newline at end of file diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl index 94a4347e..bf6f235f 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl @@ -37,8 +37,6 @@ - - @@ -47,81 +45,15 @@ <#macro commonHeader>
- - - - -
- <#macro commonLeft> @@ -131,20 +63,9 @@
@@ -234,8 +155,8 @@ Version 1.0 Copyright © 2015-2015   - github  - cnblog. + github  + cnblog. All rights reserved. diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/job/help.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/job/help.ftl index 0c72e977..9ce7eaf6 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/job/help.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/job/help.ftl @@ -1,7 +1,7 @@ - AdminLTE 2 | Dashboard + 调度中心 <#import "/common/common.macro.ftl" as netCommon> <@netCommon.commonStyle /> @@ -26,18 +26,41 @@
-

简介：xxl-job

-

调度管理平台：基于quartz封装实现的的集群任务调度管理平台.

+

简介：XXL_JOB

+

基于quartz封装实现的的集群任务调度管理平台.

- -
+

特点：

1、简单：支持通过Web页面对任务进行CRUD操作，操作简单，一分钟上手.

2、动态：支持动态修改任务状态，动态暂停/恢复任务，即时生效.

3、集群：任务信息持久化到mysql中，支持Job服务器集群(高可用)，一个任务只会在其中一台服务器上执行.

+
+

分层模型：

+

1、基础：基于quartz封装底层调度层，通过CORN自定义任务执行周期，最终执行自定义JobBean的execute方法，如需多个任务，需要开发多个JobBean实现.

+

2、分层：上述基础调度模型存在一定局限，调度层和任务层耦合，当新任务上线势必影响任务的正常调度，因此规划将调度系统分层为：调度层 + 任务层 + 通讯层.

+

+

+
+

》调度模块：维护任务的调度信息，负责定时/周期性的发出调度请求.

+

》任务模块：具体的任务逻辑，负责接收调度模块的调度请求，执行任务逻辑.

+

》通讯模块：负责调度模块和任务模块之间的通讯.

+

(总而言之，一条完整任务由 “调度信息” 和 “任务信息” 组成.)

+
+
+

+
+ +
+

调度属性解析 : 发出HTTP调度请求

+

1、调度Key【必填】：调度信息的全局唯一标识.

+

2、调度Corn【必填】：调度执行的时间表达式.

+

3、调度描述【必填】：调度的简述.

+

4、调度URL【必填】：调度执行时发出HTTP请求的目标URL地址.

+

5、+args【选填】：调度执行时发出HTTP请求的附带的POST参数.

+
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/job/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/job/index.ftl index e5fedb3a..62c41fb5 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/job/index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/job/index.ftl @@ -19,10 +19,10 @@
-

使用教程调度管理平台

+

调度中心调度管理

  1. 调度中心
    2. -
  2. 使用教程
    3. +
  3. 调度管理
@@ -32,17 +32,17 @@
-

任务列表

- +

调度列表

+
- + - - + + @@ -53,11 +53,13 @@ - + @@ -87,10 +90,10 @@ - + - - + + @@ -114,30 +117,35 @@
-

新增调度任务

+

新增调度信息

- -
+ +
- -
+ +
- -
+ +
- -
+ +
-
+ +
+
+
+
+
@@ -151,7 +159,7 @@
-

更新配置

+

更新corn

@@ -163,14 +171,6 @@
-
- -
-
-
- -
-
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/web.xml b/xxl-job-admin/src/main/webapp/WEB-INF/web.xml index cf68c167..9e5c87b0 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/web.xml +++ b/xxl-job-admin/src/main/webapp/WEB-INF/web.xml @@ -4,6 +4,10 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5"> xxl-job-admin + + webAppRootKey + xxl-job-admin + contextConfigLocation diff --git a/xxl-job-admin/src/main/webapp/static/js/job.index.1.js b/xxl-job-admin/src/main/webapp/static/js/job.index.1.js index b6936259..33a22e1d 100644 --- a/xxl-job-admin/src/main/webapp/static/js/job.index.1.js +++ b/xxl-job-admin/src/main/webapp/static/js/job.index.1.js @@ -41,6 +41,9 @@ $(function() { } else if ("job_del" == type) { typeName = "删除"; url = base_url + "/job/remove"; + } else if ("job_trigger" == type) { + typeName = "执行一次"; + url = base_url + "/job/trigger"; } else { return; } @@ -70,9 +73,16 @@ $(function() { }); }); + // jquery.validate 自定义校验 “英文字母开头，只含有英文字母、数字和下划线” + jQuery.validator.addMethod("myValid01", function(value, element) { + var length = value.length; + var valid = /^[a-zA-Z][a-zA-Z0-9_]*$/; + return this.optional(element) || valid.test(value); + }, "只支持英文字母开头，只含有英文字母、数字和下划线"); + // 新增 $(".add").click(function(){ - $('#addModal').modal('show'); + $('#addModal').modal({backdrop: false, keyboard: false}).modal('show'); }); var addModalValidate = $("#addModal .form").validate({ errorElement : 'span', @@ -82,17 +92,22 @@ $(function() { triggerKeyName : { required : true , minlength: 4, - maxlength: 100 + maxlength: 100, + myValid01:true }, cronExpression : { required : true , maxlength: 100 }, - jobClassName : { + job_desc : { required : true , - maxlength: 100 - }, - jobDesc : { + maxlength: 200 + }, + job_url : { + required : true , + maxlength: 200 + }, + handleName : { required : true , maxlength: 200 } @@ -100,20 +115,24 @@ $(function() { messages : { triggerKeyName : { required :"请输入“任务Key”." , - minlength:"“任务Key”不应低于4位", - maxlength:"“任务Key”不应超过100位" + minlength:"“任务Key”长度不应低于4位", + maxlength:"“任务Key”长度不应超过100位" }, cronExpression : { required :"请输入“任务Corn”." , - maxlength:"“任务Corn”不应超过100位" + maxlength:"“任务Corn”长度不应超过100位" }, - jobClassName : { - required :"请输入“任务Impl”." , - maxlength:"“任务Impl”不应超过100位" - }, - jobDesc : { + job_desc : { required :"请输入“任务描述”." , - maxlength:"“任务描述”不应超过200位" + maxlength:"“任务描述”长度不应超过200位" + }, + job_url : { + required :"请输入“任务URL”." , + maxlength:"“任务URL”长度不应超过200位" + }, + handleName : { + required : "请输入“任务handler”." , + maxlength: "“任务handler”长度不应超过200位" } }, highlight : function(element) { @@ -127,32 +146,77 @@ $(function() { element.parent('div').append(error); }, submitHandler : function(form) { - $.post(base_url + "/job/add", $("#addModal .form").serialize(), function(data, status) { - if (data.code == "200") { - ComAlert.show(1, "新增调度任务成功", function(){ - window.location.reload(); - }); - } else { - if (data.msg) { - ComAlert.show(2, data.msg); - } else { - ComAlert.show(2, "新增失败"); + + var triggerKeyName = $('#addModal input[name="triggerKeyName"]').val(); + var cronExpression = $('#addModal input[name="cronExpression"]').val(); + var job_desc = $('#addModal input[name="job_desc"]').val(); + var job_url = $('#addModal input[name="job_url"]').val(); + var handleName = $('#addModal input[name="handleName"]').val(); + + var paramStr = 'triggerKeyName=' + triggerKeyName + + '&cronExpression=' + cronExpression + + '&job_desc=' + job_desc + + '&job_url=' + job_url + + '&handleName=' + handleName; + + var ifFin = true; + $('#addModal .newParam').each(function(){ + ifFin = false; + var key = $(this).find('input[name="key"]').val(); + var value = $(this).find('input[name="value"]').val(); + if (!key) { + ComAlert.show(2, "新增参数key不可为空"); + return; + } else { + if(!/^[a-zA-Z][a-zA-Z0-9_]*$/.test(key)){ + ComAlert.show(2, "新增参数key不合法, 只支持英文字母开头，只含有英文字母、数字和下划线"); + return; } - } - }); + } + paramStr += "&" + key + "=" + value; + ifFin = true; + }); + + if(ifFin){ + $.post(base_url + "/job/add", paramStr, function(data, status) { + if (data.code == "200") { + ComAlert.show(1, "新增调度任务成功", function(){ + window.location.reload(); + }); + } else { + if (data.msg) { + ComAlert.show(2, data.msg); + } else { + ComAlert.show(2, "新增失败"); + } + } + }); + } } }); $("#addModal").on('hide.bs.modal', function () { $("#addModal .form")[0].reset() }); + // 新增-添加参数 + $("#addModal .addParam").on('click', function () { + var html = '
'+ + ''+ + '
'+ + '
'+ + '
'; + $(this).parents('.form-group').parent().append(html); + + $("#addModal .removeParam").on('click', function () { + $(this).parents('.form-group').remove(); + }); + }); + // 更新 $(".update").click(function(){ $("#updateModal .form input[name='triggerKeyName']").val($(this).parent('p').attr("name")); $("#updateModal .form input[name='cronExpression']").val($(this).parent('p').attr("cronExpression")); - $("#updateModal .form input[name='jobClassName']").val($(this).parent('p').attr("jobClassName")); - $("#updateModal .form input[name='jobDesc']").val($(this).parent('p').attr("jobDesc")); - $('#updateModal').modal('show'); + $('#updateModal').modal({backdrop: false, keyboard: false}).modal('show'); }); var updateModalValidate = $("#updateModal .form").validate({ errorElement : 'span', @@ -167,14 +231,6 @@ $(function() { cronExpression : { required : true , maxlength: 100 - }, - jobClassName : { - required : true , - maxlength: 100 - }, - jobDesc : { - required : true , - maxlength: 200 } }, messages : { @@ -186,14 +242,6 @@ $(function() { cronExpression : { required :"请输入“任务Corn”." , maxlength:"“任务Corn”不应超过100位" - }, - jobClassName : { - required :"请输入“任务Impl”." , - maxlength:"“任务Impl”不应超过100位" - }, - jobDesc : { - required :"请输入“任务描述”." , - maxlength:"“任务描述”不应超过200位" } }, highlight : function(element) { diff --git a/xxl-job-client-demo/.classpath b/xxl-job-client-demo/.classpath new file mode 100644 index 00000000..803d7e0d --- /dev/null +++ b/xxl-job-client-demo/.classpath @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xxl-job-client-demo/.gitignore b/xxl-job-client-demo/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/xxl-job-client-demo/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/xxl-job-client-demo/.project b/xxl-job-client-demo/.project new file mode 100644 index 00000000..c293ddf1 --- /dev/null +++ b/xxl-job-client-demo/.project @@ -0,0 +1,42 @@ + + + xxl-job-client-demo + + + + + + org.eclipse.wst.jsdt.core.javascriptValidator + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.jsdt.core.jsNature + + diff --git a/xxl-job-client-demo/.settings/.jsdtscope b/xxl-job-client-demo/.settings/.jsdtscope new file mode 100644 index 00000000..a2d71f4f --- /dev/null +++ b/xxl-job-client-demo/.settings/.jsdtscope @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/xxl-job-client-demo/.settings/org.eclipse.core.resources.prefs b/xxl-job-client-demo/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..8fd0b3a2 --- /dev/null +++ b/xxl-job-client-demo/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF8 diff --git a/xxl-job-client-demo/.settings/org.eclipse.jdt.core.prefs b/xxl-job-client-demo/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..62a317c8 --- /dev/null +++ b/xxl-job-client-demo/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/xxl-job-client-demo/.settings/org.eclipse.m2e.core.prefs b/xxl-job-client-demo/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..14b697b7 --- /dev/null +++ b/xxl-job-client-demo/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/xxl-job-client-demo/.settings/org.eclipse.wst.common.component b/xxl-job-client-demo/.settings/org.eclipse.wst.common.component new file mode 100644 index 00000000..2ce4810f --- /dev/null +++ b/xxl-job-client-demo/.settings/org.eclipse.wst.common.component @@ -0,0 +1,13 @@ + + + + + + + + uses + + + + + diff --git a/xxl-job-client-demo/.settings/org.eclipse.wst.common.project.facet.core.xml b/xxl-job-client-demo/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 00000000..6f361dd8 --- /dev/null +++ b/xxl-job-client-demo/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/xxl-job-client-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container b/xxl-job-client-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container new file mode 100644 index 00000000..3bd5d0a4 --- /dev/null +++ b/xxl-job-client-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/xxl-job-client-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name b/xxl-job-client-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name new file mode 100644 index 00000000..05bd71b6 --- /dev/null +++ b/xxl-job-client-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name @@ -0,0 +1 @@ +Window \ No newline at end of file diff --git a/xxl-job-client-demo/.settings/org.eclipse.wst.validation.prefs b/xxl-job-client-demo/.settings/org.eclipse.wst.validation.prefs new file mode 100644 index 00000000..6f1cba68 --- /dev/null +++ b/xxl-job-client-demo/.settings/org.eclipse.wst.validation.prefs @@ -0,0 +1,2 @@ +disabled=06target +eclipse.preferences.version=1 diff --git a/branch-dianping/dianping-job-client-demo/pom.xml b/xxl-job-client-demo/pom.xml similarity index 81% rename from branch-dianping/dianping-job-client-demo/pom.xml rename to xxl-job-client-demo/pom.xml index cbfbdaac..8e779cc2 100644 --- a/branch-dianping/dianping-job-client-demo/pom.xml +++ b/xxl-job-client-demo/pom.xml @@ -2,14 +2,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.dianping - dianping-job - 0.0.1-SNAPSHOT + com.xxl + xxl-job + 1.1.1-SNAPSHOT - dianping-job-client-demo + xxl-job-client-demo + 1.1.2-SNAPSHOT war - dianping-job-client-demo - http://maven.apache.org 3.2.14.RELEASE @@ -52,11 +51,11 @@ 1.7.5 - + - com.dianping - dianping-job-client - 1.0.1-SNAPSHOT + com.xxl + xxl-job-client + 1.1.2-SNAPSHOT diff --git a/branch-dianping/dianping-job-client-demo/src/main/java/com/dianping/job/service/handler/DemoJobHandler.java b/xxl-job-client-demo/src/main/java/com/xxl/job/service/handler/DemoJobHandler.java similarity index 82% rename from branch-dianping/dianping-job-client-demo/src/main/java/com/dianping/job/service/handler/DemoJobHandler.java rename to xxl-job-client-demo/src/main/java/com/xxl/job/service/handler/DemoJobHandler.java index a3d83885..4d5c66eb 100644 --- a/branch-dianping/dianping-job-client-demo/src/main/java/com/dianping/job/service/handler/DemoJobHandler.java +++ b/xxl-job-client-demo/src/main/java/com/xxl/job/service/handler/DemoJobHandler.java @@ -1,4 +1,4 @@ -package com.dianping.job.service.handler; +package com.xxl.job.service.handler; import java.util.Map; import java.util.Random; @@ -8,8 +8,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import com.dianping.job.client.handler.HandlerRepository; -import com.dianping.job.client.handler.IJobHandler; +import com.xxl.job.client.handler.HandlerRepository; +import com.xxl.job.client.handler.IJobHandler; /** * demo job handler diff --git a/branch-dianping/dianping-job-client-demo/src/main/resources/applicationcontext-base.xml b/xxl-job-client-demo/src/main/resources/applicationcontext-base.xml similarity index 85% rename from branch-dianping/dianping-job-client-demo/src/main/resources/applicationcontext-base.xml rename to xxl-job-client-demo/src/main/resources/applicationcontext-base.xml index 55e2d377..047d065c 100644 --- a/branch-dianping/dianping-job-client-demo/src/main/resources/applicationcontext-base.xml +++ b/xxl-job-client-demo/src/main/resources/applicationcontext-base.xml @@ -9,7 +9,6 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> - - + \ No newline at end of file diff --git a/xxl-job-client-demo/src/main/resources/log4j.properties b/xxl-job-client-demo/src/main/resources/log4j.properties new file mode 100644 index 00000000..a79ff48f --- /dev/null +++ b/xxl-job-client-demo/src/main/resources/log4j.properties @@ -0,0 +1,10 @@ +log4j.rootLogger=info,console + +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d - xxl-job-client-demo - %p [%c] - <%m>%n + +log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender +log4j.appender.logFile.File=${catalina.base}/logs/xxl-job-client-demo.log +log4j.appender.logFile.layout=org.apache.log4j.PatternLayout +log4j.appender.logFile.layout.ConversionPattern=%d - xxl-job-client-demo - %p [%c] - <%m>%n diff --git a/branch-dianping/dianping-job-client-demo/src/main/webapp/WEB-INF/web.xml b/xxl-job-client-demo/src/main/webapp/WEB-INF/web.xml similarity index 68% rename from branch-dianping/dianping-job-client-demo/src/main/webapp/WEB-INF/web.xml rename to xxl-job-client-demo/src/main/webapp/WEB-INF/web.xml index 2c747e73..49d0a282 100644 --- a/branch-dianping/dianping-job-client-demo/src/main/webapp/WEB-INF/web.xml +++ b/xxl-job-client-demo/src/main/webapp/WEB-INF/web.xml @@ -3,7 +3,11 @@ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5"> - + + webAppRootKey + xxl-job-client-demo + + contextConfigLocation classpath*:applicationcontext-*.xml @@ -16,18 +20,17 @@ org.springframework.web.context.ContextLoaderListener - + - DianpingJobServlet - com.dianping.job.client.netcom.http.DianpingJobServlet + XxlJobServlet + com.xxl.job.client.netcom.http.XxlJobServlet 1 - DianpingJobServlet - /dianpingJobServlet + XxlJobServlet + /xxlJobServlet - clock-job-web index.html diff --git a/branch-dianping/dianping-job-client-demo/src/main/webapp/index.html b/xxl-job-client-demo/src/main/webapp/index.html similarity index 100% rename from branch-dianping/dianping-job-client-demo/src/main/webapp/index.html rename to xxl-job-client-demo/src/main/webapp/index.html diff --git a/xxl-job-client/.classpath b/xxl-job-client/.classpath new file mode 100644 index 00000000..b46ac092 --- /dev/null +++ b/xxl-job-client/.classpath @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xxl-job-client/.gitignore b/xxl-job-client/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/xxl-job-client/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/xxl-job-client/.project b/xxl-job-client/.project new file mode 100644 index 00000000..3025ece1 --- /dev/null +++ b/xxl-job-client/.project @@ -0,0 +1,36 @@ + + + xxl-job-client + + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + + diff --git a/xxl-job-client/.settings/org.eclipse.core.resources.prefs b/xxl-job-client/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..8fd0b3a2 --- /dev/null +++ b/xxl-job-client/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF8 diff --git a/xxl-job-client/.settings/org.eclipse.jdt.core.prefs b/xxl-job-client/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..62a317c8 --- /dev/null +++ b/xxl-job-client/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/xxl-job-client/.settings/org.eclipse.m2e.core.prefs b/xxl-job-client/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..14b697b7 --- /dev/null +++ b/xxl-job-client/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/xxl-job-client/.settings/org.eclipse.wst.common.component b/xxl-job-client/.settings/org.eclipse.wst.common.component new file mode 100644 index 00000000..7ff9858d --- /dev/null +++ b/xxl-job-client/.settings/org.eclipse.wst.common.component @@ -0,0 +1,5 @@ + + + + + diff --git a/xxl-job-client/.settings/org.eclipse.wst.common.project.facet.core.xml b/xxl-job-client/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 00000000..0ae79700 --- /dev/null +++ b/xxl-job-client/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/xxl-job-client/.settings/org.eclipse.wst.validation.prefs b/xxl-job-client/.settings/org.eclipse.wst.validation.prefs new file mode 100644 index 00000000..6f1cba68 --- /dev/null +++ b/xxl-job-client/.settings/org.eclipse.wst.validation.prefs @@ -0,0 +1,2 @@ +disabled=06target +eclipse.preferences.version=1 diff --git a/branch-dianping/dianping-job-client/pom.xml b/xxl-job-client/pom.xml similarity index 84% rename from branch-dianping/dianping-job-client/pom.xml rename to xxl-job-client/pom.xml index 8c1a5779..b60cb83d 100644 --- a/branch-dianping/dianping-job-client/pom.xml +++ b/xxl-job-client/pom.xml @@ -2,14 +2,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.dianping - dianping-job - 0.0.1-SNAPSHOT + com.xxl + xxl-job + 1.1.1-SNAPSHOT - dianping-job-client - 1.0.1-SNAPSHOT - dianping-job-client - http://maven.apache.org + xxl-job-client + 1.1.2-SNAPSHOT diff --git a/branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/handler/HandlerRepository.java b/xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerRepository.java similarity index 84% rename from branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/handler/HandlerRepository.java rename to xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerRepository.java index 2050f542..ff983708 100644 --- a/branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/handler/HandlerRepository.java +++ b/xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerRepository.java @@ -1,4 +1,4 @@ -package com.dianping.job.client.handler; +package com.xxl.job.client.handler; import java.io.PrintWriter; import java.io.StringWriter; @@ -10,8 +10,9 @@ import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.dianping.job.client.handler.IJobHandler.JobHandleStatus; -import com.dianping.job.client.handler.IJobHandler.JobTriggerStatus; +import com.xxl.job.client.handler.IJobHandler.JobHandleStatus; +import com.xxl.job.client.handler.IJobHandler.JobTriggerStatus; + /** * handler repository @@ -38,7 +39,7 @@ public class HandlerRepository { HandlerThread handlerThread = new HandlerThread(handleName); handlerThread.start(); handlerTreadMap.put(handleName, handlerThread); - logger.info(">>>>>>>>>>> dianping-job regist handler success, handleName:{}, handler:{}, handlerDateQueue:{}, handlerThread:{}", + logger.info(">>>>>>>>>>> xxl-job regist handler success, handleName:{}, handler:{}, handlerDateQueue:{}, handlerThread:{}", new Object[]{handleName, handler, handlerDateQueue, handlerThread}); } @@ -71,7 +72,7 @@ public class HandlerRepository { jobHandleDetail = out.toString(); } String _triggerUuid = handlerDate.get(triggerUuid); - logger.info("<<<<<<<<<<< dianping-job thread handle, _triggerUuid:{}, _handleName:{}, jobHandleStatus:{}, jobHandleDetail:{}, thread:{}", + logger.info("<<<<<<<<<<< xxl-job thread handle, _triggerUuid:{}, _handleName:{}, jobHandleStatus:{}, jobHandleDetail:{}, thread:{}", new Object[]{_triggerUuid, _handleName, jobHandleStatus, jobHandleDetail, this}); } else { try { @@ -98,7 +99,7 @@ public class HandlerRepository { if (handlerDateQueue == null) { handlerDateQueue = new LinkedBlockingQueue>(); handlerDataQueueMap.put(handleName, handlerDateQueue); - logger.info(">>>>>>>>>>> dianping-job handler lazy fresh handlerDateQueue, handleName:{}, handler:{}, handlerDateQueue:{}", + logger.info(">>>>>>>>>>> xxl-job handler lazy fresh handlerDateQueue, handleName:{}, handler:{}, handlerDateQueue:{}", new Object[]{handleName, handler, handlerDateQueue}); } handlerDateQueue.offer(_param); @@ -109,7 +110,7 @@ public class HandlerRepository { HandlerThread handlerThread = new HandlerThread(handleName); handlerThread.start(); handlerTreadMap.put(handleName, handlerThread); - logger.info(">>>>>>>>>>> dianping-job handler lazy fresh thread, handleName:{}, handler:{}, handlerThread:{}", + logger.info(">>>>>>>>>>> xxl-job handler lazy fresh thread, handleName:{}, handler:{}, handlerThread:{}", new Object[]{handleName, handler, handlerThread}); } _triggerStatus = JobTriggerStatus.SUCCESS; @@ -122,7 +123,7 @@ public class HandlerRepository { e.printStackTrace(new PrintWriter(out)); _triggerDetailLog = out.toString(); } - logger.info(">>>>>>>>>>> dianping-job pushHandleQueue, triggerUuid:{}, handleName, _triggerStatus:{}, _triggerDetailLog", + logger.info(">>>>>>>>>>> xxl-job pushHandleQueue, triggerUuid:{}, handleName, _triggerStatus:{}, _triggerDetailLog", new Object[]{triggerUuid, handleName, _triggerStatus, _triggerDetailLog}); String responseBody = _triggerStatus.name(); diff --git a/branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/handler/IJobHandler.java b/xxl-job-client/src/main/java/com/xxl/job/client/handler/IJobHandler.java similarity index 88% rename from branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/handler/IJobHandler.java rename to xxl-job-client/src/main/java/com/xxl/job/client/handler/IJobHandler.java index fb25271b..b6a6d947 100644 --- a/branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/handler/IJobHandler.java +++ b/xxl-job-client/src/main/java/com/xxl/job/client/handler/IJobHandler.java @@ -1,4 +1,4 @@ -package com.dianping.job.client.handler; +package com.xxl.job.client.handler; import java.util.Map; diff --git a/branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/netcom/http/DianpingJobServlet.java b/xxl-job-client/src/main/java/com/xxl/job/client/netcom/http/XxlJobServlet.java similarity index 87% rename from branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/netcom/http/DianpingJobServlet.java rename to xxl-job-client/src/main/java/com/xxl/job/client/netcom/http/XxlJobServlet.java index f5d31fc9..32ceb5d7 100644 --- a/branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/netcom/http/DianpingJobServlet.java +++ b/xxl-job-client/src/main/java/com/xxl/job/client/netcom/http/XxlJobServlet.java @@ -1,4 +1,4 @@ -package com.dianping.job.client.netcom.http; +package com.xxl.job.client.netcom.http; import java.io.IOException; @@ -10,19 +10,20 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.dianping.job.client.handler.HandlerRepository; +import com.xxl.job.client.handler.HandlerRepository; + /** * remote job client on http * @author xuxueli 2015-12-19 18:36:47 */ -public class DianpingJobServlet extends HttpServlet { +public class XxlJobServlet extends HttpServlet { private static final long serialVersionUID = 1L; /** * Default constructor. */ - public DianpingJobServlet() { + public XxlJobServlet() { // TODO Auto-generated constructor stub } diff --git a/branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/util/HttpUtil.java b/xxl-job-client/src/main/java/com/xxl/job/client/util/HttpUtil.java similarity index 94% rename from branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/util/HttpUtil.java rename to xxl-job-client/src/main/java/com/xxl/job/client/util/HttpUtil.java index 8fe9cd68..57b1d9f6 100644 --- a/branch-dianping/dianping-job-client/src/main/java/com/dianping/job/client/util/HttpUtil.java +++ b/xxl-job-client/src/main/java/com/xxl/job/client/util/HttpUtil.java @@ -1,4 +1,4 @@ -package com.dianping.job.client.util; +package com.xxl.job.client.util; import java.io.IOException; diff --git a/xxl-job-simple/.classpath b/xxl-job-simple/.classpath new file mode 100644 index 00000000..803d7e0d --- /dev/null +++ b/xxl-job-simple/.classpath @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xxl-job-simple/.gitignore b/xxl-job-simple/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/xxl-job-simple/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/xxl-job-simple/.project b/xxl-job-simple/.project new file mode 100644 index 00000000..5aa2fd72 --- /dev/null +++ b/xxl-job-simple/.project @@ -0,0 +1,42 @@ + + + xxl-job-simple + + + + + + org.eclipse.wst.jsdt.core.javascriptValidator + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.jsdt.core.jsNature + + diff --git a/xxl-job-simple/.settings/.jsdtscope b/xxl-job-simple/.settings/.jsdtscope new file mode 100644 index 00000000..a2d71f4f --- /dev/null +++ b/xxl-job-simple/.settings/.jsdtscope @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/xxl-job-simple/.settings/org.eclipse.core.resources.prefs b/xxl-job-simple/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..b9bd8f64 --- /dev/null +++ b/xxl-job-simple/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF8 +encoding//src/test/java=UTF8 diff --git a/xxl-job-simple/.settings/org.eclipse.jdt.core.prefs b/xxl-job-simple/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..62a317c8 --- /dev/null +++ b/xxl-job-simple/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/xxl-job-simple/.settings/org.eclipse.m2e.core.prefs b/xxl-job-simple/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..14b697b7 --- /dev/null +++ b/xxl-job-simple/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/xxl-job-simple/.settings/org.eclipse.wst.common.component b/xxl-job-simple/.settings/org.eclipse.wst.common.component new file mode 100644 index 00000000..1772721f --- /dev/null +++ b/xxl-job-simple/.settings/org.eclipse.wst.common.component @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/xxl-job-simple/.settings/org.eclipse.wst.common.project.facet.core.xml b/xxl-job-simple/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 00000000..6f361dd8 --- /dev/null +++ b/xxl-job-simple/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/xxl-job-simple/.settings/org.eclipse.wst.jsdt.ui.superType.container b/xxl-job-simple/.settings/org.eclipse.wst.jsdt.ui.superType.container new file mode 100644 index 00000000..3bd5d0a4 --- /dev/null +++ b/xxl-job-simple/.settings/org.eclipse.wst.jsdt.ui.superType.container @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/xxl-job-simple/.settings/org.eclipse.wst.jsdt.ui.superType.name b/xxl-job-simple/.settings/org.eclipse.wst.jsdt.ui.superType.name new file mode 100644 index 00000000..05bd71b6 --- /dev/null +++ b/xxl-job-simple/.settings/org.eclipse.wst.jsdt.ui.superType.name @@ -0,0 +1 @@ +Window \ No newline at end of file diff --git a/xxl-job-simple/.settings/org.eclipse.wst.validation.prefs b/xxl-job-simple/.settings/org.eclipse.wst.validation.prefs new file mode 100644 index 00000000..6f1cba68 --- /dev/null +++ b/xxl-job-simple/.settings/org.eclipse.wst.validation.prefs @@ -0,0 +1,2 @@ +disabled=06target +eclipse.preferences.version=1 diff --git a/branch-dianping/dianping-job-web/pom.xml b/xxl-job-simple/pom.xml similarity index 83% rename from branch-dianping/dianping-job-web/pom.xml rename to xxl-job-simple/pom.xml index 780c15cf..9c3fedc6 100644 --- a/branch-dianping/dianping-job-web/pom.xml +++ b/xxl-job-simple/pom.xml @@ -2,16 +2,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.dianping - dianping-job - 0.0.1-SNAPSHOT + com.xxl + xxl-job + 1.1.1-SNAPSHOT - dianping-job-web - 1.0.1-SNAPSHOT + xxl-job-simple + 1.1.2-SNAPSHOT war - dianping-job-web - http://maven.apache.org - + 3.2.14.RELEASE @@ -131,20 +129,6 @@ quartz 2.2.1 - - - - org.apache.httpcomponents - httpclient - 4.3.6 - - - - - com.dianping - dianping-job-client - 1.0.1-SNAPSHOT - diff --git a/xxl-job-admin/src/main/java/com/xxl/controller/IndexController.java b/xxl-job-simple/src/main/java/com/xxl/controller/IndexController.java similarity index 95% rename from xxl-job-admin/src/main/java/com/xxl/controller/IndexController.java rename to xxl-job-simple/src/main/java/com/xxl/controller/IndexController.java index 7ddc713d..e06e72c4 100644 --- a/xxl-job-admin/src/main/java/com/xxl/controller/IndexController.java +++ b/xxl-job-simple/src/main/java/com/xxl/controller/IndexController.java @@ -17,11 +17,10 @@ import com.xxl.quartz.DynamicSchedulerUtil; import com.xxl.quartz.ReturnT; @Controller -@RequestMapping("/job") public class IndexController { - @RequestMapping("/index") + @RequestMapping("") public String index(Model model) { List> jobList = DynamicSchedulerUtil.getJobList(); model.addAttribute("jobList", jobList); diff --git a/xxl-job-admin/src/main/java/com/xxl/quartz/DynamicSchedulerUtil.java b/xxl-job-simple/src/main/java/com/xxl/quartz/DynamicSchedulerUtil.java similarity index 100% rename from xxl-job-admin/src/main/java/com/xxl/quartz/DynamicSchedulerUtil.java rename to xxl-job-simple/src/main/java/com/xxl/quartz/DynamicSchedulerUtil.java diff --git a/xxl-job-admin/src/main/java/com/xxl/quartz/ReturnT.java b/xxl-job-simple/src/main/java/com/xxl/quartz/ReturnT.java similarity index 100% rename from xxl-job-admin/src/main/java/com/xxl/quartz/ReturnT.java rename to xxl-job-simple/src/main/java/com/xxl/quartz/ReturnT.java diff --git a/xxl-job-admin/src/main/java/com/xxl/service/ITriggerService.java b/xxl-job-simple/src/main/java/com/xxl/service/ITriggerService.java similarity index 100% rename from xxl-job-admin/src/main/java/com/xxl/service/ITriggerService.java rename to xxl-job-simple/src/main/java/com/xxl/service/ITriggerService.java diff --git a/xxl-job-admin/src/main/java/com/xxl/service/impl/TriggerServiceImpl.java b/xxl-job-simple/src/main/java/com/xxl/service/impl/TriggerServiceImpl.java similarity index 100% rename from xxl-job-admin/src/main/java/com/xxl/service/impl/TriggerServiceImpl.java rename to xxl-job-simple/src/main/java/com/xxl/service/impl/TriggerServiceImpl.java diff --git a/xxl-job-admin/src/main/java/com/xxl/service/job/JobDetailDemo.java b/xxl-job-simple/src/main/java/com/xxl/service/job/JobDetailDemo.java similarity index 100% rename from xxl-job-admin/src/main/java/com/xxl/service/job/JobDetailDemo.java rename to xxl-job-simple/src/main/java/com/xxl/service/job/JobDetailDemo.java diff --git a/xxl-job-admin/src/main/java/com/xxl/service/job/TestDynamicJob.java b/xxl-job-simple/src/main/java/com/xxl/service/job/TestDynamicJob.java similarity index 100% rename from xxl-job-admin/src/main/java/com/xxl/service/job/TestDynamicJob.java rename to xxl-job-simple/src/main/java/com/xxl/service/job/TestDynamicJob.java diff --git a/branch-dianping/dianping-job-web/src/main/resources/applicationcontext-base.xml b/xxl-job-simple/src/main/resources/applicationcontext-base.xml similarity index 80% rename from branch-dianping/dianping-job-web/src/main/resources/applicationcontext-base.xml rename to xxl-job-simple/src/main/resources/applicationcontext-base.xml index a8344895..e63b7982 100644 --- a/branch-dianping/dianping-job-web/src/main/resources/applicationcontext-base.xml +++ b/xxl-job-simple/src/main/resources/applicationcontext-base.xml @@ -10,7 +10,7 @@ http://www.springframework.org/schema/util/spring-util.xsd"> - + @@ -19,6 +19,11 @@ + + + + + diff --git a/branch-dianping/dianping-job-web/src/main/resources/applicationcontext-database.xml b/xxl-job-simple/src/main/resources/applicationcontext-database.xml similarity index 92% rename from branch-dianping/dianping-job-web/src/main/resources/applicationcontext-database.xml rename to xxl-job-simple/src/main/resources/applicationcontext-database.xml index a72057d1..cdb291a1 100644 --- a/branch-dianping/dianping-job-web/src/main/resources/applicationcontext-database.xml +++ b/xxl-job-simple/src/main/resources/applicationcontext-database.xml @@ -15,6 +15,7 @@ + @@ -34,7 +35,7 @@ - + diff --git a/branch-dianping/dianping-job-web/src/main/resources/applicationcontext-trigger-db.xml b/xxl-job-simple/src/main/resources/applicationcontext-trigger-db.xml similarity index 55% rename from branch-dianping/dianping-job-web/src/main/resources/applicationcontext-trigger-db.xml rename to xxl-job-simple/src/main/resources/applicationcontext-trigger-db.xml index 51c15a27..f3ba1019 100644 --- a/branch-dianping/dianping-job-web/src/main/resources/applicationcontext-trigger-db.xml +++ b/xxl-job-simple/src/main/resources/applicationcontext-trigger-db.xml @@ -9,16 +9,37 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> + + + + + + + + + + + + + + + + + + + + + + - - - + + diff --git a/branch-dianping/dianping-job-web/src/main/resources/applicationcontext-trigger-local.xml b/xxl-job-simple/src/main/resources/applicationcontext-trigger-local.xml similarity index 81% rename from branch-dianping/dianping-job-web/src/main/resources/applicationcontext-trigger-local.xml rename to xxl-job-simple/src/main/resources/applicationcontext-trigger-local.xml index 911aba64..cf0f3c8d 100644 --- a/branch-dianping/dianping-job-web/src/main/resources/applicationcontext-trigger-local.xml +++ b/xxl-job-simple/src/main/resources/applicationcontext-trigger-local.xml @@ -20,11 +20,11 @@ - - + + - + diff --git a/branch-dianping/dianping-job-web/src/main/resources/applicationcontext-tx.xml b/xxl-job-simple/src/main/resources/applicationcontext-tx.xml similarity index 85% rename from branch-dianping/dianping-job-web/src/main/resources/applicationcontext-tx.xml rename to xxl-job-simple/src/main/resources/applicationcontext-tx.xml index 709ad8ca..2511344b 100644 --- a/branch-dianping/dianping-job-web/src/main/resources/applicationcontext-tx.xml +++ b/xxl-job-simple/src/main/resources/applicationcontext-tx.xml @@ -12,12 +12,15 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd"> + + + @@ -30,8 +33,11 @@ + + + diff --git a/branch-dianping/dianping-job-web/src/main/resources/freemarker.properties b/xxl-job-simple/src/main/resources/freemarker.properties similarity index 100% rename from branch-dianping/dianping-job-web/src/main/resources/freemarker.properties rename to xxl-job-simple/src/main/resources/freemarker.properties diff --git a/xxl-job-admin/src/main/resources/freemarker.variables.properties b/xxl-job-simple/src/main/resources/freemarker.variables.properties similarity index 100% rename from xxl-job-admin/src/main/resources/freemarker.variables.properties rename to xxl-job-simple/src/main/resources/freemarker.variables.properties diff --git a/branch-dianping/dianping-job-web/src/main/resources/jdbc.properties b/xxl-job-simple/src/main/resources/jdbc.properties similarity index 100% rename from branch-dianping/dianping-job-web/src/main/resources/jdbc.properties rename to xxl-job-simple/src/main/resources/jdbc.properties diff --git a/xxl-job-simple/src/main/resources/log4j.properties b/xxl-job-simple/src/main/resources/log4j.properties new file mode 100644 index 00000000..60ca14ad --- /dev/null +++ b/xxl-job-simple/src/main/resources/log4j.properties @@ -0,0 +1,10 @@ +log4j.rootLogger=info,console + +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d - xxl-job-demo - %p [%c] - <%m>%n + +log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender +log4j.appender.logFile.File=${catalina.base}/logs/xxl-job-demo.log +log4j.appender.logFile.layout=org.apache.log4j.PatternLayout +log4j.appender.logFile.layout.ConversionPattern=%d - xxl-job-demo - %p [%c] - <%m>%n diff --git a/branch-dianping/dianping-job-web/src/main/resources/quartz.properties b/xxl-job-simple/src/main/resources/quartz.properties similarity index 92% rename from branch-dianping/dianping-job-web/src/main/resources/quartz.properties rename to xxl-job-simple/src/main/resources/quartz.properties index 99409e5d..a1e68509 100644 --- a/branch-dianping/dianping-job-web/src/main/resources/quartz.properties +++ b/xxl-job-simple/src/main/resources/quartz.properties @@ -18,7 +18,6 @@ org.quartz.jobStore.misfireThreshold: 60000 #org.quartz.jobStore.class: org.quartz.simpl.RAMJobStore # for cluster -org.quartz.jobStore.tablePrefix = WED_qrtz_ org.quartz.scheduler.instanceId: AUTO org.quartz.jobStore.class: org.quartz.impl.jdbcjobstore.JobStoreTX org.quartz.jobStore.isClustered: true diff --git a/branch-dianping/dianping-job-web/src/main/resources/springmvc-context.xml b/xxl-job-simple/src/main/resources/springmvc-context.xml similarity index 61% rename from branch-dianping/dianping-job-web/src/main/resources/springmvc-context.xml rename to xxl-job-simple/src/main/resources/springmvc-context.xml index a2a4d85e..b44ff95f 100644 --- a/branch-dianping/dianping-job-web/src/main/resources/springmvc-context.xml +++ b/xxl-job-simple/src/main/resources/springmvc-context.xml @@ -18,35 +18,34 @@ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd"> + Spring-web MVC配置 + - + - - + + - - + + - - - - - + + + + + - + --> \ No newline at end of file diff --git a/branch-dianping/dianping-job-web/src/main/webapp/500.html b/xxl-job-simple/src/main/webapp/500.html similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/500.html rename to xxl-job-simple/src/main/webapp/500.html diff --git a/branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.exception.ftl b/xxl-job-simple/src/main/webapp/WEB-INF/template/common/common.exception.ftl similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.exception.ftl rename to xxl-job-simple/src/main/webapp/WEB-INF/template/common/common.exception.ftl diff --git a/branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.macro.ftl b/xxl-job-simple/src/main/webapp/WEB-INF/template/common/common.macro.ftl similarity index 70% rename from branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.macro.ftl rename to xxl-job-simple/src/main/webapp/WEB-INF/template/common/common.macro.ftl index bf6f235f..c6de78a6 100644 --- a/branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.macro.ftl +++ b/xxl-job-simple/src/main/webapp/WEB-INF/template/common/common.macro.ftl @@ -37,6 +37,8 @@ + + @@ -45,15 +47,71 @@ <#macro commonHeader>
- + +
+ <#macro commonLeft> @@ -63,9 +121,22 @@
@@ -155,8 +226,8 @@ Version 1.0
Copyright © 2015-2015   - github  - cnblog. + github  + cnblog. All rights reserved. diff --git a/branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.result.ftl b/xxl-job-simple/src/main/webapp/WEB-INF/template/common/common.result.ftl similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/common/common.result.ftl rename to xxl-job-simple/src/main/webapp/WEB-INF/template/common/common.result.ftl diff --git a/xxl-job-simple/src/main/webapp/WEB-INF/template/job/help.ftl b/xxl-job-simple/src/main/webapp/WEB-INF/template/job/help.ftl new file mode 100644 index 00000000..0c72e977 --- /dev/null +++ b/xxl-job-simple/src/main/webapp/WEB-INF/template/job/help.ftl @@ -0,0 +1,53 @@ + + + + AdminLTE 2 | Dashboard + <#import "/common/common.macro.ftl" as netCommon> + <@netCommon.commonStyle /> + + +
+ + <@netCommon.commonHeader /> + + <@netCommon.commonLeft /> + + +
+ +
+

使用教程调度管理平台

+
    +
  1. 调度中心
    2. +
  2. 使用教程
    3. +
+
+ + +
+
+

简介：xxl-job

+

调度管理平台：基于quartz封装实现的的集群任务调度管理平台.

+

+
+ +
+

特点：

+

1、简单：支持通过Web页面对任务进行CRUD操作，操作简单，一分钟上手.

+

2、动态：支持动态修改任务状态，动态暂停/恢复任务，即时生效.

+

3、集群：任务信息持久化到mysql中，支持Job服务器集群(高可用)，一个任务只会在其中一台服务器上执行.

+
+ +
+ +
+ + + + <@netCommon.commonFooter /> + + <@netCommon.commonControl /> +
+<@netCommon.commonScript /> + + diff --git a/branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/job/index.ftl b/xxl-job-simple/src/main/webapp/WEB-INF/template/job/index.ftl similarity index 70% rename from branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/job/index.ftl rename to xxl-job-simple/src/main/webapp/WEB-INF/template/job/index.ftl index 62c41fb5..e5fedb3a 100644 --- a/branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/template/job/index.ftl +++ b/xxl-job-simple/src/main/webapp/WEB-INF/template/job/index.ftl @@ -19,10 +19,10 @@
-

调度中心调度管理

+

使用教程调度管理平台

  1. 调度中心
    2. -
  2. 调度管理
    3. +
  3. 使用教程
@@ -32,17 +32,17 @@
-

调度列表

- +

任务列表

+
任务ID调度key cronJob类路径简介参数 状态 操作
${item['TriggerKey'].name} ${item['Trigger'].cronExpression}${item['JobDetail'].jobClass} - <#if item['JobDetail'].jobDataMap?exists> - <#assign job_desc=item['JobDetail'].jobDataMap['job_desc'] /> - ${job_desc} + <#assign jobDataMap = item['JobDetail'].jobDataMap /> + <#if jobDataMap?exists && jobDataMap?keys?size gt 0> + <#list jobDataMap?keys as key> + ${key} = ${jobDataMap[key]}
+ 		@@ -77,8 +79,9 @@ <#elseif item['TriggerState'] == 'PAUSED'> - + +

任务ID调度key cronJob类路径简介参数 状态 操作
- + - - + + @@ -53,13 +53,11 @@ - + @@ -90,10 +87,10 @@ - + - - + + @@ -117,35 +114,30 @@
-

新增调度信息

+

新增调度任务

- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
-
-
-
+
-
@@ -159,7 +151,7 @@
-

更新corn

+

更新配置

@@ -171,6 +163,14 @@
+
+ +
+
+
+ +
+
diff --git a/branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/web.xml b/xxl-job-simple/src/main/webapp/WEB-INF/web.xml similarity index 94% rename from branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/web.xml rename to xxl-job-simple/src/main/webapp/WEB-INF/web.xml index 6dc13f74..cf68c167 100644 --- a/branch-dianping/dianping-job-web/src/main/webapp/WEB-INF/web.xml +++ b/xxl-job-simple/src/main/webapp/WEB-INF/web.xml @@ -3,7 +3,7 @@ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5"> - dianping-job-web + xxl-job-admin contextConfigLocation diff --git a/xxl-job-admin/src/main/webapp/static/.gitignore b/xxl-job-simple/src/main/webapp/static/.gitignore similarity index 100% rename from xxl-job-admin/src/main/webapp/static/.gitignore rename to xxl-job-simple/src/main/webapp/static/.gitignore diff --git a/xxl-job-admin/src/main/webapp/static/.jshintrc b/xxl-job-simple/src/main/webapp/static/.jshintrc similarity index 100% rename from xxl-job-admin/src/main/webapp/static/.jshintrc rename to xxl-job-simple/src/main/webapp/static/.jshintrc diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map b/xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map rename to xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css b/xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css rename to xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.eot b/xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.eot rename to xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.svg b/xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.svg rename to xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.ttf b/xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff b/xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff rename to xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff2 rename to xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/fonts/glyphicons-halflings-regular.woff2 diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/js/bootstrap.min.js b/xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/js/bootstrap.min.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/bootstrap/js/bootstrap.min.js rename to xxl-job-simple/src/main/webapp/static/adminlte/bootstrap/js/bootstrap.min.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/css/AdminLTE.min.css b/xxl-job-simple/src/main/webapp/static/adminlte/dist/css/AdminLTE.min.css similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/css/AdminLTE.min.css rename to xxl-job-simple/src/main/webapp/static/adminlte/dist/css/AdminLTE.min.css diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/css/skins/_all-skins.min.css b/xxl-job-simple/src/main/webapp/static/adminlte/dist/css/skins/_all-skins.min.css similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/css/skins/_all-skins.min.css rename to xxl-job-simple/src/main/webapp/static/adminlte/dist/css/skins/_all-skins.min.css diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/js/app.min.js b/xxl-job-simple/src/main/webapp/static/adminlte/dist/js/app.min.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/js/app.min.js rename to xxl-job-simple/src/main/webapp/static/adminlte/dist/js/app.min.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard.js b/xxl-job-simple/src/main/webapp/static/adminlte/dist/js/pages/dashboard.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard.js rename to xxl-job-simple/src/main/webapp/static/adminlte/dist/js/pages/dashboard.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard2.js b/xxl-job-simple/src/main/webapp/static/adminlte/dist/js/pages/dashboard2.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/dist/js/pages/dashboard2.js rename to xxl-job-simple/src/main/webapp/static/adminlte/dist/js/pages/dashboard2.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.css similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.css diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.min.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.min.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.min.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/dataTables.bootstrap.min.js diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/Readme.txt b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/Readme.txt similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/Readme.txt rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/Readme.txt diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/css/dataTables.autoFill.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/css/dataTables.autoFill.css similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/css/dataTables.autoFill.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/css/dataTables.autoFill.css diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/css/dataTables.autoFill.min.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/css/dataTables.autoFill.min.css similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/css/dataTables.autoFill.min.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/css/dataTables.autoFill.min.css diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/columns.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/columns.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/columns.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/columns.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/complete-callback.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/complete-callback.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/complete-callback.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/complete-callback.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/fill-both.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/fill-both.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/fill-both.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/fill-both.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/fill-horizontal.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/fill-horizontal.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/fill-horizontal.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/fill-horizontal.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/index.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/index.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/index.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/index.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/scrolling.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/scrolling.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/scrolling.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/scrolling.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/simple.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/simple.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/simple.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/simple.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/step-callback.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/step-callback.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/step-callback.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/examples/step-callback.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/images/filler.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/images/filler.png similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/images/filler.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/images/filler.png diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/js/dataTables.autoFill.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/js/dataTables.autoFill.js similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/js/dataTables.autoFill.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/js/dataTables.autoFill.js diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/js/dataTables.autoFill.min.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/js/dataTables.autoFill.min.js similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/js/dataTables.autoFill.min.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/AutoFill/js/dataTables.autoFill.min.js diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/License.txt b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/License.txt similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/License.txt rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/License.txt diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/Readme.md b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/Readme.md similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/Readme.md rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/Readme.md diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/css/dataTables.colReorder.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/css/dataTables.colReorder.css similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/css/dataTables.colReorder.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/css/dataTables.colReorder.css diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/css/dataTables.colReorder.min.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/css/dataTables.colReorder.min.css similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/css/dataTables.colReorder.min.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/css/dataTables.colReorder.min.css diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/alt_insert.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/alt_insert.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/alt_insert.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/alt_insert.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/col_filter.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/col_filter.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/col_filter.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/col_filter.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/colvis.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/colvis.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/colvis.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/colvis.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/fixedcolumns.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/fixedcolumns.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/fixedcolumns.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/fixedcolumns.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/fixedheader.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/fixedheader.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/fixedheader.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/fixedheader.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/index.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/index.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/index.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/index.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/jqueryui.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/jqueryui.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/jqueryui.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/jqueryui.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/new_init.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/new_init.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/new_init.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/new_init.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/predefined.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/predefined.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/predefined.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/predefined.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/realtime.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/realtime.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/realtime.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/realtime.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/reset.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/reset.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/reset.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/reset.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/scrolling.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/scrolling.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/scrolling.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/scrolling.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/server_side.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/server_side.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/server_side.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/server_side.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/simple.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/simple.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/simple.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/simple.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/state_save.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/state_save.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/state_save.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/examples/state_save.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/images/insert.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/images/insert.png similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/images/insert.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/images/insert.png diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.js similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.js diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.min.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.min.js similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.min.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.min.js diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/License.txt b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/License.txt similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/License.txt rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/License.txt diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/Readme.md b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/Readme.md similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/Readme.md rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/Readme.md diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/css/dataTables.colVis.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/css/dataTables.colVis.css similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/css/dataTables.colVis.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/css/dataTables.colVis.css diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/css/dataTables.colVis.min.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/css/dataTables.colVis.min.css similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/css/dataTables.colVis.min.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/css/dataTables.colVis.min.css diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/css/dataTables.colvis.jqueryui.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/css/dataTables.colvis.jqueryui.css similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/css/dataTables.colvis.jqueryui.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/css/dataTables.colvis.jqueryui.css diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/button_order.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/button_order.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/button_order.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/button_order.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/exclude_columns.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/exclude_columns.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/exclude_columns.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/exclude_columns.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/group_columns.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/group_columns.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/group_columns.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/group_columns.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/index.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/index.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/index.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/index.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/jqueryui.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/jqueryui.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/jqueryui.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/jqueryui.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/mouseover.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/mouseover.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/mouseover.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/mouseover.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/new_init.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/new_init.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/new_init.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/new_init.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/restore.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/restore.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/restore.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/restore.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/simple.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/simple.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/simple.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/simple.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/text.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/text.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/text.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/text.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/title_callback.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/title_callback.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/title_callback.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/title_callback.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/two_tables.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/two_tables.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/two_tables.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/two_tables.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/two_tables_identical.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/two_tables_identical.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/two_tables_identical.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/examples/two_tables_identical.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/js/dataTables.colVis.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/js/dataTables.colVis.js similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/js/dataTables.colVis.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/js/dataTables.colVis.js diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/js/dataTables.colVis.min.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/js/dataTables.colVis.min.js similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/js/dataTables.colVis.min.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/ColVis/js/dataTables.colVis.min.js diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/License.txt b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/License.txt similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/License.txt rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/License.txt diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/Readme.md b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/Readme.md similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/Readme.md rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/Readme.md diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/css/dataTables.fixedColumns.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/css/dataTables.fixedColumns.css similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/css/dataTables.fixedColumns.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/css/dataTables.fixedColumns.css diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/css/dataTables.fixedColumns.min.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/css/dataTables.fixedColumns.min.css similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/css/dataTables.fixedColumns.min.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/css/dataTables.fixedColumns.min.css diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/bootstrap.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/bootstrap.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/bootstrap.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/bootstrap.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/col_filter.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/col_filter.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/col_filter.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/col_filter.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/colvis.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/colvis.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/colvis.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/colvis.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/css_size.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/css_size.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/css_size.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/css_size.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/index.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/index.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/index.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/index.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/index_column.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/index_column.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/index_column.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/index_column.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/left_right_columns.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/left_right_columns.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/left_right_columns.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/left_right_columns.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/right_column.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/right_column.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/right_column.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/right_column.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/rowspan.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/rowspan.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/rowspan.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/rowspan.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/server-side-processing.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/server-side-processing.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/server-side-processing.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/server-side-processing.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/simple.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/simple.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/simple.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/simple.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/size_fixed.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/size_fixed.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/size_fixed.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/size_fixed.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/size_fluid.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/size_fluid.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/size_fluid.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/size_fluid.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/two_columns.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/two_columns.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/two_columns.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/examples/two_columns.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/js/dataTables.fixedColumns.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/js/dataTables.fixedColumns.js similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/js/dataTables.fixedColumns.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/js/dataTables.fixedColumns.js diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/js/dataTables.fixedColumns.min.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/js/dataTables.fixedColumns.min.js similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/js/dataTables.fixedColumns.min.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedColumns/js/dataTables.fixedColumns.min.js diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/Readme.txt b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/Readme.txt similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/Readme.txt rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/Readme.txt diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/css/dataTables.fixedHeader.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/css/dataTables.fixedHeader.css similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/css/dataTables.fixedHeader.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/css/dataTables.fixedHeader.css diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/css/dataTables.fixedHeader.min.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/css/dataTables.fixedHeader.min.css similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/css/dataTables.fixedHeader.min.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/css/dataTables.fixedHeader.min.css diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/header_footer.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/header_footer.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/header_footer.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/header_footer.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/index.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/index.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/index.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/index.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/simple.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/simple.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/simple.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/simple.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/top_left_right.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/top_left_right.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/top_left_right.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/top_left_right.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/two_tables.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/two_tables.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/two_tables.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/two_tables.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/zIndexes.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/zIndexes.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/zIndexes.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/examples/zIndexes.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/js/dataTables.fixedHeader.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/js/dataTables.fixedHeader.js similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/js/dataTables.fixedHeader.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/js/dataTables.fixedHeader.js diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/js/dataTables.fixedHeader.min.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/js/dataTables.fixedHeader.min.js similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/js/dataTables.fixedHeader.min.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/FixedHeader/js/dataTables.fixedHeader.min.js diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/Readme.txt b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/Readme.txt similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/Readme.txt rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/Readme.txt diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/css/dataTables.keyTable.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/css/dataTables.keyTable.css similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/css/dataTables.keyTable.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/css/dataTables.keyTable.css diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/css/dataTables.keyTable.min.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/css/dataTables.keyTable.min.css similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/css/dataTables.keyTable.min.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/css/dataTables.keyTable.min.css diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/events.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/events.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/events.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/events.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/html.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/html.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/html.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/html.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/index.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/index.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/index.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/index.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/scrolling.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/scrolling.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/scrolling.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/scrolling.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/simple.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/simple.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/simple.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/examples/simple.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/js/dataTables.keyTable.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/js/dataTables.keyTable.js similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/js/dataTables.keyTable.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/js/dataTables.keyTable.js diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/js/dataTables.keyTable.min.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/js/dataTables.keyTable.min.js similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/js/dataTables.keyTable.min.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/KeyTable/js/dataTables.keyTable.min.js diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/License.txt b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/License.txt similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/License.txt rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/License.txt diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/Readme.md b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/Readme.md similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/Readme.md rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/Readme.md diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/css/dataTables.responsive.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/css/dataTables.responsive.css similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/css/dataTables.responsive.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/css/dataTables.responsive.css diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/css/dataTables.responsive.scss b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/css/dataTables.responsive.scss similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/css/dataTables.responsive.scss rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/css/dataTables.responsive.scss diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/column-control.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/column-control.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/column-control.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/column-control.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/custom-renderer.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/custom-renderer.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/custom-renderer.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/custom-renderer.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/disable-child-rows.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/disable-child-rows.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/disable-child-rows.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/disable-child-rows.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/index.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/index.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/index.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/index.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/right-column.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/right-column.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/right-column.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/right-column.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/whole-row-control.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/whole-row-control.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/whole-row-control.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/child-rows/whole-row-control.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/auto.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/auto.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/auto.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/auto.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/classes.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/classes.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/classes.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/classes.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/complexHeader.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/complexHeader.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/complexHeader.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/complexHeader.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/fixedHeader.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/fixedHeader.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/fixedHeader.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/fixedHeader.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/index.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/index.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/index.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/index.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/init-classes.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/init-classes.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/init-classes.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/display-control/init-classes.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/index.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/index.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/index.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/index.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/ajax.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/ajax.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/ajax.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/ajax.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/className.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/className.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/className.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/className.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/default.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/default.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/default.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/default.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/index.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/index.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/index.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/index.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/new.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/new.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/new.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/new.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/option.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/option.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/option.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/initialisation/option.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/bootstrap.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/bootstrap.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/bootstrap.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/bootstrap.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/compact.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/compact.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/compact.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/compact.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/foundation.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/foundation.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/foundation.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/foundation.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/index.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/index.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/index.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/index.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/scrolling.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/scrolling.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/scrolling.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/examples/styling/scrolling.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/js/dataTables.responsive.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/js/dataTables.responsive.js similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/js/dataTables.responsive.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/js/dataTables.responsive.js diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/js/dataTables.responsive.min.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/js/dataTables.responsive.min.js similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/js/dataTables.responsive.min.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Responsive/js/dataTables.responsive.min.js diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/Readme.txt b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/Readme.txt similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/Readme.txt rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/Readme.txt diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/css/dataTables.scroller.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/css/dataTables.scroller.css similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/css/dataTables.scroller.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/css/dataTables.scroller.css diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/css/dataTables.scroller.min.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/css/dataTables.scroller.min.css similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/css/dataTables.scroller.min.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/css/dataTables.scroller.min.css diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/api_scrolling.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/api_scrolling.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/api_scrolling.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/api_scrolling.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/data/2500.txt b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/data/2500.txt similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/data/2500.txt rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/data/2500.txt diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/data/ssp.php b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/data/ssp.php similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/data/ssp.php rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/data/ssp.php diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/index.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/index.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/index.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/index.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/large_js_source.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/large_js_source.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/large_js_source.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/large_js_source.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/server-side_processing.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/server-side_processing.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/server-side_processing.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/server-side_processing.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/simple.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/simple.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/simple.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/simple.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/state_saving.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/state_saving.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/state_saving.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/examples/state_saving.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/images/loading-background.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/images/loading-background.png similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/images/loading-background.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/images/loading-background.png diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/js/dataTables.scroller.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/js/dataTables.scroller.js similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/js/dataTables.scroller.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/js/dataTables.scroller.js diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/js/dataTables.scroller.min.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/js/dataTables.scroller.min.js similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/js/dataTables.scroller.min.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/Scroller/js/dataTables.scroller.min.js diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/Readme.md b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/Readme.md similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/Readme.md rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/Readme.md diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/css/dataTables.tableTools.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/css/dataTables.tableTools.css similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/css/dataTables.tableTools.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/css/dataTables.tableTools.css diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/css/dataTables.tableTools.min.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/css/dataTables.tableTools.min.css similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/css/dataTables.tableTools.min.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/css/dataTables.tableTools.min.css diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/ajax.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/ajax.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/ajax.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/ajax.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/alter_buttons.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/alter_buttons.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/alter_buttons.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/alter_buttons.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/bootstrap.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/bootstrap.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/bootstrap.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/bootstrap.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/button_text.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/button_text.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/button_text.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/button_text.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/collection.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/collection.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/collection.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/collection.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/defaults.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/defaults.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/defaults.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/defaults.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/index.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/index.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/index.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/index.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/jqueryui.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/jqueryui.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/jqueryui.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/jqueryui.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/multi_instance.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/multi_instance.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/multi_instance.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/multi_instance.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/multiple_tables.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/multiple_tables.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/multiple_tables.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/multiple_tables.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/new_init.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/new_init.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/new_init.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/new_init.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/pdf_message.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/pdf_message.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/pdf_message.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/pdf_message.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/plug-in.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/plug-in.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/plug-in.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/plug-in.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/select_column.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/select_column.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/select_column.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/select_column.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/select_multi.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/select_multi.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/select_multi.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/select_multi.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/select_os.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/select_os.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/select_os.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/select_os.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/select_single.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/select_single.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/select_single.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/select_single.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/simple.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/simple.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/simple.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/simple.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/swf_path.html b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/swf_path.html similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/swf_path.html rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/examples/swf_path.html diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/collection.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/collection.png similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/collection.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/collection.png diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/collection_hover.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/collection_hover.png similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/collection_hover.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/collection_hover.png diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/copy.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/copy.png similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/copy.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/copy.png diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/copy_hover.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/copy_hover.png similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/copy_hover.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/copy_hover.png diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/csv.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/csv.png similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/csv.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/csv.png diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/csv_hover.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/csv_hover.png similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/csv_hover.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/csv_hover.png diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/pdf.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/pdf.png similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/pdf.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/pdf.png diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/pdf_hover.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/pdf_hover.png similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/pdf_hover.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/pdf_hover.png diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/print.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/print.png similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/print.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/print.png diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/print_hover.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/print_hover.png similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/print_hover.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/print_hover.png diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/psd/collection.psd b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/psd/collection.psd similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/psd/collection.psd rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/psd/collection.psd diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/psd/copy document.psd b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/psd/copy document.psd similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/psd/copy document.psd rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/psd/copy document.psd diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/psd/file_types.psd b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/psd/file_types.psd similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/psd/file_types.psd rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/psd/file_types.psd diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/psd/printer.psd b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/psd/printer.psd similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/psd/printer.psd rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/psd/printer.psd diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/xls.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/xls.png similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/xls.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/xls.png diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/xls_hover.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/xls_hover.png similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/xls_hover.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/images/xls_hover.png diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/js/dataTables.tableTools.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/js/dataTables.tableTools.js similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/js/dataTables.tableTools.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/js/dataTables.tableTools.js diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/js/dataTables.tableTools.min.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/js/dataTables.tableTools.min.js similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/js/dataTables.tableTools.min.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/js/dataTables.tableTools.min.js diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/swf/copy_csv_xls.swf b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/swf/copy_csv_xls.swf similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/swf/copy_csv_xls.swf rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/swf/copy_csv_xls.swf diff --git a/xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/swf/copy_csv_xls_pdf.swf b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/swf/copy_csv_xls_pdf.swf similarity index 100% rename from xxl-job-admin/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/swf/copy_csv_xls_pdf.swf rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/extensions/TableTools/swf/copy_csv_xls_pdf.swf diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc.png similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc.png diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc_disabled.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc_disabled.png similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc_disabled.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/images/sort_asc_disabled.png diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_both.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/images/sort_both.png similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_both.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/images/sort_both.png diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc.png similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc.png diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc_disabled.png b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc_disabled.png similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc_disabled.png rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/images/sort_desc_disabled.png diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.css similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.css diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.css similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.css diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables.min.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables_themeroller.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables_themeroller.css similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables_themeroller.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/datatables/jquery.dataTables_themeroller.css diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.min.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.min.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.min.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/fastclick/fastclick.min.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/jQuery/jQuery-2.1.4.min.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/jQuery/jQuery-2.1.4.min.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/jQuery/jQuery-2.1.4.min.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/jQuery/jQuery-2.1.4.min.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/az.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/az.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/az.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/az.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/bg.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/bg.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/bg.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/bg.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ca.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/ca.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ca.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/ca.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/cs.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/cs.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/cs.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/cs.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/da.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/da.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/da.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/da.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/de.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/de.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/de.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/de.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/en.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/en.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/en.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/en.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/es.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/es.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/es.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/es.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/et.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/et.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/et.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/et.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/eu.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/eu.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/eu.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/eu.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fa.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/fa.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fa.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/fa.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fi.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/fi.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fi.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/fi.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fr.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/fr.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/fr.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/fr.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/gl.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/gl.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/gl.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/gl.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/he.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/he.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/he.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/he.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hi.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/hi.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hi.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/hi.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hr.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/hr.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hr.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/hr.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hu.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/hu.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/hu.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/hu.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/id.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/id.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/id.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/id.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/is.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/is.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/is.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/is.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/it.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/it.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/it.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/it.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ko.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/ko.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ko.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/ko.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lt.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/lt.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lt.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/lt.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lv.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/lv.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/lv.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/lv.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/mk.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/mk.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/mk.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/mk.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nb.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/nb.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nb.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/nb.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nl.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/nl.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/nl.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/nl.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pl.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/pl.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pl.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/pl.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt-BR.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/pt-BR.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt-BR.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/pt-BR.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/pt.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/pt.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/pt.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ro.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/ro.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ro.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/ro.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ru.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/ru.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/ru.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/ru.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sk.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/sk.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sk.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/sk.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sr.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/sr.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sr.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/sr.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sv.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/sv.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/sv.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/sv.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/th.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/th.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/th.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/th.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/tr.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/tr.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/tr.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/tr.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/uk.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/uk.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/uk.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/uk.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/vi.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/vi.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/vi.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/vi.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-CN.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-CN.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-CN.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-CN.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-TW.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-TW.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-TW.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/i18n/zh-TW.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/select2.css similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/select2.css diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.full.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/select2.full.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.full.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/select2.full.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.full.min.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/select2.full.min.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.full.min.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/select2.full.min.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/select2.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/select2.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.min.css b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/select2.min.css similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.min.css rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/select2.min.css diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.min.js b/xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/select2.min.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/adminlte/plugins/select2/select2.min.js rename to xxl-job-simple/src/main/webapp/static/adminlte/plugins/select2/select2.min.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/js/common.1.js b/xxl-job-simple/src/main/webapp/static/js/common.1.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/js/common.1.js rename to xxl-job-simple/src/main/webapp/static/js/common.1.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/js/job.index.1.js b/xxl-job-simple/src/main/webapp/static/js/job.index.1.js similarity index 55% rename from branch-dianping/dianping-job-web/src/main/webapp/static/js/job.index.1.js rename to xxl-job-simple/src/main/webapp/static/js/job.index.1.js index 33a22e1d..b6936259 100644 --- a/branch-dianping/dianping-job-web/src/main/webapp/static/js/job.index.1.js +++ b/xxl-job-simple/src/main/webapp/static/js/job.index.1.js @@ -41,9 +41,6 @@ $(function() { } else if ("job_del" == type) { typeName = "删除"; url = base_url + "/job/remove"; - } else if ("job_trigger" == type) { - typeName = "执行一次"; - url = base_url + "/job/trigger"; } else { return; } @@ -73,16 +70,9 @@ $(function() { }); }); - // jquery.validate 自定义校验 “英文字母开头，只含有英文字母、数字和下划线” - jQuery.validator.addMethod("myValid01", function(value, element) { - var length = value.length; - var valid = /^[a-zA-Z][a-zA-Z0-9_]*$/; - return this.optional(element) || valid.test(value); - }, "只支持英文字母开头，只含有英文字母、数字和下划线"); - // 新增 $(".add").click(function(){ - $('#addModal').modal({backdrop: false, keyboard: false}).modal('show'); + $('#addModal').modal('show'); }); var addModalValidate = $("#addModal .form").validate({ errorElement : 'span', @@ -92,22 +82,17 @@ $(function() { triggerKeyName : { required : true , minlength: 4, - maxlength: 100, - myValid01:true + maxlength: 100 }, cronExpression : { required : true , maxlength: 100 }, - job_desc : { + jobClassName : { required : true , - maxlength: 200 - }, - job_url : { - required : true , - maxlength: 200 - }, - handleName : { + maxlength: 100 + }, + jobDesc : { required : true , maxlength: 200 } @@ -115,24 +100,20 @@ $(function() { messages : { triggerKeyName : { required :"请输入“任务Key”." , - minlength:"“任务Key”长度不应低于4位", - maxlength:"“任务Key”长度不应超过100位" + minlength:"“任务Key”不应低于4位", + maxlength:"“任务Key”不应超过100位" }, cronExpression : { required :"请输入“任务Corn”." , - maxlength:"“任务Corn”长度不应超过100位" + maxlength:"“任务Corn”不应超过100位" }, - job_desc : { + jobClassName : { + required :"请输入“任务Impl”." , + maxlength:"“任务Impl”不应超过100位" + }, + jobDesc : { required :"请输入“任务描述”." , - maxlength:"“任务描述”长度不应超过200位" - }, - job_url : { - required :"请输入“任务URL”." , - maxlength:"“任务URL”长度不应超过200位" - }, - handleName : { - required : "请输入“任务handler”." , - maxlength: "“任务handler”长度不应超过200位" + maxlength:"“任务描述”不应超过200位" } }, highlight : function(element) { @@ -146,77 +127,32 @@ $(function() { element.parent('div').append(error); }, submitHandler : function(form) { - - var triggerKeyName = $('#addModal input[name="triggerKeyName"]').val(); - var cronExpression = $('#addModal input[name="cronExpression"]').val(); - var job_desc = $('#addModal input[name="job_desc"]').val(); - var job_url = $('#addModal input[name="job_url"]').val(); - var handleName = $('#addModal input[name="handleName"]').val(); - - var paramStr = 'triggerKeyName=' + triggerKeyName + - '&cronExpression=' + cronExpression + - '&job_desc=' + job_desc + - '&job_url=' + job_url + - '&handleName=' + handleName; - - var ifFin = true; - $('#addModal .newParam').each(function(){ - ifFin = false; - var key = $(this).find('input[name="key"]').val(); - var value = $(this).find('input[name="value"]').val(); - if (!key) { - ComAlert.show(2, "新增参数key不可为空"); - return; - } else { - if(!/^[a-zA-Z][a-zA-Z0-9_]*$/.test(key)){ - ComAlert.show(2, "新增参数key不合法, 只支持英文字母开头，只含有英文字母、数字和下划线"); - return; + $.post(base_url + "/job/add", $("#addModal .form").serialize(), function(data, status) { + if (data.code == "200") { + ComAlert.show(1, "新增调度任务成功", function(){ + window.location.reload(); + }); + } else { + if (data.msg) { + ComAlert.show(2, data.msg); + } else { + ComAlert.show(2, "新增失败"); } - } - paramStr += "&" + key + "=" + value; - ifFin = true; - }); - - if(ifFin){ - $.post(base_url + "/job/add", paramStr, function(data, status) { - if (data.code == "200") { - ComAlert.show(1, "新增调度任务成功", function(){ - window.location.reload(); - }); - } else { - if (data.msg) { - ComAlert.show(2, data.msg); - } else { - ComAlert.show(2, "新增失败"); - } - } - }); - } + } + }); } }); $("#addModal").on('hide.bs.modal', function () { $("#addModal .form")[0].reset() }); - // 新增-添加参数 - $("#addModal .addParam").on('click', function () { - var html = '
'+ - ''+ - '
'+ - '
'+ - '
'; - $(this).parents('.form-group').parent().append(html); - - $("#addModal .removeParam").on('click', function () { - $(this).parents('.form-group').remove(); - }); - }); - // 更新 $(".update").click(function(){ $("#updateModal .form input[name='triggerKeyName']").val($(this).parent('p').attr("name")); $("#updateModal .form input[name='cronExpression']").val($(this).parent('p').attr("cronExpression")); - $('#updateModal').modal({backdrop: false, keyboard: false}).modal('show'); + $("#updateModal .form input[name='jobClassName']").val($(this).parent('p').attr("jobClassName")); + $("#updateModal .form input[name='jobDesc']").val($(this).parent('p').attr("jobDesc")); + $('#updateModal').modal('show'); }); var updateModalValidate = $("#updateModal .form").validate({ errorElement : 'span', @@ -231,6 +167,14 @@ $(function() { cronExpression : { required : true , maxlength: 100 + }, + jobClassName : { + required : true , + maxlength: 100 + }, + jobDesc : { + required : true , + maxlength: 200 } }, messages : { @@ -242,6 +186,14 @@ $(function() { cronExpression : { required :"请输入“任务Corn”." , maxlength:"“任务Corn”不应超过100位" + }, + jobClassName : { + required :"请输入“任务Impl”." , + maxlength:"“任务Impl”不应超过100位" + }, + jobDesc : { + required :"请输入“任务描述”." , + maxlength:"“任务描述”不应超过200位" } }, highlight : function(element) { diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/js/login.1.js b/xxl-job-simple/src/main/webapp/static/js/login.1.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/js/login.1.js rename to xxl-job-simple/src/main/webapp/static/js/login.1.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.css b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.css similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.css rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.css diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.min.css b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.min.css similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.min.css rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/css/font-awesome.min.css diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/FontAwesome.otf b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/FontAwesome.otf similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/FontAwesome.otf rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/FontAwesome.otf diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.eot b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.eot similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.eot rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.eot diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.svg b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.svg similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.svg rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.svg diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.ttf b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.ttf similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.ttf rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.ttf diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff2 b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff2 similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff2 rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/fonts/fontawesome-webfont.woff2 diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/animated.less b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/animated.less similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/animated.less rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/animated.less diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/bordered-pulled.less b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/bordered-pulled.less similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/bordered-pulled.less rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/bordered-pulled.less diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/core.less b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/core.less similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/core.less rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/core.less diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/fixed-width.less b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/fixed-width.less similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/fixed-width.less rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/fixed-width.less diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/font-awesome.less b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/font-awesome.less similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/font-awesome.less rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/font-awesome.less diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/icons.less b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/icons.less similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/icons.less rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/icons.less diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/larger.less b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/larger.less similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/larger.less rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/larger.less diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/list.less b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/list.less similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/list.less rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/list.less diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/mixins.less b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/mixins.less similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/mixins.less rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/mixins.less diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/path.less b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/path.less similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/path.less rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/path.less diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/rotated-flipped.less b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/rotated-flipped.less similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/rotated-flipped.less rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/rotated-flipped.less diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/stacked.less b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/stacked.less similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/stacked.less rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/stacked.less diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/variables.less b/xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/variables.less similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/font-awesome-4.3.0/less/variables.less rename to xxl-job-simple/src/main/webapp/static/plugins/font-awesome-4.3.0/less/variables.less diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.css b/xxl-job-simple/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.css similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.css rename to xxl-job-simple/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.css diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.min.css b/xxl-job-simple/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.min.css similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.min.css rename to xxl-job-simple/src/main/webapp/static/plugins/ionicons-2.0.1/css/ionicons.min.css diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.eot b/xxl-job-simple/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.eot similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.eot rename to xxl-job-simple/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.eot diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.svg b/xxl-job-simple/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.svg similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.svg rename to xxl-job-simple/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.svg diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.ttf b/xxl-job-simple/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.ttf similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.ttf rename to xxl-job-simple/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.ttf diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.woff b/xxl-job-simple/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.woff similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.woff rename to xxl-job-simple/src/main/webapp/static/plugins/ionicons-2.0.1/fonts/ionicons.woff diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/jquery/jquery.validate.min.js b/xxl-job-simple/src/main/webapp/static/plugins/jquery/jquery.validate.min.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/jquery/jquery.validate.min.js rename to xxl-job-simple/src/main/webapp/static/plugins/jquery/jquery.validate.min.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/scrollup/image.css b/xxl-job-simple/src/main/webapp/static/plugins/scrollup/image.css similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/scrollup/image.css rename to xxl-job-simple/src/main/webapp/static/plugins/scrollup/image.css diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/scrollup/jquery.scrollUp.min.js b/xxl-job-simple/src/main/webapp/static/plugins/scrollup/jquery.scrollUp.min.js similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/scrollup/jquery.scrollUp.min.js rename to xxl-job-simple/src/main/webapp/static/plugins/scrollup/jquery.scrollUp.min.js diff --git a/branch-dianping/dianping-job-web/src/main/webapp/static/plugins/scrollup/top.png b/xxl-job-simple/src/main/webapp/static/plugins/scrollup/top.png similarity index 100% rename from branch-dianping/dianping-job-web/src/main/webapp/static/plugins/scrollup/top.png rename to xxl-job-simple/src/main/webapp/static/plugins/scrollup/top.png diff --git a/xxl-job-admin/src/test/java/quartz/JunitTest.java b/xxl-job-simple/src/test/java/quartz/JunitTest.java similarity index 100% rename from xxl-job-admin/src/test/java/quartz/JunitTest.java rename to xxl-job-simple/src/test/java/quartz/JunitTest.java diff --git a/xxl-job-admin/src/test/java/timer/test/TimerTest.java b/xxl-job-simple/src/test/java/timer/test/TimerTest.java similarity index 100% rename from xxl-job-admin/src/test/java/timer/test/TimerTest.java rename to xxl-job-simple/src/test/java/timer/test/TimerTest.java
调度key任务ID cron参数Job类路径简介 状态 操作
${item['TriggerKey'].name} ${item['Trigger'].cronExpression}${item['JobDetail'].jobClass} - <#assign jobDataMap = item['JobDetail'].jobDataMap /> - <#if jobDataMap?exists && jobDataMap?keys?size gt 0> - <#list jobDataMap?keys as key> - ${key} = ${jobDataMap[key]}
- + <#if item['JobDetail'].jobDataMap?exists> + <#assign job_desc=item['JobDetail'].jobDataMap['job_desc'] /> + ${job_desc} 		@@ -79,9 +77,8 @@ <#elseif item['TriggerState'] == 'PAUSED'> - + -

调度key任务ID cron参数Job类路径简介 状态 操作