From 8f497fa7d891e8c19350553682bcfe5a0b97a39b Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Tue, 31 Aug 2021 17:25:45 +0800
Subject: [PATCH] Improved

---
 .../Volo/Abp/Cli/Commands/ProxyCommandBase.cs            | 4 +++-
 .../ServiceProxy/CSharp/CSharpServiceProxyGenerator.cs   | 9 ++++-----
 2 files changed, 7 insertions(+), 6 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 d98e69fed5..019bbb6645 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
@@ -59,7 +59,7 @@ namespace Volo.Abp.Cli.Commands
 
         private GenerateProxyArgs BuildArgs(CommandLineArgs commandLineArgs)
         {
-            var url = commandLineArgs.Options.GetOrNull(Options.Url.Long);
+            var url = commandLineArgs.Options.GetOrNull(Options.Url.Short, Options.Url.Long);
             var target = commandLineArgs.Options.GetOrNull(Options.Target.Long);
             var module = commandLineArgs.Options.GetOrNull(Options.Module.Short, Options.Module.Long) ??　"app";
             var output = commandLineArgs.Options.GetOrNull(Options.Output.Short, Options.Output.Long);
@@ -85,6 +85,7 @@ namespace Volo.Abp.Cli.Commands
             sb.AppendLine("-m|--module <module-name>                         (default: 'app') The name of the backend module you wish to generate proxies for.");
             sb.AppendLine("-t|--type <generate-type>                         The name of generate type (csharp, js, ng).");
             sb.AppendLine("-wd|--working-directory <directory-path>          Execution directory.");
+            sb.AppendLine("-u|--url <url>                                    API definition URL from.");
             sb.AppendLine("-a|--api-name <module-name>                       (default: 'default') The name of the API endpoint defined in the /src/environments/environment.ts.");
             sb.AppendLine("-s|--source <source-name>                         (default: 'defaultProject') Angular project name to resolve the root namespace & API definition URL from.");
             sb.AppendLine("-o|--output <output-name>                         JavaScript file path or folder to place generated code in.");
@@ -148,6 +149,7 @@ namespace Volo.Abp.Cli.Commands
 
             public static class Url
             {
+                public const string Short = "u";
                 public const string Long = "url";
             }
 
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 73cda9f25f..ae7283c330 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
@@ -77,8 +77,7 @@ namespace Volo.Abp.Cli.ServiceProxy.CSharp
             }
 
             var projectName = Path.GetFileNameWithoutExtension(projectFilePath);
-            var assemblyFilePath = Path.Combine(args.WorkDirectory, "bin", "Debug", GetTargetFrameworkVersion(projectFilePath), $"{projectName}.dll");
-            var startupModule = GetStartupModule(assemblyFilePath);
+            var rootNamespace = GetRootNamespace(projectFilePath);
 
             var applicationApiDescriptionModel = await GetApplicationApiDescriptionModelAsync(args);
 
@@ -86,7 +85,7 @@ namespace Volo.Abp.Cli.ServiceProxy.CSharp
             {
                 if (ShouldGenerateProxy(controller.Value))
                 {
-                    await GenerateClientProxyFileAsync(args, controller.Value, startupModule.Namespace);
+                    await GenerateClientProxyFileAsync(args, controller.Value, rootNamespace);
                 }
             }
 
@@ -391,11 +390,11 @@ namespace Volo.Abp.Cli.ServiceProxy.CSharp
                 .SingleOrDefault(AbpModule.IsAbpModule);
         }
 
-        private string GetTargetFrameworkVersion(string projectFilePath)
+        private string GetRootNamespace(string projectFilePath)
         {
             var document = new XmlDocument();
             document.Load(projectFilePath);
-            return document.SelectSingleNode("//TargetFramework").InnerText;
+            return document.SelectSingleNode("//RootNamespace").InnerText;
         }
     }
 }