From 39a941642795f94efe7ee98bfcd4a67eeb81cad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Wed, 5 Jun 2024 20:28:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=91=E5=B8=830.7=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?yi-abp-tool?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/AddModuleCommand.cs | 4 ++--
 Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/HelpCommand.cs      | 3 ++-
 Yi.Abp.Net8/tool/Yi.Abp.Tool/Program.cs                   | 2 +-
 Yi.Abp.Net8/tool/Yi.Abp.Tool/Yi.Abp.Tool.csproj           | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

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 69a1474e..dd9c215f 100644
--- a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/AddModuleCommand.cs
+++ b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/AddModuleCommand.cs
@@ -47,7 +47,6 @@ namespace Yi.Abp.Tool.Commands
             StartCmd(cmdCommands);
 
             await Console.Out.WriteLineAsync("恭喜~模块添加成功！");
-            return Task.CompletedTask;
         }
 
         /// <summary>
@@ -79,7 +78,7 @@ namespace Yi.Abp.Tool.Commands
             ProcessStartInfo psi = new ProcessStartInfo
             {
                 FileName = "cmd.exe",
-                Arguments = $"/c {string.Join("&", cmdCommands)}",
+                Arguments = $"/c chcp 65001&{string.Join("&", cmdCommands)}",
                 RedirectStandardInput = true,
                 RedirectStandardOutput = true,
                 RedirectStandardError = true,
@@ -99,6 +98,7 @@ namespace Yi.Abp.Tool.Commands
             proc.WaitForExit();
         }
 
+
         /// <summary>
         /// 检查路径
         /// </summary>
diff --git a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/HelpCommand.cs b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/HelpCommand.cs
index 8364d61d..f896a9cb 100644
--- a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/HelpCommand.cs
+++ b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/HelpCommand.cs
@@ -30,7 +30,8 @@ namespace Yi.Abp.Tool.Commands
                     > help: 查看帮助列表，写下命令` yi-abp help <command> `
                     > new: 创建模块模板` yi-abp new <name> -t module -csf ` 
                     > new: 创建项目模板` yi-abp new <name> -csf `
-                    > add: 将内容添加到当前解决方案` yi-abp add module -moduleName <name> -modulePath <path>  `
+                    > add-module: 将内容添加到当前解决方案` yi-abp add-module <moduleName> -modulePath <path> [-s <slnPath>]   `
+                    - add：例子：yi-abp add-module Acme.Demo -s "D:\code\csharp\source\Yi\Yi.Abp.Net8" -modulePath "D:\\code\\csharp\\source\\Yi\\Yi.Abp.Net8\\module\\acme-demo"
 
                 """);
             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 19e7001b..9e8edcfd 100644
--- a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Program.cs
+++ b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Program.cs
@@ -16,7 +16,7 @@ class Program
         //args = ["12312"];
         //args = ["new", "Acme.Book", "-t", "module", "-csf"];
         //args = ["new", "Acme.Book", "-t", "module"];
-        args = ["add","module", "-moduleName", "Acme.Demo", "-modulePath", "module\\acme-demo"];
+        args = ["add-module", "Acme.Demo", "-s", "D:\\code\\csharp\\source\\Yi\\Yi.Abp.Net8", "-modulePath", "D:\\code\\csharp\\source\\Yi\\Yi.Abp.Net8\\module\\acme-demo"];
 #endif
         try
         {
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 b5d3c2c3..176f6ed0 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 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>0.6.0</Version>
+    <Version>0.7.0</Version>
     <Authors>橙子老哥</Authors>
     <Description>yi-framework框架配套工具</Description>
     <PackageProjectUrl>https://ccnetcore.com</PackageProjectUrl>