From 6df1fa80f1eec9fba10db1bbe3197730980f918d Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Thu, 17 Aug 2017 16:29:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0RM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" | 2 +-
 .../java/com/xxl/job/admin/controller/JobLogController.java     | 2 +-
 .../src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
index 40183c73..57cc15c0 100644
--- "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
+++ "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
@@ -239,7 +239,7 @@ XXL-JOB是一个轻量级分布式任务调度框架，其核心设计目标是
     xxl.job.executor.ip=
     xxl.job.executor.port=9999
     
-    ### xxl-job log path：执行器运行日志文件存储的磁盘位置
+    ### xxl-job log path：执行器运行日志文件存储的磁盘位置，需要对该路径拥有读写权限
     xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler/
     
     ### xxl-job, access token：执行器通讯TOKEN，非空时启用
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java
index 5d801891..f3192737 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java
@@ -195,7 +195,7 @@ public class JobLogController {
 		} else if (type == 8) {
 			clearBeforeNum = 100000;	// 清理十万条以前日志数据
 		} else if (type == 9) {
-			clearBeforeNum = 0;			// 清理所用日志数据
+			clearBeforeNum = 0;			// 清理所有日志数据
 		} else {
 			return new ReturnT<String>(ReturnT.FAIL_CODE, "清理类型参数异常");
 		}
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl
index 197722dc..d77d86d5 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl
@@ -156,7 +156,7 @@
                                 <option value="6" >清理一万条以前日志数据</option>
                                 <option value="7" >清理三万条以前日志数据</option>
                                 <option value="8" >清理十万条以前日志数据</option>
-                                <option value="9" >清理所用日志数据</option>
+                                <option value="9" >清理所有日志数据</option>
                             </select>
                         </div>
                     </div>
-- 
GitLab