1. fix Entity template bug

2. Optimize log output

Author: Ahoo-Wang

doc/SmartCode.yml

@@ -14,6 +14,7 @@ Output:
 
 # 构建任务
 Build:
+
   ClearDir:
     Type: Clear
     Paramters:

src/SmartCode.App/BuildTasks/ProcessBuildTask.cs

@@ -9,12 +9,14 @@ namespace SmartCode.App.BuildTasks
 {
     public class ProcessBuildTask : IBuildTask
     {
+        const string CREATE_NO_WINDOW = "CreateNoWindow";
         const string WORKING_DIRECTORY = "WorkingDirectory";
         const string FILE_NAME = "FileName";
         const string ARGS = "Args";
         const string TIMEOUT = "Timeout";
         private readonly ILogger<ProcessBuildTask> _logger;
         const int DEFAULT_TIME_OUT = 30 * 1000;
+        const bool DEFAULT_CREATE_NO_WINDOW = true;
         public bool Initialized => true;
 
         public string Name => "Process";
@@ -35,27 +37,34 @@ public Task Build(BuildContext context)
             }
             var process = new Process();
             var startInfo = process.StartInfo;
-            //startInfo.CreateNoWindow = true;
-            var timeOut = DEFAULT_TIME_OUT;
-            if (context.Build.Paramters.TryGetValue(TIMEOUT, out object timeoutObj))
-            {
-                if (int.TryParse(timeoutObj.ToString(), out int _timeout))
-                {
-                    timeOut = _timeout;
-                }
-            }
+            startInfo.CreateNoWindow = DEFAULT_CREATE_NO_WINDOW;
             startInfo.FileName = fileNameObj.ToString();
             startInfo.Arguments = argsObj.ToString();
             if (context.Build.Paramters.TryGetValue(WORKING_DIRECTORY, out object workingDicObj))
             {
                 startInfo.WorkingDirectory = workingDicObj.ToString();
             }
+            if (context.Build.Paramters.TryGetValue(CREATE_NO_WINDOW, out object createNoWinObj))
+            {
+                if (bool.TryParse(createNoWinObj.ToString(), out bool createNoWin))
+                {
+                    startInfo.CreateNoWindow = createNoWin;
+                }
+            }
             _logger.LogDebug($"--------Process.FileName:{startInfo.FileName},Args:{startInfo.Arguments} Start--------");
             process.ErrorDataReceived += Process_ErrorDataReceived;
             process.OutputDataReceived += Process_OutputDataReceived;
             try
             {
                 process.Start();
+                var timeOut = DEFAULT_TIME_OUT;
+                if (context.Build.Paramters.TryGetValue(TIMEOUT, out object timeoutObj))
+                {
+                    if (int.TryParse(timeoutObj.ToString(), out int _timeout))
+                    {
+                        timeOut = _timeout;
+                    }
+                }
                 process.WaitForExit(timeOut);
                 _logger.LogDebug($"--------Process.FileName:{startInfo.FileName},Args:{startInfo.Arguments} End--------");
             }

src/SmartCode.App/SmartCodeApp.cs

@@ -58,6 +58,7 @@ private void RegisterServices()
             Services.AddSingleton<IPluginManager, PluginManager>();
             Services.AddSingleton<IProjectBuilder, ProjectBuilder>();
             ServiceProvider = Services.BuildServiceProvider();
+            Logger = ServiceProvider.GetRequiredService<ILogger<SmartCodeApp>>();
         }
 
         private void RegisterPlugins()
@@ -84,12 +85,18 @@ private void RegisterPlugins()
 
         public async Task Run()
         {
-            Handlebars.Configuration.TextEncoder = NullTextEncoder.Instance;
-            var logger = ServiceProvider.GetRequiredService<ILogger<SmartCodeApp>>();
-            var projectBuilder = ServiceProvider.GetRequiredService<IProjectBuilder>();
-            logger.LogInformation($"------- Build ConfigPath:{ConfigPath} Start! --------");
-            await projectBuilder.Build();
-            logger.LogInformation($"-------- Build ConfigPath:{ConfigPath},Output:{Project.OutputPath} End! --------");
+            try
+            {
+                Handlebars.Configuration.TextEncoder = NullTextEncoder.Instance;
+                var projectBuilder = ServiceProvider.GetRequiredService<IProjectBuilder>();
+                Logger.LogInformation($"------- Build ConfigPath:{ConfigPath} Start! --------");
+                await projectBuilder.Build();
+                Logger.LogInformation($"-------- Build ConfigPath:{ConfigPath},Output:{Project.OutputPath} End! --------");
+            }
+            catch (SmartCodeException scEx)
+            {
+                Logger.LogError(new EventId(scEx.HResult), scEx, scEx.Message);
+            }
         }
 
         public class NullTextEncoder : ITextEncoder

src/SmartCode.CLI/Program.cs

@@ -39,12 +39,22 @@ static async Task Main(string[] args)
                     configPath = DEFAULT_CONFIG_PATH;
                 }
             }
-            SmartCodeApp app = new DefaultSmartCodeAppBuilder().Build(configPath);
-            await app.Run();
-            Thread.Sleep(200);//Wait for Logger
-            Console.ForegroundColor = ConsoleColor.Green;
-            Console.WriteLine($"------------ SmartCode Build End! Output:[{app.Project.OutputPath}] --------------");
-            Console.ResetColor();
+            try
+            {
+                SmartCodeApp app = new DefaultSmartCodeAppBuilder().Build(configPath);
+                await app.Run();
+                Thread.Sleep(200);//Wait for Logger
+                Console.ForegroundColor = ConsoleColor.Green;
+                Console.WriteLine($"------------ SmartCode Build End! Output:[{app.Project.OutputPath}] --------------");
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            finally
+            {
+                Console.ResetColor();
+            }
         }
     }
 }

src/SmartCode.CLI/RazorTemplates/Entity.cshtml

@@ -45,7 +45,7 @@ namespace @(project.Module)[email protected]
         @Html.PadLeft(8)@Html.NewLine()
         @Html.PadLeft(8)@("///</summary>")
         @Html.PadLeft(8)@Html.NewLine()
-        @Html.PadLeft(8)<text>public</text> <text>@column.LanguageType</text><text>@(ConvertLangType(column))</text> <text>@column.ConvertedName</text> <text>{ get; set; }</text>
+        @Html.PadLeft(8)<text>public</text> <text>@(ConvertLangType(column))</text> <text>@column.ConvertedName</text> <text>{ get; set; }</text>
         @Html.PadLeft(8)@Html.NewLine()
     }
     }

src/SmartCode.CLI/SmartCode.CLI.csproj

@@ -20,7 +20,7 @@
     <RepositoryType>Github</RepositoryType>
     <PackageTags>SmartCode SmartSql</PackageTags>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <Version>1.7.8</Version>
+    <Version>1.8.0</Version>
     <PackageIconUrl>https://raw.githubusercontent.com/Ahoo-Wang/SmartCode/master/doc/Logo.png</PackageIconUrl>
     <PackageReleaseNotes>u SmartSql.DIExtension version</PackageReleaseNotes>
   </PropertyGroup>