From 13757b0aae7f7b57907cc983748852fc96745b5c Mon Sep 17 00:00:00 2001 From: hellcat <> Date: Wed, 23 Jul 2025 20:18:50 +0800 Subject: [PATCH] no message --- app/Http/Controllers/CronController.php | 2 +- just/tom无脑流程.text | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/CronController.php b/app/Http/Controllers/CronController.php index 4cfcbe4..1bebeba 100755 --- a/app/Http/Controllers/CronController.php +++ b/app/Http/Controllers/CronController.php @@ -354,7 +354,7 @@ class CronController $this->runCommand("git commit -m \"$commitMessage\""); // 推送到远程主分支 - $this->runCommand('git push -u origin main'); // 确保将 'main' 替换为你的默认分支名称 + $this->runCommand('git push -u origin main --force'); // 确保将 'main' 替换为你的默认分支名称, 覆盖 echo "操作完成:已提交并推送更改[".$this->aArticle['id']."]。\n"; } diff --git a/just/tom无脑流程.text b/just/tom无脑流程.text index b1fca89..627dbac 100644 --- a/just/tom无脑流程.text +++ b/just/tom无脑流程.text @@ -19,8 +19,9 @@ ssh目录 ssh安装 sudo apt update sudo apt install openssh-client - ssh-keygen -t rsa -b 4096 -C "github-sg01@gemsub.online" + ssh-keygen -t rsa -b 4096 -C "erdama123@outlook.com" 生成地址写 /var/www/.ssh/id_rsa_邮箱不要后缀 dahuaidan123123 + 别忘了权限 ssh权限 chown -R www-data:www-data /var/www/.ssh