Merge branch 'master' into master

Author: JusterZhu

README.md

@@ -6,6 +6,8 @@
 
 [English introduction](https://github.com/JusterZhu/GeneralUpdate/blob/master/README_en.md)
 
+**更新无限，升级无界。**
+
 ## 1.组件介绍 ##
 
 GeneralUpdate是一款基于.NET Standard2.0开源自动升级组件。
@@ -88,6 +90,9 @@ MAUI GeneralUpdate.Maui
 | Linux        | 支持 |
 | Android      | 支持 |
 | 麒麟V10(飞腾S2500)  | 支持   |
+| 麒麟V10(飞腾FT-2000)  | 支持   |
 | 麒麟V10(x64)  | 支持   |
 | Ubuntu | 支持 |
-| 龙芯(Loongnix) | 待验证 |
+| 龙芯(Loongnix LoongArch) | 支持 |
+| 华为欧拉(EulerOS-鲲鹏Kunpeng) | 支持 |
+| Apple Mac (M1) | 支持 |

README_en.md

@@ -3,6 +3,8 @@
 
 ![](imgs/GeneralUpdate_h.png)
 
+Unlimited Updates, Boundless Upgrades.
+
 ## 1. Component Introduction ##
 
 GeneralUpdate is an open-source automatic update component based on .NET Standard 2.0.
@@ -72,12 +74,15 @@ Feature Introduction:
 
 ## 3. Operating Systems
 
-| Operating System Name     | Supported      |
-| ------------------------- | -------------- |
-| Windows                   | Yes            |
-| Linux                     | Yes            |
-| Android                   | Yes            |
-| Kylin V10 (Feiteng S2500) | Yes            |
-| Kylin V10 (x64)           | Yes            |
-| Ubuntu                    | Yes            |
-| Loongson (Loongnix)       | To be verified |
+| Operating System Name         | Supported |
+| ----------------------------- | --------- |
+| Windows                       | Yes       |
+| Linux                         | Yes       |
+| Android                       | Yes       |
+| Kylin V10 (Feiteng S2500)     | Yes       |
+| Kylin V10 (Feiteng 2000)      | Yes       |
+| Kylin V10 (x64)               | Yes       |
+| Ubuntu                        | Yes       |
+| Loongson (Loongnix LoongArch) | Yes       |
+| HuaWeiEulerOS (Kunpeng)       | Yes       |
+| Apple Mac (M1)                | Yes       |

src/c#/GeneralUpdate.Client/Program.cs

@@ -14,7 +14,7 @@ internal class Program
     {
         static async Task Main(string[] args)
         {
-            try
+            /*try
             {
                 Console.WriteLine($"主程序初始化，{DateTime.Now}！");
                 Console.WriteLine("当前运行目录：" + Thread.GetDomain().BaseDirectory);
@@ -57,23 +57,25 @@ static async Task Main(string[] args)
             catch (Exception e)
             {
                 Console.WriteLine(e.Message + "\n" + e.StackTrace);
-            }
+            }*/
 
-            /*var paramsOSS = new GlobalConfigInfoOSS();
-            paramsOSS.Url = "http://192.168.50.203/versions.json";
-            paramsOSS.CurrentVersion = "1.0.0.0";
-            paramsOSS.VersionFileName = "versions.json";
-            paramsOSS.AppName = "GeneralUpdate.Client.exe";
-            paramsOSS.Encoding = Encoding.UTF8.WebName;
-            GeneralClientOSS.Start(paramsOSS);*/
+            var paramsOSS = new GlobalConfigInfoOSS
+            {
+                Url = @"http://localhost:5000/packages/versions.json",
+                CurrentVersion = "1.0.0.0",
+                VersionFileName = "versions.json",
+                AppName = "GeneralUpdate.Client.exe",
+                Encoding = Encoding.UTF8.WebName
+            };
+            await GeneralClientOSS.Start(paramsOSS, "GeneralUpdate.Upgrad.exe");
 
-            var hub = new UpgradeHubService("http://localhost:5000/UpgradeHub"
+            /*var hub = new UpgradeHubService("http://localhost:5000/UpgradeHub"
                 , null,"dfeb5833-975e-4afb-88f1-6278ee9aeff6");
             hub.AddListenerReceive((message) =>
             {
                 Debug.WriteLine(message);
             });
-            await hub.StartAsync();
+            await hub.StartAsync();*/
 
             /*Task.Run(async () =>
            {

src/c#/GeneralUpdate.ClientCore/GeneralClientBootstrap.cs

@@ -80,6 +80,8 @@ public GeneralClientBootstrap SetConfig(Configinfo configInfo)
             UpgradeClientVersion = configInfo.UpgradeClientVersion,
             Bowl = configInfo.Bowl,
             SkipDirectorys = configInfo.SkipDirectorys
+            Scheme = configInfo.Scheme,
+            Token = configInfo.Token
         };
         return this;
     }
@@ -145,14 +147,18 @@ private async Task ExecuteWorkflowAsync()
                 , AppType.ClientApp
                 , _configInfo.AppSecretKey
                 , GetPlatform()
-                , _configInfo.ProductId);
+                , _configInfo.ProductId
+                , _configInfo.Scheme
+                , _configInfo.Token);
 
             var upgradeResp = await VersionService.Validate(_configInfo.UpdateUrl
                 , _configInfo.UpgradeClientVersion
                 , AppType.UpgradeApp
                 , _configInfo.AppSecretKey
                 , GetPlatform()
-                , _configInfo.ProductId);
+                , _configInfo.ProductId
+                , _configInfo.Scheme
+                , _configInfo.Token);
 
             _configInfo.IsUpgradeUpdate = CheckUpgrade(upgradeResp);
             _configInfo.IsMainUpdate = CheckUpgrade(mainResp);
@@ -192,7 +198,9 @@ private async Task ExecuteWorkflowAsync()
                     , mainResp.Body
                     , _configInfo.ReportUrl
                     , _configInfo.BackupDirectory
-                    , _configInfo.Bowl);
+                    , _configInfo.Bowl
+                    , _configInfo.Scheme
+                    , _configInfo.Token);
 
                 _configInfo.ProcessInfo =
                     JsonSerializer.Serialize(processInfo, ProcessInfoJsonContext.Default.ProcessInfo);

src/c#/GeneralUpdate.ClientCore/Strategys/LinuxStrategy.cs

@@ -65,7 +65,12 @@ public override async Task ExecuteAsync()
                 }
                 finally
                 {
-                    await VersionService.Report(_configinfo.ReportUrl, version.RecordId, status, version.AppType);
+                    await VersionService.Report(_configinfo.ReportUrl
+                        , version.RecordId
+                        , status
+                        , version.AppType
+                        , _configinfo.Scheme
+                        , _configinfo.Token);
                 }
             }
 

src/c#/GeneralUpdate.ClientCore/Strategys/WindowsStrategy.cs

@@ -64,7 +64,12 @@ public override async Task ExecuteAsync()
                 }
                 finally
                 {
-                    await VersionService.Report(_configinfo.ReportUrl, version.RecordId, status, version.AppType);
+                    await VersionService.Report(_configinfo.ReportUrl
+                        , version.RecordId
+                        , status
+                        , version.AppType
+                        , _configinfo.Scheme
+                        , _configinfo.Token);
                 }
             }
 

src/c#/GeneralUpdate.Common/Compress/ZipCompressionStrategy.cs

@@ -118,12 +118,6 @@ public void Decompress(string zipFilePath, string unZipDir, Encoding encoding)
     {
         try
         {
-            if (Directory.Exists(unZipDir))
-            {
-                StorageManager.DeleteDirectory(unZipDir);
-            }
-            Directory.CreateDirectory(unZipDir);
-
             var dirSeparatorChar = Path.DirectorySeparatorChar.ToString();
             unZipDir = unZipDir.EndsWith(dirSeparatorChar) ? unZipDir : unZipDir + dirSeparatorChar;
 
@@ -158,6 +152,13 @@ public void Decompress(string zipFilePath, string unZipDir, Encoding encoding)
                 {
                     greatFolder.Create();
                 }
+
+                if (File.Exists(filePath))
+                {
+                    File.SetAttributes(filePath, FileAttributes.Normal);
+                    File.Delete(filePath);
+                }
+
                 entries.ExtractToFile(filePath);
             }
         }

src/c#/GeneralUpdate.Common/Download/DownloadManager.cs

@@ -43,11 +43,11 @@ public async Task LaunchTasksAsync()
             {
                 var downloadTasks = DownloadTasks.Select(task => task.LaunchAsync()).ToList();
                 await Task.WhenAll(downloadTasks);
-                MultiAllDownloadCompleted.Invoke(this, new MultiAllDownloadCompletedEventArgs(true, FailedVersions));
+                MultiAllDownloadCompleted?.Invoke(this, new MultiAllDownloadCompletedEventArgs(true, FailedVersions));
             }
             catch (Exception ex)
             {
-                MultiAllDownloadCompleted.Invoke(this, new MultiAllDownloadCompletedEventArgs(false, FailedVersions));
+                MultiAllDownloadCompleted?.Invoke(this, new MultiAllDownloadCompletedEventArgs(false, FailedVersions));
                 throw new Exception($"Download manager error: {ex.Message}", ex);
             }
         }

src/c#/GeneralUpdate.Common/Shared/Object/Configinfo.cs

@@ -74,6 +74,10 @@ public class Configinfo
         public string ProductId { get; set; }
 
         public string Bowl { get; set; }
+        
+        public string Scheme { get; set; }
+    
+        public string Token { get; set; }
 
         public void Validate()
         {

src/c#/GeneralUpdate.Common/Shared/Object/GlobalConfigInfo.cs

@@ -122,4 +122,8 @@ public class GlobalConfigInfo
     public string BackupDirectory { get; set; }
 
     public string Bowl { get; set; }
+
+    public string Scheme { get; set; }
+    
+    public string Token { get; set; }
 }