作者 周海龙

合并分支 'zhl' 到 'master'

u



查看合并请求 !100
@@ -33,9 +33,21 @@ class CNoticeController extends BaseController @@ -33,9 +33,21 @@ class CNoticeController extends BaseController
33 /** 33 /**
34 * 更新通知C端 34 * 更新通知C端
35 * @param Request $request 35 * @param Request $request
36 - * @param WebSettingLogic $webSettingLogic 36 + * @return \Illuminate\Http\JsonResponse
37 */ 37 */
38 - public function sendNotify(){ 38 + public function sendNotify(Request $request)
  39 + {
  40 + $url = $this->user['domain'].'api/update_page/';
  41 + $param = [
  42 + 'project_id' => $this->user['project_id'],
  43 + 'type' => intval($request->input('type', 1)),
  44 + 'route' => intval($request->input('page', 1)),
  45 + 'url' => $request->input('url', []),
  46 + 'language'=> $request->input('language', []),
  47 + ];
  48 + $result = http_post($url, $param);
  49 + return $this->response('更新中请稍后, 更新完成将会发送站内信通知更新结果!');
  50 +
39 $updateProgressModel = new UpdateProgress(); 51 $updateProgressModel = new UpdateProgress();
40 $progressInfo = $updateProgressModel->formatQuery(['project_id'=>$this->user['project_id'],'type'=>$this->param['type']])->orderBy('id','desc')->first(); 52 $progressInfo = $updateProgressModel->formatQuery(['project_id'=>$this->user['project_id'],'type'=>$this->param['type']])->orderBy('id','desc')->first();
41 if((!empty($progressInfo))){ 53 if((!empty($progressInfo))){