From 2786fefc2b2efcd093d135b7fd27bb92a76313e0 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Fri, 27 Aug 2021 17:42:00 +0800 Subject: [PATCH] Writer logs --- .../Volo/Abp/Cli/Commands/ProxyCommandBase.cs | 4 ++-- .../CSharp/CSharpServiceProxyGenerator.cs | 19 ++++++++++++++++--- .../JavaScriptServiceProxyGenerator.cs | 13 +++++++++++-- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs index d70d396504..594c3fb58e 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs @@ -13,7 +13,7 @@ namespace Volo.Abp.Cli.Commands { public abstract class ProxyCommandBase : IConsoleCommand, ITransientDependency { - public ILogger Logger { get; set; } + public ILogger Logger { get; set; } protected abstract string CommandName { get; } @@ -27,7 +27,7 @@ namespace Volo.Abp.Cli.Commands { ServiceScopeFactory = serviceScopeFactory; ServiceProxyOptions = serviceProxyOptions.Value; - Logger = NullLogger.Instance; + Logger = NullLogger.Instance; } public async Task ExecuteAsync(CommandLineArgs commandLineArgs) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxy/CSharp/CSharpServiceProxyGenerator.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxy/CSharp/CSharpServiceProxyGenerator.cs index 66f847d73b..810cbb0663 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxy/CSharp/CSharpServiceProxyGenerator.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxy/CSharp/CSharpServiceProxyGenerator.cs @@ -6,6 +6,8 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; using System.Xml; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.Cli.Commands; using Volo.Abp.Cli.Http; using Volo.Abp.DependencyInjection; @@ -51,12 +53,14 @@ namespace Volo.Abp.Cli.ServiceProxy.CSharp "using Volo.Abp.Http.Modeling;" }; + public ILogger Logger { get; set; } + public CSharpServiceProxyGenerator( CliHttpClientFactory cliHttpClientFactory, IJsonSerializer jsonSerializer) : base(cliHttpClientFactory, jsonSerializer) { - + Logger = NullLogger.Instance; } public override async Task GenerateProxyAsync(GenerateProxyArgs args) @@ -97,6 +101,8 @@ namespace Volo.Abp.Cli.ServiceProxy.CSharp { Directory.Delete(folderPath, true); } + + Logger.LogInformation($"Delete {folderPath.Replace(args.WorkDirectory, string.Empty).TrimStart('\\')}"); } private async Task GenerateClientProxyFileAsync( @@ -151,12 +157,17 @@ namespace Volo.Abp.Cli.ServiceProxy.CSharp using (var writer = new StreamWriter(filePath)) { await writer.WriteAsync(clientProxyBuilder.ToString()); + Logger.LogInformation($"Create {filePath.Replace(args.WorkDirectory, string.Empty).TrimStart('\\')}"); } - await GenerateClientProxyPartialFileAsync(clientProxyName, fileNamespace, filePath); + await GenerateClientProxyPartialFileAsync(args, clientProxyName, fileNamespace, filePath); } - private async Task GenerateClientProxyPartialFileAsync(string clientProxyName, string fileNamespace, string filePath) + private async Task GenerateClientProxyPartialFileAsync( + GenerateProxyArgs args, + string clientProxyName, + string fileNamespace, + string filePath) { var clientProxyBuilder = new StringBuilder(_clientProxyPartialTemplate); clientProxyBuilder.Replace(ClassName, clientProxyName); @@ -167,6 +178,8 @@ namespace Volo.Abp.Cli.ServiceProxy.CSharp { await writer.WriteAsync(clientProxyBuilder.ToString()); } + + Logger.LogInformation($"Create {filePath.Replace(args.WorkDirectory, string.Empty).TrimStart('\\')}"); } private void GenerateMethod( diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxy/JavaScript/JavaScriptServiceProxyGenerator.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxy/JavaScript/JavaScriptServiceProxyGenerator.cs index 9d027e7dc5..521ee6fc5c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxy/JavaScript/JavaScriptServiceProxyGenerator.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxy/JavaScript/JavaScriptServiceProxyGenerator.cs @@ -2,6 +2,8 @@ using System.IO; using System.Linq; using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.Cli.Commands; using Volo.Abp.Cli.Http; using Volo.Abp.DependencyInjection; @@ -18,6 +20,8 @@ namespace Volo.Abp.Cli.ServiceProxy.JavaScript private readonly JQueryProxyScriptGenerator _jQueryProxyScriptGenerator; + public ILogger Logger { get; set; } + public JavaScriptServiceProxyGenerator( CliHttpClientFactory cliHttpClientFactory, IJsonSerializer jsonSerializer, @@ -25,6 +29,7 @@ namespace Volo.Abp.Cli.ServiceProxy.JavaScript base(cliHttpClientFactory, jsonSerializer) { _jQueryProxyScriptGenerator = jQueryProxyScriptGenerator; + Logger = NullLogger.Instance; } public override async Task GenerateProxyAsync(GenerateProxyArgs args) @@ -39,7 +44,7 @@ namespace Volo.Abp.Cli.ServiceProxy.JavaScript if (args.CommandName == RemoveProxyCommand.Name) { - RemoveProxy(output); + RemoveProxy(args, output); return; } @@ -52,14 +57,18 @@ namespace Volo.Abp.Cli.ServiceProxy.JavaScript { await writer.WriteAsync(script); } + + Logger.LogInformation($"Create {output.Replace(args.WorkDirectory, string.Empty).TrimStart('\\')}"); } - private void RemoveProxy(string filePath) + private void RemoveProxy(GenerateProxyArgs args, string filePath) { if (File.Exists(filePath)) { File.Delete(filePath); } + + Logger.LogInformation($"Delete {filePath.Replace(args.WorkDirectory, string.Empty).TrimStart('\\')}"); } private static void CheckWorkDirectory(string directory)