From 70df39c4c8622085439878d0b1661325cef1ddd9 Mon Sep 17 00:00:00 2001 From: zpc Date: Wed, 10 Jul 2024 20:07:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CodeRelease/BLL/LinuxExecuteCommand.cs | 17 ++++++++++------- .../Controllers/PublishController.cs | 5 +++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/CodeRelease/CodeRelease/BLL/LinuxExecuteCommand.cs b/src/CodeRelease/CodeRelease/BLL/LinuxExecuteCommand.cs index 4b6cd18..55c5d3b 100644 --- a/src/CodeRelease/CodeRelease/BLL/LinuxExecuteCommand.cs +++ b/src/CodeRelease/CodeRelease/BLL/LinuxExecuteCommand.cs @@ -43,22 +43,23 @@ namespace CodeRelease.BLL process.OutputDataReceived += new DataReceivedEventHandler((sender, e) => { //Log.Logger.Information($"linux执行出错OutputDataReceived，命令{command}"); - Log.Logger.Information($"linux执行出错OutputDataReceived，Output{JsonConvert.SerializeObject(e)}"); + //Log.Logger.Information($"linux执行出错OutputDataReceived，Output{JsonConvert.SerializeObject(e)}"); if (!string.IsNullOrEmpty(e.Data)) { - Console.WriteLine($"Output: {e.Data}"); - outputDataReceived = e.Data; + //Console.WriteLine($"Output: {e.Data}"); + + outputDataReceived += e.Data; } }); process.ErrorDataReceived += new DataReceivedEventHandler((sender, e) => { // Log.Logger.Information($"linux执行出错ErrorDataReceived，命令{command}"); - Log.Logger.Information($"linux执行出错ErrorDataReceived，Output:{JsonConvert.SerializeObject(e)}"); + //Log.Logger.Information($"linux执行出错ErrorDataReceived，Output:{JsonConvert.SerializeObject(e)}"); if (!string.IsNullOrEmpty(e.Data)) { - Console.WriteLine($"Error: {e.Data}"); - errorDataReceived = e.Data; + //Console.WriteLine($"Error: {e.Data}"); + errorDataReceived += e.Data; } }); @@ -74,7 +75,9 @@ namespace CodeRelease.BLL // 输出退出代码 //Console.WriteLine($"Process exited with code {process.ExitCode}"); - Log.Logger.Information($"执行结束 {process.ExitCode}"); + Log.Logger.Information($"执行结束：{process.ExitCode}"); + Log.Logger.Information($"执行日志：{outputDataReceived}"); + Log.Logger.Information($"错误日志：{errorDataReceived}"); exitCode = process.ExitCode; } } diff --git a/src/CodeRelease/CodeRelease/Controllers/PublishController.cs b/src/CodeRelease/CodeRelease/Controllers/PublishController.cs index 0166f8f..13efa01 100644 --- a/src/CodeRelease/CodeRelease/Controllers/PublishController.cs +++ b/src/CodeRelease/CodeRelease/Controllers/PublishController.cs @@ -90,6 +90,11 @@ namespace CodeRelease.Controllers var version = releaseAction.Release.TagName; var mingling = giteaWebhookConfig.MakeFile .Replace("{version}", version) + .Replace("{description}", releaseAction.Release.Body) + .Replace("{name}", version) + //.Replace("{version}", version) + //.Replace("{version}", version) + //.Replace("{version}", version) //.Replace("{dir_file_path}", download + "/") .Replace("{target_commitish}", releaseAction.Release.TargetCommitish); Log.Logger.Information("执行linux命令{mingling}", mingling);