167

src/linker.messenger.updater/UpdaterApiController.cs

@@ -31,12 +31,10 @@ namespace linker.messenger.updater
         {
             return updaterClientStore.SecretKey;
         }
-
         public void SetSecretKey(ApiControllerParamsInfo param)
         {
             updaterClientStore.SetSecretKey(param.Content);
         }
-
         public void SetInterval(ApiControllerParamsInfo param)
         {
             updaterCommonTransfer.SetInterval(int.Parse(param.Content));
@@ -56,7 +54,6 @@ namespace linker.messenger.updater
             }
             return new UpdaterInfo();
         }
-
         public async Task ConfirmServer(ApiControllerParamsInfo param)
         {
             await messengerSender.SendOnly(new MessageRequestWrap
@@ -66,7 +63,6 @@ namespace linker.messenger.updater
                 Payload = serializer.Serialize(new UpdaterConfirmServerInfo { SecretKey = updaterClientStore.SecretKey, Version = param.Content })
             });
         }
-
         public async Task ExitServer(ApiControllerParamsInfo param)
         {
             await messengerSender.SendOnly(new MessageRequestWrap
@@ -142,7 +138,6 @@ namespace linker.messenger.updater
             return true;
         }
 
-
         public async Task Subscribe(ApiControllerParamsInfo param)
         {
             await messengerSender.SendOnly(new MessageRequestWrap

src/linker.messenger.updater/UpdaterClientTransfer.cs

@@ -1,7 +1,6 @@
 using linker.libs;
 using System.Collections.Concurrent;
 using linker.messenger.signin;
-using linker.libs.extends;
 
 namespace linker.messenger.updater
 {
@@ -34,7 +33,7 @@ namespace linker.messenger.updater
         }
         private void Init()
         {
-            LoadTask();
+            CheckTask();
             UpdateTask();
             updateInfo.Update();
         }
@@ -88,14 +87,6 @@ namespace linker.messenger.updater
                 updateInfo.Update();
             }
         }
-
-        public void Check()
-        {
-            if (LoggerHelper.Instance.LoggerLevel <= LoggerTypes.DEBUG)
-                LoggerHelper.Instance.Info($"check update");
-            _ = updaterHelper.GetUpdateInfo(updateInfo);
-        }
-
         private void UpdateTask()
         {
             TimerHelper.SetInterval(async () =>
@@ -119,19 +110,44 @@ namespace linker.messenger.updater
             }, () => lastTicksManager.DiffLessEqual(5000) ? 1000 : 15000);
 
         }
-        private void LoadTask()
+
+        public void Check()
+        {
+            if (LoggerHelper.Instance.LoggerLevel <= LoggerTypes.DEBUG)
+                LoggerHelper.Instance.Info($"check update");
+            _ = GetUpdateInfo();
+        }
+        private void CheckTask()
         {
             TimerHelper.SetInterval(async () =>
             {
                 if (updaterCommonTransfer.CheckUpdate)
                 {
-                    await updaterHelper.GetUpdateInfo(updateInfo);
+                    await GetUpdateInfo();
                 }
                 return true;
             }, () => updaterCommonTransfer.UpdateIntervalSeconds * 1000);
         }
+        private async Task GetUpdateInfo()
+        {
+            if (updateInfo.Status > UpdaterStatus.Checked) return;
+
+            MessageResponeInfo resp = await messengerSender.SendReply(new MessageRequestWrap
+            {
+                Connection = signInClientState.Connection,
+                MessengerId = (ushort)UpdaterMessengerIds.UpdateServer,
+            });
+            if (resp.Code == MessageResponeCodes.OK && resp.Data.Length > 0)
+            {
+                UpdaterInfo info = serializer.Deserialize<UpdaterInfo>(resp.Data.Span);
+                if (info.Status <= UpdaterStatus.Checked && updateInfo.Status <= UpdaterStatus.Checked)
+                {
+                    updateInfo.Status = info.Status;
+                    updateInfo.Version = info.Version;
+                    updateInfo.DateTime = info.DateTime;
+                    updateInfo.Msg = info.Msg;
+                }
+            }
+        }
     }
-
-
-
 }

src/linker.messenger.updater/UpdaterHelper.cs

@@ -33,8 +33,9 @@ namespace linker.messenger.updater
             try
             {
                 updateInfo.Status = UpdaterStatus.Checking;
-
+                using HttpClientHandler handler = new HttpClientHandler();
-                using HttpClient httpClient = new HttpClient();
+                handler.ServerCertificateCustomValidationCallback = (sender, cert, chain, sslPolicyErrors) => true;
+                using HttpClient httpClient = new HttpClient(handler);
                 string str = await httpClient.GetStringAsync($"{updaterCommonTransfer.UpdateUrl}/version.txt").WaitAsync(TimeSpan.FromSeconds(15));
 
                 string[] arr = str.Split(Environment.NewLine).Select(c => c.Trim('\r').Trim('\n')).ToArray();

version.txt

@@ -1,5 +1,5 @@
 v1.6.7
-2025-02-18 10:38:06
+2025-02-18 11:10:37
 1. 修复首次启动网卡未启动bug
 2. 自定义网卡名
 3. 可禁用NAT