Merge branch 'develop'

SeriaWei · Feb 9, 2023 · 168edbe · 168edbe
2 parents 4a5686d + e198d32
commit 168edbe
Show file tree

Hide file tree

Showing 43 changed files with 87 additions and 73 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
     - name: Install dependencies
       run: dotnet restore
     - name: Build

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,7 +9,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/src/ZKEACMS.WebHost/bin/Debug/net6.0/ZKEACMS.WebHost.dll",
+            "program": "${workspaceFolder}/src/ZKEACMS.WebHost/bin/Debug/net7.0/ZKEACMS.WebHost.dll",
             "args": [],
             "cwd": "${workspaceFolder}/src/ZKEACMS.WebHost",
             "console": "internalConsole",

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS builder
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS builder
 WORKDIR /build
 # Copy all files
 COPY . ./
@@ -16,7 +16,7 @@ RUN sqlite-exec -d /build/src/ZKEACMS.WebHost/bin/Release/PublishOutput/Database
 RUN cp -f /build/Database/SQLite/appsettings.json /build/src/ZKEACMS.WebHost/bin/Release/PublishOutput/appsettings.json
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:6.0
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
 WORKDIR /zkeacms
 COPY --from=builder /build/src/ZKEACMS.WebHost/bin/Release/PublishOutput .
 EXPOSE 80

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![Auto Build](https://github.com/SeriaWei/ZKEACMS/actions/workflows/build.yml/badge.svg)](https://github.com/SeriaWei/ZKEACMS/actions/workflows/build.yml)
 
-# ZKEACMS Build With .Net 6
+# ZKEACMS Build With .Net 7
 
 ZKEACMS is a visual design, **WYSIWYG** Content Management System.
 

diff --git a/Run.cmd b/Run.cmd
@@ -6,7 +6,7 @@ ECHO dotnet core sdk was not find, please install the latest sdk at first.
 start https://www.microsoft.com/net/download/windows
 exit
 )
-if not exist "src/ZKEACMS.WebHost/bin/Debug/net6.0/ZKEACMS.WebHost.dll" (
+if not exist "src/ZKEACMS.WebHost/bin/Debug/net7.0/ZKEACMS.WebHost.dll" (
 call Build.cmd
 )
 

diff --git a/Run.sh b/Run.sh
@@ -3,10 +3,10 @@ if ! [ -x "$(command -v dotnet)" ]; then
   echo 'dotnet core sdk was not find, please install the latest sdk at first.'
   exit 1
 fi
-file="src/ZKEACMS.WebHost/bin/Debug/net6.0/ZKEACMS.WebHost.dll"
+file="src/ZKEACMS.WebHost/bin/Debug/net7.0/ZKEACMS.WebHost.dll"
 if ! [ -f "$file" ];then
     dotnet build ZKEACMS.sln
 fi
 cd src/ZKEACMS.WebHost
 echo Starting...
-ASPNETCORE_ENVIRONMENT="Development" ASPNETCORE_URLS="http://localhost:5000" dotnet bin/Debug/net6.0/ZKEACMS.WebHost.dll
+ASPNETCORE_ENVIRONMENT="Development" ASPNETCORE_URLS="http://localhost:5000" dotnet bin/Debug/net7.0/ZKEACMS.WebHost.dll
diff --git a/src/EasyFrameWork/EasyFrameWork.csproj b/src/EasyFrameWork/EasyFrameWork.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>EasyFrameWork</AssemblyName>
     <PackageId>EasyFrameWork</PackageId>
     <Copyright>深圳市纸壳软件科技有限公司 ZKEASOFT</Copyright>
@@ -17,13 +17,13 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App"></FrameworkReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="DocumentFormat.OpenXml" Version="2.18.0" />
-    <PackageReference Include="IdGen" Version="3.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
+    <PackageReference Include="IdGen" Version="3.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="6.0.0-preview.4.21253.7" />
     <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" />

diff --git a/src/EasyFrameWork/Mvc/Plugin/Loader.cs b/src/EasyFrameWork/Mvc/Plugin/Loader.cs
@@ -20,9 +20,9 @@ public class Loader : IPluginLoader
         public const string PluginFolder = "Plugins";
         private const string PluginInfoFile = "zkea.plugin";
 #if DEBUG
-        private readonly string[] AltDevelopmentPath = new[] { "bin", "Debug", "net6.0" };
+        private readonly string[] AltDevelopmentPath = new[] { "bin", "Debug", "net7.0" };
 #else
-        private readonly string[] AltDevelopmentPath = new[] { "bin", "Release", "net6.0" };
+        private readonly string[] AltDevelopmentPath = new[] { "bin", "Release", "net7.0" };
 #endif
         private readonly static List<AssemblyLoader> Loaders = new List<AssemblyLoader>();
         private readonly static Dictionary<string, Assembly> LoadedAssemblies = new Dictionary<string, Assembly>();

diff --git a/src/ZKEACMS.Animation/ZKEACMS.Animation.csproj b/src/ZKEACMS.Animation/ZKEACMS.Animation.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<AssemblyName>ZKEACMS.Animation</AssemblyName>
 		<PackageId>ZKEACMS.Animation</PackageId>

diff --git a/src/ZKEACMS.Article/Service/ArticleDetailWidgetService.cs b/src/ZKEACMS.Article/Service/ArticleDetailWidgetService.cs
@@ -15,6 +15,7 @@
 using System.Collections.Concurrent;
 using Easy.Cache;
 using Easy.RepositoryPattern;
+using Easy.Constant;
 
 namespace ZKEACMS.Article.Service
 {
@@ -66,6 +67,11 @@ public override object Display(WidgetDisplayContext widgetDisplayContext)
                 viewModel.Current = actionContext.RouteData.GetArticle(articleId) ?? _articleService.Get(articleId);
                 if (viewModel.Current != null)
                 {
+                    if (!viewModel.Current.IsPublish || viewModel.Current.Status!=(int)RecordStatus.Active) 
+                    {
+                        actionContext.NotFoundResult();
+                        return null;
+                    }
                     _articleService.IncreaseCount(viewModel.Current);
                     viewModel.Prev = _articleService.GetPrev(viewModel.Current);
                     viewModel.Next = _articleService.GetNext(viewModel.Current);

diff --git a/src/ZKEACMS.Article/Service/ArticleListWidgetService.cs b/src/ZKEACMS.Article/Service/ArticleListWidgetService.cs
@@ -16,6 +16,7 @@
 using System.Linq.Expressions;
 using ZKEACMS.Page;
 using Easy.Extend;
+using Easy.Constant;
 
 namespace ZKEACMS.Article.Service
 {
@@ -85,18 +86,18 @@ public override object Display(WidgetDisplayContext widgetDisplayContext)
             Expression<Func<ArticleEntity, bool>> filter = null;
             if (cate != 0)
             {
-                filter = m => m.IsPublish && m.ArticleTypeID == cate;
+                filter = m => m.Status == (int)RecordStatus.Active && m.IsPublish && m.ArticleTypeID == cate;
             }
             else
             {
                 var ids = _articleTypeService.Get(m => m.ID == currentWidget.ArticleTypeID || m.ParentID == currentWidget.ArticleTypeID).Select(m => m.ID).ToList();
                 if (ids.Any())
                 {
-                    filter = m => m.IsPublish && ids.Contains(m.ArticleTypeID ?? 0);
+                    filter = m => m.Status == (int)RecordStatus.Active && m.IsPublish && ids.Contains(m.ArticleTypeID ?? 0);
                 }
                 else
                 {
-                    filter = m => m.IsPublish && m.ArticleTypeID == currentWidget.ArticleTypeID;
+                    filter = m => m.Status == (int)RecordStatus.Active && m.IsPublish && m.ArticleTypeID == currentWidget.ArticleTypeID;
                 }
 
             }

diff --git a/src/ZKEACMS.Article/ZKEACMS.Article.csproj b/src/ZKEACMS.Article/ZKEACMS.Article.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<AssemblyName>ZKEACMS.Article</AssemblyName>
 		<PackageId>ZKEACMS.Article</PackageId>

diff --git a/src/ZKEACMS.Distribution/ZKEACMS.Distribution.csproj b/src/ZKEACMS.Distribution/ZKEACMS.Distribution.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<AssemblyName>ZKEACMS.Distribution</AssemblyName>
 		<PackageId>ZKEACMS.Distribution</PackageId>

diff --git a/src/ZKEACMS.FormGenerator/ZKEACMS.FormGenerator.csproj b/src/ZKEACMS.FormGenerator/ZKEACMS.FormGenerator.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<AssemblyName>ZKEACMS.FormGenerator</AssemblyName>
 		<PackageId>ZKEACMS.FormGenerator</PackageId>

diff --git a/src/ZKEACMS.GlobalScripts/ZKEACMS.GlobalScripts.csproj b/src/ZKEACMS.GlobalScripts/ZKEACMS.GlobalScripts.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<AssemblyName>ZKEACMS.GlobalScripts</AssemblyName>
 		<PackageId>ZKEACMS.GlobalScripts</PackageId>

diff --git a/src/ZKEACMS.Mail/ZKEACMS.Mail.csproj b/src/ZKEACMS.Mail/ZKEACMS.Mail.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<AssemblyName>ZKEACMS.Mail</AssemblyName>
 		<PackageId>ZKEACMS.Mail</PackageId>

diff --git a/src/ZKEACMS.Message/ZKEACMS.Message.csproj b/src/ZKEACMS.Message/ZKEACMS.Message.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<AssemblyName>ZKEACMS.Message</AssemblyName>
 		<PackageId>ZKEACMS.Message</PackageId>

diff --git a/src/ZKEACMS.PinNav/ZKEACMS.PinNav.csproj b/src/ZKEACMS.PinNav/ZKEACMS.PinNav.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<AssemblyName>ZKEACMS.PinNav</AssemblyName>
 		<PackageId>ZKEACMS.PinNav</PackageId>

diff --git a/src/ZKEACMS.Product/Service/ProductDetailWidgetService.cs b/src/ZKEACMS.Product/Service/ProductDetailWidgetService.cs
@@ -12,6 +12,7 @@
 using System.Linq;
 using Easy.Extend;
 using System.Collections.Concurrent;
+using Easy.Constant;
 
 namespace ZKEACMS.Product.Service
 {
@@ -54,6 +55,11 @@ public override object Display(WidgetDisplayContext widgetDisplayContext)
             if (productId != 0)
             {
                 product = actionContext.RouteData.GetProduct(productId) ?? _productService.Get(productId);
+                if (!product.IsPublish || product.Status != (int)RecordStatus.Active)
+                {
+                    actionContext.NotFoundResult();
+                    return null;
+                }
                 if (product != null && product.Url.IsNotNullAndWhiteSpace() && actionContext.RouteData.GetProductUrl().IsNullOrWhiteSpace())
                 {
                     actionContext.RedirectTo($"{actionContext.RouteData.GetPath()}/{product.Url}.html", true);

diff --git a/src/ZKEACMS.Product/ZKEACMS.Product.csproj b/src/ZKEACMS.Product/ZKEACMS.Product.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<AssemblyName>ZKEACMS.Product</AssemblyName>
 		<PackageId>ZKEACMS.Product</PackageId>

diff --git a/src/ZKEACMS.Redirection/ZKEACMS.Redirection.csproj b/src/ZKEACMS.Redirection/ZKEACMS.Redirection.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<AssemblyName>ZKEACMS.Redirection</AssemblyName>
 		<PackageId>ZKEACMS.Redirection</PackageId>

diff --git a/src/ZKEACMS.SectionWidget/ZKEACMS.SectionWidget.csproj b/src/ZKEACMS.SectionWidget/ZKEACMS.SectionWidget.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<AssemblyName>ZKEACMS.SectionWidget</AssemblyName>
 		<PackageId>ZKEACMS.SectionWidget</PackageId>

diff --git a/src/ZKEACMS.Shop/ZKEACMS.Shop.csproj b/src/ZKEACMS.Shop/ZKEACMS.Shop.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<AssemblyName>ZKEACMS.Shop</AssemblyName>
 		<PackageId>ZKEACMS.Shop</PackageId>

diff --git a/src/ZKEACMS.SiteSearch/ZKEACMS.SiteSearch.csproj b/src/ZKEACMS.SiteSearch/ZKEACMS.SiteSearch.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<AssemblyName>ZKEACMS.SiteSearch</AssemblyName>
 		<PackageId>ZKEACMS.SiteSearch</PackageId>

diff --git a/src/ZKEACMS.Sitemap/ZKEACMS.Sitemap.csproj b/src/ZKEACMS.Sitemap/ZKEACMS.Sitemap.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<AssemblyName>ZKEACMS.Sitemap</AssemblyName>
 		<PackageId>ZKEACMS.Sitemap</PackageId>

diff --git a/src/ZKEACMS.SpiderLog/ZKEACMS.SpiderLog.csproj b/src/ZKEACMS.SpiderLog/ZKEACMS.SpiderLog.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<AssemblyName>ZKEACMS.SpiderLog</AssemblyName>
 		<PackageId>ZKEACMS.SpiderLog</PackageId>

diff --git a/src/ZKEACMS.StyleEditor/ZKEACMS.StyleEditor.csproj b/src/ZKEACMS.StyleEditor/ZKEACMS.StyleEditor.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<AssemblyName>ZKEACMS.StyleEditor</AssemblyName>
 		<PackageId>ZKEACMS.StyleEditor</PackageId>

diff --git a/src/ZKEACMS.Swagger/ZKEACMS.Swagger.csproj b/src/ZKEACMS.Swagger/ZKEACMS.Swagger.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<AssemblyName>ZKEACMS.Swagger</AssemblyName>
 		<PackageId>ZKEACMS.Swagger</PackageId>
@@ -16,7 +16,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
 		<ProjectReference Include="..\ZKEACMS\ZKEACMS.csproj">
 			<Private>false</Private>
 			<ExcludeAssets>runtime</ExcludeAssets>

diff --git a/src/ZKEACMS.TemplateImporter/ZKEACMS.TemplateImporter.csproj b/src/ZKEACMS.TemplateImporter/ZKEACMS.TemplateImporter.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<AssemblyName>ZKEACMS.TemplateImporter</AssemblyName>
 		<PackageId>ZKEACMS.TemplateImporter</PackageId>

diff --git a/src/ZKEACMS.Updater/ZKEACMS.Updater.csproj b/src/ZKEACMS.Updater/ZKEACMS.Updater.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<AssemblyName>ZKEACMS.Updater</AssemblyName>
 		<PackageId>ZKEACMS.Updater</PackageId>

diff --git a/src/ZKEACMS.WebHost/.config/dotnet-tools.json b/src/ZKEACMS.WebHost/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "zkeacms.publisher": {
-      "version": "2.0",
+      "version": "2.1",
       "commands": [
         "publish-zkeacms"
       ]

diff --git a/src/ZKEACMS.WebHost/Run.cmd b/src/ZKEACMS.WebHost/Run.cmd
@@ -2,4 +2,4 @@
 echo Starting...
 set ASPNETCORE_ENVIRONMENT=Development
 set ASPNETCORE_URLS=http://localhost:5000
-dotnet bin/Debug/net6.0/ZKEACMS.WebHost.dll
+dotnet bin/Debug/net7.0/ZKEACMS.WebHost.dll
diff --git a/src/ZKEACMS.WebHost/Run.sh b/src/ZKEACMS.WebHost/Run.sh
@@ -1,2 +1,2 @@
 echo Starting...
-ASPNETCORE_ENVIRONMENT="Development" ASPNETCORE_URLS="http://localhost:5000" dotnet bin/Debug/net6.0/ZKEACMS.WebHost.dll
+ASPNETCORE_ENVIRONMENT="Development" ASPNETCORE_URLS="http://localhost:5000" dotnet bin/Debug/net7.0/ZKEACMS.WebHost.dll
diff --git a/src/ZKEACMS.WebHost/ZKEACMS.WebHost.csproj b/src/ZKEACMS.WebHost/ZKEACMS.WebHost.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>ZKEACMS.WebHost</AssemblyName>
     <PackageId>ZKEACMS.WebHost</PackageId>
     <Copyright>深圳市纸壳软件科技有限公司 纸壳CMS</Copyright>
@@ -20,7 +20,7 @@
     <RazorCompileOnPublish>true</RazorCompileOnPublish>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.2" />
     <ProjectReference Include="..\EasyFrameWork\EasyFrameWork.csproj" />
     <ProjectReference Include="..\ZKEACMS\ZKEACMS.csproj" />
   </ItemGroup>  

diff --git a/src/ZKEACMS.WebHost/appsettings.json b/src/ZKEACMS.WebHost/appsettings.json
@@ -1,7 +1,7 @@
 {
   "Database": {
     "DbType": "MsSql",
-    "ConnectionString": "Server=(local);Database=ZKEACMS;User Id=sa;Password=sa;"
+    "ConnectionString": "Server=(local);Database=ZKEACMS;User Id=sa;Password=sa;TrustServerCertificate=True"
     //"DbType": "Sqlite",
     //"ConnectionString": "Data Source=App_Data/Database.sqlite"
     //"DbType": "MySql",

diff --git a/src/ZKEACMS/Article/Models/ArticleEntity.cs b/src/ZKEACMS/Article/Models/ArticleEntity.cs
@@ -39,7 +39,7 @@ protected override void ViewConfigure()
             ViewConfig(m => m.ID).AsHidden().ShowInGrid().Order(1);
             ViewConfig(m => m.Title).AsTextBox().Required().Order(2).ShowInGrid().Search(Easy.LINQ.Query.Operators.Contains);
             ViewConfig(m => m.Url).AsTextBox().Order(3).MaxLength(100).UrlPart().Required().RandomText();
-            ViewConfig(m => m.Status).AsDropDownList().DataSource(DicKeys.RecordStatus, SourceType.Dictionary);
+            ViewConfig(m => m.Status).AsDropDownList().DataSource(DicKeys.RecordStatus, SourceType.Dictionary).ShowInGrid();
             ViewConfig(m => m.ImageThumbUrl).AsTextBox().MediaSelector();
             ViewConfig(m => m.ImageUrl).AsTextBox().MediaSelector();
             ViewConfig(m => m.ArticleTypeID)