[fix]AppClient本身不需要登录，而已通过TokenHttpFilter过滤器直接请求OAuth登录来获取令牌

NewLifeX · Jun 26, 2024 · 9862527 · 9862527
1 parent afeb50e
commit 9862527
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 33 deletions.
diff --git a/ClientTest/ClientTest.csproj b/ClientTest/ClientTest.csproj
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="NewLife.Redis" Version="5.7.2024.602" />
+    <PackageReference Include="NewLife.Redis" Version="5.7.2024.617-beta1504" />
     <PackageReference Include="NewLife.UnitTest" Version="1.0.2024.102-beta0146" />
     <PackageReference Include="xunit" Version="2.8.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">

diff --git a/Plugins/MySqlAgent/MySqlAgent.csproj b/Plugins/MySqlAgent/MySqlAgent.csproj
@@ -20,7 +20,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.XCode" Version="11.13.2024.606" />
+    <PackageReference Include="NewLife.XCode" Version="11.13.2024.625-beta1600" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/TestA/TestA.csproj b/Samples/TestA/TestA.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.10.2024.507" />
+    <PackageReference Include="NewLife.Core" Version="10.10.2024.625-beta1559" />
   </ItemGroup>
 
 </Project>
diff --git a/Samples/TestB/TestB.csproj b/Samples/TestB/TestB.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.10.2024.507" />
+    <PackageReference Include="NewLife.Core" Version="10.10.2024.625-beta1559" />
   </ItemGroup>
 
 </Project>
diff --git a/StarAgent/StarAgent.csproj b/StarAgent/StarAgent.csproj
@@ -42,7 +42,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Agent" Version="10.9.2024.621-beta0040" />
+    <PackageReference Include="NewLife.Agent" Version="10.9.2024.624-beta1712" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Stardust.Data/Stardust.Data.csproj b/Stardust.Data/Stardust.Data.csproj
@@ -41,7 +41,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.XCode" Version="11.13.2024.606" />
+    <PackageReference Include="NewLife.XCode" Version="11.13.2024.625-beta1600" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Stardust.Server/Controllers/AppController.cs b/Stardust.Server/Controllers/AppController.cs
@@ -10,7 +10,6 @@
 using NewLife.Serialization;
 using Stardust.Data;
 using Stardust.Data.Configs;
-using Stardust.Data.Nodes;
 using Stardust.Models;
 using Stardust.Server.Services;
 using WebSocket = System.Net.WebSockets.WebSocket;

diff --git a/Stardust.Web/Stardust.Web.csproj b/Stardust.Web/Stardust.Web.csproj
@@ -50,7 +50,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Cube.Core" Version="6.1.2024.614-beta1002" />
+    <PackageReference Include="NewLife.Cube.Core" Version="6.1.2024.625-beta1720" />
     <PackageReference Include="NewLife.Redis" Version="5.7.2024.617-beta1504" />
   </ItemGroup>
 

diff --git a/Stardust/AppClient.cs b/Stardust/AppClient.cs
@@ -69,9 +69,8 @@ public class AppClient : ClientBase, IRegistry
     /// <summary>实例化</summary>
     public AppClient()
     {
-        Features = Features.Login | Features.Ping | Features.Notify;
+        Features = Features.Ping | Features.Notify;
         SetActions("App/");
-        Actions[Features.Login] = "App/Register";
 
         // 加载已保存数据
         var dic = LoadConsumeServicese();
@@ -125,10 +124,12 @@ public void Start()
     {
         try
         {
+            Code = AppId;
+
             if (AppId != "StarServer")
             {
                 // 等待注册到平台
-                var task = TaskEx.Run(Login);
+                var task = TaskEx.Run(Register);
                 task.Wait(1_000);
             }
         }
@@ -138,6 +139,7 @@ public void Start()
         }
 
         StartTimer();
+        Attach(this);
     }
 
     /// <summary>创建Http客户端</summary>
@@ -156,21 +158,40 @@ protected override ApiHttpClient CreateHttp(String urls)
         return client;
     }
 
-    /// <summary>构建登录请求</summary>
+    /// <summary>注册</summary>
     /// <returns></returns>
-    public override ILoginRequest BuildLoginRequest()
+    public async Task<Object?> Register()
     {
-        var inf = new AppModel
+        try
         {
-            AppId = AppId,
-            AppName = AppName,
-            ClientId = ClientId,
-            Version = _version,
-            NodeCode = NodeCode,
-            IP = AgentInfo.GetIps()
-        };
+            var inf = new AppModel
+            {
+                AppId = AppId,
+                AppName = AppName,
+                ClientId = ClientId,
+                Version = _version,
+                NodeCode = NodeCode,
+                IP = AgentInfo.GetIps()
+            };
 
-        return inf;
+            var rs = await InvokeAsync<String>("App/Register", inf);
+            WriteLog("接入星尘服务端：{0}", rs);
+
+            Logined = true;
+            //if (Filter is NewLife.Http.TokenHttpFilter thf) Token = thf.Token?.AccessToken;
+
+            return rs;
+        }
+        catch (Exception ex)
+        {
+            if (ex is HttpRequestException)
+                Log?.Info("注册异常[{0}] {1}", (Client as ApiHttpClient)?.Source, ex.GetTrue()?.Message);
+            else
+                Log?.Info(ex.ToString());
+
+            //throw;
+            return null;
+        }
     }
 
     /// <summary>构建心跳请求</summary>
@@ -215,7 +236,7 @@ protected override async Task OnPing(Object state)
             {
                 if (!NetworkInterface.GetIsNetworkAvailable()) return;
 
-                var rs = await Login();
+                var rs = await Register();
                 if (rs == null) return;
             }
 

diff --git a/Stardust/Models/AppModel.cs b/Stardust/Models/AppModel.cs
@@ -3,7 +3,7 @@
 namespace Stardust.Models;
 
 /// <summary>应用模型</summary>
-public class AppModel : ILoginRequest
+public class AppModel
 {
     /// <summary>应用标识</summary>
     public String AppId { get; set; } = null!;
@@ -22,7 +22,4 @@ public class AppModel : ILoginRequest
 
     /// <summary>节点编码</summary>
     public String? NodeCode { get; set; }
-
-    String? ILoginRequest.Code { get => AppId; set => AppId = value!; }
-    String? ILoginRequest.Secret { get; set; }
 }
diff --git a/Stardust/Monitors/StarTracer.cs b/Stardust/Monitors/StarTracer.cs
@@ -1,11 +1,9 @@
 using System.Collections.Concurrent;
 using System.Diagnostics;
-using System.Net.Http;
 using System.Net.NetworkInformation;
 using System.Net.Sockets;
 using System.Reflection;
 using NewLife;
-using NewLife.Data;
 using NewLife.Http;
 using NewLife.Log;
 using NewLife.Reflection;

diff --git a/Stardust/StarFactory.cs b/Stardust/StarFactory.cs
@@ -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);

diff --git a/Stardust/Stardust.csproj b/Stardust/Stardust.csproj
@@ -106,7 +106,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Remoting" Version="3.0.2024.625-beta1714" />
+    <PackageReference Include="NewLife.Remoting" Version="3.0.2024.626-beta1337" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'!='net40'">
     <PackageReference Include="NewLife.Core" Version="10.10.2024.0625-beta1559" />

diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -30,7 +30,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Win32.SystemEvents" Version="8.0.0" />
-    <PackageReference Include="NewLife.Core" Version="10.10.2024.601" />
+    <PackageReference Include="NewLife.Core" Version="10.10.2024.625-beta1559" />
     <PackageReference Include="SSH.NET" Version="2024.0.0" />
   </ItemGroup>