diff --git a/.gitignore b/.gitignore
index d89458e2270f8671d21d4d2c3e6d83976e42f625..05c3b746832d5f75e91ade887f1e14e857742a50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -184,3 +184,5 @@ FakesAssemblies/
# SVN Repo
.svn/
+/src/.vs/GeneralUpdate/DesignTimeBuild
+/src/.vs/GeneralUpdate/v17
diff --git a/src/.vs/GeneralUpdate/DesignTimeBuild/.dtbcache.v2 b/src/.vs/GeneralUpdate/DesignTimeBuild/.dtbcache.v2
deleted file mode 100644
index ef78d594b707da348c4b390a8b2cff3ac348c521..0000000000000000000000000000000000000000
Binary files a/src/.vs/GeneralUpdate/DesignTimeBuild/.dtbcache.v2 and /dev/null differ
diff --git a/src/.vs/GeneralUpdate/v17/.futdcache.v1 b/src/.vs/GeneralUpdate/v17/.futdcache.v1
deleted file mode 100644
index aeeaf5af7fa0cb0c46507ccec43dae792ceae890..0000000000000000000000000000000000000000
Binary files a/src/.vs/GeneralUpdate/v17/.futdcache.v1 and /dev/null differ
diff --git a/src/GeneralUpdate.ClientCore/Strategys/AbstractStrategy.cs b/src/GeneralUpdate.ClientCore/Strategys/AbstractStrategy.cs
index 71e7b8282d4cc83568857812265b6cc3bbbd00ee..719884c90cf1bd08e1d418f70d1bd50ce07313d2 100644
--- a/src/GeneralUpdate.ClientCore/Strategys/AbstractStrategy.cs
+++ b/src/GeneralUpdate.ClientCore/Strategys/AbstractStrategy.cs
@@ -1,4 +1,5 @@
-using GeneralUpdate.ClientCore.Update;
+using GeneralUpdate.ClientCore.Models;
+using GeneralUpdate.ClientCore.Update;
using GeneralUpdate.ClientCore.Utils;
using System;
using System.IO;
@@ -34,5 +35,10 @@ namespace GeneralUpdate.ClientCore.Strategys
}
protected virtual bool StartApp(string appName) { throw new NotImplementedException(); }
+
+ protected virtual bool UnZip(UpdateVersion versionInfo,string zipfilepath,string unzippath)
+ {
+ throw new NotImplementedException();
+ }
}
}
diff --git a/src/GeneralUpdate.ClientCore/Strategys/ClientStrategy.cs b/src/GeneralUpdate.ClientCore/Strategys/ClientStrategy.cs
index 5a77bde7fb646a6f43984de51010e50faa054716..a89d739ab9c200eacbaceb2ccb4082b86ebafdf7 100644
--- a/src/GeneralUpdate.ClientCore/Strategys/ClientStrategy.cs
+++ b/src/GeneralUpdate.ClientCore/Strategys/ClientStrategy.cs
@@ -77,5 +77,10 @@ namespace GeneralUpdate.ClientCore.Strategys
return false;
}
}
+
+ protected override bool UnZip(UpdateVersion versionInfo, string zipfilepath, string unzippath)
+ {
+ return base.UnZip(versionInfo, zipfilepath, unzippath);
+ }
}
}
diff --git a/src/GeneralUpdate.ClientCore/Strategys/Strategy.cs b/src/GeneralUpdate.ClientCore/Strategys/Strategy.cs
index 6253d912a1824dd36678f31a06a146ed56637bdd..c13d42974b9d22612c8416375bb79d8a4dd38eef 100644
--- a/src/GeneralUpdate.ClientCore/Strategys/Strategy.cs
+++ b/src/GeneralUpdate.ClientCore/Strategys/Strategy.cs
@@ -33,7 +33,7 @@ namespace GeneralUpdate.Core.Strategys
updateVersions = updateVersions.OrderBy(x => x.PubTime).ToList();
foreach (var version in updateVersions)
{
- var zipFilePath = $"{Packet.TempPath}{ version.Name }{ Packet.Format }";
+ var zipFilePath = $"{Packet.TempPath}{ version.Name }{version.PubTime}{ Packet.Format }";
var isVerify = VerifyFileMd5(zipFilePath, version.MD5);
if (!isVerify)
{
@@ -120,7 +120,7 @@ namespace GeneralUpdate.Core.Strategys
///
///
///
- protected bool UnZip(UpdateVersion versionInfo, string zipfilepath, string unzippath)
+ protected override bool UnZip(UpdateVersion versionInfo, string zipfilepath, string unzippath)
{
try
{
diff --git a/src/GeneralUpdate.ClientCore/Utils/WebClientUtil.cs b/src/GeneralUpdate.ClientCore/Utils/WebClientUtil.cs
index b4d072f08c156bdbee2dce526beb3b8442ab4e07..ccf0e7abfb65358781e9ac6a00be51ba637d67e3 100644
--- a/src/GeneralUpdate.ClientCore/Utils/WebClientUtil.cs
+++ b/src/GeneralUpdate.ClientCore/Utils/WebClientUtil.cs
@@ -437,7 +437,7 @@ namespace GeneralUpdate.ClientCore.Utils
});
webClient.InitTimeOut(_timeOut);
webClient.Version = version;
- var installPath = $"{Path}\\{ version.Name }{ Format }";
+ var installPath = $"{Path}\\{ version.Name }{version.PubTime}{ Format }";
await webClient.DownloadFileRangeTaskAsync(version.Url, installPath, null);
return true;
}