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

修改本地支持widows命令

Browse Source
This commit is contained in:
george
2018-08-15 10:22:07 +08:00
parent 86719ab303
commit 51a71930c2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jobs/job.go
View File

@@ -76,9 +76,9 @@ func NewCommandJob(id int, name string, command string) *Job {
//cmd := exec.Command("/bin/bash", "-c", command) //cmd := exec.Command("/bin/bash", "-c", command)
var cmd *exec.Cmd var cmd *exec.Cmd
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
cmd = exec.Command("sh", "-c", command)
} else {
cmd = exec.Command("CMD", "/C", command) cmd = exec.Command("CMD", "/C", command)
} else {
cmd = exec.Command("sh", "-c", command)
} }
cmd.Stdout = bufOut cmd.Stdout = bufOut
cmd.Stderr = bufErr cmd.Stderr = bufErr

2
views/tasklog/detail.html
View File

@@ -67,7 +67,7 @@
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;"> <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
<legend>执行输出</legend> <legend>执行输出</legend>
</fieldset> </fieldset>
<pre class="layui-code">{{.taskLog.ouput}}</pre> <pre class="layui-code">{{.taskLog.output}}</pre>
</div> </div>
<div class="layui-layout layui-layout-admin" style="padding-left: 40px;margin-top: 20px;padding-right: 10px;"> <div class="layui-layout layui-layout-admin" style="padding-left: 40px;margin-top: 20px;padding-right: 10px;">