From 9df65966b17aef6161e28d9e92a7e359458317c7 Mon Sep 17 00:00:00 2001
From: Hanpaopao <510423039@qq.com>
Date: Mon, 10 Feb 2025 20:21:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4cli?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/AbpProCliCoreModule.cs | 2 +-
 .../Lion/AbpPro/Cli/Commands/CreateCommand.cs                   | 2 +-
 .../Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Commands/NewCommand.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/AbpProCliCoreModule.cs b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/AbpProCliCoreModule.cs
index 16c514b9..0215c340 100644
--- a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/AbpProCliCoreModule.cs
+++ b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/AbpProCliCoreModule.cs
@@ -60,7 +60,7 @@ public class AbpProCliCoreModule : AbpModule
             {
                 new AbpProTemplateOptions("pro", "pro", "商业版本源码版本")
                 {
-                    ExcludeFiles = ".github,LICENSE,Readme.md,templates,Lion.AbpPro.Cli.sln",
+                    ExcludeFiles = ".github,LICENSE,Readme.md,.templates,Lion.AbpPro.Cli.sln",
                     ReplaceSuffix = ".sln,.csproj,.cs,.cshtml,.json,.ci,.yml,.yaml,.nswag,.DotSettings,.env,Directory.Build.Lion.targets",
                     OldCompanyName = "Lion",
                     OldProjectName = "AbpPro",
diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Commands/CreateCommand.cs b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Commands/CreateCommand.cs
index 68a49402..8dbbcae1 100644
--- a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Commands/CreateCommand.cs
+++ b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Commands/CreateCommand.cs
@@ -104,7 +104,7 @@ public class CreateCommand : IConsoleCommand, ITransientDependency
         // 解压源码
         var extractPath = _sourceCodeManager.ExtractProjectZip(localFilePath, _cliOptions.RepositoryId, version);
 
-        var contentPath = templateOptions.Name == "pro" ? extractPath : Path.Combine(extractPath, ".templates", templateOptions.Name);
+        var contentPath = templateOptions.Name == "pro" ? Path.Combine(extractPath,_cliOptions.RepositoryId)  : Path.Combine(extractPath,_cliOptions.RepositoryId, ".templates", templateOptions.Name);
         // 复制源码到输出目录
         var destOutput = Path.Combine(CliPaths.Output, $"{companyName}-{projectName}-{version}");
 
diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Commands/NewCommand.cs b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Commands/NewCommand.cs
index b1011b42..5cc002bb 100644
--- a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Commands/NewCommand.cs
+++ b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Commands/NewCommand.cs
@@ -111,7 +111,7 @@ public class NewCommand : IConsoleCommand, ITransientDependency
         // 解压源码
         var extractPath = _sourceCodeManager.ExtractProjectZip(localFilePath, _cliOptions.RepositoryId, version);
 
-        var contentPath = templateOptions.Name == "pro" ? extractPath : Path.Combine(extractPath, "templates", templateOptions.Name);
+        var contentPath = templateOptions.Name == "pro" ? Path.Combine(extractPath,_cliOptions.RepositoryId) : Path.Combine(extractPath,_cliOptions.RepositoryId, "templates", templateOptions.Name);
         // 复制源码到输出目录
         var destOutput = Path.Combine(CliPaths.Output, $"{companyName}-{projectName}-{version}");