服务端使用net8，方便用户一键式安装，兼容性更好

NewLifeX · Dec 26, 2024 · 981ac83 · 981ac83
1 parent 20a3357
commit 981ac83
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 19 deletions.
diff --git a/DeployAgent/DeployAgent.csproj b/DeployAgent/DeployAgent.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net461;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net461;net8.0;net9.0</TargetFrameworks>
     <AssemblyTitle>星尘发布</AssemblyTitle>
     <Description>自动下载代码，编译后打包输出并推送发布中心。</Description>
     <Company>新生命开发团队</Company>

diff --git a/StarAgent/StarAgent.csproj b/StarAgent/StarAgent.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net45;net461;net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <AssemblyTitle>星尘代理</AssemblyTitle>
     <Description>星尘，分布式资源调度，部署于每一个节点，连接服务端，支持节点监控、远程发布。</Description>
     <Company>新生命开发团队</Company>

diff --git a/StarGateway/StarGateway.csproj b/StarGateway/StarGateway.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyTitle>星尘网关</AssemblyTitle>
     <Description>星尘网关，转发网络请求，实现路由切换。</Description>
     <Company>新生命开发团队</Company>

diff --git a/Stardust.Data/Monitors/应用跟踪器.Biz.cs b/Stardust.Data/Monitors/应用跟踪器.Biz.cs
@@ -10,7 +10,6 @@
 using NewLife.Data;
 using XCode;
 using XCode.Cache;
-using XCode.Membership;
 
 namespace Stardust.Data.Monitors;
 
@@ -149,7 +148,7 @@ public static AppTracer FindByName(String name)
     /// <returns>实体列表</returns>
     public static IList<AppTracer> FindAllByAppId(Int32 appId)
     {
-        if (appId <= 0) return new List<AppTracer>();
+        if (appId <= 0) return [];
 
         // 实体缓存
         if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.AppId == appId);
@@ -162,7 +161,7 @@ public static IList<AppTracer> FindAllByAppId(Int32 appId)
     /// <returns>实体列表</returns>
     public static IList<AppTracer> FindAllByProjectId(Int32 projectId)
     {
-        if (projectId <= 0) return new List<AppTracer>();
+        if (projectId <= 0) return [];
 
         // 实体缓存
         if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.ProjectId == projectId);
@@ -197,7 +196,7 @@ public static IList<AppTracer> Search(Int32 projectId, Int32 appId, String categ
     }
 
     // Select Count(ID) as ID,Category From AppTracer Where CreateTime>'2020-01-24 00:00:00' Group By Category Order By ID Desc limit 20
-    static readonly FieldCache<AppTracer> _CategoryCache = new FieldCache<AppTracer>(nameof(Category));
+    static readonly FieldCache<AppTracer> _CategoryCache = new(nameof(Category));
 
     /// <summary>获取类别列表，字段缓存10分钟，分组统计数据最多的前20种，用于魔方前台下拉选择</summary>
     /// <returns></returns>

diff --git a/Stardust.Data/Stardust.Data.csproj b/Stardust.Data/Stardust.Data.csproj
@@ -5,7 +5,7 @@
     <AssemblyTitle>星尘数据</AssemblyTitle>
     <Description>星尘，分布式服务框架。分布式资源调度，服务自动注册和发现，负载均衡，动态伸缩，故障转移，性能监控。</Description>
     <Company>新生命开发团队</Company>
-    <Copyright>©2002-2022 NewLife</Copyright>
+    <Copyright>©2002-2025 NewLife</Copyright>
     <VersionPrefix>2.0</VersionPrefix>
     <VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
     <Version>$(VersionPrefix).$(VersionSuffix)</Version>

diff --git a/Stardust.Server/Controllers/LogController.cs b/Stardust.Server/Controllers/LogController.cs
@@ -67,7 +67,7 @@ public async Task<EmptyResult> Post()
                             sb.AppendLine(lines[j]);
                             i++;
                         }
-                        msg = sb.Put(true);
+                        msg = sb.Return(true);
 
                         AppClientLog.Create(app.Id, clientId, ss, msg, ip);
                         sb.Clear();

diff --git a/Stardust.Server/Models/ConfigInModel.cs b/Stardust.Server/Models/ConfigInModel.cs
@@ -1,5 +1,6 @@
 namespace Stardust.Server.Models;
 
+#pragma warning disable CS8632 // 只能在 "#nullable" 注释上下文内的代码中使用可为 null 的引用类型的注释。
 /// <summary>配置入参</summary>
 public class ConfigInModel
 {
@@ -26,4 +27,5 @@ public class ConfigInModel
 
     /// <summary>缺失的键</summary>
     public String? MissedKeys { get; set; }
-}
+}
+#pragma warning restore CS8632 // 只能在 "#nullable" 注释上下文内的代码中使用可为 null 的引用类型的注释。
diff --git a/Stardust.Server/Models/SetConfigModel.cs b/Stardust.Server/Models/SetConfigModel.cs
@@ -1,5 +1,6 @@
 namespace Stardust.Server.Models;
 
+#pragma warning disable CS8632 // 只能在 "#nullable" 注释上下文内的代码中使用可为 null 的引用类型的注释。
 /// <summary>配置入参</summary>
 public class SetConfigModel
 {
@@ -14,4 +15,5 @@ public class SetConfigModel
 
     /// <summary>配置数据</summary>
     public IDictionary<String, Object> Configs { get; set; }
-}
+}
+#pragma warning restore CS8632 // 只能在 "#nullable" 注释上下文内的代码中使用可为 null 的引用类型的注释。
diff --git a/Stardust.Server/Models/TokenInModel.cs b/Stardust.Server/Models/TokenInModel.cs
@@ -1,5 +1,6 @@
 namespace Stardust.Server.Models;
 
+#pragma warning disable CS8632 // 只能在 "#nullable" 注释上下文内的代码中使用可为 null 的引用类型的注释。
 /// <summary>访问令牌输入参数</summary>
 public class TokenInModel
 {
@@ -17,4 +18,5 @@ public class TokenInModel
 
     /// <summary>刷新令牌</summary>
     public String? refresh_token { get; set; }
-}
+}
+#pragma warning restore CS8632 // 只能在 "#nullable" 注释上下文内的代码中使用可为 null 的引用类型的注释。
diff --git a/Stardust.Server/Stardust.Server.csproj b/Stardust.Server/Stardust.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>StarServer</AssemblyName>
     <AssemblyTitle>星尘服务平台</AssemblyTitle>
     <Description>星尘，分布式服务框架。节点管理，监控中心，配置中心，发布中心，注册中心</Description>

diff --git a/Stardust.Web/Stardust.Web.csproj b/Stardust.Web/Stardust.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>StarWeb</AssemblyName>
     <AssemblyTitle>星尘管理平台</AssemblyTitle>
     <Description>星尘，分布式服务框架。节点管理，监控中心，配置中心，发布中心，注册中心</Description>

diff --git a/Tools/Resources/linux-service.sh b/Tools/Resources/linux-service.sh
@@ -4,7 +4,7 @@
 echo "Install Stardust on Linux"
 
 if [ ! -d "/usr/share/dotnet/" ]; then
-	curl https://x.newlifex.com/dotnet/net.sh | sudo bash
+	curl https://x.newlifex.com/dotnet/net8.sh | sudo bash
 fi
 
 sudo dotnet agent\StarAgent.dll -install -server http://127.0.0.1:6600
diff --git a/Tools/Resources/run.bat b/Tools/Resources/run.bat
@@ -1,7 +1,7 @@
 
 echo "Run Stardust on Windows"
 
-clover40.exe net9-aspnet -silent
+clover40.exe net8-host -silent
 
 start agent\StarAgent.exe -run -server http://127.0.0.1:6600
 

diff --git a/Tools/Resources/windows-service.bat b/Tools/Resources/windows-service.bat
@@ -1,7 +1,7 @@
 
 echo "Install Stardust as service on Windows"
 
-clover40.exe net9-aspnet -silent
+clover40.exe net8-host -silent
 
 agent\StarAgent.exe -install -server http://127.0.0.1:6600
 

diff --git a/Tools/build.bat b/Tools/build.bat
@@ -19,7 +19,7 @@ move %base%\StarWeb.zip %out%\StarWeb.zip
 
 set out=%base%\agent
 rmdir /s/q %out%
-dotnet publish ..\StarAgent\StarAgent.csproj --nologo -c Release -f net9.0 -o %out%
+dotnet publish ..\StarAgent\StarAgent.csproj --nologo -c Release -f net8.0 -o %out%
 del /f/s/q %out%\*.pdb %out%\*.xml %out%\*.deps.json
 
 mkdir %out%\Config
@@ -30,7 +30,6 @@ xcopy Resources\*.sh %base%\ /y/s
 copy clover40.exe %base%\clover40.exe /y
 
 mkdir %base%\Plugins
-xcopy Resources\Plugins\*.dll %base%\Plugins\ /y/s
 
 del %base%\..\star.zip /f
 clover80.exe zip %base%\..\star.zip %base%\