🐛 Misc

🎨 LogConsoleService.ConsoleMaxCharCount
🎨 Log format
2026-10-26 20:20:14 +08:00 · 2024-08-29 23:22:28 +08:00 · 2024-08-29 22:14:42 +08:00 · 2024-08-29 20:33:10 +08:00 · 2024-08-29 19:10:45 +08:00 · 2024-08-29 16:32:14 +08:00
178 changed files with 3558 additions and 2944 deletions
@@ -37,6 +37,3 @@
 [submodule "ref/Facepunch.Steamworks"]
 	path = ref/Facepunch.Steamworks
 	url = https://github.com/BeyondDimension/Facepunch.Steamworks.git
-[submodule "ref/appcenter-sdk-dotnet"]
-	path = ref/appcenter-sdk-dotnet
-	url = https://github.com/BeyondDimension/appcenter-sdk-dotnet.git
@@ -214,14 +214,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Facepunch.Steamworks.Posix"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steam++", "src\BD.WTTS.Client.AppHost.Bridge\Steam++.csproj", "{26D8AA24-2ACE-4167-BC2B-117B9BB76AA4}"
 EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "BD.WTTS.Client.AppHost.Bridge.Package", "src\BD.WTTS.Client.AppHost.Bridge.Package\BD.WTTS.Client.AppHost.Bridge.Package.wapproj", "{27795C79-2994-4514-8656-BA34FCEE8901}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArchiSteamFarm", "ref\ArchiSteamFarm\ArchiSteamFarm\ArchiSteamFarm.csproj", "{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AppCenter", "AppCenter", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.AppCenter.Any", "ref\appcenter-sdk-dotnet\SDK\AppCenter\BD.AppCenter.Any\BD.AppCenter.Any.csproj", "{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.AppCenter.Analytics.Any", "ref\appcenter-sdk-dotnet\SDK\AppCenterAnalytics\BD.AppCenter.Analytics.Any\BD.AppCenter.Analytics.Any.csproj", "{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1236,6 +1232,36 @@ Global
 		{26D8AA24-2ACE-4167-BC2B-117B9BB76AA4}.Release|x64.Build.0 = Release|Any CPU
 		{26D8AA24-2ACE-4167-BC2B-117B9BB76AA4}.Release|x86.ActiveCfg = Release|Any CPU
 		{26D8AA24-2ACE-4167-BC2B-117B9BB76AA4}.Release|x86.Build.0 = Release|Any CPU
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|ARM.ActiveCfg = Debug|ARM
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|ARM.Build.0 = Debug|ARM
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|ARM.Deploy.0 = Debug|ARM
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|ARM64.Build.0 = Debug|ARM64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|x64.ActiveCfg = Debug|x64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|x64.Build.0 = Debug|x64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|x64.Deploy.0 = Debug|x64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|x86.ActiveCfg = Debug|x86
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|x86.Build.0 = Debug|x86
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|x86.Deploy.0 = Debug|x86
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|Any CPU.Build.0 = Release|Any CPU
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|ARM.ActiveCfg = Release|ARM
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|ARM.Build.0 = Release|ARM
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|ARM.Deploy.0 = Release|ARM
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|ARM64.ActiveCfg = Release|ARM64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|ARM64.Build.0 = Release|ARM64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|ARM64.Deploy.0 = Release|ARM64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x64.ActiveCfg = Release|x64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x64.Build.0 = Release|x64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x64.Deploy.0 = Release|x64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x86.ActiveCfg = Release|x86
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x86.Build.0 = Release|x86
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x86.Deploy.0 = Release|x86
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1256,46 +1282,6 @@ Global
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Release|x64.Build.0 = Release|Any CPU
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Release|x86.ActiveCfg = Release|Any CPU
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Release|x86.Build.0 = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|ARM.Build.0 = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|x64.Build.0 = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|x86.Build.0 = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|ARM.ActiveCfg = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|ARM.Build.0 = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|ARM64.Build.0 = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|x64.ActiveCfg = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|x64.Build.0 = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|x86.ActiveCfg = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|x86.Build.0 = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|ARM.Build.0 = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|x64.Build.0 = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|x86.Build.0 = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|ARM.ActiveCfg = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|ARM.Build.0 = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|ARM64.Build.0 = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|x64.ActiveCfg = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|x64.Build.0 = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|x86.ActiveCfg = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1361,10 +1347,8 @@ Global
 		{638745C0-B699-4009-9764-05434C511403} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
 		{35676E23-8E54-4785-A75B-98EB0650596B} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
 		{26D8AA24-2ACE-4167-BC2B-117B9BB76AA4} = {5541B406-4A9A-4AC8-AA77-CE14E133DB80}
+		{27795C79-2994-4514-8656-BA34FCEE8901} = {5541B406-4A9A-4AC8-AA77-CE14E133DB80}
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
-		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {90E88965-DB90-4B49-94F5-6D2965491988}
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {567F588F-E95C-4286-8B30-DB3B2200221C}
@@ -3,12 +3,6 @@
 default_base_path="$HOME/WattToolkit"
 base_path="$default_base_path"

-# 检查是否以root身份执行
-if [ "$EUID" -eq 0 ]; then
-  echo "此脚本不能以root身份执行。"
-  exit 1
-fi
-
 # 循环直到用户输入有效路径或直接回车
 while true; do
    # 使用 zenity 提示用户选择安装路径或使用默认路径
@@ -47,45 +41,7 @@ base_url="https://api.steampp.net"
 architecture=1
 app_name="Watt Toolkit"
 PROCESS_NAMES=("$exec_name" "$app_name")
-Check_LC_Code() {
-    # 检查当前 LANG 环境变量
-    current_lang="${LC_ALL:-$LANG}"
-    echo "当前语言环境: $current_lang"
-
-    # 检查是否为 C 或 C.UTF-8
-    if [ "$current_lang" = "C" ] || [ "$current_lang" = "C.UTF-8" ]; then
-        echo "当前语言环境是 C 或 C.UTF-8，需要修改。"
-
-        # 列出系统支持的语言环境
-        supported_locales=$(locale -a)
-        if [ -z "$supported_locales" ]; then
-            echo "未能获取到支持的语言环境列表。请检查系统配置。"
-            return 1
-        fi
-
-        # 遍历支持的语言环境列表，找到第一个不是 C 或 C.UTF-8 的项
-        first_non_c_locale=""
-        for locale in $supported_locales; do
-            if [ "$locale" != "C" ] && [ "$locale" != "C.UTF-8" ]; then
-                first_non_c_locale="$locale"
-                break
-            fi
-        done
-
-        # 检查是否找到了非 C/C.UTF-8 的语言环境
-        if [ -n "$first_non_c_locale" ]; then
-            echo "修改语言环境为支持列表中的第一个非 C/C.UTF-8 项：$first_non_c_locale"
-            export LC_ALL="$first_non_c_locale"
-            echo "语言环境已修改为 $first_non_c_locale。"
-        else
-            echo "未能找到非 C/C.UTF-8 的语言环境。请检查系统配置。"
-            return 1
-        fi
-    else
-        echo "当前语言环境不是 C 或 C.UTF-8，无需修改。"
-    fi
-}
-Check_LC_Code
+export LC_ALL=en_US.UTF-8
 Install_certutil() {
    # 判断发行版类型
    if command -v certutil &>/dev/null; then
@@ -404,44 +360,34 @@ Kill_Process
 Decompression
 # xdg-icon-resource install "$base_path/Icons/Watt-Toolkit.png" --size 128 Watt-Toolkit
 InitDesktop() {
-    # 检查XDG_DESKTOP_DIR环境变量，如果未设置则使用默认值
-    XDG_DESKTOP_DIR="${XDG_DESKTOP_DIR:-$HOME/Desktop}"
-
    while true; do
        # 使用 zenity 提示用户选择安装路径或使用默认路径
-        choice=$(zenity --list --radiolist --title="请选择要添加到的位置" \
-            --column="选择" --column="路径" \
-            TRUE "$XDG_DESKTOP_DIR" \
-            FALSE "$HOME/.local/share/applications/")
+        choice=$(zenity --list --radiolist --title="请选择要添加到的位置" --column="选择" --column="路径" TRUE "$HOME/.local/share/applications/" FALSE "$HOME/Desktop")

        # 检查用户输入
        if [ "$choice" == "$HOME/.local/share/applications/" ]; then
            target_dir="$HOME/.local/share/applications/"
            break
-        elif [ "$choice" == "$XDG_DESKTOP_DIR" ]; then
-            target_dir="$XDG_DESKTOP_DIR"
+        elif [ "$choice" == "$HOME/Desktop" ]; then
+            target_dir="$HOME/Desktop/"
            break
        else
-            # 无效选项时给出提示，并继续循环
-            zenity --info --text="无效选项，请重新选择。"
+            echo "无效选项，请输入 1 或 2。"
        fi
    done
-
-    # 添加桌面文件
+    #添加桌面文件
    rm -rf "$target_dir/Watt Toolkit.desktop" 2>/dev/null
-    cat <<EOT > "$target_dir/Watt Toolkit.desktop"
+    echo "#!/usr/bin/env xdg-open
 [Desktop Entry]
 Name=Watt Toolkit
 Exec=$base_path/$exec_name.sh
 Icon=$base_path/Icons/Watt-Toolkit.png
 Terminal=false
 Type=Application
-StartupNotify=false
-EOT
+StartupNotify=false" >"$target_dir/Watt Toolkit.desktop"
    chmod +x "$target_dir/Watt Toolkit.desktop"
+
 }
-
-
 InitDesktop
 # update-desktop-database ~/.local/share/applications
 #运行程序
@@ -973,7 +973,7 @@
        },
        {
          "TypeName": "string",
-          "PropertyName": "CustomDohAddres2",
+          "PropertyName": "CustomDohAddres",
          "DefaultValue": "null",
          "DefaultValueIsConst": true,
          "Summary": "自定义 DNS over HTTPS 地址",
@@ -0,0 +1,43 @@
+# Steam++ v3.X Program File Structure for Windows
+
+- dotnet 共享运行时，删除后将使用已安装的运行时，此目参考 ```C:\Program Files\dotnet```，可自行升级行库小版本号，二进制兼容
+	- host
+		- fxr
+			- x.y.z
+				- hostfxr.dll
+	- shared
+		- Microsoft.AspNetCore.App
+			- x.y.z
+		- Microsoft.NETCore.App
+			- x.y.z
+- native
+    - win-x64
+        - 7z.dll
+        - av_libglesv2.dll
+        - e_sqlite3.dll
+        - libHarfBuzzSharp.dll
+        - libSkiaSharp.dll
+        - WebView2Loader.dll
+        - WinDivert.dll
+        - WinDivert64.sys
+- assemblies 主模块程序集
+- modules 可选模块
+    - ~~Update 自更新模块，删除该文件夹后禁用更新~~
+        - Steam++.Update.exe 更新程序，CDN 分发更包，下载与解压在主程序中，此进程仅退出主程执行覆盖操作
+    - Accelerator 网络加速
+        - Steam++.Accelerator.exe 控制台子服务进，使用匿名管道与主进程通信，无参数或指定某参数(待定)启动时可读取配置文件启动加速，可全独立运行，ASP.NET Core Web API 项目，支持 Docker
+        - Steam++.Plugins.Accelerator.dll 插件程集
+    - AccountSwitch 账号切换
+        - Steam++.Plugins.AccountSwitch.dll
+    - ~~ArchiSteamFarm~~
+        - Steam++.ArchiSteamFarm.exe
+        - Steam++.Plugins.ArchiSteamFarm.dll
+    - GameList 库存游戏
+        - Steam++.Plugins.GameList.dll
+    - LocalAuth 本地令牌
+        - Steam++.Plugins.LocalAuth.dll
+    - GameTools 游戏工具
+        - Steam++.Plugins.GameTools.dll
+- Steam++.exe (主启动程序).NET Framework 二进制主程序  
+- Steam++.exe.config 使用该配置文件以允许在 .NET Framework 3.5 ~ 4.8.1 中任意版本中兼容运行(从 Windows 7 ~ 11 中所有系统自带运行时)  
+- ~~Steam++.Uninstall.exe 卸载程序(WinForms?AOT?)~~ 
@@ -21,7 +21,7 @@ public static partial class AssemblyInfo
    /// <summary>
    /// RC 版本号，范围 0~9，只增不减
    /// </summary>
-    const string ver_for_rc = "13";
+    const string ver_for_rc = "9";

    public const string FileVersion = $"{Version2}.{ver_for_rc}1{ver_for_preview}.0";

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
+  xmlns:desktop2="http://schemas.microsoft.com/appx/manifest/desktop/windows10/2"
+  IgnorableNamespaces="uap rescap desktop desktop2">
+
+	<Identity
+	  Name="4651ED44255E.47979655102CE"
+	  Publisher="CN=A90E406B-B2D3-4A23-B061-0FA1D65C4F66"
+	  Version="3.0.207.0" />
+
+	<Properties>
+		<DisplayName>Watt Toolkit</DisplayName>
+		<PublisherDisplayName>软妹币玩家</PublisherDisplayName>
+		<Logo>Images\StoreLogo.png</Logo>
+	</Properties>
+
+	<Dependencies>
+		<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+		<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+	</Dependencies>
+
+	<Resources>
+		<Resource Language="x-generate"/>
+	</Resources>
+
+	<Applications>
+		<Application Id="App"
+		  Executable="$targetnametoken$.exe"
+		  EntryPoint="$targetentrypoint$">
+			<uap:VisualElements
+			  DisplayName="Watt Toolkit"
+			  Description="「Watt Toolkit」是一个开源跨平台的多功能游戏工具箱，此工具的大部分功能都是需要您下载安装 Steam 才能使用。"
+			  BackgroundColor="transparent"
+			  Square150x150Logo="Images\Square150x150Logo.png"
+			  Square44x44Logo="Images\Square44x44Logo.png">
+				<uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png"  Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png" ShortName="Steam++">
+					<uap:ShowNameOnTiles>
+						<uap:ShowOn Tile="square150x150Logo"/>
+						<uap:ShowOn Tile="wide310x150Logo"/>
+						<uap:ShowOn Tile="square310x310Logo"/>
+					</uap:ShowNameOnTiles>
+				</uap:DefaultTile >
+				<uap:SplashScreen Image="Images\SplashScreen.png" />
+				<uap:InitialRotationPreference>
+					<uap:Rotation Preference="landscape"/>
+				</uap:InitialRotationPreference>
+				<uap:LockScreen BadgeLogo="Images\BadgeLogo.png" Notification="badgeAndTileText"/>
+			</uap:VisualElements>
+			<Extensions>
+				<desktop:Extension Category="windows.fullTrustProcess" Executable="Steam++\Steam++.exe" />
+				<desktop:Extension Category="windows.startupTask" Executable="Steam++\Steam++.exe" EntryPoint="Windows.FullTrustApplication">
+					<desktop:StartupTask TaskId="BootAutoStartTask" Enabled="true" DisplayName="Steam++ System Boot Run" />
+				</desktop:Extension>
+				<uap:Extension Category="windows.protocol">
+					<uap:Protocol Name="spp">
+						<uap:Logo>Images\Square44x44Logo.png</uap:Logo>
+						<uap:DisplayName>Steam++ URI Scheme</uap:DisplayName>
+					</uap:Protocol>
+				</uap:Extension>
+			</Extensions>
+		</Application>
+	</Applications>
+
+	<Extensions>
+		<desktop2:Extension Category="windows.firewallRules">
+			<desktop2:FirewallRules Executable="Steam++\modules\Accelerator\Steam++.Accelerator.exe">
+				<desktop2:Rule Direction="in" IPProtocol="TCP" Profile="all"/>
+				<desktop2:Rule Direction="in" IPProtocol="UDP" Profile="all"/>
+			</desktop2:FirewallRules>
+		</desktop2:Extension>
+	</Extensions>
+
+	<Capabilities>
+		<Capability Name="internetClient" />
+		<rescap:Capability Name="runFullTrust" />
+		<rescap:Capability Name="allowElevation" />
+	</Capabilities>
+</Package>
@@ -10,6 +10,6 @@
 		<legacyCorruptedStateExceptionsPolicy enabled="true"/>
 	</runtime>
 	<appSettings>
-		<add key="d" value="9.0.0"/>
+		<add key="d" value="8.0.0"/>
 	</appSettings>
 </configuration>
@@ -16,7 +16,7 @@ static unsafe partial class Program
 {
    static Program()
    {
-        dotnet_version_major = "9";
+        dotnet_version_major = "8";
        dotnet_version_minor = "0";
        dotnet_version_build = "0";
        dotnet_version = $"{dotnet_version_major}.{dotnet_version_minor}.{dotnet_version_build}";
@@ -426,8 +426,8 @@ static unsafe partial class Program
        if (!File.Exists(config_path) || !File.Exists(dotnetlib_path))
        {
 #if DEBUG
-            config_path = string.Join(Path.DirectorySeparatorChar.ToString(), new[] { ProjectUtils.ProjPath, "src", "BD.WTTS.Client.Avalonia.App", "bin", "Debug", $"net{dotnet_version_major}.{dotnet_version_minor}-windows10.0.19041", $"{dotnet_dll_name}.runtimeconfig.json" });
-            dotnetlib_path = string.Join(Path.DirectorySeparatorChar.ToString(), new[] { ProjectUtils.ProjPath, "src", "BD.WTTS.Client.Avalonia.App", "bin", "Debug", $"net{dotnet_version_major}.{dotnet_version_minor}-windows10.0.19041", $"{dotnet_dll_name}.dll" });
+            config_path = string.Join(Path.DirectorySeparatorChar.ToString(), new[] { ProjectUtils.ProjPath, "src", "BD.WTTS.Client.Avalonia.App", "bin", "Debug", $"net{dotnet_version_major}.{dotnet_version_minor}-windows10.0.19041.0", $"{dotnet_dll_name}.runtimeconfig.json" });
+            dotnetlib_path = string.Join(Path.DirectorySeparatorChar.ToString(), new[] { ProjectUtils.ProjPath, "src", "BD.WTTS.Client.Avalonia.App", "bin", "Debug", $"net{dotnet_version_major}.{dotnet_version_minor}-windows10.0.19041.0", $"{dotnet_dll_name}.dll" });
 #else
            ShowErrMessageBox($"Loading assembly failed \"{dotnetlib_path}\"");
            return (int)ExitCode.EntryPointFileNotFound;
@@ -95,37 +95,31 @@
 		<ProjectReference Include="..\BD.WTTS.Client\BD.WTTS.Client.csproj" />
 	</ItemGroup>

-	<!--<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' AND Exists('$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net9.0\System.Drawing.Common.dll')">
-		--><!-- Windows Only --><!--
-		--><!-- 修复：存在 Microsoft.WindowsDesktop.App 依赖时不会将 System.Drawing.Common.dll 复制到输出目录--><!--
-		<None Include="$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net9.0\System.Drawing.Common.dll">
+	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' AND Exists('$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net8.0\System.Drawing.Common.dll')">
+		<!-- Windows Only -->
+		<!-- 修复：存在 Microsoft.WindowsDesktop.App 依赖时不会将 System.Drawing.Common.dll 复制到输出目录-->
+		<None Include="$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net8.0\System.Drawing.Common.dll">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<Reference Include="System.Drawing.Common">
-			<HintPath>$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net9.0\System.Drawing.Common.dll</HintPath>
-		</Reference>
-		<None Include="$(NugetPackageRoot)\microsoft.win32.systemevents\9.0.0\runtimes\win\lib\net9.0\Microsoft.Win32.SystemEvents.dll">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<Reference Include="Microsoft.Win32.SystemEvents">
-			<HintPath>$(NugetPackageRoot)\microsoft.win32.systemevents\9.0.0\runtimes\win\lib\net9.0\Microsoft.Win32.SystemEvents.dll</HintPath>
+			<HintPath>$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net8.0\System.Drawing.Common.dll</HintPath>
 		</Reference>
 	</ItemGroup>

 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' AND Exists('$(NugetPackageRoot)\splat.drawing\$(Version_Splat_Drawing)\lib\net7.0\Splat.Drawing.dll')">
-		--><!-- Windows Only --><!--
-		--><!-- 修复：Splat.Drawing 包存在 WPF 的依赖项 --><!--
+		<!-- Windows Only -->
+		<!-- 修复：Splat.Drawing 包存在 WPF 的依赖项 -->
 		<PackageReference Include="Splat.Drawing">
 			<ExcludeAssets>all</ExcludeAssets>
 		</PackageReference>
 		<Reference Include="Splat.Drawing">
 			<HintPath>$(NugetPackageRoot)\splat.drawing\$(Version_Splat_Drawing)\lib\net7.0\Splat.Drawing.dll</HintPath>
 		</Reference>
-		--><!-- 修复：System.Reactive 包存在 System.Windows.Forms 的依赖项 --><!--
+		<!-- 修复：System.Reactive 包存在 System.Windows.Forms 的依赖项 -->
 		<Reference Include="System.Reactive">
 			<HintPath>$(NugetPackageRoot)\system.reactive\$(Version_System_Reactive)\lib\net6.0\System.Reactive.dll</HintPath>
 		</Reference>
-	</ItemGroup>-->
+	</ItemGroup>

 	<Import Project="..\TFM_NETX_WITH_DESKTOP.props" />

@@ -4,12 +4,12 @@
 <dict>
 	<key>CFBundleName</key>
 	<string>Watt Toolkit</string>
-	<key>CFBundleDisplayName</key>
-	<string>Watt Toolkit</string>
 	<key>CFBundleShortVersionString</key>
 	<string>3.0.0</string>
 	<key>CFBundleVersion</key>
-	<string>3.0.1219.0</string>
+	<string>3.0.0.0</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.15</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
@@ -175,10 +175,6 @@ partial class Program
                {
                    RenderingMode = GetRenderingMode().ToArray(),
                });
-                builder.With(new MacOSPlatformOptions
-                {
-                    DisableDefaultApplicationMenuItems = true,
-                });
 #elif LINUX
                builder.With(new X11PlatformOptions
                {
@@ -1,203 +0,0 @@
-using Avalonia.Reactive;
-using Avalonia.Xaml.Interactions.Responsive;
-using Avalonia.Xaml.Interactivity;
-
-namespace BD.WTTS.Behaviors;
-
-/// <summary>
-/// Observes <see cref="Behavior{T}.AssociatedObject"/> control or <see cref="SourceControl"/> control <see cref="Visual.Bounds"/> property changes and if triggered sets or removes style classes when conditions from <see cref="AdaptiveClassSetter"/> are met.
-/// </summary>
-public class AdaptiveBehavior : Behavior<Control>
-{
-    private IDisposable? _disposable;
-    private AvaloniaList<AdaptiveClassSetter>? _setters;
-
-    /// <summary>
-    /// Identifies the <seealso cref="SourceControl"/> avalonia property.
-    /// </summary>
-    public static readonly StyledProperty<Control?> SourceControlProperty =
-        AvaloniaProperty.Register<AdaptiveBehavior, Control?>(nameof(SourceControl));
-
-    /// <summary>
-    /// Identifies the <seealso cref="TargetControl"/> avalonia property.
-    /// </summary>
-    public static readonly StyledProperty<Control?> TargetControlProperty =
-        AvaloniaProperty.Register<AdaptiveBehavior, Control?>(nameof(TargetControl));
-
-    /// <summary>
-    /// Identifies the <seealso cref="Setters"/> avalonia property.
-    /// </summary>
-    public static readonly DirectProperty<AdaptiveBehavior, AvaloniaList<AdaptiveClassSetter>> SettersProperty =
-        AvaloniaProperty.RegisterDirect<AdaptiveBehavior, AvaloniaList<AdaptiveClassSetter>>(nameof(Setters), t => t.Setters);
-
-    /// <summary>
-    /// Gets or sets the the source control that <see cref="Visual.BoundsProperty"/> property are observed from, if not set <see cref="Behavior{T}.AssociatedObject"/> is used. This is a avalonia property.
-    /// </summary>
-    [ResolveByName]
-    public Control? SourceControl
-    {
-        get => GetValue(SourceControlProperty);
-        set => SetValue(SourceControlProperty, value);
-    }
-
-    /// <summary>
-    /// Gets or sets the target control that class name that should be added or removed when triggered, if not set <see cref="Behavior{T}.AssociatedObject"/> is used or <see cref="AdaptiveClassSetter.TargetControl"/> from <see cref="AdaptiveClassSetter"/>. This is a avalonia property.
-    /// </summary>
-    [ResolveByName]
-    public Control? TargetControl
-    {
-        get => GetValue(TargetControlProperty);
-        set => SetValue(TargetControlProperty, value);
-    }
-
-    /// <summary>
-    /// Gets adaptive class setters collection. This is a avalonia property.
-    /// </summary>
-    [Content]
-    public AvaloniaList<AdaptiveClassSetter> Setters => _setters ??= new AvaloniaList<AdaptiveClassSetter>();
-
-    /// <inheritdoc/>
-    protected override void OnAttachedToVisualTree()
-    {
-        base.OnAttachedToVisualTree();
-
-        StopObserving();
-        StartObserving();
-    }
-
-    /// <inheritdoc/>
-    protected override void OnDetachedFromVisualTree()
-    {
-        base.OnDetachedFromVisualTree();
-
-        StopObserving();
-    }
-
-    private void StartObserving()
-    {
-        var sourceControl = GetValue(SourceControlProperty) is not null
-            ? SourceControl
-            : AssociatedObject;
-
-        if (sourceControl is not null)
-        {
-            _disposable = ObserveBounds(sourceControl);
-        }
-    }
-
-    private void StopObserving()
-    {
-        _disposable?.Dispose();
-    }
-
-    private IDisposable ObserveBounds(Control sourceControl)
-    {
-        if (sourceControl is null)
-        {
-            throw new ArgumentNullException(nameof(sourceControl));
-        }
-
-        return sourceControl.GetObservable(Visual.BoundsProperty)
-            .Subscribe(new AnonymousObserver<Rect>(bounds => ValueChanged(sourceControl, Setters, bounds)));
-    }
-
-    private void ValueChanged(Control? sourceControl, AvaloniaList<AdaptiveClassSetter>? setters, Rect bounds)
-    {
-        if (sourceControl is null || setters is null)
-        {
-            return;
-        }
-
-        foreach (var setter in setters)
-        {
-            var isMinOrMaxWidthSet = setter.IsSet(AdaptiveClassSetter.MinWidthProperty)
-                                     || setter.IsSet(AdaptiveClassSetter.MaxWidthProperty);
-            var widthConditionTriggered = GetResult(setter.MinWidthOperator, bounds.Width, setter.MinWidth)
-                                          && GetResult(setter.MaxWidthOperator, bounds.Width, setter.MaxWidth);
-
-            var isMinOrMaxHeightSet = setter.IsSet(AdaptiveClassSetter.MinHeightProperty)
-                                      || setter.IsSet(AdaptiveClassSetter.MaxHeightProperty);
-            var heightConditionTriggered = GetResult(setter.MinHeightOperator, bounds.Height, setter.MinHeight)
-                                           && GetResult(setter.MaxHeightOperator, bounds.Height, setter.MaxHeight);
-
-            var isAddClassTriggered = isMinOrMaxWidthSet switch
-            {
-                true when !isMinOrMaxHeightSet => widthConditionTriggered,
-                false when isMinOrMaxHeightSet => heightConditionTriggered,
-                true when isMinOrMaxHeightSet => widthConditionTriggered && heightConditionTriggered,
-                _ => false
-            };
-
-            var targetControl = setter.GetValue(AdaptiveClassSetter.TargetControlProperty) is not null
-                ? setter.TargetControl
-                : GetValue(TargetControlProperty) is not null
-                    ? TargetControl
-                    : AssociatedObject;
-
-            if (targetControl is not null)
-            {
-                var className = setter.ClassName;
-                var isPseudoClass = setter.IsPseudoClass;
-
-                if (isAddClassTriggered)
-                {
-                    Add(targetControl, className, isPseudoClass);
-                }
-                else
-                {
-                    Remove(targetControl, className, isPseudoClass);
-                }
-            }
-        }
-    }
-
-    private bool GetResult(ComparisonConditionType comparisonConditionType, double property, double value)
-    {
-        return comparisonConditionType switch
-        {
-            // ReSharper disable once CompareOfFloatsByEqualityOperator
-            ComparisonConditionType.Equal => property == value,
-            // ReSharper disable once CompareOfFloatsByEqualityOperator
-            ComparisonConditionType.NotEqual => property != value,
-            ComparisonConditionType.LessThan => property < value,
-            ComparisonConditionType.LessThanOrEqual => property <= value,
-            ComparisonConditionType.GreaterThan => property > value,
-            ComparisonConditionType.GreaterThanOrEqual => property >= value,
-            _ => throw new ArgumentOutOfRangeException()
-        };
-    }
-
-    private static void Add(Control targetControl, string? className, bool isPseudoClass)
-    {
-        if (className is null || string.IsNullOrEmpty(className) || targetControl.Classes.Contains(className))
-        {
-            return;
-        }
-
-        if (isPseudoClass)
-        {
-            ((IPseudoClasses)targetControl.Classes).Add(className);
-        }
-        else
-        {
-            targetControl.Classes.Add(className);
-        }
-    }
-
-    private static void Remove(Control targetControl, string? className, bool isPseudoClass)
-    {
-        if (className is null || string.IsNullOrEmpty(className) || !targetControl.Classes.Contains(className))
-        {
-            return;
-        }
-
-        if (isPseudoClass)
-        {
-            ((IPseudoClasses)targetControl.Classes).Remove(className);
-        }
-        else
-        {
-            targetControl.Classes.Remove(className);
-        }
-    }
-}
@@ -11,7 +11,6 @@
 [assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.UI.Views.Windows")]
 [assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.Converters")]
 [assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.Markup")]
-[assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.Behaviors")]
 [assembly: XmlnsDefinition("https://steampp.net/services", "BD.WTTS.Services")]
 [assembly: XmlnsDefinition("https://steampp.net/services", "BD.WTTS.Plugins")]
 [assembly: XmlnsDefinition("https://steampp.net/services", "BD.WTTS.Plugins.Abstractions")]
@@ -44,21 +44,16 @@ sealed class AvaloniaToastServiceImpl : IToastService
        if (NotificationManager == null)
        {
            var host = AvaloniaWindowManagerImpl.GetWindowTopLevel();
-            if (host != null)
+
+            NotificationManager = new SnackbarManager(host)
            {
-                NotificationManager = new SnackbarManager(host)
-                {
-                    Position = NotificationPosition.BottomRight,
-                    MaxItems = 5,
-                };
-            }
+                Position = NotificationPosition.BottomRight,
+                MaxItems = 5,
+            };
        }

-        if (NotificationManager != null)
-        {
-            var notificationType = GetNotificationType(icon);
-            NotificationManager.Show(text, notificationType: notificationType);
-        }
+        var notificationType = GetNotificationType(icon);
+        NotificationManager.Show(text, notificationType: notificationType);
    }

    /// <inheritdoc cref="Show(string, int?)"/>
@@ -13,16 +13,8 @@ public sealed partial class App : Application

    public App()
    {
-        Name = AssemblyInfo.Trademark;
        OpenBrowserCommand = ReactiveCommand.Create<object?>(OpenBrowserCommandCore);
        CopyToClipboardCommand = ReactiveCommand.Create<object?>(CopyToClipboardCommandCore);
-#if MACOS
-        var menus = new NativeMenu();
-        menus.Add(new NativeMenuItem { Header = Strings.Settings, Command = ReactiveCommand.Create(() => { INavigationService.Instance.Navigate(typeof(SettingsPage)); }) });
-        menus.Add(new NativeMenuItemSeparator());
-        menus.Add(new NativeMenuItem { Header = Strings.Exit, Command = ReactiveCommand.Create(() => { Shutdown(); }) });
-        NativeMenu.SetMenu(this, menus);
-#endif
    }

    /// <summary>
@@ -84,7 +76,7 @@ public sealed partial class App : Application
                    Log.Error(nameof(Steamworks), ex, "Steamworks.SteamClient Init");
                }
            }
-#endif
+#endif 
        }
        catch (Exception ex)
        {
@@ -119,12 +111,6 @@ public sealed partial class App : Application
            {
                Task2.InBackground(() => appWindow.SplashScreen?.RunTasks(CancellationToken.None));
            }
-
-            IPlatformService.Instance.SetSystemSessionEnding(() =>
-            {
-                Log.Info("System Shutdown", "Application SafeExit...");
-                Shutdown();
-            });
        }
        else if (ApplicationLifetime is ISingleViewApplicationLifetime singleView)
        {
@@ -260,8 +246,8 @@ public sealed partial class App : Application
            try
            {
                Uri uri = new(urlString);
-                if (uri.Host.EndsWith(Constants.Urls.OfficialWebsiteHost, StringComparison.OrdinalIgnoreCase) &&
-                    uri.Query.EndsWith(Constants.Urls.Komaasharu_IsAuthQuery, StringComparison.OrdinalIgnoreCase))
+                if (uri.Host.EndsWith("steampp.net", StringComparison.OrdinalIgnoreCase) ||
+                    uri.Host.EndsWith("mossimo.net", StringComparison.OrdinalIgnoreCase))
                {
                    await UserService.Current.OpenAuthUrl(urlString);
                    return;
@@ -65,7 +65,7 @@
                </spp:AppItem>

                <spp:AppItem
-                    Title="Wo Long: Fallen Dynasty （卧龙：苍天陨落）（卧龙：苍天陨落）（卧龙：苍天陨落）（卧龙：苍天陨落）"
+                    Title="Wo Long: Fallen Dynasty （卧龙：苍天陨落）"
                    MaxHeight="120"
                    Description="This is a description of whatver this does"
                    Tags="111">
@@ -181,7 +181,7 @@
                                Grid.Row="2"
                                Grid.Column="1"
                                Grid.ColumnSpan="2"
-                                Margin="0,5,12,5"
+                                Margin="0,5"
                                VerticalAlignment="Top"
                                Classes="CaptionTextBlockStyle"
                                FontSize="12"
@@ -97,7 +97,7 @@
    </Design.PreviewWith>

    <Styles.Resources>
-        <Thickness x:Key="AppPageMargin">20,10,20,20</Thickness>
+        <Thickness x:Key="AppPageMargin">20</Thickness>
    </Styles.Resources>

    <Style Selector="spp|PageBase">
@@ -313,7 +313,7 @@
            <Setter Property="Grid.Row" Value="2" />
            <Setter Property="VerticalAlignment" Value="Center" />
            <Setter Property="HorizontalAlignment" Value="Center" />
-            <Setter Property="Margin" Value="0 12 0 0" />
+            <Setter Property="Margin" Value="0 12" />
        </Style>

        <Style Selector="^ /template/ Panel#PageDetails">
@@ -61,10 +61,6 @@ public class SnackbarManager : TemplatedControl, IManagedNotificationManager
        {
            Install(host);
        }
-        else
-        {
-            Log.Error("SnackbarManager", "Install Faild, host is null");
-        }

        UpdatePseudoClasses(Position);
    }
@@ -91,12 +91,6 @@
                            CommandParameter="{Binding Data.AssemblyLocation}"
                            Content="{Binding Path=Res.Plugin_OpenFolder, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
                            IsClickEnabled="True" />
-                        <ui:SettingsExpanderItem
-                            ActionIconSource="Open"
-                            Command="{Binding $parent[spp:Settings_Plugin].((spp:SettingsPageViewModel)DataContext).OpenPluginCacheDirectory_Click}"
-                            CommandParameter="{Binding Data.AppDataDirectory}"
-                            Content="{Binding Path=Res.Plugin_OpenAppDataFolder, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
-                            IsClickEnabled="True" />
                        <ui:SettingsExpanderItem
                            ActionIconSource="Open"
                            Command="{Binding $parent[spp:Settings_Plugin].((spp:SettingsPageViewModel)DataContext).OpenPluginCacheDirectory_Click}"
@@ -110,7 +110,7 @@
 		<PackageReference Include="Utf8StringInterpolation" />
 	</ItemGroup>

-	<ItemGroup Condition="!$(DefineConstants.Contains('REMOVE_DNS_INTERCEPT')) AND $([MSBuild]::IsOSPlatform('windows')) AND ($(RuntimeIdentifier.StartsWith('win-')) OR $(RuntimeIdentifier) == '')">
+	<ItemGroup Condition="$([MSBuild]::IsOSPlatform('windows')) AND ($(RuntimeIdentifier.StartsWith('win-')) OR $(RuntimeIdentifier) == '')">
 		<PackageReference Include="Aigio.WinDivertSharp" />
 	</ItemGroup>

@@ -148,7 +148,6 @@ public static partial class ServiceCollectionExtensions

 #if WINDOWS

-#if !REMOVE_DNS_INTERCEPT
    /// <summary>
    /// 注册数据包拦截器
    /// </summary>
@@ -171,7 +170,6 @@ public static partial class ServiceCollectionExtensions

        return services;
    }
-#endif

 #endif
 }
@@ -129,7 +129,7 @@ sealed partial class CertificateManagerImpl : ICertificateManager

    bool SharedCreateRootCertificate()
    {
-        RootCertificate = LoadRootCertificate();
+        RootCertificate ??= LoadRootCertificate();

        if (RootCertificate != null)
        {
@@ -83,7 +83,7 @@ sealed class CertService
            entry.SetAbsoluteExpiration(notAfter);

            var subjectName = new X500DistinguishedName($"CN={domain}");
-            using var serverCert = CertGenerator.CreateEndCertificate(caCert, subjectName, GetDomains());
+            using var serverCert = CertGenerator.CreateEndCertificate(caCert, subjectName, GetDomains(), notBefore, notAfter);
            var serverCertPfx = serverCert.Export(X509ContentType.Pfx);
            // 将生成的证书导出后重新创建一个
            return new X509Certificate2(serverCertPfx);
@@ -84,7 +84,7 @@ sealed partial class HttpReverseProxyMiddleware
            !reverseProxyConfig.Service.OnlyEnableProxyScript)
        {
            // 部分运营商将奇怪的域名解析到 127.0.0.1 再此排除这些不支持的代理域名
-            var ip = await reverseProxyConfig.DnsAnalysis.AnalysisDomainIpAsync(context.Request.Host.Value!, IDnsAnalysisService.DNS_Dnspods).FirstOrDefaultAsync();
+            var ip = await reverseProxyConfig.DnsAnalysis.AnalysisDomainIpAsync(context.Request.Host.Value, IDnsAnalysisService.DNS_Dnspods).FirstOrDefaultAsync();
            if (ip == null || IPAddress.IsLoopback(ip))
            {
                context.Response.StatusCode = StatusCodes.Status500InternalServerError;
@@ -24,7 +24,7 @@ sealed class DnsDohAnalysisService : GeneralHttpClientFactory
    {
    }

-    public const string DefaultDohAddres = Dnspod_DohAddres2;
+    public const string DefaultDohAddres = Dnspod_DohAddres;

    static Uri GetDohAddres(string? dohAddres)
    {
@@ -63,12 +63,6 @@ sealed class DnsDohAnalysisService : GeneralHttpClientFactory
        var client = new HttpClient(handler);
        client.BaseAddress = dohAddresUri;
        var dnsClient = new DnsHttpClient(client);
-        //暂未考虑释放问题 注意！
-        //foreach (var dc in dnsClients.Values)
-        //{
-        //    dc.Dispose();
-        //}
-        //dnsClients.Clear();
        dnsClients.TryAdd(dohAddresUri, dnsClient);
        return dnsClient;
    }
@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/DnsInterceptHostedService.cs

-#if WINDOWS && !REMOVE_DNS_INTERCEPT
+#if WINDOWS

 // ReSharper disable once CheckNamespace
 namespace BD.WTTS.Services.Implementation;
@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/Dns/DnsInterceptor.cs

-#if WINDOWS && !REMOVE_DNS_INTERCEPT
+#if WINDOWS

 using WinDivertSharp;
 using DNS.Protocol;
@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/Tcp/GitInterceptor.cs

-#if WINDOWS && !REMOVE_DNS_INTERCEPT
+#if WINDOWS

 using static BD.WTTS.Models.Abstractions.IReverseProxyConfig;

@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/Tcp/HttpInterceptor.cs

-#if WINDOWS && !REMOVE_DNS_INTERCEPT
+#if WINDOWS

 using static BD.WTTS.Models.Abstractions.IReverseProxyConfig;

@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/Tcp/HttpsInterceptor.cs

-#if WINDOWS && !REMOVE_DNS_INTERCEPT
+#if WINDOWS

 using static BD.WTTS.Models.Abstractions.IReverseProxyConfig;

@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/Tcp/SshInterceptor.cs

-#if WINDOWS && !REMOVE_DNS_INTERCEPT
+#if WINDOWS

 using static BD.WTTS.Models.Abstractions.IReverseProxyConfig;

@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/TcpInterceptHostedService.cs

-#if WINDOWS && !REMOVE_DNS_INTERCEPT
+#if WINDOWS

 using static BD.WTTS.Models.Abstractions.IReverseProxyConfig;

@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/Tcp/TcpInterceptor.cs

-#if WINDOWS && !REMOVE_DNS_INTERCEPT
+#if WINDOWS

 using WinDivertSharp;

@@ -23,7 +23,7 @@ partial class YarpReverseProxyServiceImpl
        services.AddReverseProxyServer();
        services.AddFlowAnalyze();

-#if WINDOWS && !REMOVE_DNS_INTERCEPT
+#if WINDOWS
        if (ProxyMode == ProxyMode.DNSIntercept)
        {
            services.AddPacketIntercept();
@@ -47,40 +47,9 @@ sealed partial class YarpReverseProxyServiceImpl : ReverseProxyServiceImpl, IRev
            ICertificateManager.Constants.CheckRootCertificate(
                platformService,
                CertificateManager);
-
-            X509Certificate2? cer = CertificateManager.RootCertificatePackable;
-            if (cer is not null && DateTime.Now <= cer.NotAfter && cer.NotAfter <= DateTime.Now.AddMonths(1))
-            {
-                var interval = cer.NotAfter - DateTime.Now;
-
-                _certificateTimer = new System.Timers.Timer(interval)
-                {
-                    AutoReset = false,
-                };
-
-                _certificateTimer.Elapsed += async (_, _) =>
-                {
-                    ICertificateManager.Constants.CheckRootCertificate(
-                        platformService,
-                        CertificateManager);
-
-                    await StopProxyAsync();
-                    await StartProxyImpl();
-                };
-                _certificateTimer.Start();
-            }
        }
    }

-    private System.Timers.Timer? _certificateTimer;
-
-    private void StopCertificateTimer()
-    {
-        _certificateTimer?.Stop();
-        _certificateTimer?.Dispose();
-        _certificateTimer = null;
-    }
-
    protected override Task<StartProxyResult> StartProxyImpl() => Task.FromResult(StartProxyCore());

    StartProxyResult StartProxyCore()
@@ -184,7 +153,6 @@ sealed partial class YarpReverseProxyServiceImpl : ReverseProxyServiceImpl, IRev

    public async Task StopProxyAsync()
    {
-        StopCertificateTimer();
        Scripts = null;
        if (app == null) return;
        await app.StopAsync();
@@ -196,11 +196,6 @@ public interface ICertificateManager
                // 生成证书
                certificateManager.GenerateCertificate();

-                packable = GetRootCertificatePackable();
-                certificate2 = packable;
-                if (certificate2 == null)
-                    return StartProxyResultCode.GetX509Certificate2Fail;
-
                // 安装证书
                ICertificateManager.Constants.TrustRootCertificate(
                    GetCerFilePath, platformService, certificate2);
@@ -8,18 +8,18 @@ public partial interface IDnsAnalysisService // 公共常量定义
 {
    #region DNS 常量

-    const string DNS_Ali_DohAddres = "https://dns.alidns.com/resolve";
-    const string DNS_Ali_DohAddres2 = "https://223.6.6.6/resolve";
-    const string DNS_Ali_DohAddres3 = "https://223.5.5.5/resolve";
+    const string DNS_Ali_DohAddres = "https://dns.alidns.com";
+    const string DNS_Ali_DohAddres2 = "https://223.6.6.6/dns-query";
+    const string DNS_Ali_DohAddres3 = "https://223.5.5.5/dns-query";

-    const string Dnspod_DohAddres = "https://1.12.12.12/resolve";
-    const string Dnspod_DohAddres2 = "https://doh.pub/resolve";
-    const string Dnspod_DohAddres3 = "https://120.53.53.53/resolve";
+    const string Dnspod_DohAddres = "https://1.12.12.12/dns-query";
+    const string Dnspod_DohAddres2 = "https://doh.pub/dns-query";
+    const string Dnspod_DohAddres3 = "https://120.53.53.53/dns-query";

-    const string Google_DohAddres = "https://dns.google/resolve";
-    const string Cloudflare_DohAddres = "https://cloudflare-dns.com/resolve";
-    const string DohAddres_360 = "https://doh.360.cn/resolve";
-    const string TUNA_DohAddres = "https://101.6.6.6:8443/resolve";
+    const string Google_DohAddres = "https://dns.google";
+    const string Cloudflare_DohAddres = "https://cloudflare-dns.com";
+    const string DohAddres_360 = "https://doh.360.cn/dns-query";
+    const string TUNA_DohAddres = "https://101.6.6.6:8443/dns-query";

    const string PrimaryDNS_IPV6_Ali = "2400:3200::1";

@@ -60,5 +60,5 @@ public partial interface IDnsAnalysisService // 公共常量定义
        public static readonly IPEndPoint Cloudflare2 = new(IPAddress.Parse("1.0.0.1"), 53);
    }

-    #endregion DNS 常量
+    #endregion
 }
@@ -124,7 +124,7 @@
 		</EmbeddedResource>
 	</ItemGroup>

-	<ItemGroup Condition="!$(DefineConstants.Contains('REMOVE_DNS_INTERCEPT')) AND $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
+	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
 		<Compile Update="Properties\WinDivertResource.Designer.cs">
 			<DesignTime>True</DesignTime>
 			<AutoGen>True</AutoGen>
@@ -136,7 +136,7 @@
 		</EmbeddedResource>
 	</ItemGroup>

-	<ItemGroup Condition="$(DefineConstants.Contains('REMOVE_DNS_INTERCEPT')) OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'windows'">
+	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'windows'">
 		<Compile Remove="Properties\WinDivertResource.Designer.cs" />
 		<EmbeddedResource Remove="Properties\WinDivertResource.resx" />
 	</ItemGroup>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
RMBGAME	0e813d4d24	🐛 Misc	2024-08-29 23:22:28 +08:00
Aigio Liu	7b7ed945d4	🎨 LogConsoleService.ConsoleMaxCharCount	2024-08-29 22:14:42 +08:00
Aigio Liu	585a7f01d0	🎨 Log format	2024-08-29 20:33:10 +08:00
RMBGAME	803d17a5f8	🐛 Misc	2024-08-29 19:10:45 +08:00
Aigio Liu	c6a2cd67b4	🐛 WebApplication Logging	2024-08-29 16:32:14 +08:00
RMBGAME	e3ef74f08e	💄 ProxyLog UI	2024-08-29 15:56:36 +08:00
RMBGAME	b43cc93215	Merge branch 'develop' into feature/ipc-console-log	2024-08-29 13:56:51 +08:00
Aigio Liu	6149625373	🐛 ref	2024-08-28 01:54:58 +08:00
Aigio Liu	c6f6dbd7ef	🎨 LogConsole	2024-08-28 01:50:09 +08:00