Tray：增加 FormBeginInvoke 和自定义退出

Apewer.Web/Web/ApiProgram.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Net;
 using System.Text;
 
 #if NETFX
@@ -62,15 +63,20 @@ namespace Apewer.Web
         static MiniServer _mini = null;
 
         /// <summary>启动 Mini 服务器，返回错误消息。</summary>
-        public static string Mini(int port = 80, bool await = true)
+        public static string Mini(IPEndPoint endpoint, bool await = true)
         {
+            if (endpoint == null) throw new ArgumentNullException(nameof(endpoint));
+
             if (_mini != null) return "无法重复启动实例。";
             _mini = new MiniServer();
             _mini.Handler = context => _invoker.Invoke(new MiniProvider(context));
-            _mini.Run(port, await);
+            _mini.Run(endpoint, await);
             return null;
         }
 
+        /// <summary>启动 Mini 服务器，返回错误消息。</summary>
+        public static string Mini(int port = 80, bool await = true) => Mini(new IPEndPoint(IPAddress.Any, port));
+
     }
 
 #if NETCORE
@@ -124,7 +130,7 @@ namespace Apewer.Web
     public partial class ApiProgram : IHttpHandler, IHttpModule
     {
 
-    #region IHttpHandler
+        #region IHttpHandler
 
         static bool _initialized = false;
 
@@ -142,9 +148,9 @@ namespace Apewer.Web
             _invoker.Invoke(new WebsiteProvider(context));
         }
 
-    #endregion
+        #endregion
 
-    #region IHttpModule
+        #region IHttpModule
 
         /// <summary></summary>
         public void Dispose() { }
@@ -171,7 +177,7 @@ namespace Apewer.Web
         {
         }
 
-    #endregion
+        #endregion
 
     }
 

Apewer.Windows/WinForm/Tray.cs

@@ -76,7 +76,12 @@ namespace Apewer.WinForm
         }
 
         /// <summary>获取 EXE 文件的图标。</summary>
-        public static Icon GetExeIcon() => System.Drawing.Icon.ExtractAssociatedIcon(RuntimeUtility.ExecutablePath);
+        public static Icon GetExeIcon()
+        {
+            var exePath = RuntimeUtility.ExecutablePath;
+            var exeIcon = System.Drawing.Icon.ExtractAssociatedIcon(exePath);
+            return exeIcon;
+        }
 
         /// <summary>获取 EXE 文件的图标。</summary>
         /// <exception cref="ArgumentNullException" />
@@ -258,6 +263,14 @@ namespace Apewer.WinForm
             action.Invoke();
         }
 
+        /// <summary></summary>
+        public void FormBeginInvoke(Action action)
+        {
+            if (action == null) return;
+            if (_form == null) return;
+            _form.BeginInvoke(action);
+        }
+
         /// <summary>显示对话框，并获取结果。</summary>
         /// <exception cref="ArgumentNullException" />
         public DialogResult ShowDialog(CommonDialog dialog)
@@ -287,6 +300,13 @@ namespace Apewer.WinForm
             Application.Exit();
         }
 
+        /// <summary></summary>
+        public void Exit(Action customExit)
+        {
+            if (!_disposed) Dispose();
+            customExit.Invoke();
+        }
+
         #endregion
 
         #region run