Browse Source

Writer logs

pull/9905/head
liangshiwei 5 years ago
parent
commit
2786fefc2b
  1. 4
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs
  2. 19
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxy/CSharp/CSharpServiceProxyGenerator.cs
  3. 13
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxy/JavaScript/JavaScriptServiceProxyGenerator.cs

4
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 abstract class ProxyCommandBase : IConsoleCommand, ITransientDependency
{ {
public ILogger<HelpCommand> Logger { get; set; } public ILogger<ProxyCommandBase> Logger { get; set; }
protected abstract string CommandName { get; } protected abstract string CommandName { get; }
@ -27,7 +27,7 @@ namespace Volo.Abp.Cli.Commands
{ {
ServiceScopeFactory = serviceScopeFactory; ServiceScopeFactory = serviceScopeFactory;
ServiceProxyOptions = serviceProxyOptions.Value; ServiceProxyOptions = serviceProxyOptions.Value;
Logger = NullLogger<HelpCommand>.Instance; Logger = NullLogger<ProxyCommandBase>.Instance;
} }
public async Task ExecuteAsync(CommandLineArgs commandLineArgs) public async Task ExecuteAsync(CommandLineArgs commandLineArgs)

19
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.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml; using System.Xml;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Volo.Abp.Cli.Commands; using Volo.Abp.Cli.Commands;
using Volo.Abp.Cli.Http; using Volo.Abp.Cli.Http;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
@ -51,12 +53,14 @@ namespace Volo.Abp.Cli.ServiceProxy.CSharp
"using Volo.Abp.Http.Modeling;" "using Volo.Abp.Http.Modeling;"
}; };
public ILogger<CSharpServiceProxyGenerator> Logger { get; set; }
public CSharpServiceProxyGenerator( public CSharpServiceProxyGenerator(
CliHttpClientFactory cliHttpClientFactory, CliHttpClientFactory cliHttpClientFactory,
IJsonSerializer jsonSerializer) : IJsonSerializer jsonSerializer) :
base(cliHttpClientFactory, jsonSerializer) base(cliHttpClientFactory, jsonSerializer)
{ {
Logger = NullLogger<CSharpServiceProxyGenerator>.Instance;
} }
public override async Task GenerateProxyAsync(GenerateProxyArgs args) public override async Task GenerateProxyAsync(GenerateProxyArgs args)
@ -97,6 +101,8 @@ namespace Volo.Abp.Cli.ServiceProxy.CSharp
{ {
Directory.Delete(folderPath, true); Directory.Delete(folderPath, true);
} }
Logger.LogInformation($"Delete {folderPath.Replace(args.WorkDirectory, string.Empty).TrimStart('\\')}");
} }
private async Task GenerateClientProxyFileAsync( private async Task GenerateClientProxyFileAsync(
@ -151,12 +157,17 @@ namespace Volo.Abp.Cli.ServiceProxy.CSharp
using (var writer = new StreamWriter(filePath)) using (var writer = new StreamWriter(filePath))
{ {
await writer.WriteAsync(clientProxyBuilder.ToString()); 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); var clientProxyBuilder = new StringBuilder(_clientProxyPartialTemplate);
clientProxyBuilder.Replace(ClassName, clientProxyName); clientProxyBuilder.Replace(ClassName, clientProxyName);
@ -167,6 +178,8 @@ namespace Volo.Abp.Cli.ServiceProxy.CSharp
{ {
await writer.WriteAsync(clientProxyBuilder.ToString()); await writer.WriteAsync(clientProxyBuilder.ToString());
} }
Logger.LogInformation($"Create {filePath.Replace(args.WorkDirectory, string.Empty).TrimStart('\\')}");
} }
private void GenerateMethod( private void GenerateMethod(

13
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxy/JavaScript/JavaScriptServiceProxyGenerator.cs

@ -2,6 +2,8 @@
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Volo.Abp.Cli.Commands; using Volo.Abp.Cli.Commands;
using Volo.Abp.Cli.Http; using Volo.Abp.Cli.Http;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
@ -18,6 +20,8 @@ namespace Volo.Abp.Cli.ServiceProxy.JavaScript
private readonly JQueryProxyScriptGenerator _jQueryProxyScriptGenerator; private readonly JQueryProxyScriptGenerator _jQueryProxyScriptGenerator;
public ILogger<JavaScriptServiceProxyGenerator> Logger { get; set; }
public JavaScriptServiceProxyGenerator( public JavaScriptServiceProxyGenerator(
CliHttpClientFactory cliHttpClientFactory, CliHttpClientFactory cliHttpClientFactory,
IJsonSerializer jsonSerializer, IJsonSerializer jsonSerializer,
@ -25,6 +29,7 @@ namespace Volo.Abp.Cli.ServiceProxy.JavaScript
base(cliHttpClientFactory, jsonSerializer) base(cliHttpClientFactory, jsonSerializer)
{ {
_jQueryProxyScriptGenerator = jQueryProxyScriptGenerator; _jQueryProxyScriptGenerator = jQueryProxyScriptGenerator;
Logger = NullLogger<JavaScriptServiceProxyGenerator>.Instance;
} }
public override async Task GenerateProxyAsync(GenerateProxyArgs args) public override async Task GenerateProxyAsync(GenerateProxyArgs args)
@ -39,7 +44,7 @@ namespace Volo.Abp.Cli.ServiceProxy.JavaScript
if (args.CommandName == RemoveProxyCommand.Name) if (args.CommandName == RemoveProxyCommand.Name)
{ {
RemoveProxy(output); RemoveProxy(args, output);
return; return;
} }
@ -52,14 +57,18 @@ namespace Volo.Abp.Cli.ServiceProxy.JavaScript
{ {
await writer.WriteAsync(script); 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)) if (File.Exists(filePath))
{ {
File.Delete(filePath); File.Delete(filePath);
} }
Logger.LogInformation($"Delete {filePath.Replace(args.WorkDirectory, string.Empty).TrimStart('\\')}");
} }
private static void CheckWorkDirectory(string directory) private static void CheckWorkDirectory(string directory)

Loading…
Cancel
Save