From d3c852fdfaeeaa92f4c4eca2badae71529c8298d Mon Sep 17 00:00:00 2001 From: snltty <1069410172@qq.com> Date: Fri, 17 Nov 2023 09:40:39 +0800 Subject: [PATCH] net8 --- README.md | 2 +- cmonitor.install.win/MainForm.cs | 2 +- cmonitor/Program.cs | 37 +++++++++++------- .../PublishProfiles/FolderProfile.pubxml | 3 +- .../PublishProfiles/FolderProfile.pubxml.user | 2 +- cmonitor/cmonitor.csproj | 1 + cmonitor/publish/cmonitor.install.win.exe | Bin 58880 -> 58880 bytes publish-docker.sh | 2 +- publish.bat | 8 ++-- 9 files changed, 33 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 7510b0e9..9bf8a157 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ params += " --share-key cmonitor/share --share-len 2550"; //server params = " --mode server --web 1800 --api 1801 --service 1802"; -schtasks.exe /create /tn "cmonitor" /rl highest /sc ONLOGON /delay 0000:30 /tr "\"{exePath}\"{params}" /f +schtasks.exe /create /tn "cmonitor" /rl highest /sc ONSTART /delay 0000:30 /tr "\"{exePath}\"{params}" /f ``` ##### linux服务端 systemd ``` diff --git a/cmonitor.install.win/MainForm.cs b/cmonitor.install.win/MainForm.cs index 8c5b6add..ce1838b5 100644 --- a/cmonitor.install.win/MainForm.cs +++ b/cmonitor.install.win/MainForm.cs @@ -138,7 +138,7 @@ namespace cmonitor.install.win if (installed == false) { string str = CommandHelper.Windows(string.Empty, new string[] { - $"schtasks.exe /create /tn \"cmonitorService\" /rl highest /sc ONLOGON /delay 0000:30 /tr \"\"{exePath}\" {paramStr}\" " + $"schtasks.exe /create /tn \"cmonitorService\" /rl highest /sc ONSTART /delay 0000:30 /tr \"\"{exePath}\" {paramStr}\" " }); if (installSas) { diff --git a/cmonitor/Program.cs b/cmonitor/Program.cs index d20c9346..0d12f677 100644 --- a/cmonitor/Program.cs +++ b/cmonitor/Program.cs @@ -208,23 +208,30 @@ namespace cmonitor } private static void InitConfig(Config config, Dictionary dic) { - config.Server = IPAddress.Parse(dic["server"]); - config.Name = dic["name"]; - config.WebPort = int.Parse(dic["web"]); - config.ApiPort = int.Parse(dic["api"]); - config.ServicePort = int.Parse(dic["service"]); - config.ShareMemoryKey = dic["share-key"]; - config.ShareMemoryLength = int.Parse(dic["share-len"]); - config.ReportDelay = int.Parse(dic["report-delay"]); - config.ScreenScale = float.Parse(dic["screen-scale"]); - config.ScreenDelay = int.Parse(dic["screen-delay"]); - config.Elevated = dic.ContainsKey("elevated"); + try + { + config.Server = IPAddress.Parse(dic["server"]); + config.Name = dic["name"]; + config.WebPort = int.Parse(dic["web"]); + config.ApiPort = int.Parse(dic["api"]); + config.ServicePort = int.Parse(dic["service"]); + config.ShareMemoryKey = dic["share-key"]; + config.ShareMemoryLength = int.Parse(dic["share-len"]); + config.ReportDelay = int.Parse(dic["report-delay"]); + config.ScreenScale = float.Parse(dic["screen-scale"]); + config.ScreenDelay = int.Parse(dic["screen-delay"]); + config.Elevated = dic.ContainsKey("elevated"); - Logger.Instance.Debug($"config:{config.ToJson()}"); - //Logger.Instance.Debug($"args:{string.Join(" ", args)}"); + Logger.Instance.Debug($"config:{config.ToJson()}"); + //Logger.Instance.Debug($"args:{string.Join(" ", args)}"); - config.IsCLient = dic.ContainsKey("mode") && dic["mode"].Contains("client"); - config.IsServer = dic.ContainsKey("mode") && dic["mode"].Contains("server"); + config.IsCLient = dic.ContainsKey("mode") && dic["mode"].Contains("client"); + config.IsServer = dic.ContainsKey("mode") && dic["mode"].Contains("server"); + } + catch (Exception ex) + { + Logger.Instance.Error(ex); + } } private static void LoggerConsole() diff --git a/cmonitor/Properties/PublishProfiles/FolderProfile.pubxml b/cmonitor/Properties/PublishProfiles/FolderProfile.pubxml index 79576fb5..6644d891 100644 --- a/cmonitor/Properties/PublishProfiles/FolderProfile.pubxml +++ b/cmonitor/Properties/PublishProfiles/FolderProfile.pubxml @@ -12,7 +12,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. net8.0 win-x64 true - false + true false + true \ No newline at end of file diff --git a/cmonitor/Properties/PublishProfiles/FolderProfile.pubxml.user b/cmonitor/Properties/PublishProfiles/FolderProfile.pubxml.user index a2cf3ac2..f6f53c43 100644 --- a/cmonitor/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/cmonitor/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2023-11-16T03:49:56.3722044Z;True|2023-11-16T11:48:06.3192199+08:00;True|2023-11-16T11:47:35.3708397+08:00;True|2023-11-16T11:45:11.0208634+08:00;False|2023-11-16T11:44:01.7611210+08:00;True|2023-10-01T17:27:31.0065885+08:00;True|2023-09-04T18:19:54.7492652+08:00;True|2023-09-04T18:19:32.2969345+08:00;False|2023-09-04T18:18:51.7827366+08:00;True|2023-09-04T18:15:31.6783417+08:00;True|2023-09-04T18:14:40.9964104+08:00; + True|2023-11-17T01:24:26.3650754Z;True|2023-11-17T09:11:28.0867966+08:00;True|2023-11-17T09:09:49.7366925+08:00;False|2023-11-17T09:08:56.6254247+08:00;False|2023-11-17T09:08:45.4560896+08:00;True|2023-11-16T11:49:56.3722044+08:00;True|2023-11-16T11:48:06.3192199+08:00;True|2023-11-16T11:47:35.3708397+08:00;True|2023-11-16T11:45:11.0208634+08:00;False|2023-11-16T11:44:01.7611210+08:00;True|2023-10-01T17:27:31.0065885+08:00;True|2023-09-04T18:19:54.7492652+08:00;True|2023-09-04T18:19:32.2969345+08:00;False|2023-09-04T18:18:51.7827366+08:00;True|2023-09-04T18:15:31.6783417+08:00;True|2023-09-04T18:14:40.9964104+08:00; \ No newline at end of file diff --git a/cmonitor/cmonitor.csproj b/cmonitor/cmonitor.csproj index 740f9b18..baad34fa 100644 --- a/cmonitor/cmonitor.csproj +++ b/cmonitor/cmonitor.csproj @@ -12,6 +12,7 @@ Debug;Release;ReleaseLinux Linux false + true diff --git a/cmonitor/publish/cmonitor.install.win.exe b/cmonitor/publish/cmonitor.install.win.exe index e6f5ee031c412cb3943a782b5cee80108cb0573f..dcd374e9a5a6ef8a743c5b92fcc55ceb04c9e5d9 100644 GIT binary patch delta 54 zcmV-60LlM=%maYT1CWRW2$zetv5a#>2~z-606_p!093OGMRWlW9OSGY7DC5Qut>dM MD0k8cvy4V`pBUg23IG5A delta 54 zcmZoT!`yI&c|r%v@y45{Hue;|aQZO#Gq?k>-)0Wi5=H@@^!wip_p*3SXY$#+!eGJH J%{^`<^8rbg6^H-; diff --git a/publish-docker.sh b/publish-docker.sh index c716d2e7..9e42a3bf 100644 --- a/publish-docker.sh +++ b/publish-docker.sh @@ -13,7 +13,7 @@ do do for r in ${rs[@]} do - dotnet publish ./${f} -c release -f net7.0 -o ./public/publish/docker/linux-${p}-${r}/${f} -r ${p}-${r} --self-contained true -p:TieredPGO=true -p:DebugType=none -p:DebugSymbols=false -p:PublishSingleFile=true -p:PublishTrimmed=true -p:EnableCompressionInSingleFile=true -p:DebuggerSupport=false -p:EnableUnsafeBinaryFormatterSerialization=false -p:EnableUnsafeUTF7Encoding=false -p:HttpActivityPropagationSupport=false -p:InvariantGlobalization=true -p:MetadataUpdaterSupport=false -p:UseSystemResourceKeys=true -p:TrimMode=partial + dotnet publish ./${f} -c release -f net8.0 -o ./public/publish/docker/linux-${p}-${r}/${f} -r ${p}-${r} --self-contained true -p:TieredPGO=true -p:DebugType=none -p:DebugSymbols=false -p:PublishSingleFile=true -p:PublishTrimmed=true -p:EnableCompressionInSingleFile=true -p:DebuggerSupport=false -p:EnableUnsafeBinaryFormatterSerialization=false -p:EnableUnsafeUTF7Encoding=false -p:HttpActivityPropagationSupport=false -p:InvariantGlobalization=true -p:MetadataUpdaterSupport=false -p:UseSystemResourceKeys=true -p:TrimMode=partial cp -rf public/publish/docker/linux-${p}-${r}/${f}/${f} public/publish/docker/linux-${p}-${r}/${f}/${f}.run rm -rf public/publish/docker/linux-${p}-${r}/${f}/${f} cp -rf cmonitor/Dockerfile-${p} public/publish/docker/linux-${p}-${r}/${f}/Dockerfile-${p} diff --git a/publish.bat b/publish.bat index a101cb20..b3f5d095 100644 --- a/publish.bat +++ b/publish.bat @@ -5,12 +5,12 @@ rd /s /q public\\publish-zip mkdir public\\publish-zip -dotnet publish ./cmonitor -c release -f net7.0 -o ./public/publish/win-x64 -r win-x64 -p:PublishTrimmed=true -p:TrimMode=partial --self-contained true -p:TieredPGO=true -p:DebugType=none -p:DebugSymbols=false -p:PublishSingleFile=true -p:EnableCompressionInSingleFile=true -p:DebuggerSupport=false -p:EnableUnsafeBinaryFormatterSerialization=false -p:EnableUnsafeUTF7Encoding=false -p:HttpActivityPropagationSupport=false -p:InvariantGlobalization=true -p:MetadataUpdaterSupport=false -p:UseSystemResourceKeys=true +dotnet publish ./cmonitor -c release -f net8.0 -o ./public/publish/win-x64 -r win-x64 -p:PublishTrimmed=true -p:TrimMode=partial --self-contained true -p:TieredPGO=true -p:DebugType=none -p:DebugSymbols=false -p:PublishSingleFile=true -p:EnableCompressionInSingleFile=true -p:DebuggerSupport=false -p:EnableUnsafeBinaryFormatterSerialization=false -p:EnableUnsafeUTF7Encoding=false -p:HttpActivityPropagationSupport=false -p:InvariantGlobalization=true -p:MetadataUpdaterSupport=false -p:UseSystemResourceKeys=true -dotnet publish ./cmonitor -c releaselinux -f net7.0 -o ./public/publish/linux-x64 -r linux-x64 -p:PublishTrimmed=true --self-contained true -p:TieredPGO=true -p:DebugType=none -p:DebugSymbols=false -p:PublishSingleFile=true -p:EnableCompressionInSingleFile=true -p:DebuggerSupport=false -p:EnableUnsafeBinaryFormatterSerialization=false -p:EnableUnsafeUTF7Encoding=false -p:HttpActivityPropagationSupport=false -p:InvariantGlobalization=true -p:MetadataUpdaterSupport=false -p:UseSystemResourceKeys=true -p:TrimMode=partial +dotnet publish ./cmonitor -c releaselinux -f net8.0 -o ./public/publish/linux-x64 -r linux-x64 -p:PublishTrimmed=true --self-contained true -p:TieredPGO=true -p:DebugType=none -p:DebugSymbols=false -p:PublishSingleFile=true -p:EnableCompressionInSingleFile=true -p:DebuggerSupport=false -p:EnableUnsafeBinaryFormatterSerialization=false -p:EnableUnsafeUTF7Encoding=false -p:HttpActivityPropagationSupport=false -p:InvariantGlobalization=true -p:MetadataUpdaterSupport=false -p:UseSystemResourceKeys=true -p:TrimMode=partial -dotnet publish ./cmonitor -c release -f net7.0 -r win-x64 -o ./public/publish/win-x64-any/ -p:PublishSingleFile=true --self-contained false -dotnet publish ./cmonitor -c releaselinux -f net7.0 -r linux-x64 -o ./public/publish/linux-x64-any/ -p:PublishSingleFile=true --self-contained false +dotnet publish ./cmonitor -c release -f net8.0 -r win-x64 -o ./public/publish/win-x64-any/ -p:PublishSingleFile=true --self-contained false +dotnet publish ./cmonitor -c releaselinux -f net8.0 -r linux-x64 -o ./public/publish/linux-x64-any/ -p:PublishSingleFile=true --self-contained false for %%r in (win-x64,win-x64-any) do (