|
|
@@ -103,8 +103,8 @@ class Exec extends \app\admin\BaseController{
|
|
|
"down_url"=>'',
|
|
|
"status"=>1,
|
|
|
"remark"=>'',
|
|
|
- "type"=>$exec["type"],
|
|
|
- "expiretime"=>$exec["type"]==1? date("Y-m-d H:i:s"):date("Y-m-d 22:00:00"),
|
|
|
+ "type"=>$param["type"],
|
|
|
+ "expiretime"=>$param["type"]==1? date("Y-m-d H:i:s"):date("Y-m-d 22:00:00"),
|
|
|
"addtime"=> date("Y-m-d H:i:s"),
|
|
|
"updatetime"=> date("Y-m-d H:i:s")
|
|
|
];
|
|
|
@@ -131,13 +131,13 @@ class Exec extends \app\admin\BaseController{
|
|
|
return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
|
|
|
}
|
|
|
public function logdel(){
|
|
|
- $param=$this->request->param(["logid"=>""],"post","trim");
|
|
|
- if($param['logid']=='')return error_show(1004,"参数logid 不能为空");
|
|
|
- $log=Db::name("exec_log")->where(["id"=>$param['logid']])->findOrEmpty();
|
|
|
+ $param=$this->request->param(["id"=>""],"post","trim");
|
|
|
+ if($param['id']=='')return error_show(1004,"参数 id 不能为空");
|
|
|
+ $log=Db::name("exec_log")->where(["id"=>$param['id']])->findOrEmpty();
|
|
|
if(empty($log))return error_show(1004,"脚本记录不存在");
|
|
|
if($log['is_del']==1) return error_show(1004,"脚本记录已删除");
|
|
|
if(in_array($log['status'],[2,4])) return error_show(1004,"脚本执行中或已完成");
|
|
|
- $del=Db::name("exec_log")->where(["id"=>$param['logid']])->update(["is_del"=>1,"updatetime"=>date("Y-m-d H:i:s")]);
|
|
|
+ $del=Db::name("exec_log")->where(["id"=>$param['id']])->update(["is_del"=>1,"updatetime"=>date("Y-m-d H:i:s")]);
|
|
|
return $del? app_show("0","删除成功"):app_show("1004","删除失败");
|
|
|
}
|
|
|
public function actionList(){
|
