diff --git a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/AddModuleCommand.cs b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/AddModuleCommand.cs index 484e6e08..d1e9b1dc 100644 --- a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/AddModuleCommand.cs +++ b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/AddModuleCommand.cs @@ -11,29 +11,31 @@ namespace Yi.Abp.Tool.Commands public class AddModuleCommand : ICommand { public string Command => "add-module"; - public string? Description { get; } + public string? Description => "将内容添加到当前解决方案` yi-abp add-module [-p ] [-s ] "; public void CommandLineApplication(CommandLineApplication application) { + application.HelpOption("-h|--help"); var modulePathOption= application.Option("-p|--modulePath", "模块路径",CommandOptionType.SingleValue); var solutionOption= application.Option("-s|--solution", "解决方案路径",CommandOptionType.SingleValue); var moduleNameArgument = application.Argument("moduleName", "模块名", (_) => { }); application.OnExecute(() => { - var modulePath = ""; var moduleName = moduleNameArgument.Value; - //模块路径默认按小写规则,当前路径 + + //模块路径默认按小写规则,默认在模块路径下一层 + var modulePath =moduleName.ToLower().Replace(".", "-"); if (modulePathOption.HasValue()) { - modulePath = moduleName.ToLower().Replace(".", "-"); + modulePath = modulePathOption.Value(); } //解决方案默认在模块文件夹上一级,也可以通过s进行指定 - var slnPath = string.Empty; + var slnPath = "../"; - if (!solutionOption.HasValue()) + if (solutionOption.HasValue()) { - slnPath = "../"; + slnPath = solutionOption.Value(); } CheckFirstSlnPath(slnPath); diff --git a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/ClearCommand.cs b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/ClearCommand.cs index 5c49d851..b8f43a26 100644 --- a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/ClearCommand.cs +++ b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/ClearCommand.cs @@ -17,6 +17,7 @@ namespace Yi.Abp.Tool.Commands public void CommandLineApplication(CommandLineApplication application) { + application.HelpOption("-h|--help"); List delDirBlacklist = ["obj", "bin"]; var pathOption= application.Option("-path", "路径",CommandOptionType.SingleValue); diff --git a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/CloneCommand.cs b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/CloneCommand.cs index 206eab7f..ab3e20d8 100644 --- a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/CloneCommand.cs +++ b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/CloneCommand.cs @@ -10,19 +10,17 @@ namespace Yi.Abp.Tool.Commands { public class CloneCommand : ICommand { - public List CommandStrs => new List { "clone"}; - - private const string cloneAddress= "https://gitee.com/ccnetcore/Yi"; + private const string CloneAddress= "https://gitee.com/ccnetcore/Yi"; public string Command => "clone"; - public string? Description => "克隆最新YiFramework源代码"; + public string? Description => "克隆最新YiFramework源代码,需依赖git"; public void CommandLineApplication(CommandLineApplication application) { application.OnExecute(() => { - StartCmd($"git clone {cloneAddress}"); + StartCmd($"git clone {CloneAddress}"); return 0; }); } diff --git a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/NewCommand.cs b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/NewCommand.cs index 74250abc..68b5327b 100644 --- a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/NewCommand.cs +++ b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/NewCommand.cs @@ -22,10 +22,12 @@ namespace Yi.Abp.Tool.Commands public string Command => "new"; - public string? Description => "创建一个模板"; + public string? Description => "创建项目模板` yi-abp new -csf `"; public void CommandLineApplication(CommandLineApplication application) { + application.HelpOption("-h|--help"); + var templateTypeOption = application.Option("-t|--template", "模板类型:`module`|`porject`", CommandOptionType.SingleValue); var pathOption = application.Option("-p|--path", "创建路径", CommandOptionType.SingleValue); @@ -35,7 +37,7 @@ namespace Yi.Abp.Tool.Commands CommandOptionType.SingleValue); var moduleNameArgument = application.Argument("moduleName", "模块名", (_) => { }); - + //子命令,new list application.Command("list",(applicationlist) => { diff --git a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/VersionCommand.cs b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/VersionCommand.cs deleted file mode 100644 index 74b520bf..00000000 --- a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/VersionCommand.cs +++ /dev/null @@ -1,14 +0,0 @@ -// namespace Yi.Abp.Tool.Commands -// { -// public class VersionCommand : ICommand -// { -// public List CommandStrs => new List { "version", "v", "-version", "-v" }; -// -// public Task InvokerAsync(Dictionary options, string[] args) -// { -// var version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; -// Console.WriteLine($"Yi-ABP TOOL {version}"); -// return Task.CompletedTask; -// } -// } -// } diff --git a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Program.cs b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Program.cs index ad81db5b..39ba5aa0 100644 --- a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Program.cs +++ b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Program.cs @@ -23,7 +23,9 @@ class Program //查看模板列表 //args = ["new","list"]; - + //查看子命令帮组 + // args = ["new","-h"]; + //添加模块 //args = ["add-module", "kkk"]; #endif diff --git a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Yi.Abp.Tool.csproj b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Yi.Abp.Tool.csproj index 755565e3..7c00e995 100644 --- a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Yi.Abp.Tool.csproj +++ b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Yi.Abp.Tool.csproj @@ -5,7 +5,7 @@ net8.0 enable enable - 2.0.1 + 2.0.4 橙子老哥 yi-framework框架配套工具 https://ccnetcore.com