Compare commits

...

2 Commits

Author SHA1 Message Date
Leonmmcoset
5f4d97729a 移除颜色快 2026-02-26 13:47:47 +08:00
Leonmmcoset
e8e45ef7ae 更改些东西 2026-02-26 13:33:53 +08:00
5 changed files with 53 additions and 43 deletions

View File

@@ -1 +1 @@
2026-02-25 18:46:09 2026-02-26 13:45:40

View File

@@ -1 +1 @@
0724502 e8e45ef

View File

@@ -440,7 +440,7 @@ namespace CMLeonOS
} }
Console.WriteLine("Executing startup script..."); Console.WriteLine("Executing startup script...");
Console.WriteLine("--------------------------------"); // Console.WriteLine("--------------------------------");
// 逐行执行命令 // 逐行执行命令
foreach (string line in lines) foreach (string line in lines)
@@ -456,7 +456,7 @@ namespace CMLeonOS
shell.ExecuteCommand(line); shell.ExecuteCommand(line);
} }
Console.WriteLine("--------------------------------"); // Console.WriteLine("--------------------------------");
_logger.Success("Kernel", "Startup script execution completed"); _logger.Success("Kernel", "Startup script execution completed");
} }
else else
@@ -475,40 +475,48 @@ namespace CMLeonOS
private void ExecuteStartupTest() private void ExecuteStartupTest()
{ {
Console.BackgroundColor = ConsoleColor.Red; Console.WriteLine("------------------------------------------------------");
Console.Write(" "); Console.WriteLine($"Welcome to {Version.DisplayVersion}");
Console.BackgroundColor = ConsoleColor.Yellow; Console.WriteLine("* Documentation: https://cmleonos.jjmm.ink/");
Console.Write(" "); Console.WriteLine("* Forum: https://lbbs.ecuil.com/#/category/10");
Console.BackgroundColor = ConsoleColor.Green; // Console.WriteLine("");
Console.Write(" ");
Console.BackgroundColor = ConsoleColor.Cyan; // 感觉排版有点割裂,先注释掉
Console.Write(" "); // Console.BackgroundColor = ConsoleColor.Red;
Console.BackgroundColor = ConsoleColor.Blue; // Console.Write(" ");
Console.Write(" "); // Console.BackgroundColor = ConsoleColor.Yellow;
Console.BackgroundColor = ConsoleColor.Magenta; // Console.Write(" ");
Console.Write(" "); // Console.BackgroundColor = ConsoleColor.Green;
Console.BackgroundColor = ConsoleColor.White; // Console.Write(" ");
Console.Write(" "); // Console.BackgroundColor = ConsoleColor.Cyan;
Console.BackgroundColor = ConsoleColor.DarkBlue; // Console.Write(" ");
Console.Write(" "); // Console.BackgroundColor = ConsoleColor.Blue;
Console.BackgroundColor = ConsoleColor.DarkCyan; // Console.Write(" ");
Console.Write(" "); // Console.BackgroundColor = ConsoleColor.Magenta;
Console.BackgroundColor = ConsoleColor.DarkGreen; // Console.Write(" ");
Console.Write(" "); // Console.BackgroundColor = ConsoleColor.White;
Console.BackgroundColor = ConsoleColor.DarkYellow; // Console.Write(" ");
Console.Write(" "); // Console.BackgroundColor = ConsoleColor.DarkBlue;
Console.BackgroundColor = ConsoleColor.DarkRed; // Console.Write(" ");
Console.Write(" "); // Console.BackgroundColor = ConsoleColor.DarkCyan;
Console.BackgroundColor = ConsoleColor.Gray; // Console.Write(" ");
Console.Write(" "); // Console.BackgroundColor = ConsoleColor.DarkGreen;
Console.BackgroundColor = ConsoleColor.DarkGray; // Console.Write(" ");
Console.Write(" "); // Console.BackgroundColor = ConsoleColor.DarkYellow;
Console.BackgroundColor = ConsoleColor.DarkMagenta; // Console.Write(" ");
Console.Write(" "); // Console.BackgroundColor = ConsoleColor.DarkRed;
Console.BackgroundColor = ConsoleColor.Black; // Console.Write(" ");
Console.Write(" "); // Console.BackgroundColor = ConsoleColor.Gray;
Console.WriteLine(""); // Console.Write(" ");
Console.ResetColor(); // Console.BackgroundColor = ConsoleColor.DarkGray;
// Console.Write(" ");
// Console.BackgroundColor = ConsoleColor.DarkMagenta;
// Console.Write(" ");
// Console.BackgroundColor = ConsoleColor.Black;
// Console.Write(" ");
// Console.WriteLine("");
// Console.ResetColor();
Console.WriteLine("------------------------------------------------------");
} }
private string FormatBytes(long bytes) private string FormatBytes(long bytes)

View File

@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using Sys = Cosmos.System; using Sys = Cosmos.System;
using CMLeonOS.Logger;
namespace CMLeonOS namespace CMLeonOS
{ {
@@ -23,6 +24,7 @@ namespace CMLeonOS
private List<User> users; private List<User> users;
public bool fixmode = Kernel.FixMode; public bool fixmode = Kernel.FixMode;
private User currentLoggedInUser; private User currentLoggedInUser;
private static CMLeonOS.Logger.Logger _logger = CMLeonOS.Logger.Logger.Instance;
public User CurrentLoggedInUser public User CurrentLoggedInUser
{ {
@@ -519,7 +521,7 @@ namespace CMLeonOS
{ {
try try
{ {
Console.WriteLine($"Creating user folder for {username}..."); _logger.Info("UserSystem", $"Creating user folder for {username}...");
// 在user文件夹下创建用户文件夹 // 在user文件夹下创建用户文件夹
string userFolderPath = Path.Combine(@"0:\user", username); string userFolderPath = Path.Combine(@"0:\user", username);
@@ -528,16 +530,16 @@ namespace CMLeonOS
if (!Directory.Exists(userFolderPath)) if (!Directory.Exists(userFolderPath))
{ {
Directory.CreateDirectory(userFolderPath); Directory.CreateDirectory(userFolderPath);
Console.WriteLine($"Created user folder for {username}."); _logger.Info("UserSystem", $"Created user folder for {username}.");
} }
else else
{ {
Console.WriteLine($"User folder for {username} already exists."); _logger.Info("UserSystem", $"User folder for {username} already exists.");
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
ShowError($"Error creating user folder: {ex.Message}"); _logger.Error("UserSystem", $"Error creating user folder for {username}: {ex.Message}");
} }
} }

View File

@@ -7,7 +7,7 @@ namespace CMLeonOS.Commands
public static void ProcessAbout() public static void ProcessAbout()
{ {
Console.WriteLine("CMLeonOS Project"); Console.WriteLine("CMLeonOS Project");
Console.WriteLine("By LeonOS 2 Developement Team"); Console.WriteLine("By LeonOS 2 Developer Team");
} }
} }
} }