diff --git a/doc/XXL-JOB1.3.x用户手册_20160522_2306.docx b/doc/XXL-JOB1.3.x用户手册_20160522_2306.docx index 99cddcd3..7bdc9e7f 100644 Binary files a/doc/XXL-JOB1.3.x用户手册_20160522_2306.docx and b/doc/XXL-JOB1.3.x用户手册_20160522_2306.docx differ diff --git a/doc/~$L-JOB1.3.x用户手册_20160522_2306.docx b/doc/~$L-JOB1.3.x用户手册_20160522_2306.docx new file mode 100644 index 00000000..fcd42e3f Binary files /dev/null and b/doc/~$L-JOB1.3.x用户手册_20160522_2306.docx differ diff --git a/xxl-job-admin/src/main/resources/applicationcontext-trigger-db.xml b/xxl-job-admin/src/main/resources/applicationcontext-xxl-job.xml similarity index 100% rename from xxl-job-admin/src/main/resources/applicationcontext-trigger-db.xml rename to xxl-job-admin/src/main/resources/applicationcontext-xxl-job.xml diff --git a/xxl-job-executor-example/src/main/resources/applicationcontext-xxl-job.xml b/xxl-job-executor-example/src/main/resources/applicationcontext-xxl-job.xml index 21a62e16..79bdb8e1 100644 --- a/xxl-job-executor-example/src/main/resources/applicationcontext-xxl-job.xml +++ b/xxl-job-executor-example/src/main/resources/applicationcontext-xxl-job.xml @@ -12,7 +12,7 @@ - + diff --git a/xxl-job-executor-example/src/main/resources/log4j.xml b/xxl-job-executor-example/src/main/resources/log4j.xml index 7e707e38..5b67f5c5 100644 --- a/xxl-job-executor-example/src/main/resources/log4j.xml +++ b/xxl-job-executor-example/src/main/resources/log4j.xml @@ -33,17 +33,18 @@ - + - + + \ No newline at end of file