yanglc
/
OneManager-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: depl state ERROR, app ID not found

pull/453/merge
qkqpttgf 2022-08-27 16:22:16 +08:00 committed by GitHub
parent 2e5ea1bc6f
commit dbb2de5f50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
platform/Vercel.php
View File

@ -176,9 +176,15 @@ function install()
$header["Content-Type"] = "application/json"; $header["Content-Type"] = "application/json";
$aliases = json_decode(curl("GET", "https://api.vercel.com/v3/now/aliases", "", $header)['body'], true); $aliases = json_decode(curl("GET", "https://api.vercel.com/v3/now/aliases", "", $header)['body'], true);
$host = splitfirst($_SERVER["host"], "//")[1]; $host = splitfirst($_SERVER["host"], "//")[1];
$aliases1 = [];
foreach ($aliases["aliases"] as $key => $aliase) { foreach ($aliases["aliases"] as $key => $aliase) {
$aliases1[] = $aliase["alias"];
if ($host==$aliase["alias"]) $projectId = $aliase["projectId"]; if ($host==$aliase["alias"]) $projectId = $aliase["projectId"];
} }
if (!$projectId) {
$html = 'Please visit from: ' . json_encode($aliases1);
return message($html, 'Error', 400);
}
$tmp['HerokuappId'] = $projectId; $tmp['HerokuappId'] = $projectId;
$response = json_decode(setVercelConfig($tmp, $projectId, $APIKey), true); $response = json_decode(setVercelConfig($tmp, $projectId, $APIKey), true);
@ -258,12 +264,12 @@ language:<br>';
return message($html, $title, 201); return message($html, $title, 201);
} }
if (substr($_SERVER["host"], -10)=="vercel.app") { //if (substr($_SERVER["host"], -10)=="vercel.app") {
$html .= '<a href="?install0">' . getconstStr('ClickInstall') . '</a>, ' . getconstStr('LogintoBind'); $html .= '<a href="?install0">' . getconstStr('ClickInstall') . '</a>, ' . getconstStr('LogintoBind');
$html .= "<br>Remember: you MUST wait 30-60s after each operate / do some change, that make sure Vercel has done the building<br>" ; $html .= "<br>Remember: you MUST wait 30-60s after each operate / do some change, that make sure Vercel has done the building<br>" ;
} else { //} else {
$html.= "Please visit form *.vercel.app"; // $html.= "Please visit form *.vercel.app";
} //}
$title = 'Install'; $title = 'Install';
return message($html, $title, 201); return message($html, $title, 201);
} }
@ -340,7 +346,7 @@ function checkBuilding($projectId, $token)
//echo json_encode($response, JSON_PRETTY_PRINT) . " ,res<br>"; //echo json_encode($response, JSON_PRETTY_PRINT) . " ,res<br>";
$result = json_decode($response["body"], true); $result = json_decode($response["body"], true);
foreach ( $result['deployments'] as $deployment ) { foreach ( $result['deployments'] as $deployment ) {
if ($deployment['state']!=="READY") $r++; if ($deployment['state']!=="READY" && $deployment['state']!=="ERROR") $r++;
} }
return $r; return $r;
//if ($r===0) return true; //if ($r===0) return true;