From f1f455a7c4e91279cc90868506472d7763f75968 Mon Sep 17 00:00:00 2001 From: hellcat <> Date: Fri, 19 Dec 2025 17:34:39 +0800 Subject: [PATCH] no message --- app/Services/Cron/FreenodeCrawl.php | 3 ++- app/Services/Cron/FreenodeSync.php | 4 ++-- fn部署.md | 11 +++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/Services/Cron/FreenodeCrawl.php b/app/Services/Cron/FreenodeCrawl.php index f6d7f909..9a9d225e 100644 --- a/app/Services/Cron/FreenodeCrawl.php +++ b/app/Services/Cron/FreenodeCrawl.php @@ -47,9 +47,10 @@ final class FreenodeCrawl $sFileName = str_replace("{{Ymd}}", date("Ymd"), $v); - $sUrlSend = "http://".$aFrom["url_base"].$aFrom["url_node"].$sFileName; + $sUrlSend = "https://".$aFrom["url_base"].$aFrom["url_node"].$sFileName; $sFileContent = self::curl($sUrlSend) ?? ""; +// tomd($sUrlSend); // tomd($sFileContent, 1); if (!$sFileContent) { return []; diff --git a/app/Services/Cron/FreenodeSync.php b/app/Services/Cron/FreenodeSync.php index f9bc81ed..92ca3aca 100644 --- a/app/Services/Cron/FreenodeSync.php +++ b/app/Services/Cron/FreenodeSync.php @@ -40,11 +40,11 @@ final class FreenodeSync $sApiUrl = "https://".$oFnSite->url."/".$sSiteApiFreenodeReceive; $sResult = HttpV2::make($sApiUrl, "post")->setDataA($aFnContent)->enableJsonSend()->send(); - + $aResult = json_decode($sResult, true); if (!isset($aResult["is_done"]) || $aResult["is_done"] != true) { - $sMsg = "freenodeSync::同步失败 ->".json_encode($oFnSite->toArray())."->".$sResult; + $sMsg = "freenodeSync::同步失败 ->".$oFnSite->name."->".$sResult; echo $sMsg; TeleSlave::warn()->setMsgS($sMsg)->send(); continue; diff --git a/fn部署.md b/fn部署.md index e9c68bd4..ca0d89e1 100644 --- a/fn部署.md +++ b/fn部署.md @@ -7,6 +7,8 @@ master加crawl_freenode表,加freenode_pool表 master的fn文件夹里加template +master加dog_option表 + cfn的option里嫁freenode_client cnf加http_queue表 - 不用 @@ -49,3 +51,12 @@ CREATE TABLE `freenode_pool` ( PRIMARY KEY (`id`), KEY `date` (`date`) ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; + +CREATE TABLE `dog_option` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `dog_name` varchar(255) DEFAULT NULL, + `k` varchar(255) DEFAULT NULL, + `v` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `unique_this_name_k` (`dog_name`,`k`) +) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;