diff --git a/app/Services/Cron.php b/app/Services/Cron.php index f9f9bb42..0146e3b7 100755 --- a/app/Services/Cron.php +++ b/app/Services/Cron.php @@ -64,11 +64,11 @@ final class Cron CronFreenodeMerge::save(); // 3.加工成文件 } if ($i === 12) { - CronFreenodeMerge::baseToSite("fn_a"); // 4.文件分散为各站用 - CronFreenodeMerge::baseToSite("fn_b"); // 4.文件分散为各站用 + CronFreenodeMerge::baseToSite("fn_a"); // 4.文件处理成各站版本 + CronFreenodeMerge::baseToSite("fn_b"); // 4.文件处理成各站版本 } if ($i === 15) { - CronFreenodeSync::nodehub(); // 6.fn分到到nodehub + CronFreenodeSync::nodehub(); // 6.fn发布到nodehub } // 发布在11点,只一次,即可 diff --git a/app/Services/Cron/FreenodeSync.php b/app/Services/Cron/FreenodeSync.php index 4d032568..2d1ac743 100755 --- a/app/Services/Cron/FreenodeSync.php +++ b/app/Services/Cron/FreenodeSync.php @@ -65,9 +65,9 @@ final class FreenodeSync $oFnSiteList = ModelSiteMap::whereIn("group_code", ["fn_b", "fn_a"])->get(); $oSiteNodehub = ModelSiteMap::where("code", "nodehub")->first(); - $aSiteNodehubConfig = json_decode($oSiteNodehub->config ?? '', true); +// $aSiteNodehubConfig = json_decode($oSiteNodehub->config ?? '', true); - $aFreenodeClient = $aSiteNodehubConfig["freenode_client"] ?? []; +// $aFreenodeClient = $aSiteNodehubConfig["freenode_client"] ?? []; $aNodehubApis = json_decode($oSiteNodehub->api_path, true); $sSiteApiFreenodeReceive = $aNodehubApis["freenode_receive"] ?? ""; @@ -80,6 +80,8 @@ final class FreenodeSync // $aSiteApi = json_decode($oFnSite->api_path, true); // $sSiteApiFreenodeReceive = $aSiteApi["freenode_receive"] ?? ""; + $aFreenodeClient = $oFnSite["freenode_client"] ?? []; + $aData = []; $aData["site_code_short"] = $oFnSite->code_short; foreach ($aFreenodeClient as $aSiteConfigFnClientRow) {