Merge branch 'develop' of github.com:SeriaWei/ZKEACMS into develop

SeriaWei · Sep 19, 2023 · 83ba377 · 83ba377
2 parents 7e50a7a + d79f899
commit 83ba377
Show file tree

Hide file tree

Showing 20 changed files with 592 additions and 457 deletions.
diff --git a/src/EasyFrameWork/Cache/CacheManager.cs b/src/EasyFrameWork/Cache/CacheManager.cs
@@ -51,7 +51,7 @@ public void Remove(string key)
             _memoryCache.Remove(CreateCacheKey(key));
         }
 
-        private static string CreateCacheKey(string key)
+        protected virtual string CreateCacheKey(string key)
         {
             return $"{typeof(Category).FullName}_{key}";
         }

diff --git a/src/EasyFrameWork/EasyFrameWork.csproj b/src/EasyFrameWork/EasyFrameWork.csproj
@@ -20,13 +20,13 @@
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.20.0" />
     <PackageReference Include="FastExpressionCompiler" Version="3.3.4" />
     <PackageReference Include="IdGen" Version="3.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.10" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
     <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="13.1.1" />
+    <PackageReference Include="YamlDotNet" Version="13.3.1" />
   </ItemGroup>
 </Project>
diff --git a/src/EasyFrameWork/Modules/MutiLanguage/LanguageService.cs b/src/EasyFrameWork/Modules/MutiLanguage/LanguageService.cs
@@ -80,10 +80,9 @@ private static void SaveLocalizeTextToFile(string localeFile, Dictionary<string,
             return _cacheManager.GetOrCreate("AllLanguageEntry", factory =>
             {
                 factory.AddExpirationToken(_signals.When(LanguageChanged));
+                factory.AddExpirationToken(_webHostEnvironment.ContentRootFileProvider.Watch("Locale/*.yml"));
 
-                ExpireCacheOnFileChanged();
-
-                ConcurrentDictionary<string, ConcurrentDictionary<string, LanguageEntity>> result = new ConcurrentDictionary<string, ConcurrentDictionary<string, LanguageEntity>>(StringComparer.OrdinalIgnoreCase);
+                var result = new ConcurrentDictionary<string, ConcurrentDictionary<string, LanguageEntity>>(StringComparer.OrdinalIgnoreCase);
                 foreach (var item in GetAllFromLocaleFile())
                 {
                     if (!result.TryGetValue(item.LanKey, out ConcurrentDictionary<string, LanguageEntity> cultureDic))
@@ -105,16 +104,6 @@ private static void SaveLocalizeTextToFile(string localeFile, Dictionary<string,
             });
         }
 
-        private void ExpireCacheOnFileChanged()
-        {
-            if (!_webHostEnvironment.IsDevelopment()) return;
-
-            _webHostEnvironment.ContentRootFileProvider.Watch("Locale/*.yml").RegisterChangeCallback(signals =>
-            {
-                (signals as ISignals).Trigger(LanguageChanged);
-            }, _signals);
-        }
-
         private ServiceResult<LanguageEntity> Save(LanguageEntity item)
         {
             var result = new ServiceResult<LanguageEntity>();

diff --git a/src/ZKEACMS.WebHost/ZKEACMS.WebHost.csproj b/src/ZKEACMS.WebHost/ZKEACMS.WebHost.csproj
@@ -20,7 +20,7 @@
     <RazorCompileOnPublish>true</RazorCompileOnPublish>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.10" />
     <ProjectReference Include="..\EasyFrameWork\EasyFrameWork.csproj" />
     <ProjectReference Include="..\ZKEACMS\ZKEACMS.csproj" />
   </ItemGroup>  

diff --git a/src/ZKEACMS.WebHost/wwwroot/css/admin.css b/src/ZKEACMS.WebHost/wwwroot/css/admin.css
@@ -598,7 +598,7 @@ a.badge:hover {
 
 #media-list .thumbnail.status-2 .caption:after {
     display: block;
-    content: "文件不完整";
+    content: "Error";
     color: #fff;
     position: absolute;
     left: 0;
@@ -611,6 +611,12 @@ a.badge:hover {
 
 #media-list .thumbnail .caption .edit {
     text-align: center;
+    height: 20px;
+    padding: 0;
+    line-height: 20px;
+    border: 1px solid #ddd;
+    outline: none;
+    border-radius: 3px;
 }
 
 #media-list .thumbnail .close {

diff --git a/src/ZKEACMS.WebHost/wwwroot/css/admin.min.css b/src/ZKEACMS.WebHost/wwwroot/css/admin.min.css