diff --git a/api/src/main/resources/logback.xml b/api/src/main/resources/logback.xml
index 62b8f64fd8b954c11e6429b0d85916d110786cf5..17e0c4639ce8647cc987da40fe14a3c4adbe9d40 100644
--- a/api/src/main/resources/logback.xml
+++ b/api/src/main/resources/logback.xml
@@ -73,7 +73,7 @@
 
     <!-- 2. 输出SQL 的参数到控制台和文件-->
     <logger name="org.hibernate.type.descriptor.sql.BasicBinder" additivity="false" level="TRACE">
-        <level value="TRACE" />
+        <level value="DEBUG" />
         <appender-ref ref="ROLLING-FILE" />
         <appender-ref ref="CONSOLE" />
     </logger>
diff --git a/web/src/main/java/com/simon/common/plugins/quartz/QuartzManage.java b/web/src/main/java/com/simon/common/plugins/quartz/QuartzManage.java
index 8b8c01c9ba124177066dde7ac49b96191cfbdf72..29986a50f9d6779ea499c2d4671fa5a3e316fef9 100644
--- a/web/src/main/java/com/simon/common/plugins/quartz/QuartzManage.java
+++ b/web/src/main/java/com/simon/common/plugins/quartz/QuartzManage.java
@@ -2,6 +2,7 @@ package com.simon.common.plugins.quartz;
 
 import com.simon.model.QuartzJob;
 import org.quartz.*;
+import org.quartz.impl.matchers.GroupMatcher;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -23,7 +24,7 @@ public class QuartzManage {
     public void addJob(QuartzJob job) throws SchedulerException, ClassNotFoundException, IllegalAccessException, InstantiationException {
         //通过类名获取实体类，即要执行的定时任务的类
         Class<?> clazz = Class.forName(job.getBeanName());
-        Job jobEntity = (Job)clazz.newInstance();
+        Job jobEntity = (Job) clazz.newInstance();
         //通过实体类和任务名创建 JobDetail
         JobDetail jobDetail = JobBuilder.newJob(jobEntity.getClass())
                 .withDescription(job.getDescription())
@@ -38,11 +39,12 @@ public class QuartzManage {
                 .withSchedule(CronScheduleBuilder.cronSchedule(job.getCronExpression()))
                 .build();
         //执行定时任务
-        scheduler.scheduleJob(jobDetail,cronTrigger);
+        scheduler.scheduleJob(jobDetail, cronTrigger);
     }
 
     /**
      * 更新job cron表达式
+     *
      * @param quartzJob
      * @throws SchedulerException
      */
@@ -54,8 +56,10 @@ public class QuartzManage {
         trigger = trigger.getTriggerBuilder().withIdentity(triggerKey).withSchedule(scheduleBuilder).build();
         scheduler.rescheduleJob(triggerKey, trigger);
     }
+
     /**
      * 删除一个job
+     *
      * @param quartzJob
      * @throws SchedulerException
      */
@@ -63,8 +67,10 @@ public class QuartzManage {
         JobKey jobKey = JobKey.jobKey(quartzJob.getJobName());
         scheduler.deleteJob(jobKey);
     }
+
     /**
      * 恢复一个job
+     *
      * @param quartzJob
      * @throws SchedulerException
      */
@@ -72,8 +78,10 @@ public class QuartzManage {
         JobKey jobKey = JobKey.jobKey(quartzJob.getJobName());
         scheduler.resumeJob(jobKey);
     }
+
     /**
      * 立即执行job
+     *
      * @param quartzJob
      * @throws SchedulerException
      */
@@ -81,8 +89,10 @@ public class QuartzManage {
         JobKey jobKey = JobKey.jobKey(quartzJob.getJobName());
         scheduler.triggerJob(jobKey);
     }
+
     /**
      * 暂停一个job
+     *
      * @param quartzJob
      * @throws SchedulerException
      */
@@ -90,4 +100,33 @@ public class QuartzManage {
         JobKey jobKey = JobKey.jobKey(quartzJob.getJobName());
         scheduler.pauseJob(jobKey);
     }
+
+    /**
+     * 判断任务是否正在运行
+     * @param name 任务名称
+     * @return 是否正在运行
+     */
+    public boolean isRun(String name) {
+        try {
+            for(String groupName : scheduler.getJobGroupNames()){
+                for(JobKey jobKey : scheduler.getJobKeys(GroupMatcher.jobGroupEquals(groupName))){
+                    if (name.equals(jobKey.getName())){
+                        return true;
+                    }
+                }
+            }
+        } catch (SchedulerException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    /**
+     * 判断任务是否正在运行
+     * @param quartzJob 任务
+     * @return 是否正在运行
+     */
+    public boolean isRun(QuartzJob quartzJob){
+        return isRun(quartzJob.getJobName());
+    }
 }
diff --git a/web/src/main/java/com/simon/controller/QuartzJobController.java b/web/src/main/java/com/simon/controller/QuartzJobController.java
index e684cc7989fcc11253d669a9b481c876f58c3abb..fa0bff42e2efc7da68b721ca1b287ddf32125e26 100644
--- a/web/src/main/java/com/simon/controller/QuartzJobController.java
+++ b/web/src/main/java/com/simon/controller/QuartzJobController.java
@@ -6,6 +6,7 @@ import com.simon.common.domain.ResultMsg;
 import com.simon.common.domain.UserEntity;
 import com.simon.common.plugins.quartz.QuartzManage;
 import com.simon.model.QuartzJob;
+import com.simon.service.DictTypeService;
 import com.simon.service.QuartzJobService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -16,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -24,40 +26,59 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
-* quartz任务
-*
-* @author SimonSun
-* @date 2018-12-22
-**/
+ * quartz任务
+ *
+ * @author SimonSun
+ * @date 2018-12-22
+ **/
 @Slf4j
 @Api(description = "quartz任务")
 @Controller
 @RequestMapping("/api/quartzJobs")
-public class QuartzJobController extends BaseController{
+public class QuartzJobController extends BaseController {
 
     @Autowired
     private QuartzJobService quartzJobService;
 
+    @Autowired
+    private DictTypeService dictTypeService;
+
     @Autowired
     private QuartzManage quartzManage;
 
     @ApiIgnore
     @ApiOperation(value = "列表页面")
-    @GetMapping(params = "easyui-list")
-    public String getEasyUIList(){
-        return "easyui/quartz_job";
+    @GetMapping("list")
+    public String list(Model model) {
+        model.addAttribute("jobStatusList", dictTypeService.getTypeByGroupCode("job_status"));
+        return "easyui/quartzJob/list";
+    }
+
+    @ApiIgnore
+    @ApiOperation(value = "新增页面")
+    @GetMapping("add")
+    public String add() {
+        return "easyui/quartzJob/add";
+    }
+
+    @ApiIgnore
+    @ApiOperation(value = "编辑页面")
+    @GetMapping("edit")
+    public String edit(@RequestParam Long id, Model model) {
+        model.addAttribute("quartzJob", quartzJobService.findById(id));
+        return "easyui/quartzJob/edit";
     }
 
     @ApiIgnore
     @ApiOperation(value = "列表数据")
-    @GetMapping("easyui/list")
+    @GetMapping("data")
     @ResponseBody
     public EasyUIDataGridResult<QuartzJob> getEasyUIList(
             @ApiParam(value = "类名") @RequestParam(required = false) String beanName,
             @ApiParam(value = "job状态") @RequestParam(required = false) Integer jobStatus,
             @ApiParam(value = "页码", defaultValue = "1", required = true) @RequestParam Integer pageNo,
-            @ApiParam(value = "每页条数", defaultValue = "10", required = true)@RequestParam Integer pageSize,
-            @ApiParam(value = "排序")@RequestParam(required = false, defaultValue = "") String orderBy){
+            @ApiParam(value = "每页条数", defaultValue = "10", required = true) @RequestParam Integer pageSize,
+            @ApiParam(value = "排序") @RequestParam(required = false, defaultValue = "") String orderBy) {
         Map<String, Object> params = new LinkedHashMap<>();
         params.put("beanName", beanName);
         params.put("jobStatus", jobStatus);
@@ -65,25 +86,39 @@ public class QuartzJobController extends BaseController{
     }
 
     @ApiOperation(value = "新增")
-    @PostMapping
+    @PostMapping("add")
     @ResponseBody
-    public ResultMsg add(@RequestBody QuartzJob body){
+    public ResultMsg add(@RequestBody QuartzJob body, Authentication authentication) {
+        Object principal = authentication.getPrincipal();
+        UserEntity userEntity = null;
+        if (principal instanceof UserEntity) {
+            userEntity = (UserEntity) principal;
+        }
+        body.setCreateDate(new Date());
+        body.setCreateBy(userEntity.getId());
         quartzJobService.insertSelective(body);
         return ResultMsg.success();
     }
 
     @ApiOperation(value = "修改")
-    @PatchMapping
+    @PatchMapping("edit")
     @ResponseBody
-    public ResultMsg update(@RequestBody QuartzJob body){
+    public ResultMsg update(@RequestBody QuartzJob body, Authentication authentication) {
+        Object principal = authentication.getPrincipal();
+        UserEntity userEntity = null;
+        if (principal instanceof UserEntity) {
+            userEntity = (UserEntity) principal;
+        }
+        body.setUpdateDate(new Date());
+        body.setUpdateBy(userEntity.getId());
         quartzJobService.updateByPrimaryKeySelective(body);
         return ResultMsg.success();
     }
 
     @ApiOperation(value = "删除")
-    @DeleteMapping("/id/{ids}")
+    @DeleteMapping("/ids/{ids}")
     @ResponseBody
-    public ResultMsg delete(@PathVariable String ids){
+    public ResultMsg delete(@PathVariable String ids) {
         quartzJobService.deleteByIds(ids);
         return ResultMsg.success();
     }
@@ -96,19 +131,25 @@ public class QuartzJobController extends BaseController{
     public ResultMsg operation(
             Authentication authentication,
             @PathVariable Long id,
-            @ApiParam(value = "job状态[0:off, 1:on]", required = true)@PathVariable int jobStatus) throws ClassNotFoundException, InstantiationException, SchedulerException, IllegalAccessException {
+            @ApiParam(value = "job状态[0:off, 1:on]", required = true) @PathVariable int jobStatus) throws ClassNotFoundException, InstantiationException, SchedulerException, IllegalAccessException {
         Object principal = authentication.getPrincipal();
         UserEntity userEntity = null;
-        if(principal instanceof UserEntity){
-            userEntity = (UserEntity)principal;
+        if (principal instanceof UserEntity) {
+            userEntity = (UserEntity) principal;
         }
 
         QuartzJob quartzJob = quartzJobService.findById(id);
 
-        if(0 == jobStatus){
-            quartzManage.pauseJob(quartzJob);
-        }else{
-            quartzManage.resumeJob(quartzJob);
+        if (quartzManage.isRun(quartzJob.getJobName())) {
+            if (0 == jobStatus) {
+                quartzManage.pauseJob(quartzJob);
+            } else {
+                quartzManage.resumeJob(quartzJob);
+            }
+        } else {
+            if (1 == jobStatus) {
+                quartzManage.addJob(quartzJob);
+            }
         }
 
         quartzJob.setJobStatus(jobStatus);
diff --git a/web/src/main/resources/logback.xml b/web/src/main/resources/logback.xml
index a66c4b7e3654fa8c4e708b3ab1411ffb5bb4f918..68378ba0703dbf3f467fc2c671651a91eede9a3a 100644
--- a/web/src/main/resources/logback.xml
+++ b/web/src/main/resources/logback.xml
@@ -73,7 +73,7 @@
 
     <!-- 2. 输出SQL 的参数到控制台和文件-->
     <logger name="org.hibernate.type.descriptor.sql.BasicBinder" additivity="false" level="TRACE">
-        <level value="TRACE" />
+        <level value="DEBUG" />
         <appender-ref ref="ROLLING-FILE" />
         <appender-ref ref="CONSOLE" />
     </logger>
diff --git a/web/src/main/resources/templates/code/list.ftl b/web/src/main/resources/templates/code/list.ftl
index 0bfbfc5a6a2ac729d6e95a61ae9d0fb26c049478..f94cf145bfbcbaabaa88852f744247510b968db6 100644
--- a/web/src/main/resources/templates/code/list.ftl
+++ b/web/src/main/resources/templates/code/list.ftl
@@ -50,16 +50,16 @@
     <#list columns as column>
     <#switch column.easyuiType>
         <#case "rich_text">
-        <th data-options="width:200,sortable:true,align:'center',hidden:${column.hidden?c},field:'${column.name}',formatter:formatContent">${(column.comment)}</th>
+        <th data-options="width:180,sortable:true,align:'center',hidden:${column.hidden?c},field:'${column.name}',formatter:formatContent">${(column.comment)}</th>
         <#break>
         <#case "image">
-        <th data-options="width:200,sortable:true,align:'center',hidden:${column.hidden?c},field:'${column.name}',formatter:formatPic">${(column.comment)}</th>
+        <th data-options="width:180,sortable:true,align:'center',hidden:${column.hidden?c},field:'${column.name}',formatter:formatPic">${(column.comment)}</th>
         <#break>
         <#case "t:dict">
-        <th data-options="width:200,sortable:true,align:'center',hidden:${column.hidden?c},field:'${column.name}',formatter:format${dashedToCamel(column.extraInfo)?cap_first}">${(column.comment)}</th>
+        <th data-options="width:180,sortable:true,align:'center',hidden:${column.hidden?c},field:'${column.name}',formatter:format${dashedToCamel(column.extraInfo)?cap_first}">${(column.comment)}</th>
         <#break>
         <#default>
-        <th data-options="width:200,sortable:true,align:'center',hidden:${column.hidden?c},field:'${column.name}'">${(column.comment)}</th>
+        <th data-options="width:180,sortable:true,align:'center',hidden:${column.hidden?c},field:'${column.name}'">${(column.comment)}</th>
     </#switch>
     </#list>
     </tr>
diff --git a/web/src/main/resources/templates/easyui/quartzJob/add.html b/web/src/main/resources/templates/easyui/quartzJob/add.html
new file mode 100644
index 0000000000000000000000000000000000000000..6fb37eac35329e0441b31b8ef0eda3fb56c2886f
--- /dev/null
+++ b/web/src/main/resources/templates/easyui/quartzJob/add.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:t="http://www.w3.org/1999/xhtml">
+<head th:replace="components/easyui/easyui-list :: head('quartz任务', 'easyui,upload,ueditor')">
+<body>
+<form id="form_add">
+        <div>
+            <input class="easyui-textbox" id="add_cronExpression" name="cronExpression" data-options="label:'cron表达式:', width:300, required:true">
+        </div>
+        <div>
+            <input class="easyui-textbox" id="add_methodName" name="methodName" data-options="label:'任务调用的方法名:', width:300, required:true">
+        </div>
+        <div>
+            <input class="easyui-numberbox" id="add_isConcurrent" name="isConcurrent" data-options="label:'任务是否有状态:', width:300, required:true">
+        </div>
+        <div>
+            <input class="easyui-textbox" id="add_description" name="description" data-options="label:'描述:', width:300, required:true">
+        </div>
+        <div>
+            <input class="easyui-textbox" id="add_beanName" name="beanName" data-options="label:'完全限定名:', width:300, required:true">
+        </div>
+        <div>
+            <input class="easyui-textbox" id="add_triggerName" name="triggerName" data-options="label:'触发器名称:', width:300, required:true">
+        </div>
+        <div>
+            <t:dict class="easyui-combobox" id="add_jobStatus" name="jobStatus" dict-name="job_status" data-options="label:'任务状态:', width:300, multiple:false"></t:dict>
+        </div>
+        <div>
+            <input class="easyui-textbox" id="add_springBean" name="springBean" data-options="label:'spring_bean:', width:300, required:true">
+        </div>
+        <div>
+            <input class="easyui-textbox" id="add_jobName" name="jobName" data-options="label:'任务名:', width:300, required:true">
+        </div>
+    <div style="text-align:center;padding:5px 0">
+        <a href="javascript:void(0)" class="easyui-linkbutton c-primary" style="width:80px" onclick="add()" th:text="#{ok}"></a>
+        <a href="javascript:void(0)" class="easyui-linkbutton c-basic" style="width:80px" onclick="clearForm()" th:text="#{cancel}"></a>
+    </div>
+</form>
+<div id="dlg" class="easyui-dialog" data-options="title:'图片信息',closed:true" style="width:480px;height:480px;padding:10px"></div>
+<div id="window_content" class="easyui-window" title="内容详情" data-options="modal:true,closed:true,collapsible:false" style="width:720px;height:480px;padding:10px;"></div>
+<div th:replace="components/easyui/easyui-list :: js('easyui,upload,ueditor')"></div>
+<script th:inline="javascript">
+    /*<![CDATA[*/
+    $(function () {
+        //实例化编辑器
+        //建议使用工厂方法getEditor创建和引用编辑器实例，如果在某个闭包下引用该编辑器，直接调用UE.getEditor('editor')就能拿到相关的实例
+        /*var addEditor = UE.getEditor('add_editor', {
+            autoHeight: false
+        });*/
+    });
+
+    function add() {
+        doRequest({
+            formId: '#form_add',
+            url: '/api/quartzJobs/add',
+            type: 'POST',
+            extraData: {
+            }
+        });
+    }
+
+    function clearForm() {
+        var index = parent.layer.getFrameIndex(window.name);
+        parent.layer.close(index);
+    }
+
+    /*]]>*/
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/web/src/main/resources/templates/easyui/quartzJob/edit.html b/web/src/main/resources/templates/easyui/quartzJob/edit.html
new file mode 100644
index 0000000000000000000000000000000000000000..375f977f4c492ead54b97ac09bd39f8a347d0a77
--- /dev/null
+++ b/web/src/main/resources/templates/easyui/quartzJob/edit.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:t="http://www.w3.org/1999/xhtml">
+<head th:replace="components/easyui/easyui-list :: head('quartz任务', 'easyui,upload,ueditor')">
+<body>
+<form id="form_edit">
+                <div>
+                    <input class="easyui-numberbox" id="edit_id" name="id" data-options="label:'id:', width:300, required:true" th:value="${quartzJob.id}">
+                </div>
+                <div>
+                    <input class="easyui-textbox" id="edit_cronExpression" name="cronExpression" data-options="label:'cron表达式:', width:300, required:true" th:value="${quartzJob.cronExpression}">
+                </div>
+                <div>
+                    <input class="easyui-textbox" id="edit_methodName" name="methodName" data-options="label:'任务调用的方法名:', width:300, required:true" th:value="${quartzJob.methodName}">
+                </div>
+                <div>
+                    <input class="easyui-numberbox" id="edit_isConcurrent" name="isConcurrent" data-options="label:'任务是否有状态:', width:300, required:true" th:value="${quartzJob.isConcurrent}">
+                </div>
+                <div>
+                    <input class="easyui-textbox" id="edit_description" name="description" data-options="label:'描述:', width:300, required:true" th:value="${quartzJob.description}">
+                </div>
+                <div>
+                    <input class="easyui-textbox" id="edit_beanName" name="beanName" data-options="label:'完全限定名:', width:300, required:true" th:value="${quartzJob.beanName}">
+                </div>
+                <div>
+                    <input class="easyui-textbox" id="edit_triggerName" name="triggerName" data-options="label:'触发器名称:', width:300, required:true" th:value="${quartzJob.triggerName}">
+                </div>
+                <div>
+                    <t:dict class="easyui-combobox" id="edit_jobStatus" name="jobStatus" dict-name="job_status" data-options="label:'任务状态:', width:300, multiple:false"></t:dict>
+                </div>
+                <div>
+                    <input class="easyui-textbox" id="edit_springBean" name="springBean" data-options="label:'spring_bean:', width:300, required:true" th:value="${quartzJob.springBean}">
+                </div>
+                <div>
+                    <input class="easyui-textbox" id="edit_jobName" name="jobName" data-options="label:'任务名:', width:300, required:true" th:value="${quartzJob.jobName}">
+                </div>
+    <div style="text-align:center;pediting:5px 0">
+        <a href="javascript:void(0)" class="button button-rounded button-small button-primary" onclick="edit()" th:text="#{ok}"></a>
+        <a href="javascript:void(0)" class="button button-rounded button-small" onclick="clearForm()" th:text="#{cancel}"></a>
+    </div>
+</form>
+<div id="dlg" class="easyui-dialog" data-options="title:'图片信息',closed:true" style="width:480px;height:480px;pediting:10px"></div>
+<div id="window_content" class="easyui-window" title="内容详情" data-options="modal:true,closed:true,collapsible:false" style="width:720px;height:480px;pediting:10px;"></div>
+<div th:replace="components/easyui/easyui-list :: js('easyui,upload,ueditor')"></div>
+<script th:inline="javascript">
+    /*<![CDATA[*/
+    $(function () {
+        //实例化编辑器
+        //建议使用工厂方法getEditor创建和引用编辑器实例，如果在某个闭包下引用该编辑器，直接调用UE.getEditor('editor')就能拿到相关的实例
+        /*var editEditor = UE.getEditor('edit_editor', {
+            autoHeight: false
+        });*/
+        $('#edit_jobStatus').combobox('setValue', String([[${quartzJob.jobStatus}]]));
+    });
+
+    function edit() {
+        doRequest({
+            formId: '#form_edit',
+            url: '/api/quartzJobs/edit',
+            type: 'PATCH',
+            extraData: {
+    }
+    });
+    }
+
+    function clearForm() {
+        var index = parent.layer.getFrameIndex(window.name);
+        parent.layer.close(index);
+    }
+
+    /*]]>*/
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/web/src/main/resources/templates/easyui/quartzJob/list.html b/web/src/main/resources/templates/easyui/quartzJob/list.html
new file mode 100644
index 0000000000000000000000000000000000000000..61f2398cfa0bd9d9c0879b1b0f14b05318a3c924
--- /dev/null
+++ b/web/src/main/resources/templates/easyui/quartzJob/list.html
@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:t="http://www.w3.org/1999/xhtml">
+<head th:replace="components/easyui/easyui-list :: head('quartz任务', 'easyui')">
+<body>
+<div id="tb">
+    <div class="datagrid-toolbar" style="padding-bottom: 6px">
+        类名: <input class="easyui-textbox" style="width: 160px" id="search_beanName" name="beanName" data-options="required:false">
+        任务状态: <t:dict class="easyui-combobox" id="search_jobStatus" name="jobStatus" dict-name="job_status"  style="width:160px" allow-empty="true"></t:dict>
+        <a href="javascript:void(0)" class="easyui-linkbutton c-primary" style="width:80px" onclick="doSearch()"><i class="fa fa-search" aria-hidden="true"></i> <span th:text="#{search}"></span></a>
+        <a href="javascript:void(0)" class="easyui-linkbutton c-basic" style="width:80px" onclick="doSearchReset()"><i class="fa fa-repeat" aria-hidden="true"></i> <span th:text="#{reset}"></span></a>
+    </div>
+    <div class="datagrid-toolbar easyui-panel" style="padding:5px;">
+        <a th:if="${#authorization.expression('hasAnyRole(''__${add}__'')')}" href="javascript:void(0)" class="easyui-linkbutton c-primary" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doAdd()"><i class="fa fa-plus" aria-hidden="true"></i> <span th:text="#{add}"></span></a>
+        <a th:if="${#authorization.expression('hasAnyRole(''__${edit}__'')')}" href="javascript:void(0)" class="easyui-linkbutton c-warning" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doEdit()"><i class="fa fa-pencil" aria-hidden="true"></i> <span th:text="#{edit}"></span></a>
+        <a th:if="${#authorization.expression('hasAnyRole(''__${delete}__'')')}" href="javascript:void(0)" class="easyui-linkbutton c-danger" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doDelete()"><i class="fa fa-trash" aria-hidden="true"></i> <span th:text="#{delete}"></span></a>
+    </div>
+</div>
+<table id="tt">
+    <thead>
+    <tr>
+        <th data-options="field:'ck',checkbox:true"></th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'id'">id</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:true,field:'createBy'">创建人id</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:true,field:'createDate'">创建时间</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:true,field:'updateBy'">更新人id</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:true,field:'updateDate'">更新时间</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'cronExpression'">cron表达式</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'methodName'">任务调用的方法名</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'isConcurrent'">任务是否有状态</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'description'">描述</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'beanName'">任务执行时调用哪个类的方法 包名+类名，完全限定名</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'triggerName'">触发器名称</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'jobStatus',formatter:formatJobStatus">任务状态</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'springBean'">spring_bean</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'jobName'">任务名</th>
+        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'operation',formatter:formatJobAction">操作</th>
+    </tr>
+    </thead>
+</table>
+<div id="dlg" class="easyui-dialog" data-options="title:'图片信息',closed:true,border:false" style="width:480px;height:480px;padding:10px"></div>
+<div id="window_content" class="easyui-window" title="内容详情" data-options="modal:true,closed:true,collapsible:false,border:false" style="width:720px;height:480px;padding:10px;"></div>
+<div th:replace="components/easyui/easyui-list :: js('easyui')"></div>
+<script th:inline="javascript">
+    /*<![CDATA[*/
+    $(function () {
+        $('#tt').datagrid({
+            url: '/api/quartzJobs/data',
+            method: 'get',
+            idField: 'id',
+            nowrap: false,
+            animate: true,
+            rownumbers: true,
+            fit: true,
+            toolbar: '#tb',
+            pagination: true,
+            singleSelect: false,
+            selectOnCheck: true,
+            checkOnSelect: true
+        });
+    });
+
+    function doSearch() {
+        $('#tt').datagrid('load', {
+            beanName: $('#search_beanName').val(),
+            jobStatus: $('#search_jobStatus').val(),
+        });
+    }
+
+    function doSearchReset() {
+        $('#search_beanName').textbox('setValue', '');
+        $('#search_jobStatus').combobox('select', '');
+        doSearch();
+    }
+
+    function doAdd() {
+        parent.showWindow({
+            title:'录入',
+            content:'/api/quartzJobs/add'
+        });
+    }
+
+    function doEdit() {
+        //获取选中的第一行数据
+        //var row = $('#tt').datagrid('getSelected');
+        //获取选中的所有行数据
+        let rows = $('#tt').datagrid('getSelections');
+        if(rows.length == 1){
+            let row = rows[0];
+            parent.showWindow({
+                title:'编辑',
+                content:'/api/quartzJobs/edit?id=' + row.id
+            });
+        }else{
+            $.messager.alert('提示信息','请选择一条数据！','error');
+        }
+    }
+
+    function doDelete() {
+        deleteRequest('/api/quartzJobs/ids/');
+    }
+
+    function formatIcon(val, row){
+        return '<i class="' + val + '" aria-hidden="true"></i>';
+    }
+
+    function formatPic(val, row) {
+        if(!val){
+            return '';
+        }
+        return '<img class="image-thumb" src="' + [[${filePathPrefix}]] + val + '" alt="头像" width="30px">';
+    }
+
+    function formatContent(val, row) {
+        console.log(row.id.toString());
+        return "<a href=\"javascript:void(0)\" class=\"button button-rounded button-small button-primary\" onclick='showContent(\""  + row.id.toString() + "\")'>查看</a>";
+    }
+
+    function showContent(val) {
+        let rows = $('#tt').datagrid('getSelections');
+        $('#window_content').html(rows[0].content);
+        $('#window_content').window('open');
+    }
+
+    function formatJobStatus(value, row) {
+        let jobStatusList = [[${jobStatusList}]];
+        for(let i = 0; i < jobStatusList.length; i++){
+            if(String(value) == String(jobStatusList[i].typeCode)){
+                return jobStatusList[i].typeName;
+            }
+        }
+        return value;
+    }
+
+    function formatJobAction(val, row) {
+        return '<button class="button button-circle button-small button-action" onclick="jobOn(' + row.id + ')"><i class="fa fa-play" aria-hidden="true"></i></button>'
+            + ' <button class="button button-circle button-small button-highlight" onclick="jobOff(' + row.id + ')"><i class="fa fa-stop" aria-hidden="true"></i></button>'
+            + ' <button class="button button-circle button-small button-royal"><i class="fa fa-pencil" aria-hidden="true"></i></button>'
+            + ' <button class="button button-circle button-small button-caution"><i class="fa fa-trash" aria-hidden="true"></i></button>';
+    }
+
+    function jobOn(id) {
+        commonRequest({
+            url: '/api/quartzJobs/id/' + id + '/jobStatus/1',
+            type: 'POST',
+            extraData: {
+
+            }
+        });
+    }
+
+    function jobOff(id) {
+        commonRequest({
+            url: '/api/quartzJobs/id/' + id + '/jobStatus/0',
+            type: 'POST',
+            extraData: {
+
+            }
+        });
+    }
+    /*]]>*/
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/web/src/main/resources/templates/easyui/roleAuthority/auth_config.html b/web/src/main/resources/templates/easyui/roleAuthority/auth_config.html
index 0a479dc3e127e072e0e2d5b03ac43beedfc1d5f0..fc14af0b29830102488cb70aa2f5286e6ba14ae2 100644
--- a/web/src/main/resources/templates/easyui/roleAuthority/auth_config.html
+++ b/web/src/main/resources/templates/easyui/roleAuthority/auth_config.html
@@ -19,7 +19,7 @@
 <p>Tree nodes with check boxes.</p>-->
 <div style="margin:20px 0;">
     <!--<a href="#" class="easyui-linkbutton" onclick="getChecked()">GetChecked</a>-->
-    <a href="#" class="easyui-linkbutton" onclick="save()">保存</a>
+    <a href="javascript:void(0)" class="easyui-linkbutton  c-primary" style="width:80px" onclick="save()">保存</a>
 </div>
 <!--<div style="margin:10px 0">
     <input type="checkbox" checked onchange="$('#tt').tree({cascadeCheck:$(this).is(':checked')})">CascadeCheck
diff --git a/web/src/main/resources/templates/easyui/roleAuthority/list.html b/web/src/main/resources/templates/easyui/roleAuthority/list.html
index a533149b2b0afd55ffb4e06d7e2291ec3939f42e..ca417a76f883be496e354e9be3c99026d409e6d7 100644
--- a/web/src/main/resources/templates/easyui/roleAuthority/list.html
+++ b/web/src/main/resources/templates/easyui/roleAuthority/list.html
@@ -5,33 +5,30 @@
 <body>
 <div id="tb">
     <div class="datagrid-toolbar" style="padding-bottom: 6px">
-        <!--标题: <input class="easyui-textbox" style="width: 160px" id="search_title" name="title" data-options="required:false">
-        状态: <input class="easyui-textbox" style="width: 160px" id="search_status" name="status" data-options="required:false">
-        新闻类型: <t:dict class="easyui-combobox" id="search_newsType" name="newsType" dict-name="news_type"  style="width:160px" allow-empty="true"></t:dict>-->
-        <a href="javascript:void(0)" class="easyui-linkbutton c-primary" style="width:80px" onclick="doSearch()"><i class="fa fa-search" aria-hidden="true"></i> <span th:text="#{search}"></span></a>
-        <a href="javascript:void(0)" class="easyui-linkbutton c-basic" style="width:80px" onclick="doSearchReset()"><i class="fa fa-repeat" aria-hidden="true"></i> <span th:text="#{reset}"></span></a>
+        <!--<a href="javascript:void(0)" class="easyui-linkbutton c-primary" style="width:80px" onclick="doSearch()"><i class="fa fa-search" aria-hidden="true"></i> <span th:text="#{search}"></span></a>
+        <a href="javascript:void(0)" class="easyui-linkbutton c-basic" style="width:80px" onclick="doSearchReset()"><i class="fa fa-repeat" aria-hidden="true"></i> <span th:text="#{reset}"></span></a>-->
     </div>
-    <div class="datagrid-toolbar easyui-panel" style="padding:5px;">
+    <!--<div class="datagrid-toolbar easyui-panel" style="padding:5px;">
         <a href="javascript:void(0)" class="easyui-linkbutton c-primary" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doAdd()"><i class="fa fa-plus" aria-hidden="true"></i> <span th:text="#{add}"></span></a>
         <a href="javascript:void(0)" class="easyui-linkbutton c-warning" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doEdit()"><i class="fa fa-pencil" aria-hidden="true"></i> <span th:text="#{edit}"></span></a>
         <a href="javascript:void(0)" class="easyui-linkbutton c-danger" style="width:80px" data-options="toggle:true,group:'g1'" onclick="doDelete()"><i class="fa fa-trash" aria-hidden="true"></i> <span th:text="#{delete}"></span></a>
-    </div>
+    </div>-->
 </div>
 <table id="tt">
     <thead>
     <tr>
         <!--<th data-options="field:'ck',checkbox:true"></th>-->
-        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'id'">id</th>
-        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'createBy'">创建人id</th>
-        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'createDate'">创建时间</th>
-        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'updateBy'">更新人id</th>
-        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'updateDate'">更新时间</th>
-        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'typeCode'">字典编码</th>
-        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'typeName'">字典编码名称</th>
-        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'typeGroupId'">字典组id</th>
-        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'typeGroupCode'">字典组编码</th>
-        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'orderNum'">排序</th>
-        <th data-options="width:200,sortable:true,align:'center',hidden:false,field:'operation',formatter:formatRoleAuthority">操作</th>
+        <th data-options="width:160,sortable:true,align:'center',hidden:false,field:'id'">id</th>
+        <th data-options="width:160,sortable:true,align:'center',hidden:true,field:'createBy'">创建人id</th>
+        <th data-options="width:160,sortable:true,align:'center',hidden:true,field:'createDate'">创建时间</th>
+        <th data-options="width:160,sortable:true,align:'center',hidden:true,field:'updateBy'">更新人id</th>
+        <th data-options="width:160,sortable:true,align:'center',hidden:true,field:'updateDate'">更新时间</th>
+        <th data-options="width:160,sortable:true,align:'center',hidden:false,field:'typeCode'">字典编码</th>
+        <th data-options="width:160,sortable:true,align:'center',hidden:false,field:'typeName'">字典编码名称</th>
+        <th data-options="width:160,sortable:true,align:'center',hidden:true,field:'typeGroupId'">字典组id</th>
+        <th data-options="width:160,sortable:true,align:'center',hidden:true,field:'typeGroupCode'">字典组编码</th>
+        <th data-options="width:160,sortable:true,align:'center',hidden:false,field:'orderNum'">排序</th>
+        <th data-options="width:160,sortable:true,align:'center',hidden:false,field:'operation',formatter:formatRoleAuthority">操作</th>
     </tr>
     </thead>
 </table>
diff --git a/web/src/main/resources/templates/index_v1.html b/web/src/main/resources/templates/index_v1.html
index 35ca734ca7c5518bf97c375a2f3984799c008c48..c511a41e40cbcd33c6c4048018bc9cec52b82ae5 100644
--- a/web/src/main/resources/templates/index_v1.html
+++ b/web/src/main/resources/templates/index_v1.html
@@ -66,7 +66,7 @@
                             <!--<div sec:authentication="principal.authorities"></div>-->
                         </h3>
                     </div>
-                    <div class="dropdown profile-element">
+                    <!--<div class="dropdown profile-element">
 
                         <a data-toggle="dropdown" class="dropdown-toggle" href="#">
                             <span class="clear">
@@ -89,7 +89,7 @@
                             </li>
                         </ul>
                         <div class="logo-element">BootDo</div>
-                    </div>
+                    </div>-->
                 </li>
                 <!--<li><a href="#"> <i class="fa fa-home"></i> <span
                         class="nav-label">主页</span> <span class="fa arrow"></span>
@@ -124,18 +124,18 @@
 
                     <a class="navbar-minimalize minimalize-styl-2 btn btn-default "
                        href="#" title="收起菜单"><i class="fa fa-bars"></i> </a>
-                    <form role="search" class="navbar-form-custom"
+                    <!--<form role="search" class="navbar-form-custom"
                           method="post" action="">
                         <div class="form-group">
                             <input type="text" placeholder="请输入您需要查找的内容 …"
                                    class="form-control" name="top-search" id="top-search">
                         </div>
-                    </form>
+                    </form>-->
                 </div>
                 <ul class="nav navbar-top-links navbar-right">
                     <!--<li class="hidden-xs"><a href="/blog" target="_Blank"
                                              class=""><i class="fa fa-rss-square"></i>博客</a></li>-->
-                    <li class="dropdown"><a class="dropdown-toggle count-info"
+                    <!--<li class="dropdown"><a class="dropdown-toggle count-info"
                                             data-toggle="dropdown" href="#"> <i class="fa fa-envelope"></i>
                         <span class="label label-warning">0</span>通知
                     </a>
@@ -162,7 +162,7 @@
                                 </div>
                             </li>
                         </ul>
-                    </li>
+                    </li>-->
                     <li class="hidden-xs"><a href="javascript:void(0);" onclick="showUserConfig()"><i class="fa fa-id-card"></i> 个人</a></li>
                     <li class="dropdown hidden-xs"><a
                             class="right-sidebar-toggle" aria-expanded="false"> <i