StarServerSetting / StarAgentSetting

StarAgent/Program.cs

@@ -46,7 +46,7 @@ internal class Program
         var svc = new MyService
         {
             StarSetting = set,
-            AgentSetting = Setting.Current,
+            AgentSetting = StarAgentSetting.Current,
             Log = XTrace.Log,
         };
 
@@ -72,7 +72,7 @@ internal class MyService : ServiceBase, IServiceProvider
 {
     public StarSetting StarSetting { get; set; }
 
-    public Setting AgentSetting { get; set; }
+    public StarAgentSetting AgentSetting { get; set; }
 
     /// <summary>宿主服务提供者</summary>
     public IServiceProvider Provider { get; set; }
@@ -202,7 +202,7 @@ internal class MyService : ServiceBase, IServiceProvider
         StartClient();
 
         _Manager.Start();
-        Setting.Provider.Changed += OnSettingChanged;
+        StarAgentSetting.Provider.Changed += OnSettingChanged;
 
         // 启动插件
         WriteLog("启动插件[{0}]", pm.Identity);
@@ -281,7 +281,7 @@ internal class MyService : ServiceBase, IServiceProvider
         _timer.TryDispose();
         _timer = null;
 
-        Setting.Provider.Changed -= OnSettingChanged;
+        StarAgentSetting.Provider.Changed -= OnSettingChanged;
         _Manager.Stop(reason);
         //_Manager.TryDispose();
 

StarAgent/Setting.cs

@@ -6,7 +6,7 @@ namespace StarAgent;
 
 /// <summary>配置</summary>
 [Config("StarAgent")]
-public class Setting : Config<Setting>
+public class StarAgentSetting : Config<StarAgentSetting>
 {
     #region 属性
     /// <summary>调试开关。默认true</summary>

StarAgent/StarService.cs

@@ -38,7 +38,7 @@ public class StarService : DisposeBase, IApi
     public StarSetting StarSetting { get; set; }
 
     /// <summary>星尘代理设置</summary>
-    public Setting AgentSetting { get; set; }
+    public StarAgentSetting AgentSetting { get; set; }
 
     private AgentInfo _agentInfo;
     private TimerX _timer;

StarGateway/MyService.cs

@@ -12,7 +12,7 @@ namespace StarGateway
         private HttpReverseProxy _proxy2;
         public Task StartAsync(CancellationToken cancellationToken)
         {
-            var set = Setting.Current;
+            var set = StarGatewaySetting.Current;
 
             var server = new HttpReverseProxy
             {

StarGateway/Setting.cs

@@ -6,7 +6,7 @@ namespace StarGateway
 {
     /// <summary>配置</summary>
     [Config("StarGateway")]
-    public class Setting : Config<Setting>
+    public class StarGatewaySetting : Config<StarGatewaySetting>
     {
         #region 属性
         /// <summary>调试开关。默认true</summary>

Stardust.Server/Controllers/AppController.cs

@@ -26,10 +26,10 @@ public class AppController : BaseController
     private readonly DeployService _deployService;
     private readonly ITracer _tracer;
     private readonly AppQueueService _queue;
-    private readonly Setting _setting;
+    private readonly StarServerSetting _setting;
     private readonly IHostApplicationLifetime _lifetime;
 
-    public AppController(TokenService tokenService, RegistryService registryService, DeployService deployService, AppQueueService queue, Setting setting, IHostApplicationLifetime lifetime, ITracer tracer)
+    public AppController(TokenService tokenService, RegistryService registryService, DeployService deployService, AppQueueService queue, StarServerSetting setting, IHostApplicationLifetime lifetime, ITracer tracer)
     {
         _tokenService = tokenService;
         _registryService = registryService;

Stardust.Server/Controllers/ConfigController.cs

@@ -17,9 +17,9 @@ namespace Stardust.Server.Controllers
         private readonly ConfigService _configService;
         private readonly TokenService _tokenService;
         private readonly AppOnlineService _appOnline;
-        private readonly Setting _setting;
+        private readonly StarServerSetting _setting;
 
-        public ConfigController(ConfigService configService, TokenService tokenService, AppOnlineService appOnline, Setting setting)
+        public ConfigController(ConfigService configService, TokenService tokenService, AppOnlineService appOnline, StarServerSetting setting)
         {
             _configService = configService;
             _tokenService = tokenService;

Stardust.Server/Controllers/CubeController.cs

@@ -25,7 +25,7 @@ public class CubeController : ControllerBase
         var att = Attachment.FindById(id.ToLong());
         if (att == null) throw new ApiException(404, "找不到附件信息");
 
-        var set = Setting.Current;
+        var set = StarServerSetting.Current;
 
         // 如果附件不存在，则抓取
         var filePath = att.GetFilePath(set.UploadPath);

Stardust.Server/Controllers/DeployController.cs

@@ -19,9 +19,9 @@ public class DeployController : BaseController
     private readonly NodeService _nodeService;
     private readonly DeployService _deployService;
     private readonly TokenService _tokenService;
-    private readonly Setting _setting;
+    private readonly StarServerSetting _setting;
 
-    public DeployController(DeployService deployService, NodeService nodeService, TokenService tokenService, Setting setting)
+    public DeployController(DeployService deployService, NodeService nodeService, TokenService tokenService, StarServerSetting setting)
     {
         _deployService = deployService;
         _nodeService = nodeService;

Stardust.Server/Controllers/DustController.cs

@@ -18,9 +18,9 @@ public class DustController : ControllerBase
     public String UserHost => HttpContext.GetUserHost();
 
     private readonly TokenService _tokenService;
-    private readonly Setting _setting;
+    private readonly StarServerSetting _setting;
 
-    public DustController(TokenService tokenService, Setting setting)
+    public DustController(TokenService tokenService, StarServerSetting setting)
     {
         _tokenService = tokenService;
         _setting = setting;

Stardust.Server/Controllers/LogController.cs

@@ -10,9 +10,9 @@ namespace Stardust.Server.Controllers
     [Route("[controller]")]
     public class LogController : ControllerBase
     {
-        private readonly Setting _setting;
+        private readonly StarServerSetting _setting;
 
-        public LogController(Setting setting) => _setting = setting;
+        public LogController(StarServerSetting setting) => _setting = setting;
 
         [HttpGet]
         public Object Get() => "LogController";

Stardust.Server/Controllers/NodeController.cs

@@ -27,9 +27,9 @@ public class NodeController : BaseController
     private readonly NodeService _nodeService;
     private readonly TokenService _tokenService;
     private readonly DeployService _deployService;
-    private readonly Setting _setting;
+    private readonly StarServerSetting _setting;
 
-    public NodeController(NodeService nodeService, TokenService tokenService, DeployService deployService, Setting setting, ICache queue, IHostApplicationLifetime lifetime, ITracer tracer)
+    public NodeController(NodeService nodeService, TokenService tokenService, DeployService deployService, StarServerSetting setting, ICache queue, IHostApplicationLifetime lifetime, ITracer tracer)
     {
         _queue = queue;
         _lifetime = lifetime;

Stardust.Server/Controllers/OAuthController.cs

@@ -15,9 +15,9 @@ namespace Stardust.Server.Controllers
     {
         private readonly TokenService _tokenService;
         private readonly AppOnlineService _appOnline;
-        private readonly Setting _setting;
+        private readonly StarServerSetting _setting;
 
-        public OAuthController(TokenService tokenService, AppOnlineService appOnline, Setting setting)
+        public OAuthController(TokenService tokenService, AppOnlineService appOnline, StarServerSetting setting)
         {
             _tokenService = tokenService;
             _appOnline = appOnline;

Stardust.Server/Controllers/TraceController.cs

@@ -21,14 +21,14 @@ public class TraceController : ControllerBase
     private readonly TokenService _tokenService;
     private readonly AppOnlineService _appOnline;
     private readonly UplinkService _uplink;
-    private readonly Setting _setting;
+    private readonly StarServerSetting _setting;
     private readonly ITracer _tracer;
     private readonly ITraceStatService _stat;
     private readonly IAppDayStatService _appStat;
     private readonly ITraceItemStatService _itemStat;
     private static readonly ICache _cache = new MemoryCache();
 
-    public TraceController(ITraceStatService stat, IAppDayStatService appStat, ITraceItemStatService itemStat, TokenService tokenService, AppOnlineService appOnline, UplinkService uplink, Setting setting, ITracer tracer)
+    public TraceController(ITraceStatService stat, IAppDayStatService appStat, ITraceItemStatService itemStat, TokenService tokenService, AppOnlineService appOnline, UplinkService uplink, StarServerSetting setting, ITracer tracer)
     {
         _stat = stat;
         _appStat = appStat;

Stardust.Server/Program.cs

@@ -19,7 +19,7 @@ namespace Stardust.Server
             var builder = Host.CreateDefaultBuilder(args);
             builder.ConfigureWebHostDefaults(webBuilder =>
             {
-                var set = Setting.Current;
+                var set = StarServerSetting.Current;
                 if (set.Port > 0) webBuilder.UseUrls($"http://*:{set.Port}");
                 webBuilder.UseStartup<Startup>();
             });

Stardust.Server/Services/AlarmService.cs

@@ -26,10 +26,10 @@ public class AlarmService : IHostedService
     private TimerX _timer;
     //private readonly ConcurrentBag<Int32> _bag = new();
     private readonly ICache _cache = new MemoryCache();
-    private readonly Setting _setting;
+    private readonly StarServerSetting _setting;
     private readonly ITracer _tracer;
 
-    public AlarmService(Setting setting, ITracer tracer)
+    public AlarmService(StarServerSetting setting, ITracer tracer)
     {
         _setting = setting;
         _tracer = tracer;

Stardust.Server/Services/DataRetentionService.cs

@@ -14,10 +14,10 @@ namespace Stardust.Server.Services;
 
 public class DataRetentionService : IHostedService
 {
-    private readonly Setting _setting;
+    private readonly StarServerSetting _setting;
     private readonly ITracer _tracer;
     private TimerX _timer;
-    public DataRetentionService(Setting setting, ITracer tracer)
+    public DataRetentionService(StarServerSetting setting, ITracer tracer)
     {
         _setting = setting;
         _tracer = tracer;

Stardust.Server/Services/NodeOnlineService.cs

@@ -11,12 +11,12 @@ public class NodeOnlineService : IHostedService
 {
     #region 属性
     private TimerX _timer;
-    private readonly Setting _setting;
+    private readonly StarServerSetting _setting;
     private readonly ITracer _tracer;
     #endregion
 
     #region 构造
-    public NodeOnlineService(Setting setting, ITracer tracer)
+    public NodeOnlineService(StarServerSetting setting, ITracer tracer)
     {
         _setting = setting;
         _tracer = tracer;

Stardust.Server/Services/NodeService.cs

@@ -39,7 +39,7 @@ public class NodeService
         return !secret.IsNullOrEmpty() && !secret.IsNullOrEmpty() && (node.Secret == secret || node.Secret.MD5() == secret);
     }
 
-    public Node Register(LoginInfo inf, String ip, Setting setting)
+    public Node Register(LoginInfo inf, String ip, StarServerSetting setting)
     {
         var code = inf.Code;
         var secret = inf.Secret;
@@ -63,7 +63,7 @@ public class NodeService
         return node;
     }
 
-    public TokenModel Login(Node node, LoginInfo inf, String ip, Setting setting)
+    public TokenModel Login(Node node, LoginInfo inf, String ip, StarServerSetting setting)
     {
         if (!inf.ProductCode.IsNullOrEmpty()) node.ProductCode = inf.ProductCode;
 
@@ -181,7 +181,7 @@ public class NodeService
         return flag ? node : null;
     }
 
-    private Node AutoRegister(Node node, LoginInfo inf, String ip, Setting set)
+    private Node AutoRegister(Node node, LoginInfo inf, String ip, StarServerSetting set)
     {
         if (!set.AutoRegister) throw new ApiException(12, "禁止自动注册");
 
@@ -267,7 +267,7 @@ public class NodeService
         return false;
     }
 
-    private static String BuildCode(NodeInfo di, String productCode, Setting set)
+    private static String BuildCode(NodeInfo di, String productCode, StarServerSetting set)
     {
         //var set = Setting.Current;
         //var uid = $"{di.UUID}@{di.MachineGuid}@{di.Macs}";
@@ -306,7 +306,7 @@ public class NodeService
     #endregion
 
     #region 心跳
-    public PingResponse Ping(Node node, PingInfo inf, String token, String ip, Setting set)
+    public PingResponse Ping(Node node, PingInfo inf, String token, String ip, StarServerSetting set)
     {
         var rs = new PingResponse
         {
@@ -541,7 +541,7 @@ public class NodeService
     /// <param name="model"></param>
     /// <param name="token">应用令牌</param>
     /// <returns></returns>
-    public async Task<Int32> SendCommand(CommandInModel model, String token, Setting setting)
+    public async Task<Int32> SendCommand(CommandInModel model, String token, StarServerSetting setting)
     {
         if (model.Code.IsNullOrEmpty()) throw new ArgumentNullException(nameof(model.Code), "必须指定节点");
         if (model.Command.IsNullOrEmpty()) throw new ArgumentNullException(nameof(model.Command));
@@ -597,7 +597,7 @@ public class NodeService
     #endregion
 
     #region 辅助
-    public TokenModel IssueToken(String name, Setting set)
+    public TokenModel IssueToken(String name, StarServerSetting set)
     {
         // 颁发令牌
         var ss = set.TokenSecret.Split(':');
@@ -649,7 +649,7 @@ public class NodeService
         return (node, ex);
     }
 
-    public TokenModel ValidAndIssueToken(String deviceCode, String token, Setting set)
+    public TokenModel ValidAndIssueToken(String deviceCode, String token, StarServerSetting set)
     {
         if (token.IsNullOrEmpty()) return null;
         //var set = Setting.Current;

Stardust.Server/Services/OnlineService.cs

@@ -13,12 +13,12 @@ public class OnlineService : IHostedService
     private TimerX _timer;
     private TimerX _timer2;
     private readonly RegistryService _registryService;
-    private readonly Setting _setting;
+    private readonly StarServerSetting _setting;
     private readonly ITracer _tracer;
     #endregion
 
     #region 构造
-    public OnlineService(RegistryService registryService, Setting setting, ITracer tracer)
+    public OnlineService(RegistryService registryService, StarServerSetting setting, ITracer tracer)
     {
         _registryService = registryService;
         _setting = setting;

Stardust.Server/Services/ShardTableService.cs

@@ -9,10 +9,10 @@ namespace Stardust.Server.Services;
 /// <summary>分表管理</summary>
 public class ShardTableService : IHostedService
 {
-    private readonly Setting _setting;
+    private readonly StarServerSetting _setting;
     private readonly ITracer _tracer;
     private TimerX _timer;
-    public ShardTableService(Setting setting, ITracer tracer)
+    public ShardTableService(StarServerSetting setting, ITracer tracer)
     {
         _setting = setting;
         _tracer = tracer;

Stardust.Server/Services/UplinkService.cs

@@ -17,7 +17,7 @@ public class UplinkService
         var addr = Server;
         if (addr.IsNullOrEmpty())
         {
-            var set = Setting.Current;
+            var set = StarServerSetting.Current;
             addr = set.UplinkServer;
         }
 

Stardust.Server/Setting.cs

@@ -7,7 +7,7 @@ namespace Stardust.Server;
 
 /// <summary>配置</summary>
 [Config("StarServer")]
-public class Setting : Config<Setting>
+public class StarServerSetting : Config<StarServerSetting>
 {
     #region 属性
     /// <summary>调试开关。默认true</summary>

Stardust.Server/Startup.cs

@@ -47,7 +47,7 @@ public class Startup
         var cache = Cache.Default;
         services.AddSingleton(cache);
 
-        var set = Setting.Current;
+        var set = StarServerSetting.Current;
         services.AddSingleton(set);
 
         // 统计服务
@@ -194,7 +194,7 @@ public class Startup
             set2.Save();
         }
 #endif
-        var set3 = Stardust.Server.Setting.Current;
+        var set3 = Stardust.Server.StarServerSetting.Current;
         if (set3.IsNew)
         {
             set3.UploadPath = "../Uploads";

Stardust.ServerTests/Services/AppServiceTests.cs

@@ -44,7 +44,7 @@ namespace Stardust.Server.Services.Tests
         {
             var app = new App { Name = "test" };
 
-            var set = Setting.Current;
+            var set = StarServerSetting.Current;
             var service = new TokenService(null);
 
             var model = service.IssueToken(app.Name, set.TokenSecret, set.TokenExpire);
@@ -66,7 +66,7 @@ namespace Stardust.Server.Services.Tests
                 app.Insert();
             }
 
-            var set = Setting.Current;
+            var set = StarServerSetting.Current;
             var service = new TokenService(null);
 
             var model = service.IssueToken(app.Name, set.TokenSecret, set.TokenExpire);