From 49f1d1a8fa05c37ce2cadb7d4c6dae813c1b8dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Tue, 5 Nov 2024 22:36:22 +0800
Subject: [PATCH] =?UTF-8?q?test:=20=E8=A1=A5=E5=85=85=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tool/Yi.Abp.Tool/Commands/NewCommand.cs   | 22 ++++++++++++++-----
 Yi.Abp.Net8/tool/Yi.Abp.Tool/Program.cs       |  8 ++++++-
 2 files changed, 23 insertions(+), 7 deletions(-)

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 d36c6419..4ef5b6cc 100644
--- a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/NewCommand.cs
+++ b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/NewCommand.cs
@@ -26,8 +26,10 @@ namespace Yi.Abp.Tool.Commands
 
         public void CommandLineApplication(CommandLineApplication application)
         {
-            var templateTypeOption = application.Option("-t|--moduleType", "模板类型", CommandOptionType.SingleValue);
-            var csfOption = application.Option("-csf", "是否创建解决方案", CommandOptionType.SingleValue);
+            var templateTypeOption = application.Option("-t|--moduleType", "模板类型:`module`|`porject`",
+                CommandOptionType.SingleValue);
+            var pathOption = application.Option("-p|--path", "创建路径", CommandOptionType.SingleValue);
+            var csfOption = application.Option("-csf", "是否创建解决方案文件夹", CommandOptionType.NoValue);
             var moduleNameArgument = application.Argument("moduleName", "模块名", (_) => { });
 
 
@@ -57,7 +59,13 @@ namespace Yi.Abp.Tool.Commands
                     }).Result;
                 }
 
-                zipPath = $"{id}.zip";
+                var path = string.Empty;
+                if (pathOption.HasValue())
+                {
+                    path = pathOption.Value();
+                }
+
+                zipPath = Path.Combine(path, $"{id}.zip");
                 File.WriteAllBytes(zipPath, fileByteArray);
 
                 #endregion
@@ -71,17 +79,19 @@ namespace Yi.Abp.Tool.Commands
                 {
                     var moduleName = moduleNameArgument.Value.ToLower().Replace(".", "-");
 
-                    if (Directory.Exists(moduleName))
+                    unzipDirPath = Path.Combine(path, unzipDirPath);
+                    if (Directory.Exists(unzipDirPath))
                     {
-                        throw new UserFriendlyException($"文件夹[{moduleName}]已存在，请删除后重试");
+                        throw new UserFriendlyException($"文件夹[{unzipDirPath}]已存在，请删除后重试");
                     }
 
-                    Directory.CreateDirectory(moduleName);
+                    Directory.CreateDirectory(unzipDirPath);
                     unzipDirPath = moduleName;
                 }
 
                 #endregion
 
+        
                 ZipFile.ExtractToDirectory(zipPath, unzipDirPath);
                 //创建压缩包后删除临时目录
                 File.Delete(zipPath);
diff --git a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Program.cs b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Program.cs
index 36c67263..caea4edf 100644
--- a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Program.cs
+++ b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Program.cs
@@ -21,12 +21,18 @@ class Program
        
         //帮助
         //args = ["-h"];
+        
         //版本
         // args = ["-v"];
+        
         //清理
         // args = ["clear"];
+        
+        //创建模块
+        args = ["new","oooo", "-t","module","-p","D:\\temp","-csf"];
+        
         //添加模块
-        args = ["add-module", "kkk"];
+        //args = ["add-module", "kkk"];
 #endif
         try
         {