作者 刘锟

update

@@ -59,7 +59,7 @@ public function websiteHandle($infoArr) @@ -59,7 +59,7 @@ public function websiteHandle($infoArr)
59 $this->output('网站更新开始'); 59 $this->output('网站更新开始');
60 60
61 $noticeController = new NoticeController(); 61 $noticeController = new NoticeController();
62 - $noticeController->websiteHtmlHandle($infoArr["zip_count"], $infoArr["domain"]); 62 + $noticeController->websiteHtmlHandle($infoArr["zip_count"], $infoArr["domain"], $infoArr["notify_id"]);
63 63
64 $this->output('网站更新结束'); 64 $this->output('网站更新结束');
65 } 65 }
@@ -231,6 +231,7 @@ public function websiteHtml(Request $request) @@ -231,6 +231,7 @@ public function websiteHtml(Request $request)
231 $domain = $request->getHost(); 231 $domain = $request->getHost();
232 $site_token = $request->input('site_token'); 232 $site_token = $request->input('site_token');
233 $zip_count = $request->input('zip_count'); 233 $zip_count = $request->input('zip_count');
  234 + $notify_id = $request->input('notify_id');
234 $token = env("SECRET_TOKEN"); 235 $token = env("SECRET_TOKEN");
235 $pid = env("MERCHANT_NUMBER"); 236 $pid = env("MERCHANT_NUMBER");
236 $apiUrl = env("API_URL"); 237 $apiUrl = env("API_URL");
@@ -258,7 +259,8 @@ public function websiteHtml(Request $request) @@ -258,7 +259,8 @@ public function websiteHtml(Request $request)
258 259
259 $info = [ 260 $info = [
260 "domain" => $domain, 261 "domain" => $domain,
261 - "zip_count" => $zip_count 262 + "zip_count" => $zip_count,
  263 + "notify_id" => $notify_id
262 ]; 264 ];
263 $info = json_encode($info); 265 $info = json_encode($info);
264 Redis::lpush(env('REDIS_NAME', 'handle_html'), $info); 266 Redis::lpush(env('REDIS_NAME', 'handle_html'), $info);
@@ -371,8 +373,9 @@ public function limitIp($request) @@ -371,8 +373,9 @@ public function limitIp($request)
371 * 网站html解压 373 * 网站html解压
372 * @param $zip_count 374 * @param $zip_count
373 * @param $domain 375 * @param $domain
  376 + * @param $notify_id
374 */ 377 */
375 - public function websiteHtmlHandle($zip_count, $domain) 378 + public function websiteHtmlHandle($zip_count, $domain, $notify_id)
376 { 379 {
377 $api_url = env('API_URL'); 380 $api_url = env('API_URL');
378 381
@@ -400,7 +403,7 @@ public function websiteHtmlHandle($zip_count, $domain) @@ -400,7 +403,7 @@ public function websiteHtmlHandle($zip_count, $domain)
400 } 403 }
401 404
402 $transmitUrl = env("TRANSMIT_URL"); 405 $transmitUrl = env("TRANSMIT_URL");
403 - $this->httpPost($transmitUrl . "api/selfSiteNotify/", json_encode(['domain' => $domain])); 406 + $this->httpPost($transmitUrl . "api/selfSiteNotify/", json_encode(['domain' => $domain, 'notify_id' => $notify_id]));
404 } 407 }
405 408
406 /** 409 /**