代码整理

NewLifeX · Aug 23, 2024 · 4b5b81c · 4b5b81c
1 parent c4958e5
commit 4b5b81c
Show file tree

Hide file tree

Showing 4 changed files with 252 additions and 260 deletions.
diff --git a/XCoder/Engine/XConfig.cs b/XCoder/Engine/XConfig.cs
@@ -2,87 +2,85 @@
 using NewLife;
 using NewLife.Configuration;
 
-namespace XCoder
+namespace XCoder;
+
+[Config("XCoder")]
+public class XConfig : Config<XConfig>
 {
-    //[XmlConfigFile("Config\\XCoder.config")]
-    [Config("XCoder")]
-    public class XConfig : Config<XConfig>
+    #region 属性
+    /// <summary>标题</summary>
+    [Description("标题")]
+    public String Title { get; set; } = "";
+
+    /// <summary>宽度</summary>
+    [Description("宽度")]
+    public Int32 Width { get; set; }
+
+    /// <summary>高度</summary>
+    [Description("高度")]
+    public Int32 Height { get; set; }
+
+    /// <summary>顶部</summary>
+    [Description("顶部")]
+    public Int32 Top { get; set; }
+
+    /// <summary>左边</summary>
+    [Description("左边")]
+    public Int32 Left { get; set; }
+
+    /// <summary>扩展数据</summary>
+    [Description("扩展数据")]
+    public String Extend { get; set; } = "";
+
+    /// <summary>日志着色</summary>
+    [Description("日志着色")]
+    public Boolean ColorLog { get; set; } = true;
+
+    /// <summary>语音提示。默认true</summary>
+    [Description("语音提示。默认true")]
+    public Boolean SpeechTip { get; set; } = true;
+
+    /// <summary>证书</summary>
+    [Description("证书")]
+    public String Code { get; set; }
+
+    /// <summary>密钥</summary>
+    [Description("密钥")]
+    public String Secret { get; set; }
+
+    /// <summary>服务地址端口。默认为空，子网内自动发现</summary>
+    [Description("服务地址端口。默认为空，子网内自动发现")]
+    public String Server { get; set; } = "";
+
+    /// <summary>更新通道。默认Release</summary>
+    [Description("更新通道。默认Release")]
+    public String Channel { get; set; } = "Release";
+
+    /// <summary>更新服务器</summary>
+    [Description("更新服务器")]
+    public String UpdateServer { get; set; } = "";
+
+    /// <summary>最后更新时间</summary>
+    [DisplayName("最后更新时间")]
+    public DateTime LastUpdate { get; set; }
+
+    /// <summary>最后一个使用的工具</summary>
+    [DisplayName("最后一个使用的工具")]
+    public String LastTool { get; set; } = "";
+    #endregion
+
+    #region 加载/保存
+    public XConfig()
+    {
+    }
+
+    protected override void OnLoaded()
     {
-        #region 属性
-        /// <summary>标题</summary>
-        [Description("标题")]
-        public String Title { get; set; } = "";
-
-        /// <summary>宽度</summary>
-        [Description("宽度")]
-        public Int32 Width { get; set; }
-
-        /// <summary>高度</summary>
-        [Description("高度")]
-        public Int32 Height { get; set; }
-
-        /// <summary>顶部</summary>
-        [Description("顶部")]
-        public Int32 Top { get; set; }
-
-        /// <summary>左边</summary>
-        [Description("左边")]
-        public Int32 Left { get; set; }
-
-        /// <summary>扩展数据</summary>
-        [Description("扩展数据")]
-        public String Extend { get; set; } = "";
-
-        /// <summary>日志着色</summary>
-        [Description("日志着色")]
-        public Boolean ColorLog { get; set; } = true;
-
-        /// <summary>语音提示。默认true</summary>
-        [Description("语音提示。默认true")]
-        public Boolean SpeechTip { get; set; } = true;
-
-        /// <summary>证书</summary>
-        [Description("证书")]
-        public String Code { get; set; }
-
-        /// <summary>密钥</summary>
-        [Description("密钥")]
-        public String Secret { get; set; }
-
-        /// <summary>服务地址端口。默认为空，子网内自动发现</summary>
-        [Description("服务地址端口。默认为空，子网内自动发现")]
-        public String Server { get; set; } = "";
-
-        /// <summary>更新通道。默认Release</summary>
-        [Description("更新通道。默认Release")]
-        public String Channel { get; set; } = "Release";
-
-        /// <summary>更新服务器</summary>
-        [Description("更新服务器")]
-        public String UpdateServer { get; set; } = "";
-
-        /// <summary>最后更新时间</summary>
-        [DisplayName("最后更新时间")]
-        public DateTime LastUpdate { get; set; }
-
-        /// <summary>最后一个使用的工具</summary>
-        [DisplayName("最后一个使用的工具")]
-        public String LastTool { get; set; } = "";
-        #endregion
-
-        #region 加载/保存
-        public XConfig()
-        {
-        }
-
-        protected override void OnLoaded()
-        {
-            if (UpdateServer.IsNullOrEmpty() || UpdateServer.EqualIgnoreCase("http://x.newlifex.com/")) UpdateServer = NewLife.Setting.Current.PluginServer;
-
-            if (Server.IsNullOrEmpty()) Server = "http://s.newlifex.com:6600";
-
-            base.OnLoaded();
-        }
-        #endregion
+        if (UpdateServer.IsNullOrEmpty() || UpdateServer.EqualIgnoreCase("http://x.newlifex.com/")) UpdateServer = NewLife.Setting.Current.PluginServer;
+
+        if (Server.IsNullOrEmpty()) Server = "http://s.newlifex.com:6600";
+
+        base.OnLoaded();
     }
+    #endregion
 }
diff --git a/XCoderLinux/Log/XTrace.cs b/XCoderLinux/Log/XTrace.cs
@@ -15,7 +15,7 @@ namespace NewLife.Log
     /// <remarks>
     /// 该静态类包括写日志、写调用栈和Dump进程内存等调试功能。
     /// 
-    /// 默认写日志到文本文件，可通过修改<see cref="NewLife.Log"/>属性来增加日志输出方式。
+    /// 默认写日志到文本文件，可通过修改<see cref="Log"/>属性来增加日志输出方式。
     /// 对于控制台工程，可以直接通过UseConsole方法，把日志输出重定向为控制台输出，并且可以为不同线程使用不同颜色。
     /// </remarks>
     public static partial class XTrace2