red-future/ppgo_job
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.新增微信通知方式

Browse Source 
2.通知模板变量更改
3.删除沉余sql
4.readme.md更新
This commit is contained in:
linxiaozhi
2019-02-17 07:07:33 +08:00
parent 34a3de6cfd
commit e392e4c12e
21 changed files with 201 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
views/admin/add.html
View File

@@ -42,7 +42,13 @@
<div class="layui-input-inline">
<input type="text" name="dingtalk" id="dingtalk" autocomplete="off" placeholder="钉钉通知" class="layui-input" value="">
</div>
<div class="layui-form-mid layui-word-aux">*</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">微信帐号</label>
<div class="layui-input-inline">
<input type="text" name="wechat" id="wechat" autocomplete="off" placeholder="微信帐号" class="layui-input" value="">
</div>
</div>
<div class="layui-form-item">

9
views/admin/edit.html
View File

@@ -39,6 +39,13 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">微信帐号</label>
<div class="layui-input-inline">
<input type="text" name="wechat" id="wechat" autocomplete="off" placeholder="微信帐号" class="layui-input" value="{{.admin.wechat}}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">重置密码</label>
<div class="layui-input-inline">
@@ -58,8 +65,6 @@
<div class="layui-form-mid layui-word-aux">*</div>
</div>
{{end}}
<input type="hidden" id="roleids" name="roleids" value="{{.admin.role_ids}}">
<input type="hidden" id="id" name="id" value="{{.admin.id}}">

1
views/admin/list.html
View File

@@ -53,6 +53,7 @@
,{field:'phone', title: '联系电话'}
,{field:'email', title: '电子邮箱'}
,{field:'dingtalk', title: '钉钉通知'}
,{field:'wechat', title: '微信账号'}
,{field:'status_text', title: '状态'}
,{fixed: 'right', width:160, align:'center', toolbar: '#bar'}
]]

7
views/notifytpl/add.html
View File

@@ -17,6 +17,7 @@
<input type="radio" name="tpl_type" lay-filter="tpl_type" lay-verify="type" value="0" title="邮箱" checked>
<input type="radio" name="tpl_type" lay-filter="tpl_type" lay-verify="type" value="1" title="短信" >
<input type="radio" name="tpl_type" lay-filter="tpl_type" lay-verify="type" value="2" title="钉钉" >
<input type="radio" name="tpl_type" lay-filter="tpl_type" lay-verify="type" value="3" title="微信" >
</div>
<div class="layui-form-mid layui-word-aux"></div>
</div>
@@ -40,10 +41,10 @@
{{"任务 ID {{TaskId}}"}}
{{"任务名称 {{TaskName}}"}}
{{"执行时间 {{CreateTime}}"}}
{{"执行时间 {{ExecuteTime}}"}}
{{"执行耗时 {{ProcessTime}}"}}
{{"执行状态 {{Status}}"}}
{{"任务输出 {{TaskOut}}"}}
{{"执行状态 {{ExecuteStatus}}"}}
{{"任务输出 {{TaskOutput}}"}}
</pre>
</div>

7
views/notifytpl/edit.html
View File

@@ -17,6 +17,7 @@
<input type="radio" name="tpl_type" lay-filter="tpl_type" lay-verify="type" value="0" title="邮箱" {{if eq .notifyTpl.tpl_type 0}}checked{{end}}>
<input type="radio" name="tpl_type" lay-filter="tpl_type" lay-verify="type" value="1" title="短信" {{if eq .notifyTpl.tpl_type 1}}checked{{end}}>
<input type="radio" name="tpl_type" lay-filter="tpl_type" lay-verify="type" value="2" title="钉钉" {{if eq .notifyTpl.tpl_type 2}}checked{{end}}>
<input type="radio" name="tpl_type" lay-filter="tpl_type" lay-verify="type" value="3" title="微信" {{if eq .notifyTpl.tpl_type 3}}checked{{end}}>
</div>
<div class="layui-form-mid layui-word-aux"></div>
</div>
@@ -41,10 +42,10 @@
{{"任务 ID {{TaskId}}"}}
{{"任务名称 {{TaskName}}"}}
{{"执行时间 {{CreateTime}}"}}
{{"执行时间 {{ExecuteTime}}"}}
{{"执行耗时 {{ProcessTime}}"}}
{{"执行状态 {{Status}}"}}
{{"任务输出 {{TaskOut}}"}}
{{"执行状态 {{ExecuteStatus}}"}}
{{"任务输出 {{TaskOutput}}"}}
</pre>
</div>

1
views/task/add.html
View File

@@ -107,6 +107,7 @@
<input type="radio" name="notify_type" value="0" lay-filter="notify_type" title="邮件">
<input type="radio" name="notify_type" value="1" lay-filter="notify_type" title="短信">
<input type="radio" name="notify_type" value="2" lay-filter="notify_type" title="钉钉">
<input type="radio" name="notify_type" value="3" lay-filter="notify_type" title="微信">
</div>
<div class="layui-form-mid layui-word-aux"></div>
</div>

1
views/task/copy.html
View File

@@ -101,6 +101,7 @@
<input type="radio" name="notify_type" lay-verify="required" value="0" title="邮件" {{if eq .task.NotifyType 0}}checked{{end}}>
<input type="radio" name="notify_type" lay-verify="required" value="1" title="短信" {{if eq .task.NotifyType 1}}checked{{end}}>
<input type="radio" name="notify_type" lay-verify="required" value="2" title="钉钉" {{if eq .task.NotifyType 2}}checked{{end}}>
<input type="radio" name="notify_type" lay-verify="required" value="3" title="微信" {{if eq .task.NotifyType 3}}checked{{end}}>
</div>
<div class="layui-form-mid layui-word-aux"></div>
</div>

4
views/task/detail.html
View File

@@ -99,7 +99,7 @@
{{if eq .task.IsNotify 1}}
<tr>
<td>通知类型</td>
<td>{{if eq .task.NotifyType 1}}短信{{end}} {{if eq .task.NotifyType 0}}邮件{{end}} {{if eq .task.NotifyType 2}}钉钉{{end}}</td>
<td>{{if eq .task.NotifyType 1}}短信{{end}} {{if eq .task.NotifyType 0}}邮件{{end}} {{if eq .task.NotifyType 2}}钉钉{{end}} {{if eq .task.NotifyType 3}}微信{{end}}</td>
<td></td>
</tr>
@@ -217,8 +217,6 @@
})
//但是，如果你的HTML是动态生成的，自动渲染就会失效
//因此你需要在相应的地方，执行下述方法来手动渲染，跟这类似的还有 element.init();
form.render();

1
views/task/edit.html
View File

@@ -99,6 +99,7 @@
<input type="radio" name="notify_type" value="0" lay-filter="notify_type" title="邮件" {{if eq .task.NotifyType 0}}checked{{end}}>
<input type="radio" name="notify_type" value="1" lay-filter="notify_type" title="短信" {{if eq .task.NotifyType 1}}checked{{end}}>
<input type="radio" name="notify_type" value="2" lay-filter="notify_type" title="钉钉" {{if eq .task.NotifyType 2}}checked{{end}}>
<input type="radio" name="notify_type" value="3" lay-filter="notify_type" title="微信" {{if eq .task.NotifyType 3}}checked{{end}}>
</div>
<div class="layui-form-mid layui-word-aux"></div>
</div>

2
views/tasklog/detail.html
View File

@@ -153,7 +153,7 @@
{{if eq .task.IsNotify 1}}
<tr>
<td>通知类型</td>
<td>{{if eq .task.NotifyType 1}}短信{{end}} {{if eq .task.NotifyType 0}}邮件{{end}} {{if eq .task.NotifyType 2}}钉钉{{end}}</td>
<td>{{if eq .task.NotifyType 1}}短信{{end}} {{if eq .task.NotifyType 0}}邮件{{end}} {{if eq .task.NotifyType 2}}钉钉{{end}} {{if eq .task.NotifyType 3}}微信{{end}}</td>
<td></td>
</tr>

7
views/user/edit.html
View File

@@ -40,6 +40,13 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">微信帐号</label>
<div class="layui-input-inline">
<input type="text" name="wechat" id="wechat" autocomplete="off" placeholder="微信帐号" class="layui-input" value="{{.admin.wechat}}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">是否修改</label>
<div class="layui-input-inline">