From afeb50e0faa19fef03c65d2f5df4c35fbad0ffb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=A4=A7=E7=9F=B3=E5=A4=B4?= Date: Wed, 26 Jun 2024 01:34:20 +0800 Subject: [PATCH] =?UTF-8?q?AppClient=E4=BD=BF=E7=94=A8Remoting=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=9E=B6=E6=9E=84=EF=BC=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=87=8F=E5=87=8F=E5=8D=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ClientTest/StarFactoryTests.cs | 14 +- DeployAgent/DeployWorker.cs | 2 +- Plugins/MySqlAgent/BinlogClear.cs | 2 +- Plugins/MySqlAgent/MySqlPlugin.cs | 2 +- StarAgent/Program.cs | 1 + Stardust/AppClient.cs | 484 +++------------------ Stardust/Configs/StarHttpConfigProvider.cs | 1 + Stardust/Managers/FrameworkManager.cs | 2 +- Stardust/Managers/NetRuntime.cs | 2 +- Stardust/Managers/ServiceController.cs | 1 + Stardust/Managers/ServiceManager.cs | 1 + Stardust/Models/AppInfo.cs | 3 +- Stardust/Models/AppModel.cs | 9 +- Stardust/Services/TraceService.cs | 1 + Stardust/StarClient.cs | 2 + Stardust/StarFactory.cs | 30 +- Stardust/Stardust.csproj | 6 +- 17 files changed, 104 insertions(+), 459 deletions(-) diff --git a/ClientTest/StarFactoryTests.cs b/ClientTest/StarFactoryTests.cs index 9898b09c..5a66c83f 100644 --- a/ClientTest/StarFactoryTests.cs +++ b/ClientTest/StarFactoryTests.cs @@ -45,13 +45,13 @@ public void Normal() var dust = star.Service as AppClient; Assert.NotNull(dust); - var filter = star.GetValue("_tokenFilter") as TokenHttpFilter; - Assert.NotNull(filter); - Assert.Equal(star.AppId, filter.UserName); - Assert.Equal(star.Secret, filter.Password); - Assert.Equal(filter, (tracer.Client as ApiHttpClient).Filter); - Assert.Equal(filter, (config.Client as ApiHttpClient).Filter); - Assert.Equal(filter, (dust as ApiHttpClient).Filter); + //var filter = star.GetValue("_tokenFilter") as TokenHttpFilter; + //Assert.NotNull(filter); + //Assert.Equal(star.AppId, filter.UserName); + //Assert.Equal(star.Secret, filter.Password); + //Assert.Equal(filter, (tracer.Client as ApiHttpClient).Filter); + //Assert.Equal(filter, (config.Client as ApiHttpClient).Filter); + //Assert.Equal(filter, (dust as ApiHttpClient).Filter); } [Fact] diff --git a/DeployAgent/DeployWorker.cs b/DeployAgent/DeployWorker.cs index de10b340..971a6dc4 100644 --- a/DeployAgent/DeployWorker.cs +++ b/DeployAgent/DeployWorker.cs @@ -1,9 +1,9 @@ using NewLife; using NewLife.Model; +using NewLife.Remoting.Clients; using NewLife.Serialization; using Stardust; using Stardust.Models; -using Stardust.Services; namespace DeployAgent; diff --git a/Plugins/MySqlAgent/BinlogClear.cs b/Plugins/MySqlAgent/BinlogClear.cs index 8e8c4083..a8bdacca 100644 --- a/Plugins/MySqlAgent/BinlogClear.cs +++ b/Plugins/MySqlAgent/BinlogClear.cs @@ -1,7 +1,7 @@ using NewLife; using NewLife.Log; +using NewLife.Remoting.Clients; using NewLife.Threading; -using Stardust.Services; namespace MySqlAgent; diff --git a/Plugins/MySqlAgent/MySqlPlugin.cs b/Plugins/MySqlAgent/MySqlPlugin.cs index e695d4fa..631b8e1b 100644 --- a/Plugins/MySqlAgent/MySqlPlugin.cs +++ b/Plugins/MySqlAgent/MySqlPlugin.cs @@ -1,9 +1,9 @@ using System.ComponentModel; using NewLife.Log; using NewLife.Model; +using NewLife.Remoting.Clients; using NewLife.Threading; using Stardust.Plugins; -using Stardust.Services; namespace MySqlAgent; diff --git a/StarAgent/Program.cs b/StarAgent/Program.cs index 9d9b2fd5..7d64cc77 100644 --- a/StarAgent/Program.cs +++ b/StarAgent/Program.cs @@ -7,6 +7,7 @@ using NewLife.Model; using NewLife.Reflection; using NewLife.Remoting; +using NewLife.Remoting.Clients; using NewLife.Serialization; using NewLife.Threading; using Stardust; diff --git a/Stardust/AppClient.cs b/Stardust/AppClient.cs index 83410b7c..ad050493 100644 --- a/Stardust/AppClient.cs +++ b/Stardust/AppClient.cs @@ -4,15 +4,19 @@ using NewLife; using NewLife.Log; using NewLife.Reflection; -using NewLife.Remoting; using NewLife.Serialization; -using NewLife.Threading; using Stardust.Models; using Stardust.Registry; -using Stardust.Services; using NewLife.Caching; using System.Net.NetworkInformation; using NewLife.Remoting.Models; +using NewLife.Remoting.Clients; +using NewLife.Security; +using NewLife.Remoting; +using NewLife.Http; + + + #if NET45_OR_GREATER || NETCOREAPP || NETSTANDARD using System.Net.WebSockets; @@ -22,7 +26,7 @@ namespace Stardust; /// 应用客户端。每个应用有一个客户端连接星尘服务端 -public class AppClient : ApiHttpClient, ICommandClient, IRegistry, IEventProvider +public class AppClient : ClientBase, IRegistry { #region 属性 /// 应用 @@ -37,9 +41,6 @@ public class AppClient : ApiHttpClient, ICommandClient, IRegistry, IEventProvide /// 节点编码 public String? NodeCode { get; set; } - /// WebSocket长连接。建立长连接后，可以实时感知配置更新和注册服务更新，默认false - public Boolean UseWebSocket { get; set; } - /// 看门狗超时时间。默认0秒 /// /// 设置看门狗超时时间，超过该时间未收到心跳，将会重启本应用进程。 @@ -50,16 +51,6 @@ public class AppClient : ApiHttpClient, ICommandClient, IRegistry, IEventProvide /// 星尘工厂 public StarFactory? Factory { get; set; } - private ConcurrentDictionary _commands = new(StringComparer.OrdinalIgnoreCase); - /// 命令集合 - public IDictionary Commands => _commands; - - /// 收到命令时触发 - public event EventHandler? Received; - - /// 最大失败数。超过该数时，新的数据将被抛弃，默认10 * 24 * 60 - public Int32 MaxFails { get; set; } = 10 * 24 * 60; - private AppInfo? _appInfo; private readonly String? _version; @@ -78,6 +69,10 @@ public class AppClient : ApiHttpClient, ICommandClient, IRegistry, IEventProvide /// 实例化 public AppClient() { + Features = Features.Login | Features.Ping | Features.Notify; + SetActions("App/"); + Actions[Features.Login] = "App/Register"; + // 加载已保存数据 var dic = LoadConsumeServicese(); if (dic != null && dic.Count > 0) @@ -108,17 +103,7 @@ public AppClient() /// 实例化 /// - public AppClient(String urls) : this() - { - if (!urls.IsNullOrEmpty()) - { - var ss = urls.Split(',', ';'); - for (var i = 0; i < ss.Length; i++) - { - Add("service" + (i + 1), new Uri(ss[i])); - } - } - } + public AppClient(String urls) : this() => Server = urls; /// 销毁 /// @@ -126,8 +111,6 @@ protected override void Dispose(Boolean disposing) { base.Dispose(disposing); - StopTimer(); - foreach (var item in _publishServices) { //UnregisterAsync(item.Value).Wait(); @@ -145,7 +128,7 @@ public void Start() if (AppId != "StarServer") { // 等待注册到平台 - var task = TaskEx.Run(Register); + var task = TaskEx.Run(Login); task.Wait(1_000); } } @@ -157,123 +140,50 @@ public void Start() StartTimer(); } - private String? _appName; - /// 注册 + /// 创建Http客户端 + /// /// - public async Task Register() + protected override ApiHttpClient CreateHttp(String urls) { - try - { - var inf = new AppModel - { - AppId = AppId, - AppName = AppName, - ClientId = ClientId, - Version = _version, - NodeCode = NodeCode, - IP = AgentInfo.GetIps() - }; - - var rs = await PostAsync("App/Register", inf); - WriteLog("接入星尘服务端：{0}", rs); - _appName = rs + ""; - - //if (Filter is NewLife.Http.TokenHttpFilter thf) Token = thf.Token?.AccessToken; - - return rs; - } - catch (Exception ex) + var client = base.CreateHttp(urls); + client.Filter = new TokenHttpFilter { - if (ex is HttpRequestException) - Log?.Info("注册异常[{0}] {1}", Source, ex.GetTrue()?.Message); - else - Log?.Info(ex.ToString()); + UserName = AppId, + Password = Secret, + ClientId = ClientId, + }; - //throw; - return null; - } + return client; } - /// 心跳 + /// 构建登录请求 /// - public async Task Ping() + public override ILoginRequest BuildLoginRequest() { - try + var inf = new AppModel { - var inf = _appInfo; - if (inf == null) - inf = _appInfo = new AppInfo(Process.GetCurrentProcess()) { Version = _version }; - else - inf.Refresh(); - - // 如果网络不可用，直接保存到队列 - if (!NetworkInterface.GetIsNetworkAvailable()) - { - if (_fails.Count < MaxFails) _fails.Enqueue(inf.Clone()); - return null; - } - - PingResponse? rs = null; - try - { - rs = await PostAsync("App/Ping", inf); - if (rs != null) - { - // 由服务器改变采样频率 - if (rs.Period > 0 && _timer != null) _timer.Period = rs.Period * 1000; - - var delay = 0; - var dt = rs.Time.ToDateTime(); - if (dt.Year > 2000) - { - // 计算延迟 - var ts = DateTime.UtcNow - dt; - var ms = (Int32)Math.Round(ts.TotalMilliseconds); - delay = delay > 0 ? (delay + ms) / 2 : ms; - } - - // 时间偏移，用于修正本地时间 - dt = rs.ServerTime.ToDateTime(); - if (dt.Year > 2000) _span = dt.AddMilliseconds(delay / 2) - DateTime.UtcNow; - - // 推队列 - if (rs.Commands != null && rs.Commands.Length > 0) - { - foreach (var model in rs.Commands) - { - await ReceiveCommand(model); - } - } - } - } - catch - { - if (_fails.Count < MaxFails) _fails.Enqueue(inf.Clone()); - - throw; - } - - // 上报正常，处理历史，失败则丢弃 - while (_fails.TryDequeue(out var info)) - { - await PostAsync("App/Ping", info); - } + AppId = AppId, + AppName = AppName, + ClientId = ClientId, + Version = _version, + NodeCode = NodeCode, + IP = AgentInfo.GetIps() + }; - return rs; - } - catch (Exception ex) - { - var ex2 = ex.GetTrue(); - if (ex2 is ApiException aex && (aex.Code == 401 || aex.Code == 403)) - { - XTrace.WriteLine("重新登录"); - return await Register(); - } + return inf; + } - Log?.Debug("心跳异常 {0}", ex.GetTrue().Message); + /// 构建心跳请求 + /// + public override IPingRequest BuildPingRequest() + { + var inf = _appInfo; + if (inf == null) + inf = _appInfo = new AppInfo(Process.GetCurrentProcess()) { Version = _version }; + else + inf.Refresh(); - throw; - } + return inf; } /// 向本地StarAgent发送心跳 @@ -289,201 +199,34 @@ public void Start() return await local.PingAsync(_appInfo, WatchdogTimeout); } - - private TimeSpan _span; - /// 获取相对于服务器的当前时间，避免两端时间差 - /// - public DateTime GetNow() => DateTime.Now.Add(_span); #endregion - #region 上报 - private readonly ConcurrentQueue _events = new(); - private readonly ConcurrentQueue _failEvents = new(); - private TimerX? _eventTimer; - private String? _eventTraceId; - - /// 批量上报事件 - /// + #region 心跳 + /// 心跳 + /// /// - public async Task PostEvents(params EventModel[] events) => await PostAsync("App/PostEvents", events); - - async Task DoPostEvent(Object state) - { - if (!NetworkInterface.GetIsNetworkAvailable()) return; - - DefaultSpan.Current = null; - var tid = _eventTraceId; - _eventTraceId = null; - - // 正常队列为空，异常队列有数据，给它一次机会 - if (_events.IsEmpty && !_failEvents.IsEmpty) - { - while (_failEvents.TryDequeue(out var ev)) - { - _events.Enqueue(ev); - } - } - - while (!_events.IsEmpty) - { - var max = 100; - var list = new List(); - while (_events.TryDequeue(out var model) && max-- > 0) list.Add(model); - - using var span = Tracer?.NewSpan("PostEvent", list.Count); - if (!tid.IsNullOrEmpty()) span?.Detach(tid); - try - { - if (list.Count > 0) await PostEvents(list.ToArray()); - - // 成功后读取本地缓存 - while (_failEvents.TryDequeue(out var ev)) - { - _events.Enqueue(ev); - } - } - catch (Exception ex) - { - span?.SetError(ex, null); - - // 失败后进入本地缓存 - foreach (var item in list) - { - _failEvents.Enqueue(item); - } - } - } - } - - /// 写事件 - /// - /// - /// - public virtual Boolean WriteEvent(String type, String name, String? remark) - { - // 记录追踪标识，上报的时候带上，尽可能让源头和下游串联起来 - _eventTraceId = DefaultSpan.Current?.ToString(); - - var now = GetNow().ToUniversalTime(); - var ev = new EventModel { Time = now.ToLong(), Type = type, Name = name, Remark = remark }; - _events.Enqueue(ev); - - _eventTimer?.SetNext(1000); - - return true; - } - #endregion - - #region 长连接 - private TimerX? _timer; - private void StartTimer() - { - if (_timer == null) - { - lock (this) - { - if (_timer == null) - { - _timer = new TimerX(DoPing, null, 5_000, 60_000) { Async = true }; - _eventTimer = new TimerX(DoPostEvent, null, 3_000, 60_000, "Device") { Async = true }; - - Attach(this); - } - } - } - } - - private void StopTimer() - { - _timer.TryDispose(); - _timer = null; - - _eventTimer.TryDispose(); - _eventTimer = null; - -#if NET45_OR_GREATER || NETCOREAPP || NETSTANDARD - _source?.Cancel(); - try - { - if (_websocket != null && _websocket.State == WebSocketState.Open) - _websocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "finish", default); - } - catch { } - - //_websocket.TryDispose(); - _websocket = null; -#endif - } - - private async Task DoPing(Object state) + protected override async Task OnPing(Object state) { DefaultSpan.Current = null; using var span = Tracer?.NewSpan("AppPing"); try { - if (_appName == null) + if (!Logined) { if (!NetworkInterface.GetIsNetworkAvailable()) return; - var rs = await Register(); + var rs = await Login(); if (rs == null) return; } // 向服务端发送心跳后，再向本地发送心跳 - await Ping(); + await base.OnPing(state); await PingLocal(); if (!NetworkInterface.GetIsNetworkAvailable()) return; await RefreshPublish(); await RefreshConsume(); - -#if NET45_OR_GREATER || NETCOREAPP || NETSTANDARD - var svc = _currentService; - if (svc == null || !UseWebSocket) return; - - // 使用过滤器内部token，因为它有过期刷新机制 - var token = Token; - if (Filter is NewLife.Http.TokenHttpFilter thf) token = thf.Token?.AccessToken; - span?.AppendTag($"svc={svc.Address} Token=[{token?.Length}] websocket={_websocket?.State}"); - - if (token.IsNullOrEmpty()) return; - - // 定时ws心跳 - if (_websocket != null && _websocket.State == WebSocketState.Open) - { - try - { - // 在websocket链路上定时发送心跳，避免长连接被断开 - var str = "Ping"; - await _websocket.SendAsync(new ArraySegment(str.GetBytes()), WebSocketMessageType.Text, true, default); - } - catch (Exception ex) - { - span?.SetError(ex, null); - WriteLog("{0}", ex); - } - } - - if (_websocket == null || _websocket.State != WebSocketState.Open) - { - var url = svc.Address.ToString().Replace("http://", "ws://").Replace("https://", "wss://"); - var uri = new Uri(new Uri(url), "/app/notify"); - - using var span2 = Tracer?.NewSpan("WebSocketConnect", uri + ""); - - var client = new ClientWebSocket(); - client.Options.SetRequestHeader("Authorization", "Bearer " + token); - - span?.AppendTag($"WebSocket.Connect {uri}"); - await client.ConnectAsync(uri, default); - - _websocket = client; - - _source = new CancellationTokenSource(); - _ = Task.Run(() => DoPull(client, _source.Token)); - } -#endif } catch (Exception ex) { @@ -491,119 +234,6 @@ private async Task DoPing(Object state) Log?.Debug("{0}", ex); } } - -#if NET45_OR_GREATER || NETCOREAPP || NETSTANDARD - private WebSocket? _websocket; - private CancellationTokenSource? _source; - private async Task DoPull(WebSocket socket, CancellationToken cancellationToken) - { - DefaultSpan.Current = null; - try - { - var buf = new Byte[4 * 1024]; - while (!cancellationToken.IsCancellationRequested && socket.State == WebSocketState.Open) - { - var data = await socket.ReceiveAsync(new ArraySegment(buf), cancellationToken); - var txt = buf.ToStr(null, 0, data.Count); - if (txt.StartsWithIgnoreCase("Pong")) - { - } - else - { - var model = txt.ToJsonEntity(); - if (model != null) await ReceiveCommand(model); - } - } - } - catch (WebSocketException) { } - catch (Exception ex) - { - Log?.Debug("{0}", ex); - } - - using var span = Tracer?.NewSpan("AppPull", socket.State + ""); - - if (socket.State == WebSocketState.Open) - await socket.CloseAsync(WebSocketCloseStatus.NormalClosure, "finish", default); - } -#endif - - async Task ReceiveCommand(CommandModel model) - { - if (model == null) return; - - // 去重，避免命令被重复执行 - if (!_cache.Add($"nodecmd:{model.Id}", model, 3600)) return; - - // 埋点，建立调用链 - using var span = Tracer?.NewSpan("cmd:" + model.Command, model); - if (!model.TraceId.IsNullOrEmpty()) span?.Detach(model.TraceId); - try - { - //todo 有效期判断可能有隐患，现在只是假设服务器和客户端在同一个时区，如果不同，可能会出现问题 - var now = GetNow(); - XTrace.WriteLine("Got Command: {0}", model.ToJson()); - if (model.Expire.Year < 2000 || model.Expire > now) - { - // 延迟执行 - var ts = model.StartTime - now; - if (ts.TotalMilliseconds > 0) - { - TimerX.Delay(s => - { - _ = OnReceiveCommand(model); - }, (Int32)ts.TotalMilliseconds); - - var reply = new CommandReplyModel - { - Id = model.Id, - Status = CommandStatus.处理中, - Data = $"已安排计划执行 {model.StartTime.ToFullString()}" - }; - await CommandReply(reply); - } - else - await OnReceiveCommand(model); - } - else - { - var reply = new CommandReplyModel { Id = model.Id, Status = CommandStatus.取消 }; - await CommandReply(reply); - } - } - catch (Exception ex) - { - span?.SetError(ex, null); - } - } - #endregion - - #region 命令调度 - /// - /// 触发收到命令的动作 - /// - /// - protected virtual async Task OnReceiveCommand(CommandModel model) - { - var e = new CommandEventArgs { Model = model }; - Received?.Invoke(this, e); - - var rs = await this.ExecuteCommand(model); - e.Reply ??= rs; - - if (e.Reply != null && e.Reply.Id > 0) await CommandReply(e.Reply); - } - - /// 向命令引擎发送命令，触发指定已注册动作 - /// - /// - /// - public async Task SendCommand(String command, String argument) => await OnReceiveCommand(new CommandModel { Command = command, Argument = argument }); - - /// 上报服务调用结果 - /// - /// - public virtual async Task CommandReply(CommandReplyModel model) => await PostAsync("App/CommandReply", model); #endregion #region 发布、消费 @@ -617,7 +247,7 @@ protected virtual async Task OnReceiveCommand(CommandModel model) // 如果没有设置地址，则不要调用接口 if (service.Address.IsNullOrEmpty()) return null; - return await PostAsync("App/RegisterService", service); + return await InvokeAsync("App/RegisterService", service); } /// 取消服务（底层） @@ -627,7 +257,7 @@ protected virtual async Task OnReceiveCommand(CommandModel model) { _publishServices.TryRemove(service.ServiceName, out _); - return await PostAsync("App/UnregisterService", service); + return await InvokeAsync("App/UnregisterService", service); } private void AddService(PublishServiceInfo service) @@ -731,7 +361,7 @@ public PublishServiceInfo Register(String serviceName, Func addressCall /// 消费服务（底层） /// 应用服务 /// - public async Task ResolveAsync(ConsumeServiceInfo service) => await PostAsync("App/ResolveService", service); + public async Task ResolveAsync(ConsumeServiceInfo service) => await InvokeAsync("App/ResolveService", service); /// 消费得到服务地址信息 /// 服务名 @@ -905,7 +535,7 @@ public void SetServerAddress(String serverAddress) } } - if (count > 0 && _timer != null) _timer.SetNext(-1); + //if (count > 0 && _timer != null) _timer.SetNext(-1); set.ServiceAddress = serverAddress; set.Save(); diff --git a/Stardust/Configs/StarHttpConfigProvider.cs b/Stardust/Configs/StarHttpConfigProvider.cs index c6d997c2..ef92bedc 100644 --- a/Stardust/Configs/StarHttpConfigProvider.cs +++ b/Stardust/Configs/StarHttpConfigProvider.cs @@ -4,6 +4,7 @@ using NewLife.Log; using NewLife.Reflection; using NewLife.Remoting; +using NewLife.Remoting.Clients; using NewLife.Serialization; using Stardust.Models; using Stardust.Registry; diff --git a/Stardust/Managers/FrameworkManager.cs b/Stardust/Managers/FrameworkManager.cs index 70541ba6..1c798178 100644 --- a/Stardust/Managers/FrameworkManager.cs +++ b/Stardust/Managers/FrameworkManager.cs @@ -1,8 +1,8 @@ using NewLife; using NewLife.Log; +using NewLife.Remoting.Clients; using NewLife.Serialization; using Stardust.Models; -using Stardust.Services; #if NET45_OR_GREATER || NETCOREAPP || NETSTANDARD using TaskEx = System.Threading.Tasks.Task; #endif diff --git a/Stardust/Managers/NetRuntime.cs b/Stardust/Managers/NetRuntime.cs index d73b14fa..fbf4d8e3 100644 --- a/Stardust/Managers/NetRuntime.cs +++ b/Stardust/Managers/NetRuntime.cs @@ -6,7 +6,7 @@ using System.Security.Cryptography; using NewLife; using NewLife.Log; -using Stardust.Services; +using NewLife.Remoting.Clients; namespace Stardust.Managers; diff --git a/Stardust/Managers/ServiceController.cs b/Stardust/Managers/ServiceController.cs index efbbf824..0c967b10 100644 --- a/Stardust/Managers/ServiceController.cs +++ b/Stardust/Managers/ServiceController.cs @@ -1,6 +1,7 @@ using System.Diagnostics; using NewLife; using NewLife.Log; +using NewLife.Remoting.Clients; using NewLife.Threading; using Stardust.Deployment; using Stardust.Models; diff --git a/Stardust/Managers/ServiceManager.cs b/Stardust/Managers/ServiceManager.cs index efb5bce9..cbd2d572 100644 --- a/Stardust/Managers/ServiceManager.cs +++ b/Stardust/Managers/ServiceManager.cs @@ -2,6 +2,7 @@ using NewLife.Http; using NewLife.IO; using NewLife.Log; +using NewLife.Remoting.Clients; using NewLife.Remoting.Models; using NewLife.Serialization; using NewLife.Threading; diff --git a/Stardust/Models/AppInfo.cs b/Stardust/Models/AppInfo.cs index 61a05bd5..5725674e 100644 --- a/Stardust/Models/AppInfo.cs +++ b/Stardust/Models/AppInfo.cs @@ -2,11 +2,12 @@ using System.Diagnostics; using System.Net.NetworkInformation; using NewLife; +using NewLife.Remoting.Models; namespace Stardust.Models; /// 进程信息 -public class AppInfo +public class AppInfo : IPingRequest { #region 属性 /// 进程标识 diff --git a/Stardust/Models/AppModel.cs b/Stardust/Models/AppModel.cs index d7133c25..e0d41ceb 100644 --- a/Stardust/Models/AppModel.cs +++ b/Stardust/Models/AppModel.cs @@ -1,7 +1,9 @@ -namespace Stardust.Models; +using NewLife.Remoting.Models; + +namespace Stardust.Models; /// 应用模型 -public class AppModel +public class AppModel : ILoginRequest { /// 应用标识 public String AppId { get; set; } = null!; @@ -20,4 +22,7 @@ public class AppModel /// 节点编码 public String? NodeCode { get; set; } + + String? ILoginRequest.Code { get => AppId; set => AppId = value!; } + String? ILoginRequest.Secret { get; set; } } \ No newline at end of file diff --git a/Stardust/Services/TraceService.cs b/Stardust/Services/TraceService.cs index 5230bb4d..410d7237 100644 --- a/Stardust/Services/TraceService.cs +++ b/Stardust/Services/TraceService.cs @@ -1,5 +1,6 @@ using NewLife.Log; using NewLife; +using NewLife.Remoting.Clients; namespace Stardust.Services; diff --git a/Stardust/StarClient.cs b/Stardust/StarClient.cs index 514ebc98..6f8dc44b 100644 --- a/Stardust/StarClient.cs +++ b/Stardust/StarClient.cs @@ -17,6 +17,8 @@ using Stardust.Services; using NewLife.Data; using NewLife.Remoting.Models; +using NewLife.Remoting.Clients; + #if NET45_OR_GREATER || NETCOREAPP || NETSTANDARD using System.Net.WebSockets; diff --git a/Stardust/StarFactory.cs b/Stardust/StarFactory.cs index 6c9244aa..5eebbe76 100644 --- a/Stardust/StarFactory.cs +++ b/Stardust/StarFactory.cs @@ -11,13 +11,13 @@ using NewLife.Model; using NewLife.Reflection; using NewLife.Remoting; +using NewLife.Remoting.Clients; using NewLife.Remoting.Models; using NewLife.Security; using Stardust.Configs; using Stardust.Models; using Stardust.Monitors; using Stardust.Registry; -using Stardust.Services; #if NET45_OR_GREATER || NETCOREAPP || NETSTANDARD using TaskEx = System.Threading.Tasks.Task; #endif @@ -52,7 +52,7 @@ public class StarFactory : DisposeBase //public String ServiceName { get; set; } /// 客户端 - public IApiClient? Client => _client; + public IApiClient? Client => _client?.Client; /// 应用客户端 public AppClient? App => _client; @@ -64,7 +64,7 @@ public class StarFactory : DisposeBase public LocalStarClient? Local { get; private set; } private AppClient? _client; - private TokenHttpFilter? _tokenFilter; + //private TokenHttpFilter? _tokenFilter; #endregion #region 构造 @@ -265,12 +265,12 @@ private Boolean Valid() if (_client == null) { - if (!AppId.IsNullOrEmpty()) _tokenFilter = new TokenHttpFilter - { - UserName = AppId, - Password = Secret, - ClientId = ClientId, - }; + //if (!AppId.IsNullOrEmpty()) _tokenFilter = new TokenHttpFilter + //{ + // UserName = AppId, + // Password = Secret, + // ClientId = ClientId, + //}; var client = new AppClient(Server) { @@ -279,8 +279,8 @@ private Boolean Valid() AppName = AppName, ClientId = ClientId, NodeCode = Local?.Info?.Code, - Filter = _tokenFilter, - UseWebSocket = true, + //Filter = _tokenFilter, + //UseWebSocket = true, Log = Log, }; @@ -334,7 +334,7 @@ private void InitTracer() AppName = AppName, //Secret = Secret, ClientId = ClientId, - Client = _client, + Client = _client.Client, Log = Log }; @@ -366,7 +366,7 @@ public IConfigProvider? Config AppId = AppId!, //Secret = Secret, ClientId = ClientId, - Client = _client, + Client = _client.Client, }; //if (!ClientId.IsNullOrEmpty()) config.ClientId = ClientId; config.Attach(_client); @@ -461,7 +461,7 @@ public async Task SendNodeCommand(String nodeCode, String command, String { if (!Valid()) return -1; - return await _client.PostAsync("Node/SendCommand", new CommandInModel + return await _client.InvokeAsync("Node/SendCommand", new CommandInModel { Code = nodeCode, Command = command, @@ -482,7 +482,7 @@ public async Task SendAppCommand(String appId, String command, String? ar { if (!Valid()) return -1; - return await _client.PostAsync("App/SendCommand", new CommandInModel + return await _client.InvokeAsync("App/SendCommand", new CommandInModel { Code = appId, Command = command, diff --git a/Stardust/Stardust.csproj b/Stardust/Stardust.csproj index 1f4fe01d..d9623844 100644 --- a/Stardust/Stardust.csproj +++ b/Stardust/Stardust.csproj @@ -83,6 +83,8 @@ + + @@ -104,10 +106,10 @@ - + - +