Merge branch 'develop'

SeriaWei · Sep 11, 2024 · f60fe16 · f60fe16
2 parents 0a401b8 + b56bb72
commit f60fe16
Show file tree

Hide file tree

Showing 38 changed files with 396 additions and 123 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,8 +1,167 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
+!packages/*/build/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+*.pubxml
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+# =========================
+# Windows detritus
+# =========================
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
 .git
 .svn
 .vs
-.vscode
-bin
-obj
+*.mdf
+*.ldf
+src/ZKEACMS.WebHost/wwwroot/UpLoad
+src/ZKEACMS.WebHost/wwwroot/Logs
+Database/App_Data
 node_modules
-Release
+*.userprefs
+/*.userprefs
+
+# ZKEACMS App Data
+App_Data/
+*.db
+/src/ZKEACMS.WebHost/Temp
diff --git a/src/EasyFrameWork/EasyFrameWork.csproj b/src/EasyFrameWork/EasyFrameWork.csproj
@@ -27,6 +27,6 @@
     <PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
-    <PackageReference Include="YamlDotNet" Version="16.0.0" />
+    <PackageReference Include="YamlDotNet" Version="16.1.0" />
   </ItemGroup>
 </Project>
diff --git a/src/EasyFrameWork/StartTask/IStartTask.cs → src/EasyFrameWork/StartTask/IAppStartTask.cs b/src/EasyFrameWork/StartTask/IStartTask.cs → src/EasyFrameWork/StartTask/IAppStartTask.cs
@@ -4,8 +4,8 @@
 
 namespace Easy.StartTask
 {
-    public interface IStartTask
+    public interface IAppStartTask
     {
-        void Excute();
+        void OnStartup();
     }
 }
diff --git a/src/EasyFrameWork/Version.cs b/src/EasyFrameWork/Version.cs
@@ -147,6 +147,13 @@ public static Version Parse(string version)
             return false;
         }
 
+        public static implicit operator Version(string version)
+        {
+            if (string.IsNullOrEmpty(version)) return null;
+
+            return Parse(version);
+        }
+
         public override bool Equals(object obj)
         {
             if (ReferenceEquals(this, obj))

diff --git a/src/ZKEACMS.GlobalScripts/Models/StatisticsScript.cs b/src/ZKEACMS.GlobalScripts/Models/StatisticsScript.cs
@@ -24,8 +24,8 @@ protected override void ViewConfigure()
             ViewConfig(m => m.Location).AsDropDownList().DataSource(() =>
             {
                 Dictionary<string, string> data = new Dictionary<string, string>();
-                data.Add(ScriptLocation.Footer.ToString("D"), "Head");
-                data.Add(ScriptLocation.Header.ToString("D"), "Foot");
+                data.Add(ScriptLocation.Header.ToString("D"), "Head");
+                data.Add(ScriptLocation.Footer.ToString("D"), "Foot");
                 return data;
             });
             ViewConfig(m => m.Script).AsTextArea();

diff --git a/src/ZKEACMS.Product/Controllers/ProductController.cs b/src/ZKEACMS.Product/Controllers/ProductController.cs
@@ -106,10 +106,11 @@ public JsonResult Sort([FromBody] IEnumerable<ProductEntity> products)
         }
         public JsonResult GetProducts(int ProductCategoryID)
         {
-            var ids = _productCategoryService.Get(m => m.ParentID == ProductCategoryID || m.ID == ProductCategoryID).Select(m => m.ID);
-            return Json(Service.Get(m => ids.Contains(m.ProductCategoryID))
+            var ids = _productCategoryService.Get(m => m.ParentID == ProductCategoryID || m.ID == ProductCategoryID).Select(m => m.ID).ToArray();
+            return Json(Service.Get(m => ids.Contains(m.ProductCategoryID.Value))
                 .OrderBy(m => m.OrderIndex)
-                .ThenByDescending(m => m.ID).Select(m => new { m.ID, m.Title }));
+                .ThenByDescending(m => m.ID)
+                .Select(m => new { m.ID, m.Title }));
         }
         [HttpPost]
         public IActionResult ProduceTags(int productId, int ProductCategoryId)

diff --git a/src/ZKEACMS.Product/Service/ProductListWidgetService.cs b/src/ZKEACMS.Product/Service/ProductListWidgetService.cs
@@ -97,7 +97,7 @@ public override object Display(WidgetDisplayContext widgetDisplayContext)
             else
             {
                 var ids = _productCategoryService.Get(m => m.ID == currentWidget.ProductCategoryID || m.ParentID == currentWidget.ProductCategoryID).Select(m => m.ID).ToList();
-                filter = m => m.Status == (int)RecordStatus.Active && m.IsPublish && ids.Contains(m.ProductCategoryID);
+                filter = m => m.Status == (int)RecordStatus.Active && m.IsPublish && ids.Contains(m.ProductCategoryID.Value);
             }
             if (currentWidget.IsPageable)
             {

diff --git a/src/ZKEACMS.Product/Service/ProductUrlService.cs b/src/ZKEACMS.Product/Service/ProductUrlService.cs
@@ -36,7 +36,7 @@ public IEnumerable<ProductUrl> GetAllPublicUrls()
                 if (item.DetailPageUrl.IsNotNullAndWhiteSpace() && !excuted.Contains(typeDetail))
                 {
                     var ids = _productCategoryService.Get(m => m.ID == item.ProductCategoryID || m.ParentID == item.ProductCategoryID).Select(m => m.ID).ToList();
-                    var products = _productService.Get(m => m.IsPublish && ids.Contains(m.ProductCategoryID));
+                    var products = _productService.Get(m => m.IsPublish && ids.Contains(m.ProductCategoryID.Value));
                     foreach (var product in products)
                     {
                         string post = product.Url.IsNullOrWhiteSpace() ? $"post-{product.ID}" : product.Url;
@@ -66,8 +66,8 @@ public string[] GetPublicUrl(int ID)
 
         public string[] GetPublicUrl(ProductEntity product)
         {
-            int categoryId = product.ProductCategoryID;
-            if (categoryId == 0) return null;
+            var categoryId = product.ProductCategoryID;
+            if ((categoryId ?? 0) == 0) return null;
 
             ProductCategory productCategory = _productCategoryService.Get(categoryId);
 

diff --git a/src/ZKEACMS.Swagger/ZKEACMS.Swagger.csproj b/src/ZKEACMS.Swagger/ZKEACMS.Swagger.csproj
@@ -16,7 +16,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
 		<ProjectReference Include="..\ZKEACMS\ZKEACMS.csproj">
 			<Private>false</Private>
 			<ExcludeAssets>runtime</ExcludeAssets>

diff --git a/src/ZKEACMS.Updater/ApplicationStartup.cs b/src/ZKEACMS.Updater/ApplicationStartup.cs
@@ -7,14 +7,14 @@
 
 namespace ZKEACMS.Updater
 {
-    public class ApplicationStartup : IStartTask
+    public class ApplicationStartup : IAppStartTask
     {
         private readonly IDbUpdaterService _dbUpdaterService;
         public ApplicationStartup(IDbUpdaterService dbUpdaterService)
         {
             _dbUpdaterService = dbUpdaterService;
         }
-        public void Excute()
+        public void OnStartup()
         {
             _dbUpdaterService.UpdateDatabase();
         }

diff --git a/src/ZKEACMS.Updater/Models/DBVersionOption.cs b/src/ZKEACMS.Updater/Models/DBVersionOption.cs
@@ -12,6 +12,7 @@ namespace ZKEACMS.Updater.Models
 {
     public class DBVersionOption
     {
+        public string DBVersion { get; set; }
         public string BaseVersion { get; set; }
         public string[] Source { get; set; }
     }

diff --git a/src/ZKEACMS.Updater/Service/DbUpdaterService.cs b/src/ZKEACMS.Updater/Service/DbUpdaterService.cs
@@ -5,6 +5,7 @@
 using Easy.Extend;
 using Easy.Mvc.Plugin;
 using Easy.Net;
+using Easy.Serializer;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Hosting;
@@ -26,7 +27,7 @@ namespace ZKEACMS.Updater.Service
 {
     public class DbUpdaterService : IDbUpdaterService
     {
-        private readonly IOptions<DBVersionOption> _dbVersionOption;
+        private readonly DBVersionOption _dbVersionOption;
         private readonly IWebClient _webClient;
         private readonly ILogger<DbUpdaterService> _logger;
         private readonly IDBContextProvider _dbContextProvider;
@@ -39,7 +40,7 @@ public DbUpdaterService(DatabaseOption databaseOption,
             IDBContextProvider dbContextProvider,
             ILogger<DbUpdaterService> logger)
         {
-            _dbVersionOption = dbVersionOption;
+            _dbVersionOption = dbVersionOption.Value;
             _webClient = webClient;
             _scriptFileName = $"{databaseOption.DbType}.sql";//MsSql.sql, MySql.sql, Sqlite.sql
             _logger = logger;
@@ -56,6 +57,8 @@ public void UpdateDatabase()
         private void UpgradeDbToLatest()
         {
             var appVersion = Easy.Version.Parse(Version.VersionInfo);
+            if (GetVersionFromFile() == appVersion) return;
+
             bool allSuccess = true;
             foreach (var dbContext in _dbContextProvider.GetAvailableDbContexts())
             {
@@ -67,6 +70,7 @@ private void UpgradeDbToLatest()
             }
             if (allSuccess)
             {
+                SaveVersionToFile(appVersion);
                 DeleteAllCachedScripts();
             }
         }
@@ -124,11 +128,30 @@ private Easy.Version GetDbVersion(DbContext dbContext)
             }
             if (version == null)
             {
-                version = Easy.Version.Parse(_dbVersionOption.Value.BaseVersion);
+                version = Easy.Version.Parse(_dbVersionOption.BaseVersion);
             }
             return version;
         }
+        private Easy.Version GetVersionFromFile()
+        {
+            return _dbVersionOption.DBVersion;
+        }
 
+        private void SaveVersionToFile(Easy.Version version)
+        {
+            try
+            {
+                var plugPath = PluginBase.GetPath<UpdaterPlug>();
+                var versionFile = Path.Combine(plugPath, "appsettings.json");
+                _dbVersionOption.DBVersion = version.ToString();
+                string versionJson = JsonConverter.Serialize(new { DBVersionOption = _dbVersionOption });
+                File.WriteAllText(versionFile, versionJson);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, ex.Message);
+            }
+        }
         private void ExcuteLocalScripts()
         {
             List<string> localScripts = ReadLocalScripts();
@@ -223,7 +246,7 @@ private IEnumerable<string> ReadRemoteScripts(Easy.Version versionFrom, Easy.Ver
         private ReleaseVersion GetReleaseVersions()
         {
             ReleaseVersion releaseVersion = null;
-            foreach (var item in _dbVersionOption.Value.Source)
+            foreach (var item in _dbVersionOption.Source)
             {
                 availableSource = item;
                 string source = $"{availableSource}/index.json";

diff --git a/src/ZKEACMS.Updater/UpdaterPlug.cs b/src/ZKEACMS.Updater/UpdaterPlug.cs
@@ -53,7 +53,7 @@ public override IEnumerable<WidgetTemplateEntity> WidgetServiceTypes()
         public override void ConfigureServices(IServiceCollection serviceCollection)
         {
             serviceCollection.AddTransient<IOnModelCreating, EntityFrameWorkModelCreating>();
-            serviceCollection.AddTransient<IStartTask, ApplicationStartup>();
+            serviceCollection.AddTransient<IAppStartTask, ApplicationStartup>();
             serviceCollection.AddTransient<IDbUpdaterService, DbUpdaterService>();
             serviceCollection.AddTransient<IDashboardPartDriveService, UpdateDbFailedDashboardService>();
             serviceCollection.RegistEvent<UpdateDbOnDbCreatedEventHandler>(Events.OnDatabaseCreated);