diff --git a/app/Http/Controllers/CronController.php b/app/Http/Controllers/CronController.php index 54ce7b1..e76974e 100755 --- a/app/Http/Controllers/CronController.php +++ b/app/Http/Controllers/CronController.php @@ -14,6 +14,7 @@ class CronController private $sUserName; private $sProjectName; private $sMailName; + private $sMailTail; private $sProjectPath; private $sProjectUrl; @@ -100,6 +101,7 @@ class CronController foreach ($aArticle as $row) { $this->sUserName = $row["user_name"]; $this->sMailName = $row["mail_name"]; + $this->sMailTail = $row["mail_tail"]; $this->sProjectName = $row["project_name"]; $this->sProjectPath = env("BASE_DIR")."github/".$this->sUserName."-".$this->sProjectName; $this->sProjectUrl = "git@".$this->sMailName.".com:".$this->sUserName."/".$this->sProjectName.".git"; @@ -208,7 +210,7 @@ class CronController // 设置用户 $this->runCommand("git config --local user.name \"{$this->sUserName}\""); - $this->runCommand("git config --local user.email \"{$this->sUserName}@tuta.io\""); //这里得改,直接tuta不行 + $this->runCommand("git config --local user.email \"{$this->sMailName}@{$this->sMailTail}\""); //这里得改,直接tuta不行 // 创建并切换到 main 分支 $this->runCommand('git branch -M main');