From de5c751eb96ee99d4292faac575bae9c9fbcd439 Mon Sep 17 00:00:00 2001
From: georgehao <haodaquan2008@163.com>
Date: Thu, 18 Apr 2019 22:29:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=A8=A1=E7=89=88+=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=A0=E9=99=A4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

通知模版新增任务执行server_id,优化任务执行按钮位置，增加删除功能
---
 conf/app.conf             |  2 +-
 jobs/job.go               |  2 ++
 notify/dingtalk.go        |  7 ++++---
 views/notifytpl/add.html  |  1 +
 views/notifytpl/edit.html |  1 +
 views/public/main.html    |  2 +-
 views/task/detail.html    | 32 ++++++++++++++++++++++++++++++--
 views/task/list.html      |  4 ++--
 8 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/conf/app.conf b/conf/app.conf
index d3cec2e..3848531 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -3,7 +3,7 @@ HTTPPort = 8080
 RunMode = dev
 SessionOn = true
 
-version= V2.5
+version= V2.6
 
 # 允许同时运行的任务数
 jobs.pool = 1000
diff --git a/jobs/job.go b/jobs/job.go
index cfacc53..5b8a5ac 100644
--- a/jobs/job.go
+++ b/jobs/job.go
@@ -451,6 +451,7 @@ func (j *Job) Run() {
 
 			if title != "" {
 				title = strings.Replace(title, "{{TaskId}}", strconv.Itoa(j.task.Id), -1)
+				title = strings.Replace(title, "{{ServerId}}", strconv.Itoa(j.serverId), -1)
 				title = strings.Replace(title, "{{TaskName}}", j.task.TaskName, -1)
 				title = strings.Replace(title, "{{ExecuteCommand}}", j.task.Command, -1)
 				title = strings.Replace(title, "{{ExecuteTime}}", beego.Date(time.Unix(log.CreateTime, 0), "Y-m-d H:i:s"), -1)
@@ -462,6 +463,7 @@ func (j *Job) Run() {
 
 			if content != "" {
 				content = strings.Replace(content, "{{TaskId}}", strconv.Itoa(j.task.Id), -1)
+				content = strings.Replace(content, "{{ServerId}}", strconv.Itoa(j.serverId), -1)
 				content = strings.Replace(content, "{{TaskName}}", j.task.TaskName, -1)
 				content = strings.Replace(content, "{{ExecuteCommand}}", j.task.Command, -1)
 				content = strings.Replace(content, "{{ExecuteTime}}", beego.Date(time.Unix(log.CreateTime, 0), "Y-m-d H:i:s"), -1)
diff --git a/notify/dingtalk.go b/notify/dingtalk.go
index 7f3e05f..9e841a3 100644
--- a/notify/dingtalk.go
+++ b/notify/dingtalk.go
@@ -8,13 +8,13 @@
 package notify
 
 import (
+	"bytes"
+	"encoding/json"
+	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/george518/PPGo_Job/libs"
 	"log"
 	"time"
-	"fmt"
-	"encoding/json"
-	"bytes"
 )
 
 type Dingtalk struct {
@@ -41,6 +41,7 @@ func init() {
 				}
 				if err := m.SendDingtalk(); err != nil {
 					beego.Error("SendDingtalk:", err.Error())
+
 				}
 			}
 		}
diff --git a/views/notifytpl/add.html b/views/notifytpl/add.html
index c70ef52..4432b97 100644
--- a/views/notifytpl/add.html
+++ b/views/notifytpl/add.html
@@ -40,6 +40,7 @@
                 <pre class="layui-code" style="margin: 0;">
 
   {{"任务 ID {{TaskId}}"}}
+  {{"资源 ID {{ServerId}}"}}
   {{"任务名称 {{TaskName}}"}}
   {{"执行命令 {{ExecuteCommand}}"}}
   {{"执行时间 {{ExecuteTime}}"}}
diff --git a/views/notifytpl/edit.html b/views/notifytpl/edit.html
index 5978a11..db916e7 100644
--- a/views/notifytpl/edit.html
+++ b/views/notifytpl/edit.html
@@ -41,6 +41,7 @@
                 <pre class="layui-code" style="margin: 0;">
 
   {{"任务 ID {{TaskId}}"}}
+  {{"资源 ID {{ServerId}}"}}
   {{"任务名称 {{TaskName}}"}}
   {{"执行命令 {{ExecuteCommand}}"}}
   {{"执行时间 {{ExecuteTime}}"}}
diff --git a/views/public/main.html b/views/public/main.html
index e55badd..c6c6d5e 100644
--- a/views/public/main.html
+++ b/views/public/main.html
@@ -84,7 +84,7 @@
 
     <div class="layui-footer" style="border-top: 2px solid #e4e4e4">
         <!-- 底部固定区域 -->
-        © Power by <a href="http://www.haodaquan.com/" target="_blank">PPGo_Job V2.0 </a>
+        © Power by <a href="http://www.haodaquan.com/" target="_blank">PPGo_Job V2.6 </a>
     </div>
 </div>
 <script src="/static/layui/layui.js"></script>
diff --git a/views/task/detail.html b/views/task/detail.html
index 7f0ebca..41baa9f 100644
--- a/views/task/detail.html
+++ b/views/task/detail.html
@@ -25,6 +25,7 @@
         <button lay-submit class="layui-btn  layui-btn-sm " lay-filter="run">测试执行</button>
         <button lay-submit class="layui-btn  layui-btn-sm " lay-filter="log">任务日志</button>
         <button lay-submit class="layui-btn  layui-btn-sm " lay-filter="copy">复制任务</button>
+        <button lay-submit class="layui-btn  layui-btn-sm layui-btn-primary" lay-filter="del">删除任务</button>
     </div>
 
     <div class="layui-layout layui-layout-admin" style="padding-left: 40px;margin-top: 20px;padding-right: 10px;">
@@ -150,6 +151,7 @@
         <input type="hidden" name="id" id="id" value="{{.task.Id}}">
     </div>
 
+
 </div>
 <script>
     layui.use(['form','element','layer','jquery'],function(){
@@ -163,8 +165,6 @@
             })
             return;
         }
-
-
         var task_name = "{{.task.TaskName}}";
         $('.layui-btn-container button').on('click',function () {
             var event = $(this).attr('lay-filter');
@@ -180,6 +180,34 @@
                 window.parent.openTab("/tasklog/list?task_id="+id,task_name+'日志',"admin_log-"+id,'');
             }else if(event==='copy'){
                 window.parent.openTab("/task/copy?id="+id,task_name+' 复制',"admin_task_copy-"+id,'fa-copy');
+            }else if(event==="del"){
+                var status =" {{.task.Status}}";
+                if(status==1){
+                    layer.msg("运行状态无法删除任务，请先暂停任务");
+                    return;
+                }
+
+                layer.confirm("确认要删除这条任务吗？", {icon: 3, title:'提示'}, function(index){
+                    layer.load();
+                    $.post('/task/ajaxdel', {id:id}, function (out) {
+
+                        if (out.status == 0) {
+                            layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () {
+                                window.parent.deleteCurrentTab();
+                            })
+                        } else {
+                            layer.msg(out.message);
+                            return
+                        }
+                    }, "json");
+
+                    setTimeout(function(){
+                        layer.closeAll('loading');
+                    }, 2000);
+
+                    layer.close(index);
+                });
+
             }else if (event==='run'){
                 layer.confirm("测试执行任务，注意不要超时，请确认执行", {icon: 3, title:'提示'}, function(index){
                     layer.load();
diff --git a/views/task/list.html b/views/task/list.html
index 6deffd9..2f1d052 100644
--- a/views/task/list.html
+++ b/views/task/list.html
@@ -35,7 +35,7 @@
         {{/*<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="status">启|停</a>*/}}
         {{/*<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>*/}}
         <a class="layui-btn layui-btn-xs " lay-event="detail">详细</a>
-        <a class="layui-btn layui-btn-warm layui-btn-xs" lay-event="run">测试</a>
+        {{/*<a class="layui-btn layui-btn-warm layui-btn-xs" lay-event="run">测试</a>*/}}
         <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="log">日志</a>
     </script>
 </div>
@@ -64,7 +64,7 @@
                 ,{field:'next_time', width:170,title: '下次执行时间'}
                 ,{field:'pre_time', title: '上次执行时间'}
                 ,{field:'execute_times', title: '次数'}
-                ,{fixed: 'right', width:150, align:'center', title:'操作', toolbar: '#bar'}
+                ,{width:120, align:'center', title:'操作', toolbar: '#bar'}
             ]]
             ,id: 'listReload'
             ,page: true