Merge pull request #214 from SeriaWei/develop

Develop
SeriaWei · Aug 16, 2018 · 7337296 · 7337296
2 parents ae7bfaf + 4a79602
commit 7337296
Show file tree

Hide file tree

Showing 192 changed files with 3,230 additions and 220 deletions.
diff --git a/DataBase/Build.cmd b/DataBase/Build.cmd
@@ -1,4 +1,5 @@
 @echo off
+cd /d %~dp0
 REM:请根据您的个人实际情况修改以下信息：
 REM:如果您运行该批处理时出现乱码或者执行不成功，请参考
 REM:http://www.zkea.net/zkeacms/document/issues

diff --git a/DataBase/InitialData/dbo.ApplicationSetting.Table.sql b/DataBase/InitialData/dbo.ApplicationSetting.Table.sql
diff --git a/DataBase/InitialData/dbo.Article.Table.sql b/DataBase/InitialData/dbo.Article.Table.sql
diff --git a/DataBase/InitialData/dbo.ArticleType.Table.sql b/DataBase/InitialData/dbo.ArticleType.Table.sql
diff --git a/DataBase/InitialData/dbo.CMS_Layout.Table.sql b/DataBase/InitialData/dbo.CMS_Layout.Table.sql
diff --git a/DataBase/InitialData/dbo.CMS_LayoutHtml.Table.sql b/DataBase/InitialData/dbo.CMS_LayoutHtml.Table.sql
diff --git a/DataBase/InitialData/dbo.CMS_Media.Table.sql b/DataBase/InitialData/dbo.CMS_Media.Table.sql
diff --git a/DataBase/InitialData/dbo.CMS_Message.Table.sql b/DataBase/InitialData/dbo.CMS_Message.Table.sql
diff --git a/DataBase/InitialData/dbo.CMS_Page.Table.sql b/DataBase/InitialData/dbo.CMS_Page.Table.sql
diff --git a/DataBase/InitialData/dbo.CMS_Redirection.Table.sql b/DataBase/InitialData/dbo.CMS_Redirection.Table.sql
diff --git a/DataBase/InitialData/dbo.CMS_Rule.Table.sql b/DataBase/InitialData/dbo.CMS_Rule.Table.sql
diff --git a/DataBase/InitialData/dbo.CMS_Theme.Table.sql b/DataBase/InitialData/dbo.CMS_Theme.Table.sql
diff --git a/DataBase/InitialData/dbo.CMS_WidgetBase.Table.sql b/DataBase/InitialData/dbo.CMS_WidgetBase.Table.sql
diff --git a/DataBase/InitialData/dbo.CMS_Zone.Table.sql b/DataBase/InitialData/dbo.CMS_Zone.Table.sql
diff --git a/DataBase/InitialData/dbo.Carousel.Table.sql b/DataBase/InitialData/dbo.Carousel.Table.sql
diff --git a/DataBase/InitialData/dbo.CarouselItem.Table.sql b/DataBase/InitialData/dbo.CarouselItem.Table.sql
diff --git a/DataBase/InitialData/dbo.DataArchived.Table.sql b/DataBase/InitialData/dbo.DataArchived.Table.sql
diff --git a/DataBase/InitialData/dbo.Forms.Table.sql b/DataBase/InitialData/dbo.Forms.Table.sql
diff --git a/DataBase/InitialData/dbo.Language.Table.sql b/DataBase/InitialData/dbo.Language.Table.sql
diff --git a/DataBase/InitialData/dbo.Navigation.Table.sql b/DataBase/InitialData/dbo.Navigation.Table.sql
diff --git a/DataBase/InitialData/dbo.Permission.Table.sql b/DataBase/InitialData/dbo.Permission.Table.sql
diff --git a/DataBase/InitialData/dbo.Product.Table.sql b/DataBase/InitialData/dbo.Product.Table.sql
diff --git a/DataBase/InitialData/dbo.ProductCategory.Table.sql b/DataBase/InitialData/dbo.ProductCategory.Table.sql
diff --git a/DataBase/InitialData/dbo.ProductCategoryTag.Table.sql b/DataBase/InitialData/dbo.ProductCategoryTag.Table.sql
diff --git a/DataBase/InitialData/dbo.ProductImage.Table.sql b/DataBase/InitialData/dbo.ProductImage.Table.sql
diff --git a/DataBase/InitialData/dbo.ProductTag.Table.sql b/DataBase/InitialData/dbo.ProductTag.Table.sql
diff --git a/DataBase/InitialData/dbo.Roles.Table.sql b/DataBase/InitialData/dbo.Roles.Table.sql
diff --git a/DataBase/InitialData/dbo.SectionContent.Table.sql b/DataBase/InitialData/dbo.SectionContent.Table.sql
diff --git a/DataBase/InitialData/dbo.SectionGroup.Table.sql b/DataBase/InitialData/dbo.SectionGroup.Table.sql
diff --git a/DataBase/InitialData/dbo.Users.Table.sql b/DataBase/InitialData/dbo.Users.Table.sql
diff --git a/DataBase/MySql/Dump3.1.sql b/DataBase/MySql/Dump3.1.sql
diff --git a/DataBase/SQLite/Database-3.1.sqlite b/DataBase/SQLite/Database-3.1.sqlite
diff --git a/DataBase/Tables/dbo.ApplicationSetting.Table.sql b/DataBase/Tables/dbo.ApplicationSetting.Table.sql
diff --git a/DataBase/Tables/dbo.Article.Table.sql b/DataBase/Tables/dbo.Article.Table.sql
diff --git a/DataBase/Tables/dbo.ArticleDetailWidget.Table.sql b/DataBase/Tables/dbo.ArticleDetailWidget.Table.sql
diff --git a/DataBase/Tables/dbo.ArticleListWidget.Table.sql b/DataBase/Tables/dbo.ArticleListWidget.Table.sql
diff --git a/DataBase/Tables/dbo.ArticleSummaryWidget.Table.sql b/DataBase/Tables/dbo.ArticleSummaryWidget.Table.sql
diff --git a/DataBase/Tables/dbo.ArticleTopWidget.Table.sql b/DataBase/Tables/dbo.ArticleTopWidget.Table.sql
diff --git a/DataBase/Tables/dbo.ArticleType.Table.sql b/DataBase/Tables/dbo.ArticleType.Table.sql
diff --git a/DataBase/Tables/dbo.ArticleTypeWidget.Table.sql b/DataBase/Tables/dbo.ArticleTypeWidget.Table.sql
diff --git a/DataBase/Tables/dbo.Basket.Table.sql b/DataBase/Tables/dbo.Basket.Table.sql
diff --git a/DataBase/Tables/dbo.CMS_Layout.Table.sql b/DataBase/Tables/dbo.CMS_Layout.Table.sql
diff --git a/DataBase/Tables/dbo.CMS_LayoutHtml.Table.sql b/DataBase/Tables/dbo.CMS_LayoutHtml.Table.sql
diff --git a/DataBase/Tables/dbo.CMS_Media.Table.sql b/DataBase/Tables/dbo.CMS_Media.Table.sql
diff --git a/DataBase/Tables/dbo.CMS_Message.Table.sql b/DataBase/Tables/dbo.CMS_Message.Table.sql
diff --git a/DataBase/Tables/dbo.CMS_Page.Table.sql b/DataBase/Tables/dbo.CMS_Page.Table.sql
diff --git a/DataBase/Tables/dbo.CMS_Redirection.Table.sql b/DataBase/Tables/dbo.CMS_Redirection.Table.sql
diff --git a/DataBase/Tables/dbo.CMS_Rule.Table.sql b/DataBase/Tables/dbo.CMS_Rule.Table.sql
diff --git a/DataBase/Tables/dbo.CMS_Theme.Table.sql b/DataBase/Tables/dbo.CMS_Theme.Table.sql
diff --git a/DataBase/Tables/dbo.CMS_WidgetBase.Table.sql b/DataBase/Tables/dbo.CMS_WidgetBase.Table.sql
diff --git a/DataBase/Tables/dbo.CMS_Zone.Table.sql b/DataBase/Tables/dbo.CMS_Zone.Table.sql
diff --git a/DataBase/Tables/dbo.Carousel.Table.sql b/DataBase/Tables/dbo.Carousel.Table.sql
diff --git a/DataBase/Tables/dbo.CarouselItem.Table.sql b/DataBase/Tables/dbo.CarouselItem.Table.sql
diff --git a/DataBase/Tables/dbo.CarouselWidget.Table.sql b/DataBase/Tables/dbo.CarouselWidget.Table.sql
diff --git a/DataBase/Tables/dbo.Comments.Table.sql b/DataBase/Tables/dbo.Comments.Table.sql
diff --git a/DataBase/Tables/dbo.DataArchived.Table.sql b/DataBase/Tables/dbo.DataArchived.Table.sql
diff --git a/DataBase/Tables/dbo.DataDictionary.Table.sql b/DataBase/Tables/dbo.DataDictionary.Table.sql
diff --git a/DataBase/Tables/dbo.ExtendField.Table.sql b/DataBase/Tables/dbo.ExtendField.Table.sql
diff --git a/DataBase/Tables/dbo.FormData.Table.sql b/DataBase/Tables/dbo.FormData.Table.sql
diff --git a/DataBase/Tables/dbo.FormDataItem.Table.sql b/DataBase/Tables/dbo.FormDataItem.Table.sql
diff --git a/DataBase/Tables/dbo.Forms.Table.sql b/DataBase/Tables/dbo.Forms.Table.sql
diff --git a/DataBase/Tables/dbo.HtmlWidget.Table.sql b/DataBase/Tables/dbo.HtmlWidget.Table.sql
diff --git a/DataBase/Tables/dbo.ImageWidget.Table.sql b/DataBase/Tables/dbo.ImageWidget.Table.sql
diff --git a/DataBase/Tables/dbo.Language.Table.sql b/DataBase/Tables/dbo.Language.Table.sql
diff --git a/DataBase/Tables/dbo.Navigation.Table.sql b/DataBase/Tables/dbo.Navigation.Table.sql
diff --git a/DataBase/Tables/dbo.NavigationWidget.Table.sql b/DataBase/Tables/dbo.NavigationWidget.Table.sql
diff --git a/DataBase/Tables/dbo.Order.Table.sql b/DataBase/Tables/dbo.Order.Table.sql
diff --git a/DataBase/Tables/dbo.OrderItem.Table.sql b/DataBase/Tables/dbo.OrderItem.Table.sql
diff --git a/DataBase/Tables/dbo.PageView.Table.sql b/DataBase/Tables/dbo.PageView.Table.sql
diff --git a/DataBase/Tables/dbo.Permission.Table.sql b/DataBase/Tables/dbo.Permission.Table.sql
diff --git a/DataBase/Tables/dbo.Product.Table.sql b/DataBase/Tables/dbo.Product.Table.sql
diff --git a/DataBase/Tables/dbo.ProductCategory.Table.sql b/DataBase/Tables/dbo.ProductCategory.Table.sql
diff --git a/DataBase/Tables/dbo.ProductCategoryTag.Table.sql b/DataBase/Tables/dbo.ProductCategoryTag.Table.sql
diff --git a/DataBase/Tables/dbo.ProductCategoryWidget.Table.sql b/DataBase/Tables/dbo.ProductCategoryWidget.Table.sql
diff --git a/DataBase/Tables/dbo.ProductDetailWidget.Table.sql b/DataBase/Tables/dbo.ProductDetailWidget.Table.sql
diff --git a/DataBase/Tables/dbo.ProductImage.Table.sql b/DataBase/Tables/dbo.ProductImage.Table.sql
diff --git a/DataBase/Tables/dbo.ProductListWidget.Table.sql b/DataBase/Tables/dbo.ProductListWidget.Table.sql
diff --git a/DataBase/Tables/dbo.ProductTag.Table.sql b/DataBase/Tables/dbo.ProductTag.Table.sql
diff --git a/DataBase/Tables/dbo.Roles.Table.sql b/DataBase/Tables/dbo.Roles.Table.sql
diff --git a/DataBase/Tables/dbo.ScriptWidget.Table.sql b/DataBase/Tables/dbo.ScriptWidget.Table.sql
diff --git a/DataBase/Tables/dbo.SectionContent.Table.sql b/DataBase/Tables/dbo.SectionContent.Table.sql
diff --git a/DataBase/Tables/dbo.SectionContentCallToAction.Table.sql b/DataBase/Tables/dbo.SectionContentCallToAction.Table.sql
diff --git a/DataBase/Tables/dbo.SectionContentImage.Table.sql b/DataBase/Tables/dbo.SectionContentImage.Table.sql
diff --git a/DataBase/Tables/dbo.SectionContentParagraph.Table.sql b/DataBase/Tables/dbo.SectionContentParagraph.Table.sql
diff --git a/DataBase/Tables/dbo.SectionContentTitle.Table.sql b/DataBase/Tables/dbo.SectionContentTitle.Table.sql
diff --git a/DataBase/Tables/dbo.SectionContentVideo.Table.sql b/DataBase/Tables/dbo.SectionContentVideo.Table.sql
diff --git a/DataBase/Tables/dbo.SectionGroup.Table.sql b/DataBase/Tables/dbo.SectionGroup.Table.sql
diff --git a/DataBase/Tables/dbo.SectionTemplate.Table.sql b/DataBase/Tables/dbo.SectionTemplate.Table.sql
diff --git a/DataBase/Tables/dbo.SectionWidget.Table.sql b/DataBase/Tables/dbo.SectionWidget.Table.sql
diff --git a/DataBase/Tables/dbo.StyleSheetWidget.Table.sql b/DataBase/Tables/dbo.StyleSheetWidget.Table.sql
diff --git a/DataBase/Tables/dbo.UserRoleRelation.Table.sql b/DataBase/Tables/dbo.UserRoleRelation.Table.sql
diff --git a/DataBase/Tables/dbo.Users.Table.sql b/DataBase/Tables/dbo.Users.Table.sql
diff --git a/DataBase/Tables/dbo.VideoWidget.Table.sql b/DataBase/Tables/dbo.VideoWidget.Table.sql
diff --git a/DataBase/Update/3.1/Scripts.Sqlite.sql b/DataBase/Update/3.1/Scripts.Sqlite.sql
@@ -0,0 +1,9 @@
+ALTER TABLE Article ADD Url NVARCHAR(100);
+ALTER TABLE ArticleType ADD Url NVARCHAR(100);
+ALTER TABLE ProductCategory ADD Url NVARCHAR(100);
+ALTER TABLE Forms ADD NotificationReceiver NVARCHAR(500);
+
+INSERT INTO [Language] ([LanKey], [CultureName], [LanValue], [Module], [LanType]) VALUES ('Robots@Content', 'zh-CN', '内容', 'Robots', 'EntityProperty');
+INSERT INTO [Language] ([LanKey], [CultureName], [LanValue], [Module], [LanType]) VALUES ('MessageNotificationConfig@MessageNotifyEmails', 'zh-CN', '新留言通知邮箱', 'MessageNotificationConfig', 'EntityProperty');
+INSERT INTO [Language] ([LanKey], [CultureName], [LanValue], [Module], [LanType]) VALUES ('MessageNotificationConfig@CommentNotifyEmails', 'zh-CN', '新评论通知邮箱', 'MessageNotificationConfig', 'EntityProperty');
+
diff --git a/DataBase/Update/3.1/Scripts.sql b/DataBase/Update/3.1/Scripts.sql
@@ -0,0 +1,11 @@
+ALTER TABLE dbo.Article ADD Url NVARCHAR(100) NULL
+ALTER TABLE dbo.ArticleType ADD Url NVARCHAR(100) NULL
+ALTER TABLE dbo.ProductCategory ADD Url NVARCHAR(100) NULL
+
+ALTER TABLE dbo.Forms ADD NotificationReceiver NVARCHAR(500) NULL
+
+INSERT [dbo].[Language] ([LanKey], [CultureName], [LanValue], [Module], [LanType]) VALUES (N'Robots@Content', N'zh-CN', N'内容', N'Robots', N'EntityProperty')
+
+INSERT [dbo].[Language] ([LanKey], [CultureName], [LanValue], [Module], [LanType]) VALUES (N'MessageNotificationConfig@MessageNotifyEmails', N'zh-CN', N'新留言通知邮箱', N'MessageNotificationConfig', N'EntityProperty')
+INSERT [dbo].[Language] ([LanKey], [CultureName], [LanValue], [Module], [LanType]) VALUES (N'MessageNotificationConfig@CommentNotifyEmails', N'zh-CN', N'新评论通知邮箱', N'MessageNotificationConfig', N'EntityProperty')
+
diff --git a/Dockerfile.SQLite b/Dockerfile.SQLite
@@ -11,7 +11,7 @@ RUN publish-zkeacms
 
 # Copy Database
 RUN mkdir /build/src/ZKEACMS.WebHost/bin/Release/PublishOutput/App_Data
-RUN cp -f /build/DataBase/SQLite/Database-3.0.1.sqlite /build/src/ZKEACMS.WebHost/bin/Release/PublishOutput/App_Data/Database.sqlite
+RUN cp -f /build/DataBase/SQLite/Database-3.1.sqlite /build/src/ZKEACMS.WebHost/bin/Release/PublishOutput/App_Data/Database.sqlite
 RUN cp -f /build/DataBase/SQLite/appsettings.json /build/src/ZKEACMS.WebHost/bin/Release/PublishOutput/appsettings.json
 
 # Build runtime image

diff --git a/Release.ps1 b/Release.ps1
@@ -1,6 +1,6 @@
 Add-Type -assembly "system.io.compression.filesystem"
 $source = "Release"
-$destination = "ZKEACMS.Core.v3.0.1.zip"
+$destination = "ZKEACMS.Core.zip"
 Write-Host "Starting release" $destination
 Write-Host "This may take a few minutes, please wait..."
 if(Test-Path $source){

diff --git a/src/EasyFrameWork/Constant/RegularExpression.cs b/src/EasyFrameWork/Constant/RegularExpression.cs
@@ -43,11 +43,11 @@ public class RegularExpression
         /// <summary>
         /// 匹配正整数
         /// </summary>
-        public const string PositiveIntegers = @"^[1-9]+$";
+        public const string PositiveIntegers = @"^[1-9]\d*$";
         /// <summary>
         /// 匹配负整数
         /// </summary>
-        public const string NegativeIntegers = @"^-[1-9]+$";
+        public const string NegativeIntegers = @"^-[1-9]\d*$";
         /// <summary>
         ///匹配整数
         /// </summary>

diff --git a/src/EasyFrameWork/Logging/FileLogger.cs b/src/EasyFrameWork/Logging/FileLogger.cs
@@ -42,14 +42,7 @@ void WriteInfo(string msg)
                             writer.WriteLine($"{item.Key}:{item.Value}");
                         }
                     }
-                    if (_httpContextAccessor.HttpContext.Request.Form != null)
-                    {
-                        writer.WriteLine("Form:");
-                        foreach (var item in _httpContextAccessor.HttpContext.Request.Form)
-                        {
-                            writer.WriteLine($"{item.Key}:{item.Value}");
-                        }
-                    }
+
                     writer.WriteLine(_httpContextAccessor.HttpContext.Request.GetAbsoluteUrl());
                 }
                 writer.WriteLine(Split);

diff --git a/src/EasyFrameWork/Mvc/Plugin/DeveloperViewFileProvider.cs b/src/EasyFrameWork/Mvc/Plugin/DeveloperViewFileProvider.cs
@@ -10,6 +10,7 @@ namespace Easy.Mvc.Plugin
 {
     public class DeveloperViewFileProvider : IFileProvider
     {
+        public const string ProjectRootPath = "/Porject.RootPath/";
         public DeveloperViewFileProvider(IHostingEnvironment hostingEnvironment)
         {
             HostingEnvironment = hostingEnvironment;
@@ -22,10 +23,10 @@ public IDirectoryContents GetDirectoryContents(string subpath)
 
         public IFileInfo GetFileInfo(string subpath)
         {
-            if (subpath.StartsWith("/Porject.RootPath/", StringComparison.Ordinal))
+            if (subpath.StartsWith(ProjectRootPath, StringComparison.Ordinal))
             {
                 var parent = new DirectoryInfo(HostingEnvironment.ContentRootPath).Parent;
-                var file = Path.Combine(parent.FullName, subpath.Replace("/Porject.RootPath/", "").ToFilePath());
+                var file = Path.Combine(parent.FullName, subpath.Replace(ProjectRootPath, string.Empty).ToFilePath());
                 if (File.Exists(file))
                 {
                     return new PhysicalFileInfo(new FileInfo(file));
@@ -36,10 +37,10 @@ public IFileInfo GetFileInfo(string subpath)
 
         public IChangeToken Watch(string filter)
         {
-            if (filter.StartsWith("/Porject.RootPath/", StringComparison.Ordinal))
+            if (filter.StartsWith(ProjectRootPath, StringComparison.Ordinal))
             {
                 var parent = new DirectoryInfo(HostingEnvironment.ContentRootPath).Parent;
-                var file = Path.Combine(parent.FullName, filter.Replace("/Porject.RootPath/", "").ToFilePath());
+                var file = Path.Combine(parent.FullName, filter.Replace(ProjectRootPath, string.Empty).ToFilePath());
                 if (File.Exists(file))
                 {
                     return new PollingFileChangeToken(new FileInfo(file));

diff --git a/src/EasyFrameWork/Mvc/Plugin/PluginRazorViewEngineOptionsSetup.cs b/src/EasyFrameWork/Mvc/Plugin/PluginRazorViewEngineOptionsSetup.cs
@@ -41,9 +41,9 @@ private static void ConfigureRazor(RazorViewEngineOptions options, IHostingEnvir
                 var directory = new DirectoryInfo(m.RelativePath);
                 if (hostingEnvironment.IsDevelopment())
                 {
-                    options.ViewLocationFormats.Add($"/Porject.RootPath/{directory.Name}" + "/Views/{1}/{0}" + RazorViewEngine.ViewExtension);
-                    options.ViewLocationFormats.Add($"/Porject.RootPath/{directory.Name}" + "/Views/Shared/{0}" + RazorViewEngine.ViewExtension);
-                    options.ViewLocationFormats.Add($"/Porject.RootPath/{directory.Name}" + "/Views/{0}" + RazorViewEngine.ViewExtension);
+                    options.ViewLocationFormats.Add($"{DeveloperViewFileProvider.ProjectRootPath}{directory.Name}" + "/Views/{1}/{0}" + RazorViewEngine.ViewExtension);
+                    options.ViewLocationFormats.Add($"{DeveloperViewFileProvider.ProjectRootPath}{directory.Name}" + "/Views/Shared/{0}" + RazorViewEngine.ViewExtension);
+                    options.ViewLocationFormats.Add($"{DeveloperViewFileProvider.ProjectRootPath}{directory.Name}" + "/Views/{0}" + RazorViewEngine.ViewExtension);
                 }
                 else
                 {

diff --git a/src/EasyFrameWork/Mvc/RazorPages/ViewRenderService.cs b/src/EasyFrameWork/Mvc/RazorPages/ViewRenderService.cs
@@ -1,62 +1,72 @@
-using Microsoft.AspNetCore.Http;
+using Easy.Mvc.Plugin;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Hosting;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Text;
 
 namespace Easy.Mvc.RazorPages
 {
     public class ViewRenderService : IViewRenderService
     {
         private readonly IRazorViewEngine _viewEngine;
         private readonly ITempDataProvider _tempDataProvider;
-        private readonly IServiceProvider _serviceProvider;
+        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public ViewRenderService(IRazorViewEngine viewEngine, ITempDataProvider tempDataProvider,
-            IServiceProvider serviceProvider)
+        public ViewRenderService(IRazorViewEngine viewEngine, ITempDataProvider tempDataProvider, IHostingEnvironment hostingEnvironment, IHttpContextAccessor httpContextAccessor)
         {
             _viewEngine = viewEngine;
             _tempDataProvider = tempDataProvider;
-            _serviceProvider = serviceProvider;
+            _hostingEnvironment = hostingEnvironment;
+            _httpContextAccessor = httpContextAccessor;
         }
         public string Render(string viewPath)
         {
             return Render(viewPath, string.Empty);
         }
         public string Render<TModel>(string viewPath, TModel model)
         {
-            var httpContext = new DefaultHttpContext { RequestServices = _serviceProvider };
-            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            ActionContext actionContext = new ActionContext(_httpContextAccessor.HttpContext, new RouteData(), new ActionDescriptor());
+
+            string pluginPath = $"~/wwwroot/{Loader.PluginFolder}/";
+            string actualViewPath = viewPath;
+            if (_hostingEnvironment.IsDevelopment() && actualViewPath.StartsWith(pluginPath))
+            {
+                actualViewPath = actualViewPath.Replace(pluginPath, DeveloperViewFileProvider.ProjectRootPath);
+            }
+
+            ViewEngineResult viewResult = _viewEngine.GetView(null, actualViewPath, true);
 
-            var viewResult = _viewEngine.GetView(null, viewPath, false);
             if (!viewResult.Success)
             {
-                throw new InvalidOperationException($"找不到视图模板 {viewPath}");
+                throw new InvalidOperationException($"Can not find view from path: {viewPath}. If your view is in plugins, please make sure the path is starts with ~/wwwroot/{Loader.PluginFolder}/");
             }
 
-            var viewDictionary = new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary())
+            ViewDataDictionary viewDictionary = new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary())
             {
                 Model = model
             };
 
-            using (var writer = new StringWriter())
+            using (StringWriter writer = new StringWriter())
             {
-                var viewContext = new ViewContext(
+                ViewContext viewContext = new ViewContext(
                      actionContext,
                      viewResult.View,
                      viewDictionary,
                      new TempDataDictionary(actionContext.HttpContext, _tempDataProvider),
                      writer,
                      new HtmlHelperOptions()
                  );
-                var render = viewResult.View.RenderAsync(viewContext);
+
+                System.Threading.Tasks.Task render = viewResult.View.RenderAsync(viewContext);
                 render.Wait();
                 return writer.ToString();
             }

diff --git a/src/EasyFrameWork/Notification/RazorEmailNotice.cs b/src/EasyFrameWork/Notification/RazorEmailNotice.cs
@@ -7,6 +7,10 @@ namespace Easy.Notification
     public class RazorEmailNotice : EmailNotice
     {
         public object Model { get; set; }
+        /// <summary>
+        /// Content root view path: ~/EmailTemplates/ResetPassword.cshtml.
+        /// Or view in plugins: ~/wwwroot/Plugins/ZKEACMS.Article/EmailTemplates/ResetPassword.cshtml
+        /// </summary>
         public string TemplatePath { get; set; }
     }
 }
diff --git a/src/EasyFrameWork/RepositoryPattern/IService.cs b/src/EasyFrameWork/RepositoryPattern/IService.cs
@@ -4,6 +4,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace Easy.RepositoryPattern
 {
@@ -16,10 +17,15 @@ public interface IService<T> : IDisposable
         ServiceResult<T> AddRange(params T[] items);
         IQueryable<T> Get();
         T GetSingle(Expression<Func<T, bool>> filter);
+        Task<T> GetSingleAsync(Expression<Func<T, bool>> filter);
         IList<T> Get(Expression<Func<T, bool>> filter);
+        Task<IList<T>> GetAsync(Expression<Func<T, bool>> filter);
         IList<T> Get(Expression<Func<T, bool>> filter, Pagination pagination);
+        Task<IList<T>> GetAsync(Expression<Func<T, bool>> filter, Pagination pagination);
         T Get(params object[] primaryKey);
+        Task<T> GetAsync(params object[] primaryKey);
         int Count(Expression<Func<T, bool>> filter);
+        Task<int> CountAsync(Expression<Func<T, bool>> filter);
         ServiceResult<T> Update(T item);
         ServiceResult<T> UpdateRange(params T[] items);
         void Remove(params object[] primaryKey);

diff --git a/src/EasyFrameWork/RepositoryPattern/ServiceBase.cs b/src/EasyFrameWork/RepositoryPattern/ServiceBase.cs
@@ -10,6 +10,7 @@
 using System.Reflection;
 using Easy.Extend;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Threading.Tasks;
 
 namespace Easy.RepositoryPattern
 {
@@ -113,7 +114,7 @@ public virtual ServiceResult<T> Add(T item)
                 SaveChanges();
             }
             return result;
-        }
+        }   
         public virtual ServiceResult<T> AddRange(params T[] items)
         {
             ServiceResult<T> result = new ServiceResult<T>();
@@ -146,6 +147,7 @@ public virtual ServiceResult<T> AddRange(params T[] items)
             }
             return result;
         }
+
         public virtual IQueryable<T> Get()
         {
             return CurrentDbSet;
@@ -154,10 +156,18 @@ public virtual T GetSingle(Expression<Func<T, bool>> filter)
         {
             return Get().Single(filter);
         }
+        public virtual async Task<T> GetSingleAsync(Expression<Func<T, bool>> filter)
+        {
+            return await Get().SingleAsync(filter);
+        }
         public virtual IList<T> Get(Expression<Func<T, bool>> filter)
         {
             return Get().Where(filter).ToList();
         }
+        public virtual async Task<IList<T>> GetAsync(Expression<Func<T, bool>> filter)
+        {
+            return await Get().Where(filter).ToListAsync();
+        }
         public virtual IList<T> Get(Expression<Func<T, bool>> filter, Pagination pagination)
         {
             pagination.RecordCount = Count(filter);
@@ -183,10 +193,39 @@ public virtual IList<T> Get(Expression<Func<T, bool>> filter, Pagination paginat
             }
             return result.Skip(pagination.PageIndex * pagination.PageSize).Take(pagination.PageSize).ToList();
         }
+        public virtual async Task<IList<T>> GetAsync(Expression<Func<T, bool>> filter, Pagination pagination)
+        {
+            pagination.RecordCount = await CountAsync(filter);
+            IQueryable<T> result;
+            if (filter != null)
+            {
+                result = Get().Where(filter);
+            }
+            else
+            {
+                result = Get();
+            }
+            if (pagination.OrderBy != null || pagination.OrderByDescending != null)
+            {
+                if (pagination.OrderBy != null)
+                {
+                    result = result.OrderBy(pagination.OrderBy);
+                }
+                else
+                {
+                    result = result.OrderByDescending(pagination.OrderByDescending);
+                }
+            }
+            return await result.Skip(pagination.PageIndex * pagination.PageSize).Take(pagination.PageSize).ToListAsync();
+        }
         public virtual T Get(params object[] primaryKey)
         {
             return CurrentDbSet.Find(primaryKey);
         }
+        public virtual async Task<T> GetAsync(params object[] primaryKey)
+        {
+            return await CurrentDbSet.FindAsync(primaryKey);
+        }
         public virtual int Count(Expression<Func<T, bool>> filter)
         {
             if (filter != null)
@@ -195,6 +234,14 @@ public virtual int Count(Expression<Func<T, bool>> filter)
             }
             return Get().Count();
         }
+        public virtual async Task<int> CountAsync(Expression<Func<T, bool>> filter)
+        {
+            if (filter != null)
+            {
+                return await Get().Where(filter).CountAsync();
+            }
+            return await Get().CountAsync();
+        }
         public virtual ServiceResult<T> Update(T item)
         {
             var result = Validate(item);

diff --git a/src/ZKEACMS.Article/ArticlePlug.cs b/src/ZKEACMS.Article/ArticlePlug.cs
@@ -12,6 +12,7 @@
 using Microsoft.Extensions.Options;
 using ZKEACMS.WidgetTemplate;
 using Easy.RepositoryPattern;
+using ZKEACMS.Route;
 
 namespace ZKEACMS.Article
 {
@@ -117,6 +118,8 @@ public override void ConfigureServices(IServiceCollection serviceCollection)
         {
             serviceCollection.AddTransient<IArticleService, ArticleService>();
             serviceCollection.AddTransient<IArticleTypeService, ArticleTypeService>();
+            serviceCollection.AddTransient<IRouteDataProvider, ArticleRouteDataProvider>();
+            serviceCollection.AddTransient<IRouteDataProvider, ArticleTypeRouteDataProvider>();
             serviceCollection.AddScoped<IOnModelCreating, EntityFrameWorkModelCreating>();
 
             serviceCollection.Configure<ArticleListWidget>(option =>