正在显示
1 个修改的文件
包含
19 行增加
和
20 行删除
| @@ -45,26 +45,25 @@ class CNoticeController extends BaseController | @@ -45,26 +45,25 @@ class CNoticeController extends BaseController | ||
| 45 | 'url' => $request->input('url', []), | 45 | 'url' => $request->input('url', []), |
| 46 | 'language'=> $request->input('language', []), | 46 | 'language'=> $request->input('language', []), |
| 47 | ]; | 47 | ]; |
| 48 | - $result = http_post($url, json_encode($param)); | ||
| 49 | - return $this->response('更新中请稍后, 更新完成将会发送站内信通知更新结果!'); | ||
| 50 | - | ||
| 51 | - $updateProgressModel = new UpdateProgress(); | ||
| 52 | - $progressInfo = $updateProgressModel->formatQuery(['project_id'=>$this->user['project_id'],'type'=>$this->param['type']])->orderBy('id','desc')->first(); | ||
| 53 | - if((!empty($progressInfo))){ | ||
| 54 | - $progressInfo = $progressInfo->toArray(); | ||
| 55 | - if(($progressInfo['total_num'] > $progressInfo['current_num'])){ | ||
| 56 | - $this->response('当前页面正在生成了,请完成后再点击',Code::SUCCESS,$progressInfo); | ||
| 57 | - } | ||
| 58 | - } | ||
| 59 | - //通知更新 | ||
| 60 | - if($this->param['type'] == UpdateNotify::TYPE_MASTER){ | ||
| 61 | - $this->updateMaster(); | ||
| 62 | - }else{ | ||
| 63 | - $this->updateMinorLanguages(); | ||
| 64 | - } | ||
| 65 | - $urlStr = $this->getString($this->param['type'],$this->param['page']); | ||
| 66 | - curlGet($urlStr); | ||
| 67 | - $this->response('更新成功'); | 48 | + http_post($url, json_encode($param)); |
| 49 | + $this->response('更新中请稍后, 更新完成将会发送站内信通知更新结果!'); | ||
| 50 | +// $updateProgressModel = new UpdateProgress(); | ||
| 51 | +// $progressInfo = $updateProgressModel->formatQuery(['project_id'=>$this->user['project_id'],'type'=>$this->param['type']])->orderBy('id','desc')->first(); | ||
| 52 | +// if((!empty($progressInfo))){ | ||
| 53 | +// $progressInfo = $progressInfo->toArray(); | ||
| 54 | +// if(($progressInfo['total_num'] > $progressInfo['current_num'])){ | ||
| 55 | +// $this->response('当前页面正在生成了,请完成后再点击',Code::SUCCESS,$progressInfo); | ||
| 56 | +// } | ||
| 57 | +// } | ||
| 58 | +// //通知更新 | ||
| 59 | +// if($this->param['type'] == UpdateNotify::TYPE_MASTER){ | ||
| 60 | +// $this->updateMaster(); | ||
| 61 | +// }else{ | ||
| 62 | +// $this->updateMinorLanguages(); | ||
| 63 | +// } | ||
| 64 | +// $urlStr = $this->getString($this->param['type'],$this->param['page']); | ||
| 65 | +// curlGet($urlStr); | ||
| 66 | +// $this->response('更新成功'); | ||
| 68 | } | 67 | } |
| 69 | 68 | ||
| 70 | /** | 69 | /** |
-
请 注册 或 登录 后发表评论