diff --git a/.github/workflows/docfx.yml b/.github/workflows/docfx.yml
new file mode 100644
index 00000000..44e3666e
--- /dev/null
+++ b/.github/workflows/docfx.yml
@@ -0,0 +1,52 @@
+name: .NET Core Deploy Docfx
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 5.0.202
+    - name: Install dependencies
+      run: dotnet restore lin-cms-dotnetcore.sln
+    - name: Build solution
+      run: dotnet build lin-cms-dotnetcore.sln --configuration Release --no-restore
+    
+  generate-docs:
+    runs-on: windows-latest
+    needs: build
+    
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 5.0.202
+      - name: Install dependencies
+        run:  dotnet nuget add source https://api.nuget.org/v3/index.json -n nuget.org --configfile $env:APPDATA\NuGet\NuGet.Config && dotnet restore lin-cms-dotnetcore.sln
+      - name: Setup DocFX
+        uses: crazy-max/ghaction-chocolatey@v1
+        with:
+          args: install docfx --version 2.56.7
+      - name: DocFX Build
+        working-directory: docs
+        run: docfx docfx.json
+        continue-on-error: false
+      - name: Publish
+        if: github.event_name == 'push'
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: docs/_site
+          force_orphan: true
diff --git a/.github/workflows/gitee-mirror.yml b/.github/workflows/gitee-mirror.yml
new file mode 100644
index 00000000..05af38f3
--- /dev/null
+++ b/.github/workflows/gitee-mirror.yml
@@ -0,0 +1,19 @@
+name: Publish 
+
+on:
+    push:
+        branches:
+            - master
+            - gh-pages
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Sync to Gitee 💕
+              uses: wearerequired/git-mirror-action@master
+              env:
+                  SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+              with:
+                  source-repo: "git@github.com:luoyunchong/lin-cms-dotnetcore.git"
+                  destination-repo: "git@gitee.com:igeekfan/lin-cms-dotnetcore.git"
diff --git a/.gitignore b/.gitignore
index 9e8a1b6b..1cfab7d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -338,6 +338,23 @@ ASALocalRun/
 # BeatPulse healthcheck temp database
 healthchecksdb
 src/LinCms.Web/wwwroot/assets/
-src/LinCms.Web/appsettings.Private.json
-identityserver4/LinCms.IdentityServer4/appsettings.Private.json
-/src/LinCms.Web/wwwroot/_Illegal
+src/LinCms.Web/wwwroot/_Illegal
+identityserver4/LinCms.IdentityServer4/Logs/
+src/LinCms.Web/Logs/
+/src/LinCms.Web/appsettings.Staging.json
+/identityserver4/LinCms.IdentityServer4/appsettings.Staging.json
+/code-scaffolding/*
+###############
+#    folder   #
+###############
+/**/DROP/
+/**/TEMP/
+/**/packages/
+/**/bin/
+/**/obj/
+_site
+###############
+#  temp file  #
+###############
+docs/api/*.yml
+docs/api/.manifest
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 00000000..429d27d6
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,13 @@
+<Project>
+
+	<PropertyGroup>
+		<RepositoryUrl>https://github.com/luoyunchong/lin-cms-dotnetcore</RepositoryUrl>
+		<PublishRepositoryUrl>true</PublishRepositoryUrl>
+		<EmbedUntrackedSources>true</EmbedUntrackedSources>
+		<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+	</ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/LinCms.Scaffolding.sln b/LinCms.Scaffolding.sln
new file mode 100644
index 00000000..28ef66c3
--- /dev/null
+++ b/LinCms.Scaffolding.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30223.230
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinCms.Scaffolding", "src\LinCms.Scaffolding\LinCms.Scaffolding.csproj", "{FC1AC12F-338B-4608-ABF3-F301BF631F21}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FC1AC12F-338B-4608-ABF3-F301BF631F21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC1AC12F-338B-4608-ABF3-F301BF631F21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC1AC12F-338B-4608-ABF3-F301BF631F21}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC1AC12F-338B-4608-ABF3-F301BF631F21}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {60090452-8177-4B47-B59D-CE49B7D519F9}
+	EndGlobalSection
+EndGlobal
diff --git a/README.md b/README.md
index 5764678b..4909cd6c 100644
--- a/README.md
+++ b/README.md
@@ -4,21 +4,24 @@
     <img width="200" src="https://consumerminiaclprd01.blob.core.chinacloudapi.cn/miniappbackground/sfgmember/lin/left-logo.png">
   </a>
   <h1>
-  Lin CMS .NET Core
+  Lin CMS By .NET 
   </h1>
 </h1>
-😃 A simple and practical CMS implememted by .NET Core 3.1
+
+😃 A simple and practical CMS implemented by [ASP.NET Core 5](https://docs.microsoft.com/zh-cn/aspnet/core/introduction-to-aspnet-core?view=aspnetcore-5.0)
 
 ## 项目简介
-![Total visitor](https://visitor-count-badge.herokuapp.com/total.svg?repo_id=https://github.com/luoyunchong/lin-cms-dotnetcore)
+![gitee async](https://github.com/luoyunchong/lin-cms-dotnetcore/workflows/Publish/badge.svg)
+<!--![Total visitor](https://visitor-count-badge.herokuapp.com/total.svg?repo_id=https://github.com/luoyunchong/lin-cms-dotnetcore)
 ![Visitors in today](https://visitor-count-badge.herokuapp.com/today.svg?repo_id=https://github.com/luoyunchong/lin-cms-dotnetcore)
-![](https://img.shields.io/badge/.NETCore-3.1.0-3963bc.svg)
+-->
+![](https://img.shields.io/badge/.NET5.0.0-3963bc.svg)
 ![](https://img.shields.io/badge/license-MIT-3963bc.svg)
 ![](https://img.shields.io/badge/developer-IGeekFan-3963bc.svg)
 
 本项目是完全出于个人喜爱，看到Lin-cms有了python,node.js,社区也有人出了[lin-cms-tp5](https://github.com/ChenJinchuang/lin-cms-tp5)的版本
 
-本项目是 Lin CMS 后端的 [.NET Core 3.1](https://docs.microsoft.com/zh-cn/dotnet/core/)的 实现，通过Vue.js实现的前后端分离CMS平台，目前实现简约的权限管理系统、基础字典项管理、随笔专栏，评论点赞，消息通知，标签等仿掘金模块。
+本项目是 Lin CMS 后端的 [.NET5](https://docs.microsoft.com/zh-cn/dotnet/core/introduction)的 实现，通过Vue.js实现的前后端分离CMS平台，目前实现简约的权限管理系统、基础字典项管理、随笔专栏，评论点赞，消息通知，标签等仿掘金模块。
 
 ## 什么是 Lin CMS？
 
@@ -30,17 +33,16 @@
 - [https://igeekfan.gitee.io/vovo-docs/dotnetcore/lin-cms/](https://igeekfan.gitee.io/vovo-docs/dotnetcore/lin-cms/)
 
 ## 线上 Demo
-- 本项目swagger地址 [http://47.106.80.39:7000/swagger/index.html](http://47.106.80.39:7000/swagger/index.html)
-- 用户端 lin-cms-vvlog [http://47.106.80.39:8080/index](http://47.106.80.39:8080/index) 
+- 本项目swagger地址 [https://api.igeekfan.cn/swagger/index.html](https://api.igeekfan.cn/swagger/index.html)
+- 用户端 lin-cms-vvlog [https://vvlog.baimocore.cn](https://vvlog.baimocore.cn) 
   - 普通用户：710277267@qq.com
   - 密码：123qwe
-
-- 管理员 lin-cms-vue [http://47.106.80.39:8081/#/](http://47.106.80.39:8081/#/)
+- 管理员 lin-cms-vue [https://cms.baimocore.cn/](https://cms.baimocore.cn)
   - 管理员： admin
   - 密码：123qwe
 
 ## 前端
-- 在原[开源项目](https://github.com/TaleLin/lin-cms-vue)中增加了博客随笔、随笔评论、关注用户、标签、关注标签、技术频道（标签分类）、插件式功能（目前还没有）
+- 在原[开源项目](https://github.com/TaleLin/lin-cms-vue)中增加了博客随笔、标签、随笔评论、关注用户、关注标签、技术频道（标签分类）、插件式功能（目前还没有）
 ，具体特点查看如下[lin-cms-dotnetcore功能模块的设计](https://blog.igeekfan.cn/2019/11/24/lin-cms-dotnetcore/design/),开源地址见下方。
 
 ### Lin CMS 的特点
@@ -81,15 +83,17 @@ Lin 已经内置了 CMS 中最为常见的需求：用户管理、权限管理
 - 文档API：Swagger([Swashbuckle.AspNetCore](https://github.com/domaindrivendev/Swashbuckle.AspNetCore))
 - 序列化：Newtonsoft.Json
 - 测试框架：Xunit
-- 日志 NLog
-- 简化注入服务：[Scrutor](https://github.com/khellang/Scrutor)
+- 日志 [Serilog](https://github.com/serilog/serilog-aspnetcore)
+- 依赖注入服务[AutoFac](https://github.com/autofac/Autofac.Extensions.DependencyInjection)
 - 通用扩展方法 Z.ExtensionMethods
 - 云存储：七牛云 [MQiniu.Core](https://github.com/Hello-Mango/MQiniu.Core)
 - 分布式事务、EventBus：[DotNeteCore.CAP](https://github.com/dotnetcore/CAP)
 - GitHub第三方授权登录[AspNet.Security.OAuth.GitHub](https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers)
-- 系统启动时的异步任务 running tasks asynchronously on ASP.NET Core app startup [NetEscapades.AspNetCore.StartupTasks](https://github.com/andrewlock/NetEscapades.AspNetCore.StartupTasks)
+- QQ第三方授权登录[AspNet.Security.OAuth.QQ](https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers)
 - [Docker](https://docs.docker.com/)
 - [Azure DevOps](https://dev.azure.com/)
+- 健康检查[AspNetCore.HealthChecks.UI.Client](https://github.com/xabaril/AspNetCore.Diagnostics.HealthChecks)
+- [GitHub Action](https://help.github.com/en/actions)
 
 ### 实践
 - DDD(Domain-Driven Design)领域驱动设计 
@@ -105,16 +109,19 @@ Lin 已经内置了 CMS 中最为常见的需求：用户管理、权限管理
 
 ### 分层结构（Layers）
 - framework
-   - VoVo.CAP.MySql：为CAP实现了配合FreeSql的事务一致性扩展
+  - src
+    - IGeekFan.CAP.MySql：为CAP实现了配合FreeSql的事务一致性扩展
+    - IGeekFan.Localization.FreeSql：本地化的FreeSql数据库存储方案
 - identityserver4
    - LinCms.IdentityServer4:使用id4授权登录
 - src
   - LinCms.Web：接口API（ASP.NET Core)
   - LinCms.Application:应用服务
-  - LinCms.Application.Contracts:DTO,数据传输对象
+  - LinCms.Application.Contracts:DTO,数据传输对象，应用服务接口
   - LinCms.Infrastructure:基础设施，数据库持久性的操作
   - LinCms.Core:该应用的核心，实体类，通用操作类，AOP扩展，分页对象，基础依赖对象接口，时间扩展方法，当前用户信息，异常类，值对象
-  - LinCms.Plugins 使用单项目实现某个业务的扩展，不需要主要项目结构，可暂时忽略。
+  - LinCms.Plugins 使用单项目实现某个业务的扩展，不是该项目的主要结构，可暂时忽略。
+  - LinCms.Scaffolding [代码生成器](https://igeekfan.gitee.io/vovo-docs/dotnetcore/lin-cms/lincms-scaffolding.html)
 - test
   - LinCms.Test:对仓储，应用服务或工具类进行测试
 
@@ -140,17 +147,25 @@ Lin 已经内置了 CMS 中最为常见的需求：用户管理、权限管理
 <img class="QR-img" src="https://ae01.alicdn.com/kf/H4e69faac4a834b8a82f54ea05d2dd53av.jpg">
 
 
-## 下个版本开发计划
+## 开发计划
 - [功能模块的设计 ](https://github.com/luoyunchong/lin-cms-dotnetcore/issues/3)
 - [0.3.0系统权限模块更新](https://github.com/luoyunchong/lin-cms-dotnetcore/issues/6 )
 
-## azure devops
+## 自动化构建CI/CD
 
+### azure devops
 - [.Net Core DevOps -免费用Azure四步实现自动化发布（CI/CD）](https://www.cnblogs.com/zhaozhengyan/p/azure-devops-aliyun.html)
 - [.Net Core DevOps - 替换 ConnectionStrings](https://www.cnblogs.com/zhaozhengyan/p/azure-replace-appsettings.html)
 
+### github action
+- [github gitee自动同步](https://luoyunchong.github.io/vovo-docs/dotnetcore/lin-cms/devops-ci-cd.html)
+
 ##  开源地址
 - 后端接口Gitee 链接 [https://gitee.com/igeekfan/lin-cms-dotnetcore](https://gitee.com/igeekfan/lin-cms-dotnetcore)
 - 后端接口GitHub 链接 [https://github.com/luoyunchong/lin-cms-dotnetcore](https://github.com/luoyunchong/lin-cms-dotnetcore)
 - 管理端UI [https://github.com/luoyunchong/lin-cms-vue](https://github.com/luoyunchong/lin-cms-vue)
-- 用户端UI [https://github.com/luoyunchong/lin-cms-vvlog](https://github.com/luoyunchong/lin-cms-vvlog)
\ No newline at end of file
+- 用户端UI [https://github.com/luoyunchong/lin-cms-vvlog](https://github.com/luoyunchong/lin-cms-vvlog)
+
+
+## 更新日志
+https://github.com/luoyunchong/lin-cms-dotnetcore/wiki/%E6%9B%B4%E6%96%B0%E6%97%A5%E5%BF%97
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 360c6ee6..bcadb666 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -20,23 +20,38 @@ steps:
     script: |
       echo read to execute command
       ls
+      sed -i 's/{ConnectionStrings.DefaultDB}/$(ConnectionStrings.DefaultDB)/g' identityserver4/LinCms.IdentityServer4/appsettings.Production.json
       sed -i 's/{ConnectionStrings.MySql}/$(ConnectionStrings.MySql)/g' identityserver4/LinCms.IdentityServer4/appsettings.Production.json
       sed -i 's/{Certificates.Password}/$(Certificates.Password)/g' identityserver4/LinCms.IdentityServer4/appsettings.Production.json
-
+      sed -i 's/{ConnectionStrings.DefaultDB}/$(ConnectionStrings.DefaultDB)/g' src/LinCms.Web/appsettings.Production.json
       sed -i 's/{ConnectionStrings.MySql}/$(ConnectionStrings.MySql)/g' src/LinCms.Web/appsettings.Production.json
+      sed -i 's/{ConnectionStrings.CsRedis}/$(ConnectionStrings.CsRedis)/g' src/LinCms.Web/appsettings.Production.json
       sed -i 's/{Authentication.GitHub.ClientId}/$(Authentication.GitHub.ClientId)/g' src/LinCms.Web/appsettings.Production.json
       sed -i 's/{Authentication.GitHub.ClientSecret}/$(Authentication.GitHub.ClientSecret)/g' src/LinCms.Web/appsettings.Production.json
-      sed -i 's/{RabbitMQ.UserName}/$(RabbitMQ.UserName)/g' src/LinCms.Web/appsettings.Production.json
-      sed -i 's/{RabbitMQ.Password}/$(RabbitMQ.Password)/g' src/LinCms.Web/appsettings.Production.json
+      sed -i 's/{Authentication.QQ.ClientId}/$(Authentication.QQ.ClientId)/g' src/LinCms.Web/appsettings.Production.json
+      sed -i 's/{Authentication.QQ.ClientSecret}/$(Authentication.QQ.ClientSecret)/g' src/LinCms.Web/appsettings.Production.json
+      sed -i 's/{Authentication.Gitee.ClientId}/$(Authentication.Gitee.ClientId)/g' src/LinCms.Web/appsettings.Production.json
+      sed -i 's/{Authentication.Gitee.ClientSecret}/$(Authentication.Gitee.ClientSecret)/g' src/LinCms.Web/appsettings.Production.json
+      sed -i 's/{IdentityServer.Authority}/$(IdentityServer.Authority)/g' src/LinCms.Web/appsettings.Production.json
+      sed -i 's/{CAP.RabbitMQ.HostName}/$(CAP.RabbitMQ.HostName)/g' src/LinCms.Web/appsettings.Production.json
+      sed -i 's/{CAP.RabbitMQ.UserName}/$(CAP.RabbitMQ.UserName)/g' src/LinCms.Web/appsettings.Production.json
+      sed -i 's/{CAP.RabbitMQ.Password}/$(CAP.RabbitMQ.Password)/g' src/LinCms.Web/appsettings.Production.json
+      sed -i 's/{CAP.RabbitMQ.VirtualHost}/$(CAP.RabbitMQ.VirtualHost)/g' src/LinCms.Web/appsettings.Production.json
+      sed -i 's/{FileStorage.Qiniu.AK}/$(FileStorage.Qiniu.AK)/g' src/LinCms.Web/appsettings.Production.json
+      sed -i 's/{FileStorage.Qiniu.SK}/$(FileStorage.Qiniu.SK)/g' src/LinCms.Web/appsettings.Production.json
+      sed -i 's/{MailKitOptions.Host}/$(MailKitOptions.Host)/g' src/LinCms.Web/appsettings.Production.json
+      sed -i 's/{MailKitOptions.Port}/$(MailKitOptions.Port)/g' src/LinCms.Web/appsettings.Production.json
+      sed -i 's/{MailKitOptions.UserName}/$(MailKitOptions.UserName)/g' src/LinCms.Web/appsettings.Production.json
+      sed -i 's/{MailKitOptions.Password}/$(MailKitOptions.Password)/g' src/LinCms.Web/appsettings.Production.json
       echo command executed
 
-- script: |
-    docker build -f $(identityserver4dockerfilepath) -t $(identityserver4imageName) .
-    docker login -u $(dockerId) -p $(pwd) $(registry)
-    docker tag $(identityserver4imageName) $(registry)/$(namespace)/$(identityserver4imageName)
-    docker push $(registry)/$(namespace)/$(identityserver4imageName)
+#- script: |
+#    docker build -f $(identityserver4dockerfilepath) -t $(identityserver4imageName) .
+#    docker login -u $(dockerId) -p $(pwd) $(registry)
+#    docker tag $(identityserver4imageName) $(registry)/$(namespace)/$(identityserver4imageName)
+#    docker push $(registry)/$(namespace)/$(identityserver4imageName)
 
-  displayName: push to lincms-identityserver4
+#  displayName: push to lincms-identityserver4
 
 - script: |
     docker build -f $(linCmsWebdockerfilepath) -t $(webimageName) .
diff --git a/docs/README.md b/docs/README.md
index 617e1a28..b564535e 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -24,15 +24,24 @@ token_endpoint:
 
 
 ## ����
-- lincms-identityserver4 [http://47.106.80.39:5010/swagger/index.html](http://47.106.80.39:5010/swagger/index.html)
-- http://47.106.80.39:5010/.well-known/openid-configuration
-- lincms-web [http://47.106.80.39:5011/swagger/index.html](http://47.106.80.39:5011/swagger/index.html)
-- cap [http://47.106.80.39:5011/cap](http://47.106.80.39:5011/cap)
-- Portainer  [http://47.106.80.39:9000/#/home](http://47.106.80.39:9000/#/home)
-
-
+- lincms-identityserver4 [http://111.231.197.142:5011/swagger/index.html](http://111.231.197.142:5011/swagger/index.html)
+- http://111.231.197.142:5010/.well-known/openid-configuration
+- lincms-web [http://111.231.197.142:5012/swagger/index.html](http://111.231.197.142:5012/swagger/index.html)
+- cap [http://111.231.197.142:5012/cap](http://111.231.197.142:5012/cap)
+- Docker����Portainer  [http://47.106.80.39:9000/#/home](http://111.231.197.142:9000/#/home)
+- [http://111.231.197.142:5005/healthchecks-ui#/healthchecks](http:/111.231.197.142:5005/healthchecks-ui#/healthchecks)
+
+### �������˺ŵ�¼
+- https://localhost:5001/cms/oauth2/signin?provider=Gitee&redirectUrl=https://vvlog.baimocore.cn/
+- https://localhost:5001/cms/oauth2/signin?provider=GitHub&redirectUrl=https://vvlog.baimocore.cn/
+- https://localhost:5001/cms/oauth2/signin?provider=QQ&redirectUrl=https://vvlog.baimocore.cn/
+
+### �������˺Ű�
+- https://localhost:5001/cms/oauth2/signin-bind?provider=GitHub&redirectUrl=https://vvlog.baimocore.cn&token=
+- https://localhost:5001/cms/oauth2/signin-bind?provider=QQ&redirectUrl=http://localhost:8081&token=
+github���ٵ�¼��ʹ�õ�myget��Դ��
 
+[https://www.myget.org/feed/aspnet-contrib/package/nuget/AspNet.Security.OAuth.GitHub](https://www.myget.org/feed/aspnet-contrib/package/nuget/AspNet.Security.OAuth.GitHub)
 
-github���ٵ�¼��ʹ�õ�myget��Դ��
 
-[https://www.myget.org/feed/aspnet-contrib/package/nuget/AspNet.Security.OAuth.GitHub](https://www.myget.org/feed/aspnet-contrib/package/nuget/AspNet.Security.OAuth.GitHub)
\ No newline at end of file
+//https://github.com/login/oauth/authorize?client_id=0be6b05fc717bfc4fb67&state=github&redirect_uri=https://localhost:5001/signin-github
\ No newline at end of file
diff --git a/docs/api/index.md b/docs/api/index.md
new file mode 100644
index 00000000..78dc9c00
--- /dev/null
+++ b/docs/api/index.md
@@ -0,0 +1,2 @@
+# PLACEHOLDER
+TODO: Add .NET projects to the *src* folder and run `docfx` to generate **REAL** *API Documentation*!
diff --git a/docs/articles/intro.md b/docs/articles/intro.md
new file mode 100644
index 00000000..c0478ced
--- /dev/null
+++ b/docs/articles/intro.md
@@ -0,0 +1 @@
+# Add your introductions here!
diff --git a/docs/articles/toc.yml b/docs/articles/toc.yml
new file mode 100644
index 00000000..ff89ef1f
--- /dev/null
+++ b/docs/articles/toc.yml
@@ -0,0 +1,2 @@
+- name: Introduction
+  href: intro.md
diff --git a/docs/docfx.json b/docs/docfx.json
new file mode 100644
index 00000000..a5cebf94
--- /dev/null
+++ b/docs/docfx.json
@@ -0,0 +1,69 @@
+{
+  "metadata": [
+    {
+      "src": [
+        {
+          "files": [
+            "**/*.csproj"
+          ],
+          "exclude": [
+            "**/bin/**",
+            "**/obj/**"
+          ],
+          "src": "../src"
+        }
+      ],
+      "dest": "api",
+      "disableGitFeatures": false,
+      "disableDefaultFilter": false
+    }
+  ],
+  "build": {
+    "content": [
+      {
+        "files": [
+          "api/**.yml",
+          "api/index.md"
+        ]
+      },
+      {
+        "files": [
+          "articles/**.md",
+          "articles/**/toc.yml",
+          "toc.yml",
+          "*.md"
+        ]
+      }
+    ],
+    "resource": [
+      {
+        "files": [
+          "images/**"
+        ]
+      }
+    ],
+    "overwrite": [
+      {
+        "files": [
+          "apidoc/**.md"
+        ],
+        "exclude": [
+          "obj/**",
+          "_site/**"
+        ]
+      }
+    ],
+    "dest": "_site",
+    "globalMetadataFiles": [],
+    "fileMetadataFiles": [],
+    "template": [
+      "default"
+    ],
+    "postProcessors": [],
+    "markdownEngineName": "markdig",
+    "noLangKeyword": false,
+    "keepFileLink": false,
+    "cleanupCacheHistory": false,
+    "disableGitFeatures": false
+  }
+}
\ No newline at end of file
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 00000000..3ae25063
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,4 @@
+# This is the **HOMEPAGE**.
+Refer to [Markdown](http://daringfireball.net/projects/markdown/) for how to write markdown files.
+## Quick Start Notes:
+1. Add images to the *images* folder if the file is referencing an image.
diff --git a/docs/sql/lincms.sql b/docs/sql/lincms.sql
deleted file mode 100644
index be06ec6d..00000000
--- a/docs/sql/lincms.sql
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server         : localhost
- Source Server Type    : MySQL
- Source Server Version : 50725
- Source Host           : localhost:3306
- Source Schema         : lincms
-
- Target Server Type    : MySQL
- Target Server Version : 50725
- File Encoding         : 65001
-
- Date: 02/09/2019 23:59:12
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for base_item
--- ----------------------------
-DROP TABLE IF EXISTS `base_item`;
-CREATE TABLE `base_item`  (
-  `is_deleted` bit(1) NOT NULL,
-  `base_type_id` int(11) NOT NULL,
-  `item_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `item_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `sort_code` int(11) NULL DEFAULT NULL,
-  `create_user_id` bigint(20) NULL DEFAULT NULL,
-  `create_time` datetime(3) NULL,
-  `delete_user_id` bigint(20) NULL DEFAULT NULL,
-  `delete_time` datetime(3) NULL DEFAULT NULL,
-  `update_user_id` bigint(20) NULL DEFAULT NULL,
-  `update_time` datetime(3) NULL,
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of base_item
--- ----------------------------
-INSERT INTO `base_item` VALUES (b'0', 2, '.net core', '.net core', 2, NULL, '2019-09-02 22:12:27.196', NULL, NULL, NULL, '2019-09-02 22:17:38.230', 1);
-
--- ----------------------------
--- Table structure for base_type
--- ----------------------------
-DROP TABLE IF EXISTS `base_type`;
-CREATE TABLE `base_type`  (
-  `type_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `full_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `sort_code` int(11) NULL DEFAULT NULL,
-  `create_user_id` bigint(20) NULL DEFAULT NULL,
-  `create_time` datetime(3) NULL,
-  `is_deleted` bit(1) NOT NULL,
-  `delete_user_id` bigint(20) NULL DEFAULT NULL,
-  `delete_time` datetime(3) NULL DEFAULT NULL,
-  `update_user_id` bigint(20) NULL DEFAULT NULL,
-  `update_time` datetime(3) NULL,
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of base_type
--- ----------------------------
-INSERT INTO `base_type` VALUES ('tag', '标签', 3, NULL, '2019-09-02 22:11:20.440', b'0', NULL, NULL, NULL, '2019-09-02 22:15:02.309', 1);
-
--- ----------------------------
--- Table structure for blog_article
--- ----------------------------
-DROP TABLE IF EXISTS `blog_article`;
-CREATE TABLE `blog_article`  (
-  `is_deleted` bit(1) NOT NULL,
-  `f_id` int(11) NULL DEFAULT NULL,
-  `title` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `keywords` varchar(400) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `source` varchar(400) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `excerpt` varchar(400) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `content` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `view_hits` int(11) NOT NULL,
-  `comment_quantity` int(11) NOT NULL,
-  `point_quantity` int(11) NOT NULL,
-  `thumbnail` varchar(400) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `is_audit` bit(1) NOT NULL,
-  `recommend` bit(1) NOT NULL,
-  `is_stickie` bit(1) NOT NULL,
-  `archive` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `article_type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `editor` int(11) NOT NULL,
-  `create_user_id` bigint(20) NULL DEFAULT NULL,
-  `create_time` datetime(3) NULL,
-  `delete_user_id` bigint(20) NULL DEFAULT NULL,
-  `delete_time` datetime(3) NULL DEFAULT NULL,
-  `update_user_id` bigint(20) NULL DEFAULT NULL,
-  `update_time` datetime(3) NULL,
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1425 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for book
--- ----------------------------
-DROP TABLE IF EXISTS `book`;
-CREATE TABLE `book`  (
-  `author` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `image` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `summary` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `title` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `create_user_id` bigint(20) NULL DEFAULT NULL,
-  `create_time` datetime(3) NULL,
-  `is_deleted` bit(1) NOT NULL,
-  `delete_user_id` bigint(20) NULL DEFAULT NULL,
-  `delete_time` datetime(3) NULL DEFAULT NULL,
-  `update_user_id` bigint(20) NULL DEFAULT NULL,
-  `update_time` datetime(3) NULL,
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 29 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for lin_auth
--- ----------------------------
-DROP TABLE IF EXISTS `lin_auth`;
-CREATE TABLE `lin_auth`  (
-  `group_id` int(11) NOT NULL,
-  `auth` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `module` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 33 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of lin_auth
--- ----------------------------
-INSERT INTO `lin_auth` VALUES (2, '查询日志记录的用户', '日志', 20);
-INSERT INTO `lin_auth` VALUES (2, '搜索日志', '日志', 21);
-INSERT INTO `lin_auth` VALUES (2, '删除图书', '图书', 22);
-INSERT INTO `lin_auth` VALUES (2, '查看lin的信息', '信息', 23);
-INSERT INTO `lin_auth` VALUES (2, '查询所有日志', '日志', 24);
-INSERT INTO `lin_auth` VALUES (15, '删除图书', '图书', 32);
-
--- ----------------------------
--- Table structure for lin_file
--- ----------------------------
-DROP TABLE IF EXISTS `lin_file`;
-CREATE TABLE `lin_file`  (
-  `extension` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `md5` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `path` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `size` int(11) NULL DEFAULT NULL,
-  `type` smallint(6) NULL DEFAULT NULL,
-  `create_user_id` bigint(20) NULL DEFAULT NULL,
-  `create_time` datetime(3) NULL,
-  `is_deleted` bit(1) NOT NULL,
-  `delete_user_id` bigint(20) NULL DEFAULT NULL,
-  `delete_time` datetime(3) NULL DEFAULT NULL,
-  `update_user_id` bigint(20) NULL DEFAULT NULL,
-  `update_time` datetime(3) NULL,
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of lin_file
--- ----------------------------
-INSERT INTO `lin_file` VALUES ('.png', '87cd112413b9979753ac7119c9266b5f', '1555844046442-84200e65-7dac-452c-83db-30ea73317782.png', '2019/07/31/61fd9345-052b-4c76-bbfc-b168161ab983.png', 1936251, 1, NULL, '2019-07-31 09:13:29.833', b'0', NULL, NULL, NULL, '0001-01-01 00:00:00.000', 1);
-INSERT INTO `lin_file` VALUES ('.jpg', 'fd4cdd5d931a430975c51ed0ba34012e', 'avatar.jpg', '2019/07/31/5f533562-0614-4f6f-9cc3-cc62d919cdc1.jpg', 3195, 1, NULL, '2019-07-31 09:14:35.275', b'0', NULL, NULL, NULL, '0001-01-01 00:00:00.000', 2);
-INSERT INTO `lin_file` VALUES ('.jpg', '7aa613b4b32544141120d3027a8606b9', 'avatar.jpg', '2019/07/31/c706747b-a360-434c-b50f-8fa79bfc2818.jpg', 6468, 1, NULL, '2019-07-31 09:59:21.547', b'0', NULL, NULL, NULL, '0001-01-01 00:00:00.000', 3);
-INSERT INTO `lin_file` VALUES ('.jpg', 'c6166852e4be8657f5d41560da6103d2', 'avatar.jpg', '2019/07/31/0f40818c-ddb1-4c48-9e09-6332357a38df.jpg', 11641, 1, NULL, '2019-07-31 10:00:32.578', b'0', NULL, NULL, NULL, '0001-01-01 00:00:00.000', 4);
-INSERT INTO `lin_file` VALUES ('.jpg', '3feb060714c5c18d80eddd7947396ec5', 'avatar.jpg', '2019/07/31/40c33485-9e30-435e-8664-76ea1ad579b0.jpg', 4346, 1, NULL, '2019-07-31 10:11:27.167', b'0', NULL, NULL, NULL, '0001-01-01 00:00:00.000', 5);
-INSERT INTO `lin_file` VALUES ('.png', 'fab966fc5a5a9f6938402b3c81b6d90a', '1555843960160-99ea3f39-f119-40ee-b89a-97e1548cbfb8.png', '2019/07/31/05d32e3f-40fd-4b1e-b5c1-35bbe1f01c8f.png', 1525724, 1, NULL, '2019-07-31 12:06:53.904', b'0', NULL, NULL, NULL, '0001-01-01 00:00:00.000', 6);
-
--- ----------------------------
--- Table structure for lin_group
--- ----------------------------
-DROP TABLE IF EXISTS `lin_group`;
-CREATE TABLE `lin_group`  (
-  `name` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `info` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 16 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of lin_group
--- ----------------------------
-INSERT INTO `lin_group` VALUES ('管理员分组', '管理员分组', 2);
-INSERT INTO `lin_group` VALUES ('图书分组管理', '图书分组管理', 15);
-
--- ----------------------------
--- Table structure for lin_log
--- ----------------------------
-DROP TABLE IF EXISTS `lin_log`;
-CREATE TABLE `lin_log`  (
-  `authority` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `message` varchar(450) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `method` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `path` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `status_code` int(11) NULL DEFAULT NULL,
-  `time` datetime(0) NULL DEFAULT NULL,
-  `user_id` int(11) NOT NULL,
-  `user_name` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `other_message` varchar(5000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1143 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for lin_poem
--- ----------------------------
-DROP TABLE IF EXISTS `lin_poem`;
-CREATE TABLE `lin_poem`  (
-  `author` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `content` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
-  `dynasty` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `image` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `title` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `create_user_id` bigint(20) NULL DEFAULT NULL,
-  `create_time` datetime(3) NULL,
-  `is_deleted` bit(1) NOT NULL,
-  `delete_user_id` bigint(20) NULL DEFAULT NULL,
-  `delete_time` datetime(3) NULL DEFAULT NULL,
-  `update_user_id` bigint(20) NULL DEFAULT NULL,
-  `update_time` datetime(3) NULL,
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of lin_poem
--- ----------------------------
-INSERT INTO `lin_poem` VALUES ('1', '2', '3', '4', '', 8, '2019-08-01 21:11:47.268', b'0', NULL, NULL, 8, '2019-08-01 21:12:43.056', 1);
-INSERT INTO `lin_poem` VALUES ('string', 'string', 'string', 'string', 'string', 8, '2019-08-01 21:18:37.128', b'0', NULL, NULL, NULL, '0001-01-01 00:00:00.000', 2);
-
--- ----------------------------
--- Table structure for lin_user
--- ----------------------------
-DROP TABLE IF EXISTS `lin_user`;
-CREATE TABLE `lin_user`  (
-  `nickname` varchar(24) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `avatar` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `password` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `email` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `admin` int(11) NOT NULL,
-  `active` int(11) NOT NULL,
-  `group_id` int(11) NOT NULL,
-  `create_user_id` bigint(20) NULL DEFAULT NULL,
-  `create_time` datetime(3) NULL,
-  `is_deleted` bit(1) NOT NULL,
-  `delete_user_id` bigint(20) NULL DEFAULT NULL,
-  `delete_time` datetime(3) NULL DEFAULT NULL,
-  `update_user_id` bigint(20) NULL DEFAULT NULL,
-  `update_time` datetime(3) NULL,
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1242 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of lin_user
--- ----------------------------
-INSERT INTO `lin_user` VALUES ('admin', NULL, '46F94C8DE14FB36680850768FF1B7F2A', '', 2, 1, 2, NULL, '2019-08-02 23:46:08.000', b'0', NULL, NULL, NULL, '2019-08-02 23:46:08.000', 7);
-INSERT INTO `lin_user` VALUES ('super', '2019/07/31/0f40818c-ddb1-4c48-9e09-6332357a38df.jpg', 'BEB6B72231DAAFE7D913BAA818A63F0C', '', 1, 1, 15, NULL, '2019-08-02 23:46:08.000', b'0', NULL, NULL, NULL, '2019-08-02 23:46:08.000', 11);
-
-SET FOREIGN_KEY_CHECKS = 1;
diff --git "a/docs/sql/\346\225\260\346\215\256\345\272\223.zip" "b/docs/sql/\346\225\260\346\215\256\345\272\223.zip"
new file mode 100644
index 00000000..eb09cd73
Binary files /dev/null and "b/docs/sql/\346\225\260\346\215\256\345\272\223.zip" differ
diff --git a/docs/toc.yml b/docs/toc.yml
new file mode 100644
index 00000000..59f80104
--- /dev/null
+++ b/docs/toc.yml
@@ -0,0 +1,5 @@
+- name: Articles
+  href: articles/
+- name: Api Documentation
+  href: api/
+  homepage: api/index.md
diff --git a/framework/IGeekFan.sln b/framework/IGeekFan.sln
new file mode 100644
index 00000000..11048557
--- /dev/null
+++ b/framework/IGeekFan.sln
@@ -0,0 +1,48 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29613.14
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{33F33892-2C9C-432A-B77C-E09E18E41C1E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{E94AA563-C2D9-4312-B296-DA6DE6DE13F5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{7A7054CA-747F-4E0A-8A6B-AD3D2F02484A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IGeekFan.Localization.FreeSql", "src\IGeekFan.Localization.FreeSql\IGeekFan.Localization.FreeSql.csproj", "{481B0459-59B7-4502-B77F-0D15BA488BA2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Localization", "samples\Sample.Localization\Sample.Localization.csproj", "{74D48241-41CF-470D-8BAD-8B70318BBA3C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IGeekFan.Test", "test\IGeekFan.Test\IGeekFan.Test.csproj", "{8435070A-283C-4750-A04F-8A332D431FFC}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{481B0459-59B7-4502-B77F-0D15BA488BA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{481B0459-59B7-4502-B77F-0D15BA488BA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{481B0459-59B7-4502-B77F-0D15BA488BA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{481B0459-59B7-4502-B77F-0D15BA488BA2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{74D48241-41CF-470D-8BAD-8B70318BBA3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74D48241-41CF-470D-8BAD-8B70318BBA3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74D48241-41CF-470D-8BAD-8B70318BBA3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{74D48241-41CF-470D-8BAD-8B70318BBA3C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8435070A-283C-4750-A04F-8A332D431FFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8435070A-283C-4750-A04F-8A332D431FFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8435070A-283C-4750-A04F-8A332D431FFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8435070A-283C-4750-A04F-8A332D431FFC}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{481B0459-59B7-4502-B77F-0D15BA488BA2} = {33F33892-2C9C-432A-B77C-E09E18E41C1E}
+		{74D48241-41CF-470D-8BAD-8B70318BBA3C} = {E94AA563-C2D9-4312-B296-DA6DE6DE13F5}
+		{8435070A-283C-4750-A04F-8A332D431FFC} = {7A7054CA-747F-4E0A-8A6B-AD3D2F02484A}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {9A532480-28D6-4D1A-A85F-EA2EE2DBECD2}
+	EndGlobalSection
+EndGlobal
diff --git a/framework/VoVo.sln b/framework/VoVo.sln
deleted file mode 100644
index b492edc5..00000000
--- a/framework/VoVo.sln
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29613.14
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{33F33892-2C9C-432A-B77C-E09E18E41C1E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{E94AA563-C2D9-4312-B296-DA6DE6DE13F5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.RabbitMQ.MySql", "samples\Sample.RabbitMQ.MySql\Sample.RabbitMQ.MySql.csproj", "{45917EEB-75F8-46E0-BB8E-38D428C8175A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{7A7054CA-747F-4E0A-8A6B-AD3D2F02484A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoVo.CAP.MySql", "src\VoVo.CAP.MySql\VoVo.CAP.MySql.csproj", "{C08591A8-53DD-4066-AFC9-C7F495454778}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{45917EEB-75F8-46E0-BB8E-38D428C8175A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{45917EEB-75F8-46E0-BB8E-38D428C8175A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{45917EEB-75F8-46E0-BB8E-38D428C8175A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{45917EEB-75F8-46E0-BB8E-38D428C8175A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C08591A8-53DD-4066-AFC9-C7F495454778}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C08591A8-53DD-4066-AFC9-C7F495454778}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C08591A8-53DD-4066-AFC9-C7F495454778}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C08591A8-53DD-4066-AFC9-C7F495454778}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{45917EEB-75F8-46E0-BB8E-38D428C8175A} = {E94AA563-C2D9-4312-B296-DA6DE6DE13F5}
-		{C08591A8-53DD-4066-AFC9-C7F495454778} = {33F33892-2C9C-432A-B77C-E09E18E41C1E}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {9A532480-28D6-4D1A-A85F-EA2EE2DBECD2}
-	EndGlobalSection
-EndGlobal
diff --git a/framework/samples/Sample.Localization/Controllers/CultureController.cs b/framework/samples/Sample.Localization/Controllers/CultureController.cs
new file mode 100644
index 00000000..83623ed3
--- /dev/null
+++ b/framework/samples/Sample.Localization/Controllers/CultureController.cs
@@ -0,0 +1,41 @@
+using Microsoft.AspNetCore.Localization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Logging;
+
+namespace Sample.Localization.Controllers
+{
+    [Route("[controller]")]
+    public class CultureController : Controller
+    {
+        private readonly ILogger<CultureController> _logger;
+        private readonly IFreeSql freeSql;
+        private readonly IStringLocalizer stringLocalizer;
+
+        public CultureController(ILogger<CultureController> logger, IFreeSql freeSql, IStringLocalizerFactory localizerFactory)
+        {
+            _logger = logger;
+            this.freeSql = freeSql;
+            this.stringLocalizer = localizerFactory.Create(null); ;
+        }
+
+        [HttpGet("{id}")]
+        public string Get(int id)
+        {
+            return stringLocalizer["Request Localization"] + id;
+        }
+
+        [HttpGet]
+        public IActionResult Index()
+        {
+            var requestCultureFeature = HttpContext.Features.Get<IRequestCultureFeature>();
+            var requestCulture = requestCultureFeature.RequestCulture;
+
+            ViewBag.SR = stringLocalizer;
+            ViewBag.requestCultureFeature = requestCultureFeature;
+            ViewBag.requestCulture = requestCulture;
+
+            return View();
+        }
+    }
+}
diff --git a/framework/samples/Sample.Localization/Models/ErrorViewModel.cs b/framework/samples/Sample.Localization/Models/ErrorViewModel.cs
new file mode 100644
index 00000000..0611f460
--- /dev/null
+++ b/framework/samples/Sample.Localization/Models/ErrorViewModel.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace Sample.Localization.Models
+{
+    public class ErrorViewModel
+    {
+        public string RequestId { get; set; }
+
+        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+    }
+}
diff --git a/framework/samples/Sample.RabbitMQ.MySql/Program.cs b/framework/samples/Sample.Localization/Program.cs
similarity index 65%
rename from framework/samples/Sample.RabbitMQ.MySql/Program.cs
rename to framework/samples/Sample.Localization/Program.cs
index 07a0cedc..72e3e8ce 100644
--- a/framework/samples/Sample.RabbitMQ.MySql/Program.cs
+++ b/framework/samples/Sample.Localization/Program.cs
@@ -1,7 +1,13 @@
-using Microsoft.AspNetCore.Hosting;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 
-namespace Sample.RabbitMQ.MySql
+namespace Sample.Localization
 {
     public class Program
     {
diff --git a/framework/samples/Sample.Localization/Properties/launchSettings.json b/framework/samples/Sample.Localization/Properties/launchSettings.json
new file mode 100644
index 00000000..78e3a8dc
--- /dev/null
+++ b/framework/samples/Sample.Localization/Properties/launchSettings.json
@@ -0,0 +1,22 @@
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:59820/",
+      "sslPort": 44378
+    }
+  },
+  "profiles": {
+    "Sample.Localization": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "Culture",
+      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/framework/samples/Sample.Localization/Sample.Localization.csproj b/framework/samples/Sample.Localization/Sample.Localization.csproj
new file mode 100644
index 00000000..e02f8cb2
--- /dev/null
+++ b/framework/samples/Sample.Localization/Sample.Localization.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+     <SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
+     <UserSecretsId>3a7041ee-24e1-4e27-8328-6b7a91bc5b16</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FreeSql" Version="2.5.200" />
+    <PackageReference Include="FreeSql.Provider.MySqlConnector" Version="2.5.200" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.6" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\IGeekFan.Localization.FreeSql\IGeekFan.Localization.FreeSql.csproj" />
+  </ItemGroup>
+
+
+</Project>
diff --git a/framework/samples/Sample.Localization/Startup.cs b/framework/samples/Sample.Localization/Startup.cs
new file mode 100644
index 00000000..9ba204f4
--- /dev/null
+++ b/framework/samples/Sample.Localization/Startup.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Threading.Tasks;
+using FreeSql;
+using IGeekFan.Localization.FreeSql;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Localization;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Localization;
+
+namespace Sample.Localization
+{
+    public class Startup
+    {
+        public Startup(IConfiguration configuration)
+        {
+            Configuration = configuration;
+
+            IConfigurationSection Mysql = Configuration.GetSection("Mysql");
+            Fsql = new FreeSqlBuilder()
+                .UseConnectionString(DataType.MySql, Mysql.Value)
+                .UseAutoSyncStructure(true)
+                .UseMonitorCommand(cmd => Trace.WriteLine(cmd.CommandText))
+                .Build();
+        }
+        public IFreeSql Fsql { get; }
+        public IConfiguration Configuration { get; }
+
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddControllersWithViews().AddRazorRuntimeCompilation();
+            services.AddSingleton(Fsql);
+            services.AddSingleton<IStringLocalizerFactory, FreeSqlStringLocalizerFactory>();
+        }
+
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        {
+            if (env.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
+
+            var supportedCultures = new List<CultureInfo>
+            {
+                new CultureInfo("en-US"),
+                new CultureInfo("ja-JP"),
+                new CultureInfo("fr-FR"),
+                new CultureInfo("zh-CN")
+            };
+            var options = new RequestLocalizationOptions
+            {
+                DefaultRequestCulture = new RequestCulture("en-US"),
+                SupportedCultures = supportedCultures,
+                SupportedUICultures = supportedCultures
+            };
+            app.UseRequestLocalization(options);
+
+
+            app.UseHttpsRedirection();
+            app.UseStaticFiles();
+            app.UseRouting();
+
+            app.UseAuthorization();
+
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapControllerRoute(
+                   name: "default",
+                   pattern: "{controller=Home}/{action=Index}/{id?}");
+            });
+        }
+    }
+}
diff --git a/framework/samples/Sample.Localization/Views/Culture/Index.cshtml b/framework/samples/Sample.Localization/Views/Culture/Index.cshtml
new file mode 100644
index 00000000..219d11f5
--- /dev/null
+++ b/framework/samples/Sample.Localization/Views/Culture/Index.cshtml
@@ -0,0 +1,139 @@
+@{
+    @using Microsoft.AspNetCore.Localization;
+    @using Microsoft.Extensions.Localization;
+    @using System.Globalization;
+
+    IStringLocalizer SR = ViewBag.SR as IStringLocalizer;
+    IRequestCultureFeature requestCultureFeature = ViewBag.requestCultureFeature as IRequestCultureFeature;
+    RequestCulture requestCulture = ViewBag.requestCulture as RequestCulture;
+
+    ViewData["Title"] = SR["Request Localization"];
+}
+
+<style>
+</style>
+@section Scripts{
+    <script>
+        function useCookie() {
+            var culture = document.getElementById('culture');
+            var uiCulture = document.getElementById('uiCulture');
+            var cookieValue = '@(CookieRequestCultureProvider.DefaultCookieName)' + culture.options[culture.selectedIndex].value + '|uic=' + uiCulture.options[uiCulture.selectedIndex].value;
+            document.cookie = cookieValue;
+            window.location = window.location.href.split('?')[0];
+        }
+
+        function clearCookie() {
+            document.cookie = '@(CookieRequestCultureProvider.DefaultCookieName)=""';
+        }
+    </script>
+}
+<h1>@(SR["Request Localization Sample"])</h1>
+<h1>@(SR["Hello"])</h1>
+
+<form id="theForm" method="get">
+    <div class="form-group" style="width: 300px;margin-bottom:1rem;">
+        <label for="culture">@SR["Culture"]: </label>
+        <select id="culture" name="culture" class="form-control">
+            <option value="">-- select --</option>
+            <option value="@(new CultureInfo("en-US").Name)">@(new CultureInfo("en-US").DisplayName)</option>
+            <option value="@(new CultureInfo("fr-FR").Name)">@(new CultureInfo("fr-FR").DisplayName)</option>
+            <option value="@(new CultureInfo("ja-JP").Name)">@(new CultureInfo("ja-JP").DisplayName)</option>
+            <option value="@(new CultureInfo("zh-CN").Name)">@(new CultureInfo("zh-CN").DisplayName)</option>
+        </select>
+    </div>
+    <div class="form-group" style="width: 300px;margin-bottom: 1rem;">
+        <label for="uiCulture">@SR["UI Culture"]: </label>
+        <select id="uiCulture" name="ui-culture" class="form-control">
+            <option value="">-- select --</option>
+            <option value="@(new CultureInfo("en-US").Name)">@(new CultureInfo("en-US").DisplayName)</option>
+            <option value="@(new CultureInfo("fr-FR").Name)">@(new CultureInfo("fr-FR").DisplayName)</option>
+            <option value="@(new CultureInfo("ja-JP").Name)">@(new CultureInfo("ja-JP").DisplayName)</option>
+            <option value="@(new CultureInfo("zh-CN").Name)">@(new CultureInfo("zh-CN").DisplayName)</option>
+        </select>
+    </div>
+    <div class="form-group margin-top-xs" style="width: 300px;margin-bottom: 1rem;">
+        <input type="submit" value="go QS" class="btn btn-primary" />
+        <input type="button" value="go cookie" onclick="useCookie();" class="btn btn-danger" />
+        <a href="https://github.com/Culture" onclick="clearCookie();">@SR["reset"]</a>
+    </div>
+</form>
+<table class="table">
+    <tbody>
+        <tr>
+            <th>Winning provider:</th>
+            <td>@requestCultureFeature.Provider.GetType().Name</td>
+        </tr>
+        <tr>
+            <th>@SR["Current request culture:"]</th>
+            <td>@requestCulture.Culture.DisplayName (@requestCulture.Culture)</td>
+        </tr>
+        <tr>
+            <th>@SR["Current request UI culture:"]</th>
+            <td>@requestCulture.UICulture.DisplayName (@requestCulture.UICulture)</td>
+        </tr>
+        <tr>
+            <th>@SR["Current thread culture:"]</th>
+            <td>@CultureInfo.CurrentCulture.DisplayName (@CultureInfo.CurrentCulture)</td>
+        </tr>
+        <tr>
+            <th>@SR["Current thread UI culture:"]:</th>
+            <td>@CultureInfo.CurrentUICulture.DisplayName (@CultureInfo.CurrentUICulture)</td>
+        </tr>
+        <tr>
+            <th>@SR["Current date (invariant full):"]:</th>
+            <td>@DateTime.Now.ToString("F", CultureInfo.InvariantCulture)</td>
+        </tr>
+        <tr>
+            <th>@SR["Current date (invariant):"]</th>
+            <td>@DateTime.Now.ToString(CultureInfo.InvariantCulture)</td>
+        </tr>
+        <tr>
+            <th>@SR["Current date (request full):"]</th>
+            <td>@DateTime.Now.ToString("F")</td>
+        </tr>
+        <tr>
+            <th>@SR["Current date (request):"]</th>
+            <td>@DateTime.Now.ToString()</td>
+        </tr>
+        <tr>
+            <th>@SR["Current time (invariant):"]</th>
+            <td>@DateTime.Now.ToString("T", CultureInfo.InvariantCulture)</td>
+        </tr>
+        <tr>
+            <th>@SR["Current time (request):"]</th>
+            <td>@DateTime.Now.ToString("T")</td>
+        </tr>
+        <tr>
+            <th>@SR["Big number (invariant):"]</th>
+            <td>@((Math.Pow(2, 42) + 0.42).ToString("N", CultureInfo.InvariantCulture)))</td>
+        </tr>
+        <tr>
+            <th>@SR["Big number (request):"]</th>
+            <td>@((Math.Pow(2, 42) + 0.42).ToString("N")))</td>
+        </tr>
+        <tr>
+            <th>@SR["Big number negative (invariant):"]</th>
+            <td>-@(((Math.Pow(2, 42) + 0.42).ToString("N", CultureInfo.InvariantCulture)))</td>
+        </tr>
+        <tr>
+            <th>@SR["Big number negative (request):"]</th>
+            <td>-@((Math.Pow(2, 42) + 0.42).ToString("N")))</td>
+        </tr>
+        <tr>
+            <th>@SR["Money (invariant):"]</th>
+            <td>@((2199.50.ToString("C", CultureInfo.InvariantCulture)))</td>
+        </tr>
+        <tr>
+            <th>@SR["Money (request):"]</th>
+            <td>@(2199.50.ToString("C"))</td>
+        </tr>
+        <tr>
+            <th>@SR["Money negative (invariant):"]</th>
+            <td>@((-2199.50).ToString("C", CultureInfo.InvariantCulture))</td>
+        </tr>
+        <tr>
+            <th>@SR["Money negative (request):"]</th>
+            <td>@((-2199.50).ToString("C"))</td>
+        </tr>
+    </tbody>
+</table>
diff --git a/framework/samples/Sample.Localization/Views/Shared/Error.cshtml b/framework/samples/Sample.Localization/Views/Shared/Error.cshtml
new file mode 100644
index 00000000..a1e04783
--- /dev/null
+++ b/framework/samples/Sample.Localization/Views/Shared/Error.cshtml
@@ -0,0 +1,25 @@
+@model ErrorViewModel
+@{
+    ViewData["Title"] = "Error";
+}
+
+<h1 class="text-danger">Error.</h1>
+<h2 class="text-danger">An error occurred while processing your request.</h2>
+
+@if (Model.ShowRequestId)
+{
+    <p>
+        <strong>Request ID:</strong> <code>@Model.RequestId</code>
+    </p>
+}
+
+<h3>Development Mode</h3>
+<p>
+    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
+</p>
+<p>
+    <strong>The Development environment shouldn't be enabled for deployed applications.</strong>
+    It can result in displaying sensitive information from exceptions to end users.
+    For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
+    and restarting the app.
+</p>
diff --git a/framework/samples/Sample.Localization/Views/Shared/_Layout.cshtml b/framework/samples/Sample.Localization/Views/Shared/_Layout.cshtml
new file mode 100644
index 00000000..eab0192c
--- /dev/null
+++ b/framework/samples/Sample.Localization/Views/Shared/_Layout.cshtml
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - Sample.Localization</title>
+    <link href="https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/5.0.0-alpha1/css/bootstrap.css" rel="stylesheet">
+</head>
+<body>
+    <header>
+        <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
+            <div class="container">
+                <a class="navbar-brand" asp-area="" asp-controller="Culture" asp-action="https://github.com/Index">Sample.Localization</a>
+                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
+                        aria-expanded="false" aria-label="Toggle navigation">
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+                <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
+                    <ul class="navbar-nav flex-grow-1">
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Culture" asp-action="https://github.com/Index">Culture</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </nav>
+    </header>
+    <div class="container">
+        <main role="main" class="pb-3">
+            @RenderBody()
+        </main>
+    </div>
+
+    <footer class="border-top footer text-muted">
+        <div class="container">
+            &copy; 2020 - Sample.Localization - <a asp-area="" asp-controller="Culture" asp-action="https://github.com/Index">Culture</a>
+        </div>
+    </footer>
+    <script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
+    <script src="https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/5.0.0-alpha1/js/bootstrap.min.js"></script>
+    @RenderSection("Scripts", required: false)
+</body>
+</html>
diff --git a/framework/samples/Sample.Localization/Views/_ViewImports.cshtml b/framework/samples/Sample.Localization/Views/_ViewImports.cshtml
new file mode 100644
index 00000000..b1fce2ac
--- /dev/null
+++ b/framework/samples/Sample.Localization/Views/_ViewImports.cshtml
@@ -0,0 +1,3 @@
+@using Sample.Localization
+@using Sample.Localization.Models
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/framework/samples/Sample.Localization/Views/_ViewStart.cshtml b/framework/samples/Sample.Localization/Views/_ViewStart.cshtml
new file mode 100644
index 00000000..a5f10045
--- /dev/null
+++ b/framework/samples/Sample.Localization/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}
diff --git a/framework/samples/Sample.Localization/appsettings.Development.json b/framework/samples/Sample.Localization/appsettings.Development.json
new file mode 100644
index 00000000..8983e0fc
--- /dev/null
+++ b/framework/samples/Sample.Localization/appsettings.Development.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}
diff --git a/framework/samples/Sample.Localization/appsettings.json b/framework/samples/Sample.Localization/appsettings.json
new file mode 100644
index 00000000..a1c68fd2
--- /dev/null
+++ b/framework/samples/Sample.Localization/appsettings.json
@@ -0,0 +1,11 @@
+{
+  "Mysql": "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=samples-db;Charset=utf8;SslMode=none;Max pool size=10",
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*"
+}
diff --git a/framework/samples/Sample.RabbitMQ.MySql/AppDbContext.cs b/framework/samples/Sample.RabbitMQ.MySql/AppDbContext.cs
deleted file mode 100644
index d6fc4754..00000000
--- a/framework/samples/Sample.RabbitMQ.MySql/AppDbContext.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-
-namespace Sample.RabbitMQ.MySql
-{
-    public class Person
-    {
-        public int Id { get; set; }
-
-        public string Name { get; set; }
-
-        public override string ToString()
-        {
-            return $"Name:{Name}, Id:{Id}";
-        }
-    }
-    public class Person2
-    {
-        public int Id { get; set; }
-
-        public string Name { get; set; }
-
-        public override string ToString()
-        {
-            return $"Name:{Name}, Id:{Id}";
-        }
-    }
-    public class AppDbContext : DbContext
-    {
-        public const string ConnectionString = "Server=localhost;Database=captest;UserId=root;Password=123456;";
-
-        public DbSet<Person> Persons { get; set; }
-
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-            optionsBuilder.UseMySql(ConnectionString);
-        }
-    }
-}
diff --git a/framework/samples/Sample.RabbitMQ.MySql/Controllers/ValuesController.cs b/framework/samples/Sample.RabbitMQ.MySql/Controllers/ValuesController.cs
deleted file mode 100644
index 77364e38..00000000
--- a/framework/samples/Sample.RabbitMQ.MySql/Controllers/ValuesController.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using System;
-using System.Data;
-using System.Threading.Tasks;
-using Dapper;
-using DotNetCore.CAP;
-using Microsoft.AspNetCore.Mvc;
-using MySql.Data.MySqlClient;
-using Sample.RabbitMQ.MySql.Models;
-
-namespace Sample.RabbitMQ.MySql.Controllers
-{
-    public class ValuesController : Controller
-    {
-        private readonly ICapPublisher _capBus;
-        private readonly IFreeSql _freeSql;
-        public ValuesController(ICapPublisher capPublisher, IFreeSql freeSql)
-        {
-            _capBus = capPublisher;
-            _freeSql = freeSql;
-        }
-
-        [Route("~/without/transaction")]
-        public async Task<IActionResult> WithoutTransaction()
-        {
-            await _capBus.PublishAsync("sample.rabbitmq.mysql", new Person()
-            {
-                Id = 123,
-                Name = "Bar"
-            });
-
-            return Ok();
-        }
-
-        [Route("~/adonet/transaction")]
-        public IActionResult AdonetWithTransaction()
-        {
-            using (var connection = new MySqlConnection(AppDbContext.ConnectionString))
-            {
-                using (var transaction = connection.BeginTransaction(_capBus, true))
-                {
-                    //your business code
-                    connection.Execute("insert into test(name) values('test')", transaction: (IDbTransaction)transaction.DbTransaction);
-
-                    //for (int i = 0; i < 5; i++)
-                    //{
-                    _capBus.Publish("sample.rabbitmq.mysql", DateTime.Now);
-                    //}
-                }
-            }
-
-            return Ok();
-        }
-
-        [NonAction]
-        [CapSubscribe("sample.rabbitmq.mysql")]
-        public void Subscriber(DateTime p)
-        {
-            Console.WriteLine($@"{DateTime.Now} Subscriber invoked, Info: {p}");
-        }
-
-        [NonAction]
-        [CapSubscribe("sample.rabbitmq.mysql", Group = "group.test2")]
-        public void Subscriber2(DateTime p, [FromCap]CapHeader header)
-        {
-            Console.WriteLine($@"{DateTime.Now} Subscriber invoked, Info: {p}");
-        }
-
-        [HttpGet("~/freesql/transaction")]
-        public DateTime FreeSqlWithTransaction()
-        {
-            DateTime now = DateTime.Now;
-            using (var uow = _freeSql.CreateUnitOfWork())
-            {
-                using ICapTransaction trans = uow.BeginTransaction(_capBus, false);
-                var repo = uow.GetRepository<WeatherForecast>();
-
-                repo.Insert(new WeatherForecast()
-                {
-                    Date = now,
-                    Summary = "summary",
-                    TemperatureC = 100
-                });
-
-                repo.Insert(new WeatherForecast()
-                {
-                    Date = now,
-                    Summary = "11222",
-                    TemperatureC = 200
-                });
-                _capBus.Publish("freesql.time", now);
-                trans.Commit();
-            }
-
-            return now;
-        }
-
-        [CapSubscribe("freesql.time")]
-        public void GetTime(DateTime time)
-        {
-            Console.WriteLine($"time:{time}");
-        }
-    }
-}
diff --git a/framework/samples/Sample.RabbitMQ.MySql/Migrations/20180821021736_init.Designer.cs b/framework/samples/Sample.RabbitMQ.MySql/Migrations/20180821021736_init.Designer.cs
deleted file mode 100644
index 11b19a05..00000000
--- a/framework/samples/Sample.RabbitMQ.MySql/Migrations/20180821021736_init.Designer.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// <auto-generated />
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Sample.RabbitMQ.MySql;
-
-namespace Sample.RabbitMQ.MySql.Migrations
-{
-    [DbContext(typeof(AppDbContext))]
-    [Migration("20180821021736_init")]
-    partial class init
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.1-rtm-30846")
-                .HasAnnotation("Relational:MaxIdentifierLength", 64);
-
-            modelBuilder.Entity("Sample.RabbitMQ.MySql.Person", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Persons");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/framework/samples/Sample.RabbitMQ.MySql/Migrations/20180821021736_init.cs b/framework/samples/Sample.RabbitMQ.MySql/Migrations/20180821021736_init.cs
deleted file mode 100644
index 762ddbfe..00000000
--- a/framework/samples/Sample.RabbitMQ.MySql/Migrations/20180821021736_init.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace Sample.RabbitMQ.MySql.Migrations
-{
-    public partial class init : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Persons",
-                columns: table => new
-                {
-                    Id = table.Column<int>(nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    Name = table.Column<string>(nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Persons", x => x.Id);
-                });
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Persons");
-        }
-    }
-}
diff --git a/framework/samples/Sample.RabbitMQ.MySql/Migrations/AppDbContextModelSnapshot.cs b/framework/samples/Sample.RabbitMQ.MySql/Migrations/AppDbContextModelSnapshot.cs
deleted file mode 100644
index c74c3cd9..00000000
--- a/framework/samples/Sample.RabbitMQ.MySql/Migrations/AppDbContextModelSnapshot.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// <auto-generated />
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Sample.RabbitMQ.MySql;
-
-namespace Sample.RabbitMQ.MySql.Migrations
-{
-    [DbContext(typeof(AppDbContext))]
-    partial class AppDbContextModelSnapshot : ModelSnapshot
-    {
-        protected override void BuildModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.1-rtm-30846")
-                .HasAnnotation("Relational:MaxIdentifierLength", 64);
-
-            modelBuilder.Entity("Sample.RabbitMQ.MySql.Person", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Persons");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/framework/samples/Sample.RabbitMQ.MySql/Models/WeatherForecast.cs b/framework/samples/Sample.RabbitMQ.MySql/Models/WeatherForecast.cs
deleted file mode 100644
index 03f64b70..00000000
--- a/framework/samples/Sample.RabbitMQ.MySql/Models/WeatherForecast.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using FreeSql.DataAnnotations;
-
-namespace Sample.RabbitMQ.MySql.Models
-{
-    public class WeatherForecast
-    {
-        [Column(IsIdentity = true, IsPrimary = true)]
-        public int Id { get; set; }
-        public DateTime Date { get; set; }
-
-        public int TemperatureC { get; set; }
-
-        public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
-        [Column(DbType = "varchar(20)")]
-        public string Summary { get; set; }
-    }
-}
diff --git a/framework/samples/Sample.RabbitMQ.MySql/Properties/launchSettings.json b/framework/samples/Sample.RabbitMQ.MySql/Properties/launchSettings.json
deleted file mode 100644
index 0898ae34..00000000
--- a/framework/samples/Sample.RabbitMQ.MySql/Properties/launchSettings.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:49558/",
-      "sslPort": 44332
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "cap",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Sample.RabbitMQ.MySql": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "cap",
-      "applicationUrl": "http://localhost:5000/",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
diff --git a/framework/samples/Sample.RabbitMQ.MySql/Sample.RabbitMQ.MySql.csproj b/framework/samples/Sample.RabbitMQ.MySql/Sample.RabbitMQ.MySql.csproj
deleted file mode 100644
index 6f19bec0..00000000
--- a/framework/samples/Sample.RabbitMQ.MySql/Sample.RabbitMQ.MySql.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="DotNetCore.CAP" Version="3.0.0" />
-    <PackageReference Include="DotNetCore.CAP.Dashboard" Version="3.0.0" />
-    <PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="3.0.0" />
-    <PackageReference Include="FreeSql" Version="1.2.0-preview5" />
-    <PackageReference Include="FreeSql.Provider.MySqlConnector" Version="1.2.0-preview5" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.0" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\VoVo.CAP.MySql\VoVo.CAP.MySql.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/framework/samples/Sample.RabbitMQ.MySql/Startup.cs b/framework/samples/Sample.RabbitMQ.MySql/Startup.cs
deleted file mode 100644
index b49cb4ac..00000000
--- a/framework/samples/Sample.RabbitMQ.MySql/Startup.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using DotNetCore.CAP.Messages;
-using FreeSql;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace Sample.RabbitMQ.MySql
-{
-    public class Startup
-    {
-        public IFreeSql Fsql { get; }
-        public IConfiguration Configuration { get; }
-
-        private string connectionString = @"Data Source=localhost;Port=3306;User ID=root;Password=123456;Initial Catalog=captest;Charset=utf8mb4;SslMode=none;Max pool size=10";
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-
-            Fsql = new FreeSqlBuilder()
-                .UseConnectionString(DataType.MySql, connectionString)
-                .UseAutoSyncStructure(true)
-                .Build();
-        }
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDbContext<AppDbContext>();
-            services.AddSingleton<IFreeSql>(Fsql);
-            services.AddCap(x =>
-            {
-
-                x.UseMySql(connectionString);
-
-                x.UseRabbitMQ("localhost");
-                x.UseDashboard();
-                x.FailedRetryCount = 5;
-                x.FailedThresholdCallback = (type, msg) =>
-                {
-                    Console.WriteLine(
-                        $@"A message of type {type} failed after executing {x.FailedRetryCount} several times, requiring manual troubleshooting. Message name: {msg.GetName()}");
-                };
-            });
-
-            services.AddControllers();
-        }
-
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-
-            app.UseRouting();
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-            });
-        }
-    }
-}
diff --git a/framework/src/IGeekFan.Localization.FreeSql/FreeSqlStringLocalizer.cs b/framework/src/IGeekFan.Localization.FreeSql/FreeSqlStringLocalizer.cs
new file mode 100644
index 00000000..d594382d
--- /dev/null
+++ b/framework/src/IGeekFan.Localization.FreeSql/FreeSqlStringLocalizer.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using IGeekFan.Localization.FreeSql.Models;
+using Microsoft.Extensions.Localization;
+
+namespace IGeekFan.Localization.FreeSql
+{
+    public class FreeSqlStringLocalizer : IStringLocalizer
+    {
+        private readonly IFreeSql _db;
+
+        public FreeSqlStringLocalizer(IFreeSql db)
+        {
+            _db = db;
+        }
+
+        public LocalizedString this[string name]
+        {
+            get
+            {
+                if (name == null)
+                {
+                    throw new ArgumentNullException(nameof(name));
+                }
+                var value = GetString(name);
+                return new LocalizedString(name, value ?? name, resourceNotFound: value == null);
+            }
+        }
+
+        public LocalizedString this[string name, params object[] arguments]
+        {
+            get
+            {
+                var format = GetString(name);
+                var value = string.Format(format ?? name, arguments);
+                return new LocalizedString(name, value, resourceNotFound: format == null);
+            }
+        }
+
+        public IStringLocalizer WithCulture(CultureInfo culture)
+        {
+            CultureInfo.DefaultThreadCurrentCulture = culture;
+            return new FreeSqlStringLocalizer(_db);
+        }
+
+        public IEnumerable<LocalizedString> GetAllStrings(bool includeAncestorCultures)
+        {
+            return _db.Select<LocalResource>()
+                .Where(r => r.Culture.Name == CultureInfo.CurrentCulture.Name)
+                .ToList(r => new LocalizedString(r.Key, r.Value, true));
+        }
+
+        private string GetString(string name)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+            return _db.Select<LocalResource>()
+                .Where(r => r.Culture.Name == CultureInfo.CurrentCulture.Name && r.Key == name)
+                .First()?.Value;
+        }
+    }
+}
diff --git a/framework/src/IGeekFan.Localization.FreeSql/FreeSqlStringLocalizerFactory.cs b/framework/src/IGeekFan.Localization.FreeSql/FreeSqlStringLocalizerFactory.cs
new file mode 100644
index 00000000..65be78cc
--- /dev/null
+++ b/framework/src/IGeekFan.Localization.FreeSql/FreeSqlStringLocalizerFactory.cs
@@ -0,0 +1,25 @@
+using System;
+using Microsoft.Extensions.Localization;
+
+namespace IGeekFan.Localization.FreeSql
+{
+    public class FreeSqlStringLocalizerFactory : IStringLocalizerFactory
+    {
+        private readonly IFreeSql _db;
+
+        public FreeSqlStringLocalizerFactory(IFreeSql db)
+        {
+            this._db = db;
+        }
+
+        public IStringLocalizer Create(Type resourceSource)
+        {
+            return new FreeSqlStringLocalizer(_db);
+        }
+
+        public IStringLocalizer Create(string baseName, string location)
+        {
+            return new FreeSqlStringLocalizer(_db);
+        }
+    }
+}
diff --git a/framework/src/IGeekFan.Localization.FreeSql/FreeSqlStringLocalizerOfT.cs b/framework/src/IGeekFan.Localization.FreeSql/FreeSqlStringLocalizerOfT.cs
new file mode 100644
index 00000000..71e0eb14
--- /dev/null
+++ b/framework/src/IGeekFan.Localization.FreeSql/FreeSqlStringLocalizerOfT.cs
@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using System.Globalization;
+using IGeekFan.Localization.FreeSql.Models;
+using Microsoft.Extensions.Localization;
+
+namespace IGeekFan.Localization.FreeSql
+{
+    public class FreeSqlStringLocalizer<T> : IStringLocalizer<T>
+    {
+        private readonly IFreeSql _db;
+
+        public FreeSqlStringLocalizer(IFreeSql db)
+        {
+            _db = db;
+        }
+
+        public LocalizedString this[string name]
+        {
+            get
+            {
+                var value = GetString(name);
+                return new LocalizedString(name, value ?? name, resourceNotFound: value == null);
+            }
+        }
+
+        public LocalizedString this[string name, params object[] arguments]
+        {
+            get
+            {
+                var format = GetString(name);
+                var value = string.Format(format ?? name, arguments);
+                return new LocalizedString(name, value, resourceNotFound: format == null);
+            }
+        }
+
+        public IStringLocalizer WithCulture(CultureInfo culture)
+        {
+            CultureInfo.DefaultThreadCurrentCulture = culture;
+            return new FreeSqlStringLocalizer(_db);
+        }
+
+        public IEnumerable<LocalizedString> GetAllStrings(bool includeAncestorCultures)
+        {
+            return _db.Select<LocalResource>()
+                .Include(r => r.Culture)
+                .Where(r => r.Culture.Name == CultureInfo.CurrentCulture.Name)
+                .ToList(r => new LocalizedString(r.Key, r.Value, true));
+        }
+
+        private string GetString(string name)
+        {
+            return _db.Select<LocalResource>()
+                .Include(r => r.Culture)
+                .Where(r => r.Culture.Name == CultureInfo.CurrentCulture.Name&&r.Key==name)
+                .First()?.Value;
+        }
+    }
+}
diff --git a/framework/src/IGeekFan.Localization.FreeSql/IGeekFan.Localization.FreeSql.csproj b/framework/src/IGeekFan.Localization.FreeSql/IGeekFan.Localization.FreeSql.csproj
new file mode 100644
index 00000000..4276f3a3
--- /dev/null
+++ b/framework/src/IGeekFan.Localization.FreeSql/IGeekFan.Localization.FreeSql.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+	 <PackageReference Include="FreeSql" Version="2.5.200" />
+     <PackageReference Include="Microsoft.Extensions.Localization" Version="5.0.8" />
+  </ItemGroup>
+
+</Project>
diff --git a/framework/src/IGeekFan.Localization.FreeSql/Models/LocalCulture.cs b/framework/src/IGeekFan.Localization.FreeSql/Models/LocalCulture.cs
new file mode 100644
index 00000000..76543079
--- /dev/null
+++ b/framework/src/IGeekFan.Localization.FreeSql/Models/LocalCulture.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using FreeSql.DataAnnotations;
+
+namespace IGeekFan.Localization.FreeSql.Models
+{
+    public class LocalCulture
+    {
+        public LocalCulture()
+        {
+        }
+
+        public LocalCulture(string name, string displayName, ICollection<LocalResource> resources) : this(name, displayName)
+        {
+            Resources = resources ?? throw new ArgumentNullException(nameof(resources));
+        }
+
+        public LocalCulture(string name, string displayName)
+        {
+            Name = name ?? throw new ArgumentNullException(nameof(name));
+            DisplayName = displayName ?? throw new ArgumentNullException(nameof(displayName));
+        }
+
+        [Column(IsIdentity = true, IsPrimary = true)]
+        public long Id { get; set; }
+
+        [Column(StringLength = 10)]
+        public string Name { get; set; }
+        
+        [Column(StringLength =64)]
+        public string DisplayName { get; set; }
+        public virtual ICollection<LocalResource> Resources { get; set; }
+    }
+}
diff --git a/framework/src/IGeekFan.Localization.FreeSql/Models/LocalResource.cs b/framework/src/IGeekFan.Localization.FreeSql/Models/LocalResource.cs
new file mode 100644
index 00000000..77608946
--- /dev/null
+++ b/framework/src/IGeekFan.Localization.FreeSql/Models/LocalResource.cs
@@ -0,0 +1,28 @@
+using FreeSql.DataAnnotations;
+
+namespace IGeekFan.Localization.FreeSql.Models
+{
+    public class LocalResource
+    {
+        public LocalResource()
+        {
+        }
+
+        public LocalResource(string key, string value)
+        {
+            Key = key;
+            Value = value;
+        }
+
+        [Column(IsIdentity = true, IsPrimary = true)]
+        public long Id { get; set; }
+        [Column(StringLength = 50)]
+        public string Key { get; set; }
+        [Column(StringLength = 50)]
+        public string Value { get; set; }
+        public long CultureId { get; set; }
+
+        public virtual LocalCulture Culture { get; set; }
+
+    }
+}
diff --git a/framework/src/VoVo.CAP.MySql/CAP.MySqlCapOptionsExtension.cs b/framework/src/VoVo.CAP.MySql/CAP.MySqlCapOptionsExtension.cs
deleted file mode 100644
index 52bc3ed1..00000000
--- a/framework/src/VoVo.CAP.MySql/CAP.MySqlCapOptionsExtension.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) .NET Core Community. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-using System;
-using DotNetCore.CAP.Persistence;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-
-namespace DotNetCore.CAP
-{
-    internal class MySqlCapOptionsExtension : ICapOptionsExtension
-    {
-        private readonly Action<MySqlOptions> _configure;
-
-        public MySqlCapOptionsExtension(Action<MySqlOptions> configure)
-        {
-            _configure = configure;
-        }
-
-        public void AddServices(IServiceCollection services)
-        {
-            services.AddSingleton<CapStorageMarkerService>();
-            services.AddSingleton<IDataStorage, MySqlDataStorage>();
-            
-            services.TryAddSingleton<IStorageInitializer, MySqlStorageInitializer>();
-            services.AddTransient<ICapTransaction, MySqlCapTransaction>();
-
-            //Add MySqlOptions
-            services.Configure(_configure);
-        } 
-    }
-}
\ No newline at end of file
diff --git a/framework/src/VoVo.CAP.MySql/CAP.MySqlOptions.cs b/framework/src/VoVo.CAP.MySql/CAP.MySqlOptions.cs
deleted file mode 100644
index 46545bdb..00000000
--- a/framework/src/VoVo.CAP.MySql/CAP.MySqlOptions.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) .NET Core Community. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-// ReSharper disable once CheckNamespace
-namespace DotNetCore.CAP
-{
-    public class MySqlOptions : ProviderOptions
-    {
-        /// <summary>
-        /// Gets or sets the database's connection string that will be used to store database entities.
-        /// </summary>
-        public string ConnectionString { get; set; }
-    }
-
-}
\ No newline at end of file
diff --git a/framework/src/VoVo.CAP.MySql/CAP.Options.Extensions.cs b/framework/src/VoVo.CAP.MySql/CAP.Options.Extensions.cs
deleted file mode 100644
index 89402997..00000000
--- a/framework/src/VoVo.CAP.MySql/CAP.Options.Extensions.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) .NET Core Community. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-using System;
-using DotNetCore.CAP;
-
-// ReSharper disable once CheckNamespace
-namespace Microsoft.Extensions.DependencyInjection
-{
-    public static class CapOptionsExtensions
-    {
-        public static CapOptions UseMySql(this CapOptions options, string connectionString)
-        {
-            return options.UseMySql(opt => { opt.ConnectionString = connectionString; });
-        }
-
-        public static CapOptions UseMySql(this CapOptions options, Action<MySqlOptions> configure)
-        {
-            if (configure == null)
-            {
-                throw new ArgumentNullException(nameof(configure));
-            }
-
-            configure += x => x.Version = options.Version;
-
-            options.RegisterExtension(new MySqlCapOptionsExtension(configure));
-
-            return options;
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/framework/src/VoVo.CAP.MySql/CAP.ProviderOptions.cs b/framework/src/VoVo.CAP.MySql/CAP.ProviderOptions.cs
deleted file mode 100644
index 7d5036f9..00000000
--- a/framework/src/VoVo.CAP.MySql/CAP.ProviderOptions.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) .NET Core Community. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-
-// ReSharper disable once CheckNamespace
-namespace DotNetCore.CAP
-{
-    public class ProviderOptions
-    {
-        public const string DefaultSchema = "cap";
-
-        /// <summary>
-        /// Gets or sets the table name prefix to use when creating database objects.
-        /// </summary>
-        public string TableNamePrefix { get; set; } = DefaultSchema;
-
-        /// <summary>
-        /// Data version
-        /// </summary>
-        internal string Version { get; set; } = "v1";
-    }
-}
\ No newline at end of file
diff --git a/framework/src/VoVo.CAP.MySql/ICapTransaction.MySql.cs b/framework/src/VoVo.CAP.MySql/ICapTransaction.MySql.cs
deleted file mode 100644
index 7a888ad6..00000000
--- a/framework/src/VoVo.CAP.MySql/ICapTransaction.MySql.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright (c) .NET Core Community. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-using System.Data;
-using System.Diagnostics;
-using System.Threading;
-using System.Threading.Tasks;
-using DotNetCore.CAP.Transport;
-using FreeSql;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace DotNetCore.CAP
-{
-    public class MySqlCapTransaction : CapTransactionBase
-    {
-        public MySqlCapTransaction(
-            IDispatcher dispatcher) : base(dispatcher)
-        {
-        }
-
-        public override void Commit()
-        {
-            Debug.Assert(DbTransaction != null);
-
-            switch (DbTransaction)
-            {
-                case IDbTransaction dbTransaction:
-                    dbTransaction.Commit();
-                    break;
-                case IUnitOfWork unitOfWork:
-                    unitOfWork.Commit();
-                    break;
-            }
-            Flush();
-        }
-
-        public override Task CommitAsync(CancellationToken cancellationToken = default)
-        {
-            Debug.Assert(DbTransaction != null);
-
-            switch (DbTransaction)
-            {
-                case IDbTransaction dbTransaction:
-                    dbTransaction.Commit();
-                    break;
-                case IUnitOfWork unitOfWork:
-                    unitOfWork.Commit();
-                    break;
-            }
-            Flush();
-            return Task.CompletedTask;
-        }
-
-        public override void Rollback()
-        {
-            Debug.Assert(DbTransaction != null);
-
-            switch (DbTransaction)
-            {
-                case IDbTransaction dbTransaction:
-                    dbTransaction.Rollback();
-                    break;
-                case IUnitOfWork unitOfWork:
-                    unitOfWork.Rollback();
-                    break;
-            }
-        }
-
-        public override Task RollbackAsync(CancellationToken cancellationToken = default)
-        {
-            Debug.Assert(DbTransaction != null);
-
-            switch (DbTransaction)
-            {
-                case IDbTransaction dbTransaction:
-                    dbTransaction.Rollback();
-                    break;
-                case IUnitOfWork unitOfWork:
-                    unitOfWork.Rollback();
-                    break;
-            }
-
-            return Task.CompletedTask;
-        }
-
-        public override void Dispose()
-        {
-            (DbTransaction as IDbTransaction)?.Dispose();
-            DbTransaction = null;
-        }
-    }
-
-    public static class CapTransactionExtensions
-    {
-
-        public static ICapTransaction Begin(this ICapTransaction transaction,
-            IDbTransaction dbTransaction, bool autoCommit = false)
-        {
-            transaction.DbTransaction = dbTransaction;
-            transaction.AutoCommit = autoCommit;
-
-            return transaction;
-        }
-
-        public static ICapTransaction Begin(this ICapTransaction transaction,
-            IUnitOfWork unitOfWork, bool autoCommit = false)
-        {
-            transaction.DbTransaction = unitOfWork;
-            transaction.AutoCommit = autoCommit;
-
-            return transaction;
-        }
-
-        /// <summary>
-        /// Start the CAP transaction
-        /// </summary>
-        /// <param name="dbConnection">The <see cref="IDbConnection" />.</param>
-        /// <param name="publisher">The <see cref="ICapPublisher" />.</param>
-        /// <param name="autoCommit">Whether the transaction is automatically committed when the message is published</param>
-        /// <returns>The <see cref="ICapTransaction" /> object.</returns>
-        public static ICapTransaction BeginTransaction(this IDbConnection dbConnection,
-            ICapPublisher publisher, bool autoCommit = false)
-        {
-            if (dbConnection.State == ConnectionState.Closed)
-            {
-                dbConnection.Open();
-            }
-
-            var dbTransaction = dbConnection.BeginTransaction();
-            publisher.Transaction.Value = publisher.ServiceProvider.GetService<ICapTransaction>();
-            return publisher.Transaction.Value.Begin(dbTransaction, autoCommit);
-        }
-
-        public static ICapTransaction BeginTransaction(this IUnitOfWork unitOfWork,
-            ICapPublisher publisher, bool autoCommit = false)
-        {
-            publisher.Transaction.Value = publisher.ServiceProvider.GetService<ICapTransaction>();
-            return publisher.Transaction.Value.Begin(unitOfWork, autoCommit);
-        }
-    }
-}
\ No newline at end of file
diff --git a/framework/src/VoVo.CAP.MySql/IDataStorage.MySql.cs b/framework/src/VoVo.CAP.MySql/IDataStorage.MySql.cs
deleted file mode 100644
index 7b27a132..00000000
--- a/framework/src/VoVo.CAP.MySql/IDataStorage.MySql.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright (c) .NET Core Community. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading;
-using System.Threading.Tasks;
-using Dapper;
-using DotNetCore.CAP.Internal;
-using DotNetCore.CAP.Messages;
-using DotNetCore.CAP.Monitoring;
-using DotNetCore.CAP.Persistence;
-using DotNetCore.CAP.Serialization;
-using FreeSql;
-using Microsoft.Extensions.Options;
-using MySql.Data.MySqlClient;
-
-namespace DotNetCore.CAP
-{
-    public class MySqlDataStorage : IDataStorage
-    {
-        private readonly IOptions<MySqlOptions> _options;
-        private readonly IOptions<CapOptions> _capOptions;
-        private readonly IStorageInitializer _initializer;
-
-        public MySqlDataStorage(
-            IOptions<MySqlOptions> options,
-            IOptions<CapOptions> capOptions,
-            IStorageInitializer initializer)
-        {
-            _options = options;
-            _capOptions = capOptions;
-            _initializer = initializer;
-        }
-
-        public async Task ChangePublishStateAsync(MediumMessage message, StatusName state)
-        {
-            await using var connection = new MySqlConnection(_options.Value.ConnectionString);
-
-            var sql = $"UPDATE `{_initializer.GetPublishedTableName()}` SET `Retries` = @Retries,`ExpiresAt` = @ExpiresAt,`StatusName`=@StatusName WHERE `Id`=@Id;";
-
-            await connection.ExecuteAsync(sql, new
-            {
-                Id = message.DbId,
-                message.Retries,
-                message.ExpiresAt,
-                StatusName = state.ToString("G")
-            });
-        }
-
-        public async Task ChangeReceiveStateAsync(MediumMessage message, StatusName state)
-        {
-            await using var connection = new MySqlConnection(_options.Value.ConnectionString);
-
-            var sql = $"UPDATE `{_initializer.GetReceivedTableName()}` SET `Retries` = @Retries,`ExpiresAt` = @ExpiresAt,`StatusName`=@StatusName WHERE `Id`=@Id;";
-
-            await connection.ExecuteAsync(sql, new
-            {
-                Id = message.DbId,
-                message.Retries,
-                message.ExpiresAt,
-                StatusName = state.ToString("G")
-            });
-        }
-
-        public MediumMessage StoreMessage(string name, Message content, object dbTransaction = null)
-        {
-            var sql = $"INSERT INTO `{_initializer.GetPublishedTableName()}`(`Id`,`Version`,`Name`,`Content`,`Retries`,`Added`,`ExpiresAt`,`StatusName`) VALUES(@Id,'{_options.Value.Version}',@Name,@Content,@Retries,@Added,@ExpiresAt,@StatusName);";
-
-            var message = new MediumMessage
-            {
-                DbId = content.GetId(),
-                Origin = content,
-                Content = StringSerializer.Serialize(content),
-                Added = DateTime.Now,
-                ExpiresAt = null,
-                Retries = 0
-            };
-
-            var po = new
-            {
-                Id = message.DbId,
-                Name = name,
-                message.Content,
-                message.Retries,
-                message.Added,
-                message.ExpiresAt,
-                StatusName = nameof(StatusName.Scheduled)
-            };
-
-            if (dbTransaction == null)
-            {
-                using var connection = new MySqlConnection(_options.Value.ConnectionString);
-                connection.Execute(sql, po);
-            }
-            else
-            {
-                var dbTrans = dbTransaction as IDbTransaction;
-         
-                 if(dbTransaction is IUnitOfWork unitOfWork)
-                {
-                    dbTrans = unitOfWork.GetOrBeginTransaction();
-                }
-
-                var conn = dbTrans?.Connection;
-                conn.Execute(sql, po, dbTrans);
-            }
-
-            return message;
-        }
-
-        public void StoreReceivedExceptionMessage(string name, string group, string content)
-        {
-            var sql = $@"INSERT INTO `{_initializer.GetReceivedTableName()}`(`Id`,`Version`,`Name`,`Group`,`Content`,`Retries`,`Added`,`ExpiresAt`,`StatusName`) VALUES(@Id,'{_options.Value.Version}',@Name,@Group,@Content,@Retries,@Added,@ExpiresAt,@StatusName);";
-
-            using var connection = new MySqlConnection(_options.Value.ConnectionString);
-            connection.Execute(sql, new
-            {
-                Id = SnowflakeId.Default().NextId().ToString(),
-                Group = @group,
-                Name = name,
-                Content = content,
-                Retries = _capOptions.Value.FailedRetryCount,
-                Added = DateTime.Now,
-                ExpiresAt = DateTime.Now.AddDays(15),
-                StatusName = nameof(StatusName.Failed)
-            });
-        }
-
-        public MediumMessage StoreReceivedMessage(string name, string group, Message message)
-        {
-            var sql = $@"INSERT INTO `{_initializer.GetReceivedTableName()}`(`Id`,`Version`,`Name`,`Group`,`Content`,`Retries`,`Added`,`ExpiresAt`,`StatusName`) VALUES(@Id,'{_options.Value.Version}',@Name,@Group,@Content,@Retries,@Added,@ExpiresAt,@StatusName);";
-
-            var mdMessage = new MediumMessage
-            {
-                DbId = SnowflakeId.Default().NextId().ToString(),
-                Origin = message,
-                Added = DateTime.Now,
-                ExpiresAt = null,
-                Retries = 0
-            };
-            var content = StringSerializer.Serialize(mdMessage.Origin);
-            using var connection = new MySqlConnection(_options.Value.ConnectionString);
-            connection.Execute(sql, new
-            {
-                Id = mdMessage.DbId,
-                Group = @group,
-                Name = name,
-                Content = content,
-                mdMessage.Retries,
-                mdMessage.Added,
-                mdMessage.ExpiresAt,
-                StatusName = nameof(StatusName.Scheduled)
-            });
-            return mdMessage;
-        }
-
-        public async Task<int> DeleteExpiresAsync(string table, DateTime timeout, int batchCount = 1000, CancellationToken token = default)
-        {
-            await using var connection = new MySqlConnection(_options.Value.ConnectionString);
-
-            return await connection.ExecuteAsync(
-                $@"DELETE FROM `{table}` WHERE ExpiresAt < @timeout limit @batchCount;",
-                new { timeout, batchCount });
-        }
-
-        public async Task<IEnumerable<MediumMessage>> GetPublishedMessagesOfNeedRetry()
-        {
-            var fourMinAgo = DateTime.Now.AddMinutes(-4).ToString("O");
-            var sql = $"SELECT * FROM `{_initializer.GetPublishedTableName()}` WHERE `Retries`<{_capOptions.Value.FailedRetryCount} AND `Version`='{_capOptions.Value.Version}' AND `Added`<'{fourMinAgo}' AND (`StatusName` = '{StatusName.Failed}' OR `StatusName` = '{StatusName.Scheduled}') LIMIT 200;";
-
-            var result = new List<MediumMessage>();
-            await using var connection = new MySqlConnection(_options.Value.ConnectionString);
-            var reader = await connection.ExecuteReaderAsync(sql);
-            while (reader.Read())
-            {
-                result.Add(new MediumMessage
-                {
-                    DbId = reader.GetInt64(0).ToString(),
-                    Origin = StringSerializer.DeSerialize(reader.GetString(3)),
-                    Retries = reader.GetInt32(4),
-                    Added = reader.GetDateTime(5)
-                });
-            }
-            return result;
-        }
-
-        public async Task<IEnumerable<MediumMessage>> GetReceivedMessagesOfNeedRetry()
-        {
-            var fourMinAgo = DateTime.Now.AddMinutes(-4).ToString("O");
-            var sql =
-                $"SELECT * FROM `{_initializer.GetReceivedTableName()}` WHERE `Retries`<{_capOptions.Value.FailedRetryCount} AND `Version`='{_capOptions.Value.Version}' AND `Added`<'{fourMinAgo}' AND (`StatusName` = '{StatusName.Failed}' OR `StatusName` = '{StatusName.Scheduled}') LIMIT 200;";
-
-            var result = new List<MediumMessage>();
-
-            await using var connection = new MySqlConnection(_options.Value.ConnectionString);
-            var reader = await connection.ExecuteReaderAsync(sql);
-            while (reader.Read())
-            {
-                result.Add(new MediumMessage
-                {
-                    DbId = reader.GetInt64(0).ToString(),
-                    Origin = StringSerializer.DeSerialize(reader.GetString(4)),
-                    Retries = reader.GetInt32(5),
-                    Added = reader.GetDateTime(6)
-                });
-            }
-
-            return result;
-        }
-
-        public IMonitoringApi GetMonitoringApi()
-        {
-            return new MySqlMonitoringApi(_options, _initializer);
-        }
-    }
-}
diff --git a/framework/src/VoVo.CAP.MySql/IMonitoringApi.MySql.cs b/framework/src/VoVo.CAP.MySql/IMonitoringApi.MySql.cs
deleted file mode 100644
index d65b825e..00000000
--- a/framework/src/VoVo.CAP.MySql/IMonitoringApi.MySql.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright (c) .NET Core Community. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using Dapper;
-using DotNetCore.CAP.Internal;
-using DotNetCore.CAP.Messages;
-using DotNetCore.CAP.Monitoring;
-using DotNetCore.CAP.Persistence;
-using Microsoft.Extensions.Options;
-using MySql.Data.MySqlClient;
-
-namespace DotNetCore.CAP
-{
-    internal class MySqlMonitoringApi : IMonitoringApi
-    {
-        private readonly IOptions<MySqlOptions> _options;
-        private readonly string _pubName;
-        private readonly string _recName;
-
-        public MySqlMonitoringApi(IOptions<MySqlOptions> options, IStorageInitializer initializer)
-        {
-            _options = options;
-            _pubName = initializer.GetPublishedTableName();
-            _recName = initializer.GetReceivedTableName();
-        }
-
-        public StatisticsDto GetStatistics()
-        {
-            var sql = $@"
-set transaction isolation level read committed;
-select count(Id) from `{_pubName}` where StatusName = N'Succeeded';
-select count(Id) from `{_recName}` where StatusName = N'Succeeded';
-select count(Id) from `{_pubName}` where StatusName = N'Failed';
-select count(Id) from `{_recName}` where StatusName = N'Failed';";
-
-            var statistics = UseConnection(connection =>
-            {
-                var stats = new StatisticsDto();
-                using (var multi = connection.QueryMultiple(sql))
-                {
-                    stats.PublishedSucceeded = multi.ReadSingle<int>();
-                    stats.ReceivedSucceeded = multi.ReadSingle<int>();
-
-                    stats.PublishedFailed = multi.ReadSingle<int>();
-                    stats.ReceivedFailed = multi.ReadSingle<int>();
-                }
-
-                return stats;
-            });
-            return statistics;
-        }
-
-        public IDictionary<DateTime, int> HourlyFailedJobs(MessageType type)
-        {
-            var tableName = type == MessageType.Publish ? _pubName : _recName;
-            return UseConnection(connection =>
-                GetHourlyTimelineStats(connection, tableName, nameof(StatusName.Failed)));
-        }
-
-        public IDictionary<DateTime, int> HourlySucceededJobs(MessageType type)
-        {
-            var tableName = type == MessageType.Publish ? _pubName : _recName;
-            return UseConnection(connection =>
-                GetHourlyTimelineStats(connection, tableName, nameof(StatusName.Succeeded)));
-        }
-
-        public IList<MessageDto> Messages(MessageQueryDto queryDto)
-        {
-            var tableName = queryDto.MessageType == MessageType.Publish ? _pubName : _recName;
-            var where = string.Empty;
-            if (!string.IsNullOrEmpty(queryDto.StatusName))
-            {
-                where += " and StatusName=@StatusName";
-            }
-
-            if (!string.IsNullOrEmpty(queryDto.Name))
-            {
-                where += " and Name=@Name";
-            }
-
-            if (!string.IsNullOrEmpty(queryDto.Group))
-            {
-                where += " and `Group`=@Group";
-            }
-
-            if (!string.IsNullOrEmpty(queryDto.Content))
-            {
-                where += " and Content like CONCAT('%',@Content,'%')";
-            }
-
-            var sqlQuery =
-                $"select * from `{tableName}` where 1=1 {where} order by Added desc limit @Limit offset @Offset";
-
-            return UseConnection(conn => conn.Query<MessageDto>(sqlQuery, new
-            {
-                queryDto.StatusName,
-                queryDto.Group,
-                queryDto.Name,
-                queryDto.Content,
-                Offset = queryDto.CurrentPage * queryDto.PageSize,
-                Limit = queryDto.PageSize
-            }).ToList());
-        }
-
-        public int PublishedFailedCount()
-        {
-            return UseConnection(conn => GetNumberOfMessage(conn, _pubName, nameof(StatusName.Failed)));
-        }
-
-        public int PublishedSucceededCount()
-        {
-            return UseConnection(conn => GetNumberOfMessage(conn, _pubName, nameof(StatusName.Succeeded)));
-        }
-
-        public int ReceivedFailedCount()
-        {
-            return UseConnection(conn => GetNumberOfMessage(conn, _recName, nameof(StatusName.Failed)));
-        }
-
-        public int ReceivedSucceededCount()
-        {
-            return UseConnection(conn => GetNumberOfMessage(conn, _recName, nameof(StatusName.Succeeded)));
-        }
-
-        private int GetNumberOfMessage(IDbConnection connection, string tableName, string statusName)
-        {
-            var sqlQuery = $"select count(Id) from `{tableName}` where StatusName = @state";
-
-            var count = connection.ExecuteScalar<int>(sqlQuery, new { state = statusName });
-            return count;
-        }
-
-        private T UseConnection<T>(Func<IDbConnection, T> action)
-        {
-            return action(new MySqlConnection(_options.Value.ConnectionString));
-        }
-
-        private Dictionary<DateTime, int> GetHourlyTimelineStats(IDbConnection connection, string tableName,
-            string statusName)
-        {
-            var endDate = DateTime.Now;
-            var dates = new List<DateTime>();
-            for (var i = 0; i < 24; i++)
-            {
-                dates.Add(endDate);
-                endDate = endDate.AddHours(-1);
-            }
-
-            var keyMaps = dates.ToDictionary(x => x.ToString("yyyy-MM-dd-HH"), x => x);
-
-            return GetTimelineStats(connection, tableName, statusName, keyMaps);
-        }
-
-        private Dictionary<DateTime, int> GetTimelineStats(
-            IDbConnection connection,
-            string tableName,
-            string statusName,
-            IDictionary<string, DateTime> keyMaps)
-        {
-            var sqlQuery =
-                $@"
-select aggr.* from (
-    select date_format(`Added`,'%Y-%m-%d-%H') as `Key`,
-        count(id) `Count`
-    from  `{tableName}`
-    where StatusName = @statusName
-    group by date_format(`Added`,'%Y-%m-%d-%H')
-) aggr where `Key` in @keys;";
-
-            var valuesMap = connection.Query<TimelineCounter>(
-                    sqlQuery,
-                    new { keys = keyMaps.Keys, statusName })
-                .ToDictionary(x => x.Key, x => x.Count);
-
-            foreach (var key in keyMaps.Keys)
-            {
-                if (!valuesMap.ContainsKey(key))
-                {
-                    valuesMap.Add(key, 0);
-                }
-            }
-
-            var result = new Dictionary<DateTime, int>();
-            for (var i = 0; i < keyMaps.Count; i++)
-            {
-                var value = valuesMap[keyMaps.ElementAt(i).Key];
-                result.Add(keyMaps.ElementAt(i).Value, value);
-            }
-
-            return result;
-        }
-
-        public async Task<MediumMessage> GetPublishedMessageAsync(long id)
-        {
-            var sql = $@"SELECT * FROM `{_pubName}` WHERE `Id`={id};";
-
-            await using var connection = new MySqlConnection(_options.Value.ConnectionString);
-            return await connection.QueryFirstOrDefaultAsync<MediumMessage>(sql);
-        }
-
-        public async Task<MediumMessage> GetReceivedMessageAsync(long id)
-        {
-            var sql = $@"SELECT * FROM `{_recName}` WHERE Id={id};";
-            await using var connection = new MySqlConnection(_options.Value.ConnectionString);
-            return await connection.QueryFirstOrDefaultAsync<MediumMessage>(sql);
-        }
-    }
-
-    class TimelineCounter
-    {
-        public string Key { get; set; }
-        public int Count { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/framework/src/VoVo.CAP.MySql/IStorageInitializer.MySql.cs b/framework/src/VoVo.CAP.MySql/IStorageInitializer.MySql.cs
deleted file mode 100644
index c0a32fa9..00000000
--- a/framework/src/VoVo.CAP.MySql/IStorageInitializer.MySql.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright (c) .NET Core Community. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-using System.Threading;
-using System.Threading.Tasks;
-using Dapper;
-using DotNetCore.CAP.Persistence;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MySql.Data.MySqlClient;
-
-namespace DotNetCore.CAP
-{
-    public class MySqlStorageInitializer : IStorageInitializer
-    {
-        private readonly IOptions<MySqlOptions> _options;
-        private readonly ILogger _logger;
-
-        public MySqlStorageInitializer(
-            ILogger<MySqlStorageInitializer> logger,
-            IOptions<MySqlOptions> options)
-        {
-            _options = options;
-            _logger = logger;
-        }
-
-        public virtual string GetPublishedTableName()
-        {
-            return $"{_options.Value.TableNamePrefix}.published";
-        }
-
-        public virtual string GetReceivedTableName()
-        {
-            return $"{_options.Value.TableNamePrefix}.received";
-        }
-
-        public async Task InitializeAsync(CancellationToken cancellationToken)
-        {
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return;
-            }
-
-            var sql = CreateDbTablesScript();
-            await using (var connection = new MySqlConnection(_options.Value.ConnectionString))
-            {
-                await connection.ExecuteAsync(sql);
-            }
-
-            _logger.LogDebug("Ensuring all create database tables script are applied.");
-        }
-
-
-        protected virtual string CreateDbTablesScript()
-        {
-            var batchSql =
-                $@"
-CREATE TABLE IF NOT EXISTS `{GetReceivedTableName()}` (
-  `Id` bigint NOT NULL,
-  `Version` varchar(20) DEFAULT NULL,
-  `Name` varchar(400) NOT NULL,
-  `Group` varchar(200) DEFAULT NULL,
-  `Content` longtext,
-  `Retries` int(11) DEFAULT NULL,
-  `Added` datetime NOT NULL,
-  `ExpiresAt` datetime DEFAULT NULL,
-  `StatusName` varchar(50) NOT NULL,
-  PRIMARY KEY (`Id`),
-  INDEX `IX_ExpiresAt`(`ExpiresAt`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-CREATE TABLE IF NOT EXISTS `{GetPublishedTableName()}` (
-  `Id` bigint NOT NULL,
-  `Version` varchar(20) DEFAULT NULL,
-  `Name` varchar(200) NOT NULL,
-  `Content` longtext,
-  `Retries` int(11) DEFAULT NULL,
-  `Added` datetime NOT NULL,
-  `ExpiresAt` datetime DEFAULT NULL,
-  `StatusName` varchar(40) NOT NULL,
-  PRIMARY KEY (`Id`),
-  INDEX `IX_ExpiresAt`(`ExpiresAt`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-";
-            return batchSql;
-        }
-    }
-}
\ No newline at end of file
diff --git a/framework/src/VoVo.CAP.MySql/VoVo.CAP.MySql.csproj b/framework/src/VoVo.CAP.MySql/VoVo.CAP.MySql.csproj
deleted file mode 100644
index 1a917171..00000000
--- a/framework/src/VoVo.CAP.MySql/VoVo.CAP.MySql.csproj
+++ /dev/null
@@ -1,47 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.1</TargetFrameworks>
-    <AssemblyName>VoVo.CAP.MySql</AssemblyName>
-    <PackageTags>MySQL</PackageTags>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <DocumentationFile>VoVo.CAP.MySql.xml</DocumentationFile>
-    <NoWarn>1701;1702;1705;CS1591</NoWarn>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.0.1</Version>
-    <PackageId>VoVo.CAP.MySql</PackageId>
-    <Authors>luoyunchong</Authors>
-    <Company></Company>
-    <Product>luoyunchong</Product>
-    <RootNamespace>DotNetCore.CAP</RootNamespace>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageProjectUrl>https://github.com/luoyunchong/lin-cms-dotnetcore</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/luoyunchong/lin-cms-dotnetcore</RepositoryUrl>
-    <RepositoryType>GitHub</RepositoryType>
-    <PackageReleaseNotes>VoVo.CAP.MySql为CAP增加FreeSql中的统一事务提交，删除了efcore 的事务。</PackageReleaseNotes>
-    <Copyright></Copyright>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <AssemblyVersion>0.0.1.1</AssemblyVersion>
-    <FileVersion>0.0.1.1</FileVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="VoVo.CAP.MySql.xml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="VoVo.CAP.MySql.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Dapper" Version="2.0.30" />
-    <PackageReference Include="DotNetCore.CAP" Version="3.0.2" />
-    <PackageReference Include="FreeSql.DbContext" Version="1.3.0-preview4" />
-    <PackageReference Include="MySqlConnector" Version="0.62.0" />
-  </ItemGroup>
-
-</Project>
diff --git a/framework/src/VoVo.CAP.MySql/VoVo.CAP.MySql.xml b/framework/src/VoVo.CAP.MySql/VoVo.CAP.MySql.xml
deleted file mode 100644
index cce577d9..00000000
--- a/framework/src/VoVo.CAP.MySql/VoVo.CAP.MySql.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>VoVo.CAP.MySql</name>
-    </assembly>
-    <members>
-        <member name="P:DotNetCore.CAP.MySqlOptions.ConnectionString">
-            <summary>
-            Gets or sets the database's connection string that will be used to store database entities.
-            </summary>
-        </member>
-        <member name="P:DotNetCore.CAP.ProviderOptions.TableNamePrefix">
-            <summary>
-            Gets or sets the table name prefix to use when creating database objects.
-            </summary>
-        </member>
-        <member name="P:DotNetCore.CAP.ProviderOptions.Version">
-            <summary>
-            Data version
-            </summary>
-        </member>
-        <member name="M:DotNetCore.CAP.CapTransactionExtensions.BeginTransaction(System.Data.IDbConnection,DotNetCore.CAP.ICapPublisher,System.Boolean)">
-            <summary>
-            Start the CAP transaction
-            </summary>
-            <param name="dbConnection">The <see cref="T:System.Data.IDbConnection" />.</param>
-            <param name="publisher">The <see cref="T:DotNetCore.CAP.ICapPublisher" />.</param>
-            <param name="autoCommit">Whether the transaction is automatically committed when the message is published</param>
-            <returns>The <see cref="T:DotNetCore.CAP.ICapTransaction" /> object.</returns>
-        </member>
-    </members>
-</doc>
diff --git a/framework/test/IGeekFan.Test/IGeekFan.Test.csproj b/framework/test/IGeekFan.Test/IGeekFan.Test.csproj
new file mode 100644
index 00000000..caf0201a
--- /dev/null
+++ b/framework/test/IGeekFan.Test/IGeekFan.Test.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
+
+		<IsPackable>false</IsPackable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+		<PackageReference Include="xunit" Version="2.4.1" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="coverlet.collector" Version="3.0.3">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\src\IGeekFan.Localization.FreeSql\IGeekFan.Localization.FreeSql.csproj" />
+	</ItemGroup>
+
+</Project>
diff --git a/framework/test/IGeekFan.Test/UnitTest1.cs b/framework/test/IGeekFan.Test/UnitTest1.cs
new file mode 100644
index 00000000..76a12702
--- /dev/null
+++ b/framework/test/IGeekFan.Test/UnitTest1.cs
@@ -0,0 +1,18 @@
+using IGeekFan.Localization.FreeSql.Models;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Xunit;
+
+namespace IGeekFan.Test
+{
+    public class UnitTest1
+    {
+        [Fact]
+        public void AssertGenerice()
+        {
+            bool isGenerice=typeof(ICollection<LocalResource>).IsGenericType;
+            Assert.True(isGenerice);
+        }
+    }
+}
diff --git a/identityserver4/LinCms.IdentityServer4/.config/dotnet-tools.json b/identityserver4/LinCms.IdentityServer4/.config/dotnet-tools.json
deleted file mode 100644
index f2de6713..00000000
--- a/identityserver4/LinCms.IdentityServer4/.config/dotnet-tools.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "dotnet-ef": {
-      "version": "3.1.1",
-      "commands": [
-        "dotnet-ef"
-      ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/identityserver4/LinCms.IdentityServer4/Controllers/AccountController.cs b/identityserver4/LinCms.IdentityServer4/Controllers/AccountController.cs
new file mode 100644
index 00000000..75a113cf
--- /dev/null
+++ b/identityserver4/LinCms.IdentityServer4/Controllers/AccountController.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Threading.Tasks;
+using IdentityServer4;
+using IdentityServer4.Services;
+using LinCms.Cms.Users;
+using LinCms.Entities;
+using LinCms.IRepositories;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace LinCms.IdentityServer4.Controllers
+{
+    [ApiExplorerSettings(IgnoreApi = true)]
+    [Route("account")]
+    public class AccountController : Controller
+    {
+        private readonly IUserRepository userRepository;
+        private readonly IUserIdentityService userIdentityService;
+        private readonly IIdentityServerInteractionService _interaction;
+
+        public AccountController(IUserRepository userRepository, IUserIdentityService userIdentityService, IIdentityServerInteractionService interaction)
+        {
+            this.userRepository = userRepository;
+            this.userIdentityService = userIdentityService;
+            _interaction = interaction;
+        }
+
+
+        [HttpGet("login")]
+        public IActionResult Login(string returnUrl)
+        {
+            var viewModel = new LoginViewModel { Username = "admin", Password = "123qwe", ReturnUrl = returnUrl };
+
+            return View(viewModel);
+        }
+
+        [HttpPost("login")]
+        public async Task<IActionResult> Login([FromForm] LoginViewModel viewModel)
+        {
+            LinUser user = await userRepository.GetUserAsync(r => r.Username == viewModel.Username || r.Email == viewModel.Username);
+            if (user == null)
+            {
+                ModelState.AddModelError("", "用户不存在");
+                viewModel.Password = string.Empty;
+                return View(viewModel);
+            }
+
+            bool valid = await userIdentityService.VerifyUserPasswordAsync(user.Id, viewModel.Password, user.Salt);
+
+            if (!valid)
+            {
+                ModelState.AddModelError("", "Invalid username or password");
+                viewModel.Password = string.Empty;
+                return View(viewModel);
+            }
+
+            // Use an IdentityServer-compatible ClaimsPrincipal
+            var identityServerUser = new IdentityServerUser(user.Id.ToString())
+            {
+                DisplayName = viewModel.Username
+            };
+
+            //await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, identityServerUser.CreatePrincipal());
+            var props = new AuthenticationProperties
+            {
+                IsPersistent = true,
+                ExpiresUtc = DateTimeOffset.UtcNow.Add(TimeSpan.FromDays(1))
+            };
+            await HttpContext.SignInAsync(identityServerUser, props);
+
+            return Redirect(viewModel.ReturnUrl);
+        }
+
+        [HttpGet("account/logout")]
+        public async Task<IActionResult> Logout(string logoutId)
+        {
+            await _interaction.GetLogoutContextAsync(logoutId);
+            return RedirectToAction("Login");
+        }
+
+    }
+
+    public class LoginViewModel
+    {
+        public string ReturnUrl { get; set; } = null!;
+        public string Username { get; set; } = null!;
+        public string Password { get; set; } = null!;
+    }
+}
diff --git a/identityserver4/LinCms.IdentityServer4/Controllers/HomeController.cs b/identityserver4/LinCms.IdentityServer4/Controllers/HomeController.cs
index 3a43ad00..f71f92e4 100644
--- a/identityserver4/LinCms.IdentityServer4/Controllers/HomeController.cs
+++ b/identityserver4/LinCms.IdentityServer4/Controllers/HomeController.cs
@@ -1,12 +1,44 @@
-using Microsoft.AspNetCore.Mvc;
+using IdentityServer4.Models;
+using IdentityServer4.Services;
+using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
 
 namespace LinCms.IdentityServer4.Controllers
 {
-    public class HomeController : ControllerBase
+    [Route("[controller]/[action]")]
+    public class HomeController : Controller
     {
+        private readonly IIdentityServerInteractionService identity;
+
+        public HomeController(IIdentityServerInteractionService identity = null)
+        {
+            this.identity = identity;
+        }
+
+        [HttpGet]
         public ActionResult Index()
         {
             return Redirect("/swagger");
         }
+        [HttpGet]
+        public async Task<IActionResult> Error(string errorId)
+        {
+            var vm = new ErrorViewModel();
+
+            // retrieve error details from identityserver
+            var message = await identity.GetErrorContextAsync(errorId);
+            if (message != null)
+            {
+                vm.Error = message;
+            }
+            ViewBag.VM = vm;
+            return View(vm);
+        }
+    }
+
+
+    public class ErrorViewModel
+    {
+        public ErrorMessage Error { get; set; }
     }
 }
diff --git a/identityserver4/LinCms.IdentityServer4/Extensions.cs b/identityserver4/LinCms.IdentityServer4/DependencyInjectionExtensions.cs
similarity index 60%
rename from identityserver4/LinCms.IdentityServer4/Extensions.cs
rename to identityserver4/LinCms.IdentityServer4/DependencyInjectionExtensions.cs
index 842d15d7..6f13e8fa 100644
--- a/identityserver4/LinCms.IdentityServer4/Extensions.cs
+++ b/identityserver4/LinCms.IdentityServer4/DependencyInjectionExtensions.cs
@@ -1,14 +1,14 @@
-using System.Diagnostics;
-using FreeSql;
+using FreeSql;
 using FreeSql.Internal;
-using LinCms.Core.Entities;
-using LinCms.Infrastructure.Repositories;
+using LinCms.Entities;
+using LinCms.FreeSql;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using System.Diagnostics;
 
 namespace LinCms.IdentityServer4
 {
-    public static class Extensions
+    public static class DependencyInjectionExtensions
     {
         #region FreeSql
         /// <summary>
@@ -18,27 +18,28 @@ public static class Extensions
         public static void AddContext(this IServiceCollection services)
         {
             var configuration = services.BuildServiceProvider().GetRequiredService<IConfiguration>();
-            IConfigurationSection configurationSection = configuration.GetSection("ConnectionStrings:MySql");
 
             IFreeSql fsql = new FreeSqlBuilder()
-                   .UseConnectionString(DataType.MySql, configurationSection.Value)
-                   .UseEntityPropertyNameConvert(StringConvertType.PascalCaseToUnderscoreWithLower)
+                   .UseConnectionString(configuration)
+                   .UseNameConvert(NameConvertType.PascalCaseToUnderscoreWithLower)
                    .UseAutoSyncStructure(true)
                    .UseMonitorCommand(cmd =>
                        {
                            Trace.WriteLine(cmd.CommandText);
                        }
                    )
-                   .UseSyncStructureToLower(true) // 转小写同步结构
                    .Build();
-            services.AddSingleton(fsql);
-            services.AddScoped<IUnitOfWork>(sp => sp.GetService<IFreeSql>().CreateUnitOfWork());
+            fsql.CodeFirst.IsSyncStructureToLower = true;
 
+            services.AddSingleton(fsql);
+            services.AddScoped<UnitOfWorkManager>();
             services.AddFreeRepository(filter =>
             {
                 filter.Apply<IDeleteAduitEntity>("IsDeleted", a => a.IsDeleted == false);
-            }, typeof(AuditBaseRepository<>).Assembly);
+            });
         }
         #endregion
+
+
     }
 }
diff --git a/identityserver4/LinCms.IdentityServer4/Dockerfile b/identityserver4/LinCms.IdentityServer4/Dockerfile
index 8fc5f1bb..11cbe689 100644
--- a/identityserver4/LinCms.IdentityServer4/Dockerfile
+++ b/identityserver4/LinCms.IdentityServer4/Dockerfile
@@ -1,12 +1,13 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS base
+FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
 WORKDIR /src
+COPY ["framework/src/IGeekFan.Localization.FreeSql/IGeekFan.Localization.FreeSql.csproj", "framework/src/IGeekFan.Localization.FreeSql/"]
 COPY ["identityserver4/LinCms.IdentityServer4/LinCms.IdentityServer4.csproj", "identityserver4/LinCms.IdentityServer4/"]
 COPY ["src/LinCms.Core/LinCms.Core.csproj", "src/LinCms.Core/"]
 COPY ["src/LinCms.Application/LinCms.Application.csproj", "src/LinCms.Application/"]
diff --git a/identityserver4/LinCms.IdentityServer4/IS4.pfx b/identityserver4/LinCms.IdentityServer4/IS4.pfx
index a9a77f02..562e8104 100644
Binary files a/identityserver4/LinCms.IdentityServer4/IS4.pfx and b/identityserver4/LinCms.IdentityServer4/IS4.pfx differ
diff --git a/identityserver4/LinCms.IdentityServer4/IdentityServer4/InMemoryConfiguration.cs b/identityserver4/LinCms.IdentityServer4/IdentityServer4/InMemoryConfiguration.cs
index 3416c29b..d93975cd 100644
--- a/identityserver4/LinCms.IdentityServer4/IdentityServer4/InMemoryConfiguration.cs
+++ b/identityserver4/LinCms.IdentityServer4/IdentityServer4/InMemoryConfiguration.cs
@@ -16,15 +16,31 @@ public static IEnumerable<IdentityResource> GetIdentityResources()
             };
         }
 
-        public static IEnumerable<ApiResource> GetApis()
-        {
-            return new List<ApiResource>
+        public static IEnumerable<ApiResource> GetApis() => new List<ApiResource>
             {
-                //Configuration["Service:Name"]在AddJwtBearerAudience
+                //Configuration["Service:Scope"]在AddJwtBearerAudience
                 new ApiResource(Configuration["Service:Name"], Configuration["Service:DocName"])
+                {
+                    Scopes= { Configuration["Service:Name"] }
+                }
             };
+
+
+        public static IEnumerable<ApiScope> GetApiScopes()
+        {
+            return new ApiScope[]
+             {
+               new ApiScope(Configuration["Service:Name"], "scope1")
+             };
         }
 
+        public static ICollection<string> NewGrantTypes => new string[3]
+        { 
+                "authorization_code",
+                "password",
+                "client_credentials"
+        };
+
         public static IEnumerable<Client> GetClients()
         {
             return new List<Client>
@@ -33,23 +49,35 @@ public static IEnumerable<Client> GetClients()
                 new Client
                 {
                     ClientId = Configuration["Service:ClientId"],
-                    AllowedGrantTypes = GrantTypes.ResourceOwnerPassword,
+                    //AllowedGrantTypes = GrantTypes.ResourceOwnerPasswordAndClientCredentials,
+                    AllowedGrantTypes =NewGrantTypes,
                     AllowOfflineAccess = true,
                     //UpdateAccessTokenClaimsOnRefresh = true,
-                    AccessTokenLifetime = 3600 * 6, //6小时      //5  设置 5s，验证过期策略。
+                    AccessTokenLifetime = 3600 * 24 * 15, //15天      //5  设置 5s，验证过期策略。
                     SlidingRefreshTokenLifetime = 1296000, //15天
                     ClientSecrets =
                     {
-                        new Secret(Configuration["Service:ClientSecrets"].Sha256())
+                        new Secret(Configuration["Service:ClientSecret"].Sha256())
                     },
                     AllowedScopes =
                     {
                         Configuration["Service:Name"],
                         IdentityServerConstants.StandardScopes.OfflineAccess,
                         IdentityServerConstants.StandardScopes.OpenId,
-                    }
+                    },
+                    RedirectUris = new[] {
+                        "http://localhost:5000/oauth-receiver.html",  
+                        "https://localhost:5001/oauth-receiver.html",    
+                        "http://api.igeekfan.cn/oauth-receiver.html",
+                        "https://api.igeekfan.cn/oauth-receiver.html",
+                        "http://localhost:5000/swagger/oauth2-redirect.html",
+                        "https://localhost:5001/swagger/oauth2-redirect.html",
+                        "https://api.igeekfan.cn/swagger/oauth2-redirect.html",
+                    },
+                    RequirePkce=false
                 }
             };
         }
-    }
+
+    };
 }
diff --git a/identityserver4/LinCms.IdentityServer4/IdentityServer4/LinCmsProfileService.cs b/identityserver4/LinCms.IdentityServer4/IdentityServer4/LinCmsProfileService.cs
index 68219270..9c3f6173 100644
--- a/identityserver4/LinCms.IdentityServer4/IdentityServer4/LinCmsProfileService.cs
+++ b/identityserver4/LinCms.IdentityServer4/IdentityServer4/LinCmsProfileService.cs
@@ -6,9 +6,8 @@
 using IdentityServer4.Models;
 using IdentityServer4.Services;
 using IdentityServer4.Test;
-using LinCms.Core.Entities;
-using LinCms.Core.Security;
-using LinCms.Infrastructure.Repositories;
+using LinCms.IRepositories;
+using LinCms.Security;
 using Microsoft.Extensions.Logging;
 
 namespace LinCms.IdentityServer4.IdentityServer4
@@ -20,7 +19,7 @@ public class LinCmsProfileService : IProfileService
         /// </summary>
         private readonly ILogger _logger;
 
-        private readonly UserRepository _userRepository;
+        private readonly IUserRepository _userRepository;
 
         /// <summary>
         /// The claims factory.
@@ -30,7 +29,7 @@ public class LinCmsProfileService : IProfileService
         /// </summary>
         /// <param name="logger">The logger.</param>
         /// <param name="userRepository"></param>
-        public LinCmsProfileService(ILogger<LinCmsProfileService> logger, UserRepository userRepository)
+        public LinCmsProfileService(ILogger<LinCmsProfileService> logger, IUserRepository userRepository)
         {
             _logger = logger;
             _userRepository = userRepository;
@@ -53,17 +52,17 @@ public virtual async Task GetProfileDataAsync(ProfileDataRequestContext context)
             }
             else
             {
-                var claims = new List<Claim>()
+                List<Claim> claims = new List<Claim>()
                 {
+                    new Claim(ClaimTypes.NameIdentifier, user.Id.ToString()),
                     new Claim(ClaimTypes.Email, user.Email ?? ""),
                     new Claim(ClaimTypes.GivenName, user.Nickname ?? ""),
                     new Claim(ClaimTypes.Name, user.Username ?? ""),
-                    new Claim(LinCmsClaimTypes.IsAdmin, user.IsAdmin().ToString()),
-                    new Claim(ClaimTypes.Role,user.IsAdmin()?LinGroup.Admin:"")
                 };
 
-                user.LinGroups.ForEach(r =>
+                user.LinGroups?.ForEach(r =>
                  {
+                     claims.Add(new Claim(ClaimTypes.Role, r.Name));
                      claims.Add(new Claim(LinCmsClaimTypes.Groups, r.Id.ToString()));
                  });
 
diff --git a/identityserver4/LinCms.IdentityServer4/IdentityServer4/LinCmsResourceOwnerPasswordValidator.cs b/identityserver4/LinCms.IdentityServer4/IdentityServer4/LinCmsResourceOwnerPasswordValidator.cs
index db4ac41f..968d7e78 100644
--- a/identityserver4/LinCms.IdentityServer4/IdentityServer4/LinCmsResourceOwnerPasswordValidator.cs
+++ b/identityserver4/LinCms.IdentityServer4/IdentityServer4/LinCmsResourceOwnerPasswordValidator.cs
@@ -1,11 +1,11 @@
-using System.Threading.Tasks;
-using IdentityModel;
+using IdentityModel;
 using IdentityServer4.Models;
 using IdentityServer4.Validation;
-using LinCms.Application.Cms.Users;
-using LinCms.Core.Entities;
-using LinCms.Infrastructure.Repositories;
-using Microsoft.AspNetCore.Authentication;
+using LinCms.Cms.Users;
+using LinCms.Entities;
+using LinCms.IRepositories;
+using System;
+using System.Threading.Tasks;
 
 namespace LinCms.IdentityServer4.IdentityServer4
 {
@@ -14,14 +14,12 @@ namespace LinCms.IdentityServer4.IdentityServer4
     /// </summary>
     public class LinCmsResourceOwnerPasswordValidator : IResourceOwnerPasswordValidator
     {
-        private readonly ISystemClock _clock;
         private readonly IUserIdentityService _userIdentityService;
-        private readonly UserRepository _userRepository;
+        private readonly IUserRepository _userRepository;
 
-        public LinCmsResourceOwnerPasswordValidator(ISystemClock clock, IUserIdentityService userIdentityService, UserRepository userRepository)
+        public LinCmsResourceOwnerPasswordValidator(IUserIdentityService userIdentityService, IUserRepository userRepository)
         {
-            _clock = clock;
-            this._userIdentityService = userIdentityService;
+            _userIdentityService = userIdentityService;
             _userRepository = userRepository;
         }
 
@@ -32,7 +30,7 @@ public LinCmsResourceOwnerPasswordValidator(ISystemClock clock, IUserIdentitySer
         /// <returns></returns>
         public async Task ValidateAsync(ResourceOwnerPasswordValidationContext context)
         {
-            LinUser user = await _userRepository.Select.Where(r => r.Username == context.UserName).ToOneAsync();
+            LinUser user = await _userRepository.Select.Where(r => r.Username == context.UserName || r.Email == context.UserName).ToOneAsync();
 
             if (user == null)
             {
@@ -40,7 +38,7 @@ public async Task ValidateAsync(ResourceOwnerPasswordValidationContext context)
                 return;
             }
 
-            bool valid = _userIdentityService.VerifyUsernamePassword(user.Id, context.UserName, context.Password);
+            bool valid = await _userIdentityService.VerifyUserPasswordAsync(user.Id, context.Password, user.Salt);
 
             if (!valid)
             {
@@ -48,7 +46,8 @@ public async Task ValidateAsync(ResourceOwnerPasswordValidationContext context)
                 return;
             }
 
-            await _userRepository.UpdateLastLoginTimeAsync(user.Id);
+            user.LastLoginTime = DateTime.Now;
+            await _userRepository.UpdateAsync(user);
 
             //subjectId 为用户唯一标识 一般为用户id
             //authenticationMethod 描述自定义授权类型的认证方法 
diff --git a/identityserver4/LinCms.IdentityServer4/LinCms.IdentityServer4.csproj b/identityserver4/LinCms.IdentityServer4/LinCms.IdentityServer4.csproj
index 2e8c2a1a..3d850103 100644
--- a/identityserver4/LinCms.IdentityServer4/LinCms.IdentityServer4.csproj
+++ b/identityserver4/LinCms.IdentityServer4/LinCms.IdentityServer4.csproj
@@ -1,64 +1,71 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace>LinCms.IdentityServer4</RootNamespace>
-    <AssemblyName>LinCms.IdentityServer4</AssemblyName>
-    <UserSecretsId>75054c79-633b-497e-9b1c-f1b5fe1da2b7</UserSecretsId>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerfileContext>..\..</DockerfileContext>
-    <DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
+		<AssemblyName>LinCms.IdentityServer4</AssemblyName>
+		<UserSecretsId>75054c79-633b-497e-9b1c-f1b5fe1da2b7</UserSecretsId>
+		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+		<DockerfileContext>..\..</DockerfileContext>
+		<DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
+	</PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>LinCms.IdentityServer4.xml</DocumentationFile>
-    <WarningsAsErrors>NU1605</WarningsAsErrors>
-    <NoWarn>1701;1702;1705;1591</NoWarn>
-  </PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<OutputPath>bin\Debug\</OutputPath>
+		<DocumentationFile>LinCms.IdentityServer4.xml</DocumentationFile>
+		<WarningsAsErrors>NU1605</WarningsAsErrors>
+		<NoWarn>1701;1702;1705;1591</NoWarn>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="IS4.pfx" />
-    <None Remove="LinCms.IdentityServer4.xml" />
-    <None Remove="tempkey.rsa" />
-  </ItemGroup>
+	<ItemGroup>
+		<Compile Remove="Logs\**" />
+		<Content Remove="Logs\**" />
+		<EmbeddedResource Remove="Logs\**" />
+		<None Remove="Logs\**" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="3.0.2" />
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="FreeSql.Provider.MySqlConnector" Version="1.3.0-preview4" />
-    <PackageReference Include="IdentityServer4" Version="3.1.2" />
-    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
-    <PackageReference Include="FreeSql" Version="1.3.0-preview4" />
-  </ItemGroup>
+	<ItemGroup>
+		<None Remove="LinCms.IdentityServer4.xml" />
+		<None Remove="tempkey.rsa" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\LinCms.Application\LinCms.Application.csproj" />
-    <ProjectReference Include="..\..\src\LinCms.Core\LinCms.Core.csproj" />
-    <ProjectReference Include="..\..\src\LinCms.Infrastructure\LinCms.Infrastructure.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
+		<PackageReference Include="IdentityServer4" Version="4.1.2" />
+		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
+		<PackageReference Include="FreeSql" Version="2.5.200" />
+		<PackageReference Include="FreeSql.Provider.MySqlConnector" Version="2.5.201" />
+		<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.4" />
+		<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.1.4" />
+		<PackageReference Include="IGeekFan.AspNetCore.RapiDoc" Version="0.0.3" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Content Include="IS4.pfx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="LinCms.IdentityServer4.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\src\LinCms.Application\LinCms.Application.csproj" />
+		<ProjectReference Include="..\..\src\LinCms.Core\LinCms.Core.csproj" />
+		<ProjectReference Include="..\..\src\LinCms.Infrastructure\LinCms.Infrastructure.csproj" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Services\" />
-  </ItemGroup>
+	<ItemGroup>
+		<Content Include="LinCms.IdentityServer4.xml">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
 
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties appsettings_1production_1json__JsonSchema="http://json.schemastore.org/appsettings" properties_4launchsettings_1json__JsonSchema="" appsettings_1development_1json__JsonSchema="http://json.schemastore.org/bozr" />
-    </VisualStudio>
-  </ProjectExtensions>
+	<ItemGroup>
+		<Folder Include="wwwroot\" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Update="IS4.pfx">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+	<ProjectExtensions>
+		<VisualStudio>
+			<UserProperties appsettings_1production_1json__JsonSchema="http://json.schemastore.org/appsettings" properties_4launchsettings_1json__JsonSchema="" appsettings_1development_1json__JsonSchema="http://json.schemastore.org/bozr" />
+		</VisualStudio>
+	</ProjectExtensions>
 
 
 </Project>
diff --git a/identityserver4/LinCms.IdentityServer4/LinCms.IdentityServer4.xml b/identityserver4/LinCms.IdentityServer4/LinCms.IdentityServer4.xml
index a3a43495..a4ffd01e 100644
--- a/identityserver4/LinCms.IdentityServer4/LinCms.IdentityServer4.xml
+++ b/identityserver4/LinCms.IdentityServer4/LinCms.IdentityServer4.xml
@@ -4,7 +4,7 @@
         <name>LinCms.IdentityServer4</name>
     </assembly>
     <members>
-        <member name="M:LinCms.IdentityServer4.Extensions.AddContext(Microsoft.Extensions.DependencyInjection.IServiceCollection)">
+        <member name="M:LinCms.IdentityServer4.DependencyInjectionExtensions.AddContext(Microsoft.Extensions.DependencyInjection.IServiceCollection)">
             <summary>
             FreeSql
             </summary>
@@ -15,7 +15,7 @@
             The logger
             </summary>
         </member>
-        <member name="M:LinCms.IdentityServer4.IdentityServer4.LinCmsProfileService.#ctor(Microsoft.Extensions.Logging.ILogger{LinCms.IdentityServer4.IdentityServer4.LinCmsProfileService},LinCms.Infrastructure.Repositories.UserRepository)">
+        <member name="M:LinCms.IdentityServer4.IdentityServer4.LinCmsProfileService.#ctor(Microsoft.Extensions.Logging.ILogger{LinCms.IdentityServer4.IdentityServer4.LinCmsProfileService},LinCms.IRepositories.IUserRepository)">
             <summary>
             The claims factory.
             </summary>
diff --git a/identityserver4/LinCms.IdentityServer4/Program.cs b/identityserver4/LinCms.IdentityServer4/Program.cs
index 9d3723bd..c998f9eb 100644
--- a/identityserver4/LinCms.IdentityServer4/Program.cs
+++ b/identityserver4/LinCms.IdentityServer4/Program.cs
@@ -1,42 +1,56 @@
 using System;
-using Microsoft.AspNetCore;
+using System.IO;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Logging;
-using NLog.Web;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
+using Serilog;
 
 namespace LinCms.IdentityServer4
 {
     public class Program
     {
-        public static void Main(string[] args)
+        public static IConfiguration Configuration { get; } = new ConfigurationBuilder()
+            .SetBasePath(Directory.GetCurrentDirectory())
+            .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+            .AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"}.json", optional: true)
+            .AddEnvironmentVariables()
+            .Build();
+
+        public static int Main(string[] args)
         {
-            var logger = NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();
+            Log.Logger = new LoggerConfiguration().ReadFrom.Configuration(Configuration)
+                .Enrich.FromLogContext()
+                .CreateLogger();
+            // Configuration.GetSection("exceptionless").Bind(Exceptionless.ExceptionlessClient.Default.Configuration);
+
             try
             {
-                logger.Debug("init main");
+                Log.Information("Starting web host");
                 CreateWebHostBuilder(args).Build().Run();
+                return 0;
             }
-            catch (Exception exception)
+            catch (Exception ex)
             {
-                //NLog: catch setup errors
-                logger.Error(exception, "Stopped program because of exception");
-                throw;
+                Log.Fatal(ex, "Host terminated unexpectedly");
+                return 1;
             }
             finally
             {
-                // Ensure to flush and stop internal timers/threads before application-exit (Avoid segmentation fault on Linux)
-                NLog.LogManager.Shutdown();
+                Log.CloseAndFlush();
             }
         }
 
-        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                .ConfigureLogging(logging =>
+        public static IHostBuilder CreateWebHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webBuilder =>
                 {
-                    logging.ClearProviders();
-                    logging.SetMinimumLevel(LogLevel.Trace);
-                })
-                .UseNLog();  // NLog: setup NLog for Dependency injection
+                   
+                    webBuilder.UseStartup<Startup>()
+                    .UseKestrel((context, options) =>
+                    {
+                        options.Configure(context.Configuration.GetSection("Kestrel"));
+                    });
+                    ;
+                }) .UseSerilog();
     }
 }
diff --git a/identityserver4/LinCms.IdentityServer4/Properties/launchSettings.json b/identityserver4/LinCms.IdentityServer4/Properties/launchSettings.json
index 3004b50c..bbb24401 100644
--- a/identityserver4/LinCms.IdentityServer4/Properties/launchSettings.json
+++ b/identityserver4/LinCms.IdentityServer4/Properties/launchSettings.json
@@ -6,7 +6,7 @@
       "launchBrowser": true,
       "launchUrl": "swagger/index.html",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Development" //Staging  Development
       },
       "applicationUrl": "https://localhost:5003;http://localhost:5002"
     },
diff --git a/identityserver4/LinCms.IdentityServer4/Startup.cs b/identityserver4/LinCms.IdentityServer4/Startup.cs
index b9c92577..cb5db397 100644
--- a/identityserver4/LinCms.IdentityServer4/Startup.cs
+++ b/identityserver4/LinCms.IdentityServer4/Startup.cs
@@ -1,50 +1,78 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-#if !DEBUG
-using System.Security.Cryptography.X509Certificates;
-#endif
+using System.Runtime.InteropServices;
 using AutoMapper;
-using HealthChecks.UI.Client;
-using LinCms.Application.AutoMapper.Cms;
-using LinCms.Application.Cms.Users;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
-using LinCms.Core.Data.Enums;
-using LinCms.Core.Extensions;
-using LinCms.Core.Security;
+using IdentityServer4.Configuration;
+using IGeekFan.AspNetCore.RapiDoc;
+using LinCms.Aop.Filter;
+using LinCms.Cms.Users;
+using LinCms.Data;
+using LinCms.Data.Enums;
+using LinCms.Extensions;
 using LinCms.IdentityServer4.IdentityServer4;
+using LinCms.IRepositories;
+using LinCms.Repositories;
+using LinCms.Security;
+using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Diagnostics.HealthChecks;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.OpenApi.Models;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
+using Serilog;
+using DotNetCore.Security;
+
+#if !DEBUG
+using System.Security.Cryptography.X509Certificates;
+#endif
 
 namespace LinCms.IdentityServer4
 {
     public class Startup
     {
         public IConfiguration Configuration { get; }
+        public object JwtBearerDefaults { get; private set; }
 
         public Startup(IConfiguration configuration)
         {
             Configuration = configuration;
-           
+
         }
 
-        // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
             InMemoryConfiguration.Configuration = this.Configuration;
 
             services.AddContext();
 
-            services.AddIdentityServer()
+            services.AddCors();
+            services.AddHashService();
+            services.AddICryptographyService("lin-cms-dotnetcore-cryptography");
+
+            services.ConfigureApplicationCookie(options =>
+            {
+                options.LoginPath = "/account/login";
+            });
+            services.AddSession(options =>
+            {
+                options.IdleTimeout = TimeSpan.FromSeconds(120);
+            });
+
+            services.AddIdentityServer(options => new IdentityServerOptions
+            {
+                UserInteraction = new UserInteractionOptions
+                {
+                    LoginUrl = "/account/login",
+                    LogoutUrl = "/account/logout",
+                }
+            })
 #if DEBUG
                 .AddDeveloperSigningCredential()
 #endif
@@ -57,6 +85,7 @@ public void ConfigureServices(IServiceCollection services)
                 .AddInMemoryIdentityResources(InMemoryConfiguration.GetIdentityResources())
                 .AddInMemoryApiResources(InMemoryConfiguration.GetApis())
                 .AddInMemoryClients(InMemoryConfiguration.GetClients())
+                .AddInMemoryApiScopes(InMemoryConfiguration.GetApiScopes())
                 .AddProfileService<LinCmsProfileService>()
                 .AddResourceOwnerValidator<LinCmsResourceOwnerPasswordValidator>();
 
@@ -65,7 +94,14 @@ public void ConfigureServices(IServiceCollection services)
             //Register the Swagger generator, defining 1 or more Swagger documents
             services.AddSwaggerGen(options =>
             {
-                options.SwaggerDoc("v1", new OpenApiInfo() { Title = "LinCms.IdentityServer4", Version = "v1" });
+                string ApiName = "LinCms.IdentityServer4";
+                options.SwaggerDoc("v1", new OpenApiInfo()
+                {
+                    Title = ApiName + RuntimeInformation.FrameworkDescription,
+                    Version = "v1",
+                    Contact = new OpenApiContact { Name = ApiName, Email = "luoyunchong@foxmail.com", Url = new Uri("https://www.cnblogs.com/igeekfan/") },
+                    License = new OpenApiLicense { Name = ApiName + " 官方文档", Url = new Uri("https://luoyunchong.github.io/vovo-docs/dotnetcore/lin-cms/dotnetcore-start.html") }
+                });
                 var security = new OpenApiSecurityRequirement()
                 {
                     { new OpenApiSecurityScheme
@@ -77,52 +113,72 @@ public void ConfigureServices(IServiceCollection services)
                         }
                     }, Array.Empty<string>() }
                 };
-                options.AddSecurityRequirement(security);//����һ�������ȫ�ְ�ȫ��Ϣ����AddSecurityDefinition����ָ���ķ�������Ҫһ�£�������Bearer��
+                options.AddSecurityRequirement(security);//添加一个必须的全局安全信息，和AddSecurityDefinition方法指定的方案名称要一致，这里是Bearer。
                 options.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
                 {
-                    Description = "JWT��Ȩ(���ݽ�������ͷ�н��д���) �����ṹ: \"Authorization: Bearer {token}\"",
-                    Name = "Authorization",//jwtĬ�ϵIJ�������
-                    In = ParameterLocation.Header,//jwtĬ�ϴ��Authorization��Ϣ��λ��(����ͷ��)
+                    Description = "JWT授权(数据将在请求头中进行传输) 参数结构: \"Authorization: Bearer {token}\"",
+                    Name = "Authorization",//jwt默认的参数名称
+                    In = ParameterLocation.Header,//jwt默认存放Authorization信息的位置(请求头中)
                     Type = SecuritySchemeType.ApiKey
                 });
-
-                string xmlPath = Path.Combine(AppContext.BaseDirectory, $"{typeof(Startup).Assembly.GetName().Name}.xml");
-                options.IncludeXmlComments(xmlPath);
-
+                try
+                {
+                    string xmlPath = Path.Combine(AppContext.BaseDirectory, $"{typeof(Startup).Assembly.GetName().Name}.xml");
+                    options.IncludeXmlComments(xmlPath, true);
+                }
+                catch (Exception ex)
+                {
+                    Log.Logger.Warning(ex.Message);
+                }
+                options.AddServer(new OpenApiServer()
+                {
+                    Url = "",
+                    Description = "vvv"
+                });
+                options.CustomOperationIds(apiDesc =>
+                {
+                    var controllerAction = apiDesc.ActionDescriptor as ControllerActionDescriptor;
+                    return controllerAction.ControllerName + "-" + controllerAction.ActionName;
+                });
             });
             #endregion
 
+            services.AddTransient<IUserRepository, UserRepository>();
             services.AddTransient<IUserIdentityService, UserIdentityService>();
             services.AddTransient<ICurrentUser, CurrentUser>();
+            services.AddTransient(typeof(IAuditBaseRepository<>), typeof(AuditBaseRepository<>));
+            services.AddTransient(typeof(IAuditBaseRepository<,>), typeof(AuditBaseRepository<,>));
+            //services.AddTransient<CustomExceptionMiddleWare>();
 
-            services.AddCors();
             services.AddAutoMapper(typeof(UserProfile).Assembly);
 
-            services.AddControllers(options =>
+            services.AddControllersWithViews(options =>
                 {
                     options.Filters.Add<LinCmsExceptionFilter>();
                 })
                 .AddNewtonsoftJson(opt =>
                 {
+                    //忽略循环引用
+                    opt.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
                     //opt.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:MM:ss";
-                    //����ʱ�����ʽ
+                    //设置自定义时间戳格式
                     opt.SerializerSettings.Converters = new List<JsonConverter>()
                     {
                         new LinCmsTimeConverter()
                     };
-                    // �����»��߷�ʽ������ĸ��Сд
-                    opt.SerializerSettings.ContractResolver = new DefaultContractResolver()
-                    {
-                        NamingStrategy = new SnakeCaseNamingStrategy()
-                        {
-                            ProcessDictionaryKeys = true
-                        }
-                    };
+                    // 设置下划线方式，首字母是小写
+                    //opt.SerializerSettings.ContractResolver = new DefaultContractResolver()
+                    //{
+                    //    NamingStrategy = new SnakeCaseNamingStrategy()
+                    //    {
+                    //        ProcessDictionaryKeys = true
+                    //    }
+                    //};
                 })
                 .ConfigureApiBehaviorOptions(options =>
                 {
                     options.SuppressConsumesConstraintForFormFileParameters = true;
-                    //�Զ��� BadRequest ��Ӧ
+                    //自定义 BadRequest 响应
                     options.InvalidModelStateResponseFactory = context =>
                     {
                         var problemDetails = new ValidationProblemDetails(context.ModelState);
@@ -135,53 +191,65 @@ public void ConfigureServices(IServiceCollection services)
                         };
                     };
                 });
+            services.AddHttpsRedirection(options =>
+            {
+                options.RedirectStatusCode = StatusCodes.Status308PermanentRedirect;
+                options.HttpsPort = 443;
+            });
             services.AddHealthChecks();
         }
 
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
             }
+            else
+            {
+                app.UseHsts();
+            }
 
-            app.UseHttpsRedirection();
+            var options = new ForwardedHeadersOptions
+            {
+                ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
+            };
+            options.KnownNetworks.Clear();
+            options.KnownProxies.Clear();
+            app.UseForwardedHeaders(options);
 
-            app.UseRouting();
+            //app.UseMiddleware(typeof(CustomExceptionMiddleWare));
+            app.UseHttpsRedirection();
 
-            app.UseAuthorization();
+            //app.UseSerilogRequestLogging();
 
             app.UseCors(builder =>
             {
                 string[] withOrigins = Configuration.GetSection("WithOrigins").Get<string[]>();
-
                 builder.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(withOrigins);
             });
+
+            app.UseCookiePolicy();
+            app.UseSession();
+
+            app.UseRouting();
+            app.UseStaticFiles();
+
+            app.UseAuthorization();
+
             app.UseIdentityServer();
 
-            // Enable middleware to serve generated Swagger as a JSON endpoint.
             app.UseSwagger();
 
-            //// Enable middleware to serve swagger-ui (HTML, JS, CSS, etc.),
-            //// specifying the Swagger JSON endpoint.
-            app.UseSwaggerUI(c =>
+            app.UseRapiDocUI(c =>
             {
-                c.SwaggerEndpoint("/swagger/v1/swagger.json", "LinCms");
-
-                //c.RoutePrefix = string.Empty;
-                //c.OAuthClientId("demo_api_swagger");//�ͷ�������
-                //c.OAuthAppName("Demo API - Swagger-��ʾ"); // ����
+                c.DocumentTitle = "LinCms.IdentityServer4";
+                c.SwaggerEndpoint("/swagger/v1/swagger.json", "LinCms.IdentityServer4");
             });
-
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapControllers();
-                endpoints.MapHealthChecks("/health", new HealthCheckOptions
-                {
-                    Predicate = _ => true,
-                    ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse
-                });
+                endpoints.MapHealthChecks("/health");
             });
         }
     }
diff --git a/identityserver4/LinCms.IdentityServer4/Views/Account/Login.cshtml b/identityserver4/LinCms.IdentityServer4/Views/Account/Login.cshtml
new file mode 100644
index 00000000..7e808cb8
--- /dev/null
+++ b/identityserver4/LinCms.IdentityServer4/Views/Account/Login.cshtml
@@ -0,0 +1,23 @@
+@model LinCms.IdentityServer4.Controllers.LoginViewModel
+
+<style>
+    input {
+        display: block;
+    }
+</style>
+
+<h1>Login</h1>
+<form asp-controller="Account" asp-action="https://github.com/Login">
+    <input type="hidden" asp-for="ReturnUrl" />
+    <fieldset>
+        <label>
+            Username:
+            <input type="text" asp-for="Username" />
+        </label>
+        <label>
+            Password:
+            <input type="text" asp-for="Password" />
+        </label>
+    </fieldset>
+    <button type="submit">Login</button>
+</form>
\ No newline at end of file
diff --git a/identityserver4/LinCms.IdentityServer4/Views/Account/_ViewImports.cshtml b/identityserver4/LinCms.IdentityServer4/Views/Account/_ViewImports.cshtml
new file mode 100644
index 00000000..9018c789
--- /dev/null
+++ b/identityserver4/LinCms.IdentityServer4/Views/Account/_ViewImports.cshtml
@@ -0,0 +1 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
\ No newline at end of file
diff --git a/identityserver4/LinCms.IdentityServer4/Views/Home/Error.cshtml b/identityserver4/LinCms.IdentityServer4/Views/Home/Error.cshtml
new file mode 100644
index 00000000..c30b2979
--- /dev/null
+++ b/identityserver4/LinCms.IdentityServer4/Views/Home/Error.cshtml
@@ -0,0 +1,8 @@
+@using LinCms.IdentityServer4.Controllers
+@{
+    ViewData["Title"] = "Error";
+}
+<h1>@ViewData["Title"]</h1>
+
+<p>Error: @ViewBag.VM.Error.Error</p>
+<p>Description: @ViewBag.VM.Error.ErrorDescription</p>
\ No newline at end of file
diff --git a/identityserver4/LinCms.IdentityServer4/appsettings.Development.json b/identityserver4/LinCms.IdentityServer4/appsettings.Development.json
new file mode 100644
index 00000000..4f30a00f
--- /dev/null
+++ b/identityserver4/LinCms.IdentityServer4/appsettings.Development.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}
diff --git a/identityserver4/LinCms.IdentityServer4/appsettings.Production.json b/identityserver4/LinCms.IdentityServer4/appsettings.Production.json
new file mode 100644
index 00000000..df8503cc
--- /dev/null
+++ b/identityserver4/LinCms.IdentityServer4/appsettings.Production.json
@@ -0,0 +1,26 @@
+{
+  "ConnectionStrings": {
+    "DefaultDB": "0",
+    "MySql": "Data Source=124.70.130.97;Port=3306;User ID=root;Password=Lycqewcml520;Initial Catalog=lincms;Charset=utf8mb4;SslMode=none;Max pool size=1;Connection LifeTime=20"
+  },
+  "Certificates": {
+    "Path": "IS4.pfx",
+    "Password": "lincms123456"
+  },
+  "Kestrel": {
+    "Limits": {
+      "MaxRequestBodySize": 9223372036854775807,
+      "MaxRequestBufferSize": 9223372036854775807,
+      "MaxRequestLineSize": 9223372036854775807
+    },
+    "Endpoints": {
+      "Https": {
+        "Url": "https://*:5010/",
+        "Certificate": {
+          "Path": "ids4.igeekfan.cn.pfx",
+          "Password": "ep9225ya6xn9hu6"
+        }
+      }
+    }
+  }
+}
diff --git a/identityserver4/LinCms.IdentityServer4/appsettings.json b/identityserver4/LinCms.IdentityServer4/appsettings.json
new file mode 100644
index 00000000..c8e87ea5
--- /dev/null
+++ b/identityserver4/LinCms.IdentityServer4/appsettings.json
@@ -0,0 +1,96 @@
+{
+  "ConnectionStrings": {
+    "DefaultDB": "0",
+    "DataType": {
+      "MySql": 0,
+      "SqlServer": 1,
+      "PostgreSQL": 2,
+      "Oracle": 3,
+      "Sqlite": 4
+    },
+    "MySql": "Data Source=localhost;Port=3308;User ID=root;Password=root;Initial Catalog=lincms;Charset=utf8mb4;SslMode=none;Max pool size=1;Connection LifeTime=20",
+    "SqlServer": "Data Source=.;User ID=sa;Password=123456;Integrated Security=True;Initial Catalog=LinCMS;Pooling=true;Min Pool Size=1",
+    "Sqlite": "Data Source=|DataDirectory|\\lincms.db; Attachs=lincms.db; Pooling=true;Min Pool Size=1"
+  },
+  "Certificates": {
+    "Path": "IS4.pfx",
+    "Password": "lincms123456"
+  },
+  "AllowedHosts": "*",
+  "IdentityServer": {
+    "IsEnabled": "true",
+    "Authority": "https://localhost:5003/",
+    "ApiName": "LinCms.Web",
+    "ApiSecret": "secret",
+    "Clients": [
+      {
+        "ClientId": "lin-cms-dotnetcore-client-id",
+        "AllowedGrantTypes": [
+          "password"
+        ],
+        "ClientSecrets": [
+          {
+            "Value": "lin-cms-dotnetcore-client-secrets"
+          }
+        ],
+        "AllowedScopes": [
+          "default-api"
+        ]
+      }
+    ]
+  },
+  "Service": {
+    "GrantType": "password",
+    "ClientId": "lin-cms-dotnetcore-client-id",
+    "ClientSecret": "lin-cms-dotnetcore-client-secrets",
+    "Name": "LinCms.Web",
+    "Authority": "https://localhost:5003/",
+    "DocName": "Lin-Cms-DotNetCore",
+    "Contact": {
+      "Name": "LinCms.Web Team",
+      "Email": "710277267@qq.com"
+    }
+  },
+  "WithOrigins": [ "https://localhost:5001/", "http://localhost:5000/" ],
+  "Serilog": {
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "path": "Logs/log.txt",
+          "rollingInterval": "Day"
+        }
+      },
+      {
+        "Name": "Console",
+        "Args": {
+          "theme": "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Code, Serilog.Sinks.Console",
+          "outputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} <s:{SourceContext}>{NewLine}{Exception}"
+        }
+      }
+    ],
+    "MinimumLevel": {
+      "Default": "Information",
+      "Override": {
+        "Microsoft": "Information",
+        "System": "Warning"
+      }
+    }
+  },
+  "Kestrel": {
+    "Limits": {
+      "MaxRequestBodySize": 9223372036854775807,
+      "MaxRequestBufferSize": 9223372036854775807,
+      "MaxRequestLineSize": 9223372036854775807
+    },
+    "Endpoints": {
+      "Https": {
+        "Url": "https://*:5003/",
+        "Certificate": {
+          "Path": "ids4.igeekfan.cn.pfx",
+          "Password": "ep9225ya6xn9hu6"
+        }
+      }
+    }
+  }
+}
diff --git a/identityserver4/LinCms.IdentityServer4/ids4.igeekfan.cn.pfx b/identityserver4/LinCms.IdentityServer4/ids4.igeekfan.cn.pfx
new file mode 100644
index 00000000..73ad1298
Binary files /dev/null and b/identityserver4/LinCms.IdentityServer4/ids4.igeekfan.cn.pfx differ
diff --git a/identityserver4/LinCms.IdentityServer4/nlog.config b/identityserver4/LinCms.IdentityServer4/nlog.config
deleted file mode 100644
index c2536ea1..00000000
--- a/identityserver4/LinCms.IdentityServer4/nlog.config
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autoReload="true">
-
-  <targets>
-    <target name="defaultlog" xsi:type="File" keepFileOpen="false" encoding="utf-8"
-            fileName="${basedir}/Logs/${level}/${shortdate}.log"
-            layout="${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}" />
-    <!-- write logs to file  -->
-    <target xsi:type="File" name="allfile" fileName="${basedir}/Logs/nlog-all-${shortdate}.log"
-            layout="${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}" />
-  </targets>
-
-  <rules>
-    <!--All logs, including from Microsoft-->
-    <logger name="*" minlevel="Trace" writeTo="allfile" />
-    <!--Skip non-critical Microsoft logs and so log only own logs-->
-    <logger name="Microsoft.*" maxlevel="Info" final="true" />
-    <logger name="*" minlevel="trace" writeTo="defaultlog" />
-  </rules>
-
-</nlog>
\ No newline at end of file
diff --git a/identityserver4/LinCms.IdentityServer4/tempkey.jwk b/identityserver4/LinCms.IdentityServer4/tempkey.jwk
new file mode 100644
index 00000000..e00211b5
--- /dev/null
+++ b/identityserver4/LinCms.IdentityServer4/tempkey.jwk
@@ -0,0 +1 @@
+{"alg":"RS256","d":"aX_Kb3H_qOfKRTJ0woXZ7DoigkFt54kWDoAA4aERr_CrRhsl7KMSOyT7-VvamJnIrBAVvMdbHPKSp-FL1TPxf5EUJ6gglzsIH4P1oCQ0QEOuHTMljvaE0Ju8DY06CwdwdKBY_xcsQ-poxsdbgPC6yDll68jm5muAOyMKpDYXyOCJYFjPXr2BRNxOZcSHthzfhS7HKXWnlXzW63AFjKpvxxs5HBLEfKnOxgVtbY7mMs753LRbSwRukjSJOHcSxStEQf4YNtJJiQeISbIC8-9s07ybRGS8796J3SJJk8zUopDqXBwPlA2PwoEy2GwFX4UnIpbFiasZhQwlR9sh-QOTpQ","dp":"8hGeRrA8H_lvhmntgnYINE1wqI7oDEjiY_zpgzHi0Y1f9oXW9S65h5KoTLrxNIZCwhBv6whzfBxwZaC5WLQW-30qbagUsybRXw9zbGsVA4w3g93WsMLTUxxOAWnIRA1JqBNLjGH4VVLWToZ5P0t_6t9MM6InZrLxRHJDP0JZbtc","dq":"dR2rWMPPotr59iRue2uiEk313dFYUTd6r2YAqw7HKKwiJ9jXK1zK6u31nJ6N8K_4ZypKnt0NXYyDyduT9o_R9gHhbdmNxBerDZNRd2gtBbNf1gE01D4xla7Z8ZKr8K3S_A8KMnTRFjY0Cre34ibvm-QWOsAZMHKmt5tfrkJyJWk","e":"AQAB","kid":"4A788E92362734CB0B0CABE734B57FB1","kty":"RSA","n":"4r5sWB8WxHa8uCq7aN8nFMMhoHGBuZaEZDlz5R4bw3jtvx_G1692TQvODOkfSxmKf0Nr6bYJL-SYHHFvkfw2D-ON3Nv-jPSAVhHs4E5ZUFn8GFtuk4p2hLxDaKi1vr8xGuWpGmvxN2xqS5wdQIDqvhbnXpj4KVNLwbvcf4PZaADlN2VGl4j2udqM3RH0RoMKebsSuq_XnMCaBvseUMrHjJCC0OW-AhOVng8g5KZaBmM7xlrVM29xbc9czSQmN9sd4hF4WfzyRTrJKQ0k65xE9CJFq6h0zBgF7mo5kJ6zRi3HvntpTwyQpwFZX3IOkp1iggH_Epzj0cEtkx5BNclNcQ","p":"-zsOdkQtCHWAA3nkbRFduf5XfGupTidDEcQYeHeaJOqzw3TOhlEh1xh3L6LIBAT5tqjHBLdh2KrfFeiSVxQN1KWTEDjlTyctHejxT8wt1mLj6PI26QYaBtE_1nQS4g0Rq0AQeWqUUWbQFTKY8xla0vHBIkMXH6SjYAJ-_JCJhIM","q":"5wxdQ4fZFrzueCSIPpc1CJmxnF4_dQpLc1ImC8VTn5r6Y8WsAQRVQl9gSSYG1lbvMZ4tA1t9YnAmpEqUSKcDSBEyJl55ndWET0TTDDA-fxAaNjKypBKpwFG-l9Egi8X0TRPeWdDdh8cdYhUqdc2lVdBcdyfjB2WPsRrIAQC2S_s","qi":"eplkt5Uw5eS7a_0rYvp-WxYqt2f8KlwOn72dENINR-K3hoayzo8R8Jtq64A7ClAG4JYmGh1gq8nGlPwdCjp15K7fa6lSD04Bd___PkUG3fimU_0LWO5lheeNY8tR3eLFnVBJF-poHevC6Us-TJn7Og4tdDYgwWKrKLWZqk3NN3g"}
\ No newline at end of file
diff --git a/lin-cms-dotnetcore.sln b/lin-cms-dotnetcore.sln
index 1335601d..c2d5c078 100644
--- a/lin-cms-dotnetcore.sln
+++ b/lin-cms-dotnetcore.sln
@@ -16,13 +16,15 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{00EB91C2-D6CD-4A60-9733-32D0790D42A5}"
 	ProjectSection(SolutionItems) = preProject
 		azure-pipelines.yml = azure-pipelines.yml
-		docs\README.md = docs\README.md
+		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E441AC4F-F70F-4CA4-A5E0-9E7BFBE1B1FB}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
-		README.md = README.md
+		.gitignore = .gitignore
+		azure-pipelines.yml = azure-pipelines.yml
+		docs\README.md = docs\README.md
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinCms.Infrastructure", "src\LinCms.Infrastructure\LinCms.Infrastructure.csproj", "{A769DA45-FC9F-452F-A591-635C101569C8}"
@@ -37,10 +39,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinCms.IdentityServer4", "i
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "framework", "framework", "{CBEF94DE-6781-4649-9768-C8DFC0C66A53}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoVo.CAP.MySql", "framework\src\VoVo.CAP.MySql\VoVo.CAP.MySql.csproj", "{5590C25E-3610-475F-B614-FBA9DBFCA569}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinCms.Application.Contracts", "src\LinCms.Application.Contracts\LinCms.Application.Contracts.csproj", "{70E47B1C-17F2-4F9A-9EF6-4F94548E506D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IGeekFan.Localization.FreeSql", "framework\src\IGeekFan.Localization.FreeSql\IGeekFan.Localization.FreeSql.csproj", "{88F667F2-1FA6-4A6C-BE19-8D2482D1C70D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -75,14 +77,14 @@ Global
 		{37084D54-1A11-4C04-A091-EB502BB49B19}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{37084D54-1A11-4C04-A091-EB502BB49B19}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{37084D54-1A11-4C04-A091-EB502BB49B19}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5590C25E-3610-475F-B614-FBA9DBFCA569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5590C25E-3610-475F-B614-FBA9DBFCA569}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5590C25E-3610-475F-B614-FBA9DBFCA569}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5590C25E-3610-475F-B614-FBA9DBFCA569}.Release|Any CPU.Build.0 = Release|Any CPU
 		{70E47B1C-17F2-4F9A-9EF6-4F94548E506D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{70E47B1C-17F2-4F9A-9EF6-4F94548E506D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{70E47B1C-17F2-4F9A-9EF6-4F94548E506D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{70E47B1C-17F2-4F9A-9EF6-4F94548E506D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88F667F2-1FA6-4A6C-BE19-8D2482D1C70D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88F667F2-1FA6-4A6C-BE19-8D2482D1C70D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88F667F2-1FA6-4A6C-BE19-8D2482D1C70D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88F667F2-1FA6-4A6C-BE19-8D2482D1C70D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -95,8 +97,8 @@ Global
 		{936A0FF9-135E-4A3F-AE4D-17C3FA78D961} = {1783DEB0-9AA8-44D0-90A8-19D16FE397E7}
 		{45F73A33-9E44-4DCF-A104-0D475FF9CA1E} = {1783DEB0-9AA8-44D0-90A8-19D16FE397E7}
 		{37084D54-1A11-4C04-A091-EB502BB49B19} = {3EF28FC9-9518-401A-9DCC-FCCB4C72511F}
-		{5590C25E-3610-475F-B614-FBA9DBFCA569} = {CBEF94DE-6781-4649-9768-C8DFC0C66A53}
 		{70E47B1C-17F2-4F9A-9EF6-4F94548E506D} = {1783DEB0-9AA8-44D0-90A8-19D16FE397E7}
+		{88F667F2-1FA6-4A6C-BE19-8D2482D1C70D} = {CBEF94DE-6781-4649-9768-C8DFC0C66A53}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3AFAB7C5-4289-48FF-89A0-FB63A94D0AF4}
diff --git a/src/LinCms.Application.Contracts/Base/BaseItems/BaseItemDto.cs b/src/LinCms.Application.Contracts/Base/BaseItems/BaseItemDto.cs
index e83ee353..55d4c0a5 100644
--- a/src/LinCms.Application.Contracts/Base/BaseItems/BaseItemDto.cs
+++ b/src/LinCms.Application.Contracts/Base/BaseItems/BaseItemDto.cs
@@ -1,13 +1,14 @@
 using System;
-using LinCms.Core.Entities;
+using LinCms.Entities;
 
-namespace LinCms.Application.Contracts.Base.BaseItems
+namespace LinCms.Base.BaseItems
 {
-    public class BaseItemDto: Entity
+    public class BaseItemDto : EntityDto
     {
         public int BaseTypeId { get; set; }
         public string ItemCode { get; set; }
         public string ItemName { get; set; }
+        public bool Status { get; set; }
         public int? SortCode { get; set; }
         public DateTime CreateTime { get; set; }
     }
diff --git a/src/LinCms.Application.Contracts/Base/BaseItems/CreateUpdateBaseItemDto.cs b/src/LinCms.Application.Contracts/Base/BaseItems/CreateUpdateBaseItemDto.cs
index 72f7bfb8..08af0f48 100644
--- a/src/LinCms.Application.Contracts/Base/BaseItems/CreateUpdateBaseItemDto.cs
+++ b/src/LinCms.Application.Contracts/Base/BaseItems/CreateUpdateBaseItemDto.cs
@@ -1,15 +1,16 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace LinCms.Application.Contracts.Base.BaseItems
+namespace LinCms.Base.BaseItems
 {
     public class CreateUpdateBaseItemDto:IValidatableObject
     {
         public int BaseTypeId { get; set; }
         [Required(ErrorMessage = "编码为必填项")]
         public string ItemCode { get; set; }
-        [Required(ErrorMessage = "资料类别为必填项")]
+        [Required(ErrorMessage = "字典类别为必填项")]
         public string ItemName { get; set; }
+        public bool Status { get; set; }
         public int? SortCode { get; set; }
         public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
         {
diff --git a/src/LinCms.Application.Contracts/Base/BaseItems/IBaseItemService.cs b/src/LinCms.Application.Contracts/Base/BaseItems/IBaseItemService.cs
new file mode 100644
index 00000000..3e6e181d
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Base/BaseItems/IBaseItemService.cs
@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace LinCms.Base.BaseItems
+{
+    public interface IBaseItemService
+    {
+        Task DeleteAsync(int id);
+
+        Task<List<BaseItemDto>> GetListAsync(string typeCode);
+
+        Task<BaseItemDto> GetAsync(int id);
+
+        Task CreateAsync(CreateUpdateBaseItemDto createBaseItem);
+
+        Task UpdateAsync(int id, CreateUpdateBaseItemDto updateBaseItem);
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Application.Contracts/Base/BaseTypes/BaseTypeDto.cs b/src/LinCms.Application.Contracts/Base/BaseTypes/BaseTypeDto.cs
index a476705c..7002331d 100644
--- a/src/LinCms.Application.Contracts/Base/BaseTypes/BaseTypeDto.cs
+++ b/src/LinCms.Application.Contracts/Base/BaseTypes/BaseTypeDto.cs
@@ -1,9 +1,9 @@
 using System;
-using LinCms.Core.Entities;
+using LinCms.Entities;
 
-namespace LinCms.Application.Contracts.Base.BaseTypes
+namespace LinCms.Base.BaseTypes
 {
-    public class BaseTypeDto :Entity
+    public class BaseTypeDto : EntityDto
     {
         public string TypeCode { get; set; }
         public string FullName { get; set; }
diff --git a/src/LinCms.Application.Contracts/Base/BaseTypes/CreateUpdateBaseTypeDto.cs b/src/LinCms.Application.Contracts/Base/BaseTypes/CreateUpdateBaseTypeDto.cs
index 3d9e6997..59fd69ef 100644
--- a/src/LinCms.Application.Contracts/Base/BaseTypes/CreateUpdateBaseTypeDto.cs
+++ b/src/LinCms.Application.Contracts/Base/BaseTypes/CreateUpdateBaseTypeDto.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace LinCms.Application.Contracts.Base.BaseTypes
+namespace LinCms.Base.BaseTypes
 {
     public class CreateUpdateBaseTypeDto
     {
diff --git a/src/LinCms.Application.Contracts/Base/BaseTypes/IBaseTypeService.cs b/src/LinCms.Application.Contracts/Base/BaseTypes/IBaseTypeService.cs
new file mode 100644
index 00000000..9806fddb
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Base/BaseTypes/IBaseTypeService.cs
@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace LinCms.Base.BaseTypes
+{
+    public interface IBaseTypeService
+    {
+        Task DeleteAsync(int id);
+
+        Task<List<BaseTypeDto>> GetListAsync();
+
+        Task<BaseTypeDto> GetAsync(int id);
+
+        Task CreateAsync(CreateUpdateBaseTypeDto createBaseType);
+
+        Task UpdateAsync(int id, CreateUpdateBaseTypeDto updateBaseType);
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Base/Docs/CreateUpdateDocDto.cs b/src/LinCms.Application.Contracts/Base/Docs/CreateUpdateDocDto.cs
new file mode 100644
index 00000000..b8de6695
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Base/Docs/CreateUpdateDocDto.cs
@@ -0,0 +1,10 @@
+
+namespace LinCms.Base.Docs
+{
+    public class CreateUpdateDocDto
+    {
+        public string Name { get; set; }
+
+        public string DisplayName { get; set; }
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Base/Docs/DocDto.cs b/src/LinCms.Application.Contracts/Base/Docs/DocDto.cs
new file mode 100644
index 00000000..6646d7ba
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Base/Docs/DocDto.cs
@@ -0,0 +1,11 @@
+using LinCms.Entities;
+namespace LinCms.Base.Docs
+{
+    public class DocDto:EntityDto<long>
+    {
+        public string Name { get; set; }
+
+        public string DisplayName { get; set; }
+
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Base/Docs/IDocService.cs b/src/LinCms.Application.Contracts/Base/Docs/IDocService.cs
new file mode 100644
index 00000000..a45550f5
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Base/Docs/IDocService.cs
@@ -0,0 +1,18 @@
+using System.Threading.Tasks;
+using LinCms.Data;
+
+namespace LinCms.Base.Docs
+{
+    public interface IDocService
+    {
+        Task DeleteAsync(long id);
+
+        Task<PagedResultDto<DocDto>> GetListAsync(PageDto pageDto);
+
+        Task<DocDto> GetAsync(long id);
+
+        Task CreateAsync(CreateUpdateDocDto createDoc);
+
+        Task UpdateAsync(long id, CreateUpdateDocDto updateDoc);
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Application.Contracts/Base/Localizations/CreateUpdateResource.cs b/src/LinCms.Application.Contracts/Base/Localizations/CreateUpdateResource.cs
new file mode 100644
index 00000000..4f7bf701
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Base/Localizations/CreateUpdateResource.cs
@@ -0,0 +1,7 @@
+
+namespace LinCms.Base.Localizations
+{
+    class CreateUpdateResource
+    {
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Base/Localizations/CultureDto.cs b/src/LinCms.Application.Contracts/Base/Localizations/CultureDto.cs
new file mode 100644
index 00000000..6f3255ec
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Base/Localizations/CultureDto.cs
@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations;
+using LinCms.Entities;
+
+namespace LinCms.Base.Localizations
+{
+    public class CultureDto : EntityDto<long>
+    {
+        [Required]
+        [StringLength(10)]
+        public string Name { get; set; }
+
+        [Required]
+        [StringLength(10)]
+        public string DisplayName { get; set; }
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Base/Localizations/ICultureService.cs b/src/LinCms.Application.Contracts/Base/Localizations/ICultureService.cs
new file mode 100644
index 00000000..6f63bf57
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Base/Localizations/ICultureService.cs
@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace LinCms.Base.Localizations
+{
+    public interface ICultureService
+    {
+        Task<List<CultureDto>> GetListAsync();
+
+        Task DeleteAsync(long id);
+
+        Task<CultureDto> GetAsync(long id);
+
+        Task<CultureDto> CreateAsync(CultureDto createChannel);
+
+        Task<CultureDto> UpdateAsync(CultureDto updateChannel);
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Base/Localizations/IResourceService.cs b/src/LinCms.Application.Contracts/Base/Localizations/IResourceService.cs
new file mode 100644
index 00000000..81bfd17b
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Base/Localizations/IResourceService.cs
@@ -0,0 +1,18 @@
+using System.Threading.Tasks;
+using LinCms.Data;
+
+namespace LinCms.Base.Localizations
+{
+    public interface IResourceService
+    {
+        Task<PagedResultDto<ResourceDto>> GetListAsync(ResourceSearchDto searchDto);
+
+        Task DeleteAsync(long id);
+
+        Task<ResourceDto> GetAsync(long id);
+
+        Task CreateAsync(ResourceDto createChannel);
+
+        Task UpdateAsync(ResourceDto updateChannel);
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Base/Localizations/ResourceDto.cs b/src/LinCms.Application.Contracts/Base/Localizations/ResourceDto.cs
new file mode 100644
index 00000000..c9054d49
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Base/Localizations/ResourceDto.cs
@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+using LinCms.Entities;
+
+namespace LinCms.Base.Localizations
+{
+    public class ResourceDto : EntityDto<long>
+    {
+        [StringLength(50)]
+        public string Key { get; set; }
+        [StringLength(50)]
+        public string Value { get; set; }
+        public long CultureId { get; set; }
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Base/Localizations/ResourceSearchDto.cs b/src/LinCms.Application.Contracts/Base/Localizations/ResourceSearchDto.cs
new file mode 100644
index 00000000..2bc125ef
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Base/Localizations/ResourceSearchDto.cs
@@ -0,0 +1,11 @@
+using LinCms.Data;
+
+namespace LinCms.Base.Localizations
+{
+    public class ResourceSearchDto : PageDto
+    {
+        public long CultureId { get; set; }
+
+        public string Key { get; set; }
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Blog/ArticleDrafts/ArticleDraftDto.cs b/src/LinCms.Application.Contracts/Blog/ArticleDrafts/ArticleDraftDto.cs
new file mode 100644
index 00000000..96578047
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Blog/ArticleDrafts/ArticleDraftDto.cs
@@ -0,0 +1,9 @@
+namespace LinCms.Blog.ArticleDrafts
+{
+    public class ArticleDraftDto
+    {
+        public string Title { get; set; }
+        public string Content { get; set; }
+        public int Editor { get; set; }
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Blog/ArticleDrafts/IArticleDraftService.cs b/src/LinCms.Application.Contracts/Blog/ArticleDrafts/IArticleDraftService.cs
new file mode 100644
index 00000000..42159d75
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Blog/ArticleDrafts/IArticleDraftService.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Threading.Tasks;
+
+namespace LinCms.Blog.ArticleDrafts
+{
+    public interface IArticleDraftService
+    {
+        Task UpdateAsync(Guid id, UpdateArticleDraftDto updateArticleDto);
+
+        Task<ArticleDraftDto> GetAsync(Guid id);
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Blog/ArticleDrafts/UpdateArticleDraftDto.cs b/src/LinCms.Application.Contracts/Blog/ArticleDrafts/UpdateArticleDraftDto.cs
new file mode 100644
index 00000000..18e1815f
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Blog/ArticleDrafts/UpdateArticleDraftDto.cs
@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace LinCms.Blog.ArticleDrafts
+{
+    public class UpdateArticleDraftDto
+    {
+        [MaxLength(200)]
+        public string Title { get; set; }
+
+        [Required(ErrorMessage = "文章内容不能为空")]
+        public string Content { get; set; }
+
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Blog/Articles/ArticleDto.cs b/src/LinCms.Application.Contracts/Blog/Articles/ArticleDto.cs
index e7c48f57..487b8d50 100644
--- a/src/LinCms.Application.Contracts/Blog/Articles/ArticleDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Articles/ArticleDto.cs
@@ -1,14 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using LinCms.Application.Contracts.Blog.Classifys;
-using LinCms.Application.Contracts.Blog.Tags;
-using LinCms.Application.Contracts.Cms.Users;
-using LinCms.Core.Common;
-using LinCms.Core.Entities;
-using LinCms.Core.Entities.Blog;
+using LinCms.Blog.Classifys;
+using LinCms.Blog.Tags;
+using LinCms.Cms.Users;
+using LinCms.Common;
+using LinCms.Entities;
+using LinCms.Entities.Blog;
 
-namespace LinCms.Application.Contracts.Blog.Articles
+namespace LinCms.Blog.Articles
 {
     public class ArticleDto : Entity<Guid>, ICreateAduitEntity
     {
@@ -61,7 +61,7 @@ public class ArticleDto : Entity<Guid>, ICreateAduitEntity
         public long WordNumber { get; set; }
 
         public long ReadingTime { get; set; }
-
+        public bool Commentable { get; set; }
         public List<Guid> TagIds
         {
             get { return this.Tags.Select(r => r.Id).ToList(); }
diff --git a/src/LinCms.Application.Contracts/Blog/Articles/ArticleListDto.cs b/src/LinCms.Application.Contracts/Blog/Articles/ArticleListDto.cs
index fadeeae1..bbf17fdf 100644
--- a/src/LinCms.Application.Contracts/Blog/Articles/ArticleListDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Articles/ArticleListDto.cs
@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Generic;
-using LinCms.Application.Contracts.Blog.Tags;
-using LinCms.Application.Contracts.Cms.Users;
-using LinCms.Core.Common;
-using LinCms.Core.Entities;
-using LinCms.Core.Entities.Blog;
+using LinCms.Blog.Tags;
+using LinCms.Cms.Users;
+using LinCms.Common;
+using LinCms.Entities;
+using LinCms.Entities.Blog;
 
-namespace LinCms.Application.Contracts.Blog.Articles
+namespace LinCms.Blog.Articles
 {
     public class ArticleListDto : Entity<Guid>, ICreateAduitEntity
     {
diff --git a/src/LinCms.Application.Contracts/Blog/Articles/ArticleSearchDto.cs b/src/LinCms.Application.Contracts/Blog/Articles/ArticleSearchDto.cs
index 047508a4..fc04d88b 100644
--- a/src/LinCms.Application.Contracts/Blog/Articles/ArticleSearchDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Articles/ArticleSearchDto.cs
@@ -1,9 +1,9 @@
 using System;
-using LinCms.Core.Data;
+using LinCms.Data;
 
-namespace LinCms.Application.Contracts.Blog.Articles
+namespace LinCms.Blog.Articles
 {
-    public class ArticleSearchDto:PageDto
+    public class ArticleSearchDto : PageDto
     {
         public Guid? ClassifyId { get; set; }
         public Guid? ChannelId { get; set; }
@@ -13,7 +13,7 @@ public class ArticleSearchDto:PageDto
 
         public override string ToString()
         {
-            return $"{ClassifyId}-{ChannelId}-{TagId}-{Title}-{UserId}";
+            return $"{ClassifyId}:{ChannelId}:{TagId}:{Title}:{UserId}:{Count}:{Page}:{Sort}";
         }
 
     }
diff --git a/src/LinCms.Application.Contracts/Blog/Articles/CreateUpdateArticleDto.cs b/src/LinCms.Application.Contracts/Blog/Articles/CreateUpdateArticleDto.cs
index 42b430d7..9b51ac3e 100644
--- a/src/LinCms.Application.Contracts/Blog/Articles/CreateUpdateArticleDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Articles/CreateUpdateArticleDto.cs
@@ -1,30 +1,30 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using LinCms.Core.Entities.Blog;
+using LinCms.Entities.Blog;
 
-namespace LinCms.Application.Contracts.Blog.Articles
+namespace LinCms.Blog.Articles
 {
     public class CreateUpdateArticleDto
     {
-        public Guid Id { get; set; }
         public Guid? ClassifyId { get; set; }
         public Guid? ChannelId { get; set; }
-        [StringLength(200)]
+        [MaxLength(200)]
         public string Title { get; set; }
-        [StringLength(400)]
+        [MaxLength(400)]
         public string Keywords { get; set; }
-        [StringLength(400)]
+        [MaxLength(400)]
         public string Source { get; set; }
-        [StringLength(400)]
+        [MaxLength(400)]
         public string Excerpt { get; set; }
+        [Required(ErrorMessage = "文章内容不能为空")]
         public string Content { get; set; }
-        [StringLength(400)]
+        [MaxLength(400)]
         public string Thumbnail { get; set; }
         public bool IsAudit { get; set; }
         public bool Recommend { get; set; }
         public bool IsStickie { get; set; }
-        [StringLength(50)]
+        [MaxLength(50)]
         public string Archive { get; set; }
 
         public ArticleType ArticleType { get; set; }
diff --git a/src/LinCms.Application.Contracts/Blog/Articles/IArticleService.cs b/src/LinCms.Application.Contracts/Blog/Articles/IArticleService.cs
new file mode 100644
index 00000000..16086885
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Blog/Articles/IArticleService.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Threading.Tasks;
+using LinCms.Data;
+
+namespace LinCms.Blog.Articles
+{
+    public interface IArticleService
+    {
+        Task<Guid> CreateAsync(CreateUpdateArticleDto createArticle);
+        Task UpdateAsync(Guid id, CreateUpdateArticleDto updateArticleDto);
+        Task<PagedResultDto<ArticleListDto>> GetArticleAsync(ArticleSearchDto searchDto);
+
+        Task DeleteAsync(Guid id);
+
+        Task<ArticleDto> GetAsync(Guid id);
+
+        Task UpdateTagAsync(Guid id, CreateUpdateArticleDto updateArticleDto);
+
+        Task<PagedResultDto<ArticleListDto>> GetSubscribeArticleAsync(PageDto pageDto);
+
+        Task UpdateLikeQuantityAysnc(Guid subjectId, int likesQuantity);
+        Task UpdateCommentable(Guid id,bool commetable);
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Blog/Channels/ChannelDto.cs b/src/LinCms.Application.Contracts/Blog/Channels/ChannelDto.cs
index 86dc7c69..5517b637 100644
--- a/src/LinCms.Application.Contracts/Blog/Channels/ChannelDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Channels/ChannelDto.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using LinCms.Application.Contracts.Blog.Tags;
-using LinCms.Core.Entities;
+using LinCms.Blog.Tags;
+using LinCms.Entities;
 
-namespace LinCms.Application.Contracts.Blog.Channels
+namespace LinCms.Blog.Channels
 {
     public class ChannelDto:Entity<Guid>
     {
diff --git a/src/LinCms.Application.Contracts/Blog/Channels/ChannelSearchDto.cs b/src/LinCms.Application.Contracts/Blog/Channels/ChannelSearchDto.cs
new file mode 100644
index 00000000..9a0d2a4a
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Blog/Channels/ChannelSearchDto.cs
@@ -0,0 +1,9 @@
+using LinCms.Data;
+
+namespace LinCms.Blog.Channels
+{
+    public class ChannelSearchDto:PageDto
+    {
+        public string ChannelName { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Application.Contracts/Blog/Channels/CreateUpdateChannelDto.cs b/src/LinCms.Application.Contracts/Blog/Channels/CreateUpdateChannelDto.cs
index 7064d2ff..571c87e1 100644
--- a/src/LinCms.Application.Contracts/Blog/Channels/CreateUpdateChannelDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Channels/CreateUpdateChannelDto.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace LinCms.Application.Contracts.Blog.Channels
+namespace LinCms.Blog.Channels
 {
     public class CreateUpdateChannelDto
     {
diff --git a/src/LinCms.Application/Blog/Channels/IChannelService.cs b/src/LinCms.Application.Contracts/Blog/Channels/IChannelService.cs
similarity index 71%
rename from src/LinCms.Application/Blog/Channels/IChannelService.cs
rename to src/LinCms.Application.Contracts/Blog/Channels/IChannelService.cs
index a550ad98..6ee55edf 100644
--- a/src/LinCms.Application/Blog/Channels/IChannelService.cs
+++ b/src/LinCms.Application.Contracts/Blog/Channels/IChannelService.cs
@@ -1,15 +1,14 @@
 using System;
 using System.Threading.Tasks;
-using LinCms.Application.Contracts.Blog.Channels;
-using LinCms.Core.Data;
+using LinCms.Data;
 
-namespace LinCms.Application.Blog.Channels
+namespace LinCms.Blog.Channels
 {
     public interface IChannelService
     {
-        void Delete(Guid id);
+        Task DeleteAsync(Guid id);
       
-        Task<PagedResultDto<ChannelDto>> GetListAsync(PageDto pageDto);
+        Task<PagedResultDto<ChannelDto>> GetListAsync(ChannelSearchDto searchDto);
 
         /// <summary>
         /// 首页减少不必要的字段后，流量字节更少
diff --git a/src/LinCms.Application.Contracts/Blog/Channels/NavChannelListDto.cs b/src/LinCms.Application.Contracts/Blog/Channels/NavChannelListDto.cs
index 0f13c057..976fc056 100644
--- a/src/LinCms.Application.Contracts/Blog/Channels/NavChannelListDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Channels/NavChannelListDto.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using LinCms.Application.Contracts.Blog.Tags;
-using LinCms.Core.Entities;
+using LinCms.Blog.Tags;
+using LinCms.Entities;
 
-namespace LinCms.Application.Contracts.Blog.Channels
+namespace LinCms.Blog.Channels
 {
     public class NavChannelListDto : Entity<Guid>
     {
diff --git a/src/LinCms.Application.Contracts/Blog/Classifys/ClassifyDto.cs b/src/LinCms.Application.Contracts/Blog/Classifys/ClassifyDto.cs
index 8ba17e6e..7b80b72f 100644
--- a/src/LinCms.Application.Contracts/Blog/Classifys/ClassifyDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Classifys/ClassifyDto.cs
@@ -1,7 +1,7 @@
 using System;
-using LinCms.Core.Entities;
+using LinCms.Entities;
 
-namespace LinCms.Application.Contracts.Blog.Classifys
+namespace LinCms.Blog.Classifys
 {
     public class ClassifyDto : EntityDto<Guid>, ICreateAduitEntity
     {
diff --git a/src/LinCms.Application.Contracts/Blog/Classifys/ClassifySearchDto.cs b/src/LinCms.Application.Contracts/Blog/Classifys/ClassifySearchDto.cs
index c2a7fd88..a302c5d6 100644
--- a/src/LinCms.Application.Contracts/Blog/Classifys/ClassifySearchDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Classifys/ClassifySearchDto.cs
@@ -1,6 +1,6 @@
-using LinCms.Core.Data;
+using LinCms.Data;
 
-namespace LinCms.Application.Contracts.Blog.Classifys
+namespace LinCms.Blog.Classifys
 {
     public class ClassifySearchDto : PageDto
     {
diff --git a/src/LinCms.Application.Contracts/Blog/Classifys/CreateUpdateClassifyDto.cs b/src/LinCms.Application.Contracts/Blog/Classifys/CreateUpdateClassifyDto.cs
index 52c86b73..36c85b2a 100644
--- a/src/LinCms.Application.Contracts/Blog/Classifys/CreateUpdateClassifyDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Classifys/CreateUpdateClassifyDto.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace LinCms.Application.Contracts.Blog.Classifys
+namespace LinCms.Blog.Classifys
 {
     public class CreateUpdateClassifyDto
     {
diff --git a/src/LinCms.Application.Contracts/Blog/Classifys/IClassifyService.cs b/src/LinCms.Application.Contracts/Blog/Classifys/IClassifyService.cs
new file mode 100644
index 00000000..acca803b
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Blog/Classifys/IClassifyService.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace LinCms.Blog.Classifys
+{
+    public interface IClassifyService:ICrudAppService<ClassifyDto,ClassifyDto,Guid,ClassifySearchDto,CreateUpdateClassifyDto,CreateUpdateClassifyDto>
+    {
+        List<ClassifyDto> GetListByUserId(long? userId);
+        Task UpdateArticleCountAsync(Guid? id, int inCreaseCount);
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Application.Contracts/Blog/Comments/CommentDto.cs b/src/LinCms.Application.Contracts/Blog/Comments/CommentDto.cs
index 2e45818e..fe500929 100644
--- a/src/LinCms.Application.Contracts/Blog/Comments/CommentDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Comments/CommentDto.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using LinCms.Application.Contracts.Cms.Users;
-using LinCms.Core.Entities;
+using LinCms.Cms.Users;
+using LinCms.Entities;
 
-namespace LinCms.Application.Contracts.Blog.Comments
+namespace LinCms.Blog.Comments
 {
     public class CommentDto:EntityDto<Guid>,ICreateAduitEntity
     {
diff --git a/src/LinCms.Application.Contracts/Blog/Comments/CommentSearchDto.cs b/src/LinCms.Application.Contracts/Blog/Comments/CommentSearchDto.cs
index ee84e082..dc39e902 100644
--- a/src/LinCms.Application.Contracts/Blog/Comments/CommentSearchDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Comments/CommentSearchDto.cs
@@ -1,7 +1,7 @@
 using System;
-using LinCms.Core.Data;
+using LinCms.Data;
 
-namespace LinCms.Application.Contracts.Blog.Comments
+namespace LinCms.Blog.Comments
 {
     public class CommentSearchDto:PageDto
     {
diff --git a/src/LinCms.Application.Contracts/Blog/Comments/CreateCommentDto.cs b/src/LinCms.Application.Contracts/Blog/Comments/CreateCommentDto.cs
index 86f51b64..4b197e41 100644
--- a/src/LinCms.Application.Contracts/Blog/Comments/CreateCommentDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Comments/CreateCommentDto.cs
@@ -1,7 +1,7 @@
 
 using System;
 
-namespace LinCms.Application.Contracts.Blog.Comments
+namespace LinCms.Blog.Comments
 {
     public class CreateCommentDto
     {
diff --git a/src/LinCms.Application.Contracts/Blog/Comments/ICommentService.cs b/src/LinCms.Application.Contracts/Blog/Comments/ICommentService.cs
new file mode 100644
index 00000000..754f7980
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Blog/Comments/ICommentService.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Threading.Tasks;
+using LinCms.Data;
+using LinCms.Entities.Blog;
+using Microsoft.AspNetCore.Mvc;
+
+namespace LinCms.Blog.Comments
+{
+    public interface ICommentService
+    {
+        /// <summary>
+        /// 文章下的评论列表
+        /// </summary>
+        /// <param name="commentSearchDto"></param>
+        /// <returns></returns>
+        Task<PagedResultDto<CommentDto>> GetListByArticleAsync(CommentSearchDto commentSearchDto);
+
+        /// <summary>
+        /// 评论分页项
+        /// </summary>
+        /// <param name="commentSearchDto"></param>
+        /// <returns></returns>
+        Task<PagedResultDto<CommentDto>> GetListAsync([FromQuery] CommentSearchDto commentSearchDto);
+        Task CreateAsync( CreateCommentDto createCommentDto);
+        Task DeleteAsync(Comment comment);
+        Task DeleteAsync(Guid id);
+        Task DeleteMyComment(Guid id);
+        Task UpdateLikeQuantityAysnc(Guid subjectId, int likesQuantity);
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Application.Contracts/Blog/MessageBoards/CreateMessageBoardDto.cs b/src/LinCms.Application.Contracts/Blog/MessageBoards/CreateMessageBoardDto.cs
deleted file mode 100644
index 0e71ac6d..00000000
--- a/src/LinCms.Application.Contracts/Blog/MessageBoards/CreateMessageBoardDto.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace LinCms.Application.Contracts.Blog.MessageBoards
-{
-    public class CreateMessageBoardDto
-    {
-
-        /// <summary>
-        /// 留言板内容
-        /// </summary>
-        public string Text { get; set; }
-
-    }
-}
diff --git a/src/LinCms.Application.Contracts/Blog/MessageBoards/MessageBoardDto.cs b/src/LinCms.Application.Contracts/Blog/MessageBoards/MessageBoardDto.cs
deleted file mode 100644
index 962a8741..00000000
--- a/src/LinCms.Application.Contracts/Blog/MessageBoards/MessageBoardDto.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using LinCms.Core.Entities;
-
-namespace LinCms.Application.Contracts.Blog.MessageBoards
-{
-    public class MessageBoardDto:EntityDto<Guid>
-    {
-        public string Text { get; set; }
-
-        public string Ip { get; set; }
-        public string Agent { get; set; }
-        public string System { get; set; }
-       
-        public string GeoPosition { get; set; }
-    
-        public string UserHost { get; set; }
-        public string Avatar { get; set; }
-        public bool? IsAudit { get; set; }
-    }
-}
diff --git a/src/LinCms.Application.Contracts/Blog/Notifications/ArticleEntry.cs b/src/LinCms.Application.Contracts/Blog/Notifications/ArticleEntry.cs
index bd6ed95b..986e4eeb 100644
--- a/src/LinCms.Application.Contracts/Blog/Notifications/ArticleEntry.cs
+++ b/src/LinCms.Application.Contracts/Blog/Notifications/ArticleEntry.cs
@@ -1,7 +1,7 @@
 using System;
-using LinCms.Core.Entities;
+using LinCms.Entities;
 
-namespace LinCms.Application.Contracts.Blog.Notifications
+namespace LinCms.Blog.Notifications
 {
     public class ArticleEntry:EntityDto<Guid>
     {
diff --git a/src/LinCms.Application.Contracts/Blog/Notifications/CommentEntry.cs b/src/LinCms.Application.Contracts/Blog/Notifications/CommentEntry.cs
index a2cdb0b0..78da970a 100644
--- a/src/LinCms.Application.Contracts/Blog/Notifications/CommentEntry.cs
+++ b/src/LinCms.Application.Contracts/Blog/Notifications/CommentEntry.cs
@@ -1,7 +1,7 @@
 using System;
-using LinCms.Core.Entities;
+using LinCms.Entities;
 
-namespace LinCms.Application.Contracts.Blog.Notifications
+namespace LinCms.Blog.Notifications
 {
     public class CommentEntry:EntityDto<Guid>
     {
diff --git a/src/LinCms.Application.Contracts/Blog/Notifications/CreateNotificationDto.cs b/src/LinCms.Application.Contracts/Blog/Notifications/CreateNotificationDto.cs
index 850e3f9e..491fcb9c 100644
--- a/src/LinCms.Application.Contracts/Blog/Notifications/CreateNotificationDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Notifications/CreateNotificationDto.cs
@@ -1,15 +1,18 @@
 using System;
-using LinCms.Core.Entities.Blog;
+using LinCms.Entities.Blog;
 
-namespace LinCms.Application.Contracts.Blog.Notifications
+namespace LinCms.Blog.Notifications
 {
     public class CreateNotificationDto
     {
+        public const string CreateOrCancelAsync = "CreateNotificationDto.CreateOrCancelAsync";
         public NotificationType NotificationType { get; set; }
         public Guid? ArticleId { get; set; }
         public Guid? CommentId { get; set; }
         public long NotificationRespUserId { get; set; }
         public long UserInfoId { get; set; }
+
+        public bool IsCancel { get; set; }
         public DateTime CreateTime { get; set; }
     }
 }
diff --git a/src/LinCms.Application/Blog/Notifications/IEventService.cs b/src/LinCms.Application.Contracts/Blog/Notifications/IEventService.cs
similarity index 50%
rename from src/LinCms.Application/Blog/Notifications/IEventService.cs
rename to src/LinCms.Application.Contracts/Blog/Notifications/IEventService.cs
index 8e00dd11..a49e789d 100644
--- a/src/LinCms.Application/Blog/Notifications/IEventService.cs
+++ b/src/LinCms.Application.Contracts/Blog/Notifications/IEventService.cs
@@ -1,4 +1,4 @@
-namespace LinCms.Application.Blog.Notifications
+namespace LinCms.Blog.Notifications
 {
     public interface IEventService
     {
diff --git a/src/LinCms.Application.Contracts/Blog/Notifications/INotificationService.cs b/src/LinCms.Application.Contracts/Blog/Notifications/INotificationService.cs
new file mode 100644
index 00000000..8ff95819
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Blog/Notifications/INotificationService.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Threading.Tasks;
+using LinCms.Data;
+
+namespace LinCms.Blog.Notifications
+{
+    public interface INotificationService
+    {
+        Task<PagedResultDto<NotificationDto>> GetListAsync(NotificationSearchDto pageDto);
+
+        /// <summary>
+        /// 新增一个消息通知,或取消消息通知
+        /// </summary>
+        /// <param name="createNotificationDto"></param>
+        Task CreateOrCancelAsync(CreateNotificationDto createNotificationDto);
+
+        /// <summary>
+        /// 设置消息通知为已读状态
+        /// </summary>
+        /// <param name="id"></param>
+        Task SetNotificationReadAsync(Guid id);
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Blog/Notifications/NotificationDto.cs b/src/LinCms.Application.Contracts/Blog/Notifications/NotificationDto.cs
index d1c79f22..af28dc51 100644
--- a/src/LinCms.Application.Contracts/Blog/Notifications/NotificationDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Notifications/NotificationDto.cs
@@ -1,9 +1,9 @@
 using System;
-using LinCms.Application.Contracts.Cms.Users;
-using LinCms.Core.Entities;
-using LinCms.Core.Entities.Blog;
+using LinCms.Cms.Users;
+using LinCms.Entities;
+using LinCms.Entities.Blog;
 
-namespace LinCms.Application.Contracts.Blog.Notifications
+namespace LinCms.Blog.Notifications
 {
     public class NotificationDto : EntityDto<Guid>
     {
diff --git a/src/LinCms.Application.Contracts/Blog/Notifications/NotificationSearchDto.cs b/src/LinCms.Application.Contracts/Blog/Notifications/NotificationSearchDto.cs
index 3ca194cf..194801f6 100644
--- a/src/LinCms.Application.Contracts/Blog/Notifications/NotificationSearchDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Notifications/NotificationSearchDto.cs
@@ -1,6 +1,6 @@
-using LinCms.Core.Data;
+using LinCms.Data;
 
-namespace LinCms.Application.Contracts.Blog.Notifications
+namespace LinCms.Blog.Notifications
 {
     public class NotificationSearchDto : PageDto
     {
diff --git a/src/LinCms.Application.Contracts/Blog/Tags/CreateUpdateTagDto.cs b/src/LinCms.Application.Contracts/Blog/Tags/CreateUpdateTagDto.cs
index 8f187da0..251b59db 100644
--- a/src/LinCms.Application.Contracts/Blog/Tags/CreateUpdateTagDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Tags/CreateUpdateTagDto.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace LinCms.Application.Contracts.Blog.Tags
+namespace LinCms.Blog.Tags
 {
     public class CreateUpdateTagDto
     {
diff --git a/src/LinCms.Application/Blog/Tags/ITagService.cs b/src/LinCms.Application.Contracts/Blog/Tags/ITagService.cs
similarity index 75%
rename from src/LinCms.Application/Blog/Tags/ITagService.cs
rename to src/LinCms.Application.Contracts/Blog/Tags/ITagService.cs
index 5ee356aa..f2f3a77e 100644
--- a/src/LinCms.Application/Blog/Tags/ITagService.cs
+++ b/src/LinCms.Application.Contracts/Blog/Tags/ITagService.cs
@@ -1,10 +1,9 @@
 using System;
 using System.Threading.Tasks;
-using LinCms.Application.Contracts.Blog.Tags;
-using LinCms.Application.Contracts.Blog.UserSubscribes;
-using LinCms.Core.Data;
+using LinCms.Blog.UserSubscribes;
+using LinCms.Data;
 
-namespace LinCms.Application.Blog.Tags
+namespace LinCms.Blog.Tags
 {
     public interface ITagService
     {
@@ -21,7 +20,7 @@ public interface ITagService
         /// </summary>
         /// <param name="tagId"></param>
         /// <returns></returns>
-        bool IsSubscribe(Guid tagId);
+        Task<bool> IsSubscribeAsync(Guid tagId);
 
         /// <summary>
         /// 得到某个用户关注的标签
@@ -30,9 +29,9 @@ public interface ITagService
         /// <returns></returns>
         PagedResultDto<TagListDto> GetSubscribeTags(UserSubscribeSearchDto userSubscribeDto);
 
-        void UpdateArticleCount(Guid? id, int inCreaseCount);
+        Task UpdateArticleCountAsync(Guid? id, int inCreaseCount);
 
-        void UpdateSubscribersCount(Guid? id, int inCreaseCount);
+        Task UpdateSubscribersCountAsync(Guid? id, int inCreaseCount);
 
         Task CorrectedTagCountAsync(Guid tagId);
 
diff --git a/src/LinCms.Application.Contracts/Blog/Tags/IUserTagService.cs b/src/LinCms.Application.Contracts/Blog/Tags/IUserTagService.cs
new file mode 100644
index 00000000..d7bd8aee
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Blog/Tags/IUserTagService.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Threading.Tasks;
+
+namespace LinCms.Blog.Tags
+{
+    public interface IUserTagService
+    {
+        /// <summary>
+        /// 用户关注标签
+        /// </summary>
+        /// <param name="tagId"></param>
+        Task CreateUserTagAsync(Guid tagId);
+
+        /// <summary>
+        /// 当前用户取消关注标签
+        /// </summary>
+        /// <param name="tagId"></param>
+        /// <returns></returns>
+        Task DeleteUserTagAsync(Guid tagId);
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Application.Contracts/Blog/Tags/TagDto.cs b/src/LinCms.Application.Contracts/Blog/Tags/TagDto.cs
index 95ea6c9f..ab3bec73 100644
--- a/src/LinCms.Application.Contracts/Blog/Tags/TagDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Tags/TagDto.cs
@@ -1,7 +1,7 @@
 using System;
-using LinCms.Core.Entities;
+using LinCms.Entities;
 
-namespace LinCms.Application.Contracts.Blog.Tags
+namespace LinCms.Blog.Tags
 {
     public class TagDto : EntityDto<Guid>
     {
diff --git a/src/LinCms.Application.Contracts/Blog/Tags/TagListDto.cs b/src/LinCms.Application.Contracts/Blog/Tags/TagListDto.cs
index 7a32709d..904849ed 100644
--- a/src/LinCms.Application.Contracts/Blog/Tags/TagListDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Tags/TagListDto.cs
@@ -1,7 +1,7 @@
 using System;
-using LinCms.Core.Entities;
+using LinCms.Entities;
 
-namespace LinCms.Application.Contracts.Blog.Tags
+namespace LinCms.Blog.Tags
 {
     /// <summary>
     /// 后台列表List
diff --git a/src/LinCms.Application.Contracts/Blog/Tags/TagSearchDto.cs b/src/LinCms.Application.Contracts/Blog/Tags/TagSearchDto.cs
index 545b24e0..d9c730a2 100644
--- a/src/LinCms.Application.Contracts/Blog/Tags/TagSearchDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Tags/TagSearchDto.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using LinCms.Core.Data;
+using LinCms.Data;
 
-namespace LinCms.Application.Contracts.Blog.Tags
+namespace LinCms.Blog.Tags
 {
     public class TagSearchDto:PageDto
     {
diff --git a/src/LinCms.Application.Contracts/Blog/UserTags/UserTagDto.cs b/src/LinCms.Application.Contracts/Blog/Tags/UserTagDto.cs
similarity index 78%
rename from src/LinCms.Application.Contracts/Blog/UserTags/UserTagDto.cs
rename to src/LinCms.Application.Contracts/Blog/Tags/UserTagDto.cs
index 777e412b..8561e6e3 100644
--- a/src/LinCms.Application.Contracts/Blog/UserTags/UserTagDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/Tags/UserTagDto.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace LinCms.Application.Contracts.Blog.UserTags
+namespace LinCms.Blog.Tags
 {
     public class UserTagDto
     {
diff --git a/src/LinCms.Application.Contracts/Blog/UserLikes/CreateUpdateUserLikeDto.cs b/src/LinCms.Application.Contracts/Blog/UserLikes/CreateUpdateUserLikeDto.cs
index 3c895a9a..a2a4c00d 100644
--- a/src/LinCms.Application.Contracts/Blog/UserLikes/CreateUpdateUserLikeDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/UserLikes/CreateUpdateUserLikeDto.cs
@@ -1,7 +1,7 @@
 using System;
-using LinCms.Core.Entities.Blog;
+using LinCms.Entities.Blog;
 
-namespace LinCms.Application.Contracts.Blog.UserLikes
+namespace LinCms.Blog.UserLikes
 {
     public class CreateUpdateUserLikeDto
     {
diff --git a/src/LinCms.Application.Contracts/Blog/UserLikes/IUserLikeService.cs b/src/LinCms.Application.Contracts/Blog/UserLikes/IUserLikeService.cs
new file mode 100644
index 00000000..b838d716
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Blog/UserLikes/IUserLikeService.cs
@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace LinCms.Blog.UserLikes
+{
+    public interface IUserLikeService
+    {
+        Task<bool> CreateOrCancelAsync(CreateUpdateUserLikeDto createUpdateUserLike);
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Application.Contracts/Blog/UserSubscribes/IUserSubscribeService.cs b/src/LinCms.Application.Contracts/Blog/UserSubscribes/IUserSubscribeService.cs
new file mode 100644
index 00000000..86446658
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Blog/UserSubscribes/IUserSubscribeService.cs
@@ -0,0 +1,27 @@
+using LinCms.Data;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace LinCms.Blog.UserSubscribes
+{
+    public interface IUserSubscribeService
+    {
+        /// <summary>
+        /// 得到某用户的关注的用户Id
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        Task<List<long>> GetSubscribeUserIdAsync(long userId);
+
+        /// <summary>
+        /// 得到某个用户的关注
+        /// </summary>
+        /// <param name="searchDto"></param>
+        /// <returns></returns>
+        PagedResultDto<UserSubscribeDto> GetUserSubscribeeeList(UserSubscribeSearchDto searchDto); 
+        PagedResultDto<UserSubscribeDto> GetUserFansList(UserSubscribeSearchDto searchDto);
+        Task CreateAsync(long subscribeUserId);
+        
+        Task DeleteAsync(long subscribeUserId);
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Blog/UserSubscribes/SubscribeCountDto.cs b/src/LinCms.Application.Contracts/Blog/UserSubscribes/SubscribeCountDto.cs
index c0014f74..c8635c8f 100644
--- a/src/LinCms.Application.Contracts/Blog/UserSubscribes/SubscribeCountDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/UserSubscribes/SubscribeCountDto.cs
@@ -1,4 +1,4 @@
-namespace LinCms.Application.Contracts.Blog.UserSubscribes
+namespace LinCms.Blog.UserSubscribes
 {
     public class SubscribeCountDto
     {
diff --git a/src/LinCms.Application.Contracts/Blog/UserSubscribes/UserSubscribeDto.cs b/src/LinCms.Application.Contracts/Blog/UserSubscribes/UserSubscribeDto.cs
index 5476218d..83289110 100644
--- a/src/LinCms.Application.Contracts/Blog/UserSubscribes/UserSubscribeDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/UserSubscribes/UserSubscribeDto.cs
@@ -1,6 +1,6 @@
-using LinCms.Application.Contracts.Cms.Users;
+using LinCms.Cms.Users;
 
-namespace LinCms.Application.Contracts.Blog.UserSubscribes
+namespace LinCms.Blog.UserSubscribes
 {
     public class UserSubscribeDto
     {
diff --git a/src/LinCms.Application.Contracts/Blog/UserSubscribes/UserSubscribeSearchDto.cs b/src/LinCms.Application.Contracts/Blog/UserSubscribes/UserSubscribeSearchDto.cs
index e25ac0a0..6460558a 100644
--- a/src/LinCms.Application.Contracts/Blog/UserSubscribes/UserSubscribeSearchDto.cs
+++ b/src/LinCms.Application.Contracts/Blog/UserSubscribes/UserSubscribeSearchDto.cs
@@ -1,8 +1,8 @@
-using LinCms.Core.Data;
+using LinCms.Data;
 
-namespace LinCms.Application.Contracts.Blog.UserSubscribes
+namespace LinCms.Blog.UserSubscribes
 {
-    public class UserSubscribeSearchDto:PageDto
+    public class UserSubscribeSearchDto : PageDto
     {
         public long UserId { get; set; }
     }
diff --git a/src/LinCms.Application.Contracts/Cms/Account/IAccountService.cs b/src/LinCms.Application.Contracts/Cms/Account/IAccountService.cs
new file mode 100644
index 00000000..078a70b8
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Cms/Account/IAccountService.cs
@@ -0,0 +1,13 @@
+using System.Threading.Tasks;
+
+namespace LinCms.Cms.Account
+{
+    public interface IAccountService
+    {
+        Task<string> SendPasswordResetCode(SendEmailCodeInput sendEmailCode);
+
+        Task SendEmailCode(RegisterDto registerDto);
+
+        Task ResetPassword(ResetEmailPasswordDto resetPassword);
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Cms/Account/ITokenService.cs b/src/LinCms.Application.Contracts/Cms/Account/ITokenService.cs
new file mode 100644
index 00000000..e1359dfe
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Cms/Account/ITokenService.cs
@@ -0,0 +1,25 @@
+using LinCms.Security;
+using System.Threading.Tasks;
+
+namespace LinCms.Cms.Account
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public interface ITokenService
+    {
+        /// <summary>
+        /// 登录
+        /// </summary>
+        /// <param name="loginInputDto"></param>
+        /// <returns></returns>
+        Task<Tokens> LoginAsync(LoginInputDto loginInputDto);
+
+        /// <summary>
+        /// 刷新token
+        /// </summary>
+        /// <param name="refreshToken"></param>
+        /// <returns></returns>
+        Task<Tokens> GetRefreshTokenAsync(string refreshToken);
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Cms/Account/LoginInputDto.cs b/src/LinCms.Application.Contracts/Cms/Account/LoginInputDto.cs
index 9dc2c132..490f0858 100644
--- a/src/LinCms.Application.Contracts/Cms/Account/LoginInputDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Account/LoginInputDto.cs
@@ -1,6 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+using LinCms.Common;
+using System.ComponentModel.DataAnnotations;
 
-namespace LinCms.Application.Contracts.Cms.Account
+namespace LinCms.Cms.Account
 {
     public class LoginInputDto
     {
diff --git a/src/LinCms.Application.Contracts/Cms/Account/RegisterDto.cs b/src/LinCms.Application.Contracts/Cms/Account/RegisterDto.cs
index f84f6937..6e79e26f 100644
--- a/src/LinCms.Application.Contracts/Cms/Account/RegisterDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Account/RegisterDto.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Net.Mail;
 
-namespace LinCms.Application.Contracts.Cms.Account
+namespace LinCms.Cms.Account
 {
     public class RegisterDto : IValidatableObject
     {
diff --git a/src/LinCms.Application.Contracts/Cms/Account/ResetEmailPasswordDto.cs b/src/LinCms.Application.Contracts/Cms/Account/ResetEmailPasswordDto.cs
new file mode 100644
index 00000000..11143b8e
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Cms/Account/ResetEmailPasswordDto.cs
@@ -0,0 +1,18 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace LinCms.Cms.Account
+{
+    public class ResetEmailPasswordDto
+    {
+        [Required(ErrorMessage = "非法请求")]
+        public string Email { get; set; }
+        [Required(ErrorMessage = "非法请求")]
+        public string PasswordResetCode { get; set; }
+
+        [Required(ErrorMessage = "请输入验证码")]
+        public string ResetCode { get; set; }
+        [Required(ErrorMessage = "请输入密码")]
+        [RegularExpression("^[A-Za-z0-9_*&$#@]{6,22}$", ErrorMessage = "密码长度必须在6~22位之间，包含字符、数字和 _")]
+        public string Password { get; set; }
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Cms/Account/SendEmailCodeInput.cs b/src/LinCms.Application.Contracts/Cms/Account/SendEmailCodeInput.cs
new file mode 100644
index 00000000..41a9bdf5
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Cms/Account/SendEmailCodeInput.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Net.Mail;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LinCms.Cms.Account
+{
+    public class SendEmailCodeInput : IValidatableObject
+    {
+        [Required(ErrorMessage = "请输入邮件")]
+        public string Email { get; set; }
+
+        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+        {
+            if (!Email.IsNullOrEmpty())
+            {
+
+                string address = null;
+                try
+                {
+                    address = new MailAddress(Email).Address;
+                }
+                catch
+                {
+                    // ignored
+                }
+
+                if (address.IsNullOrEmpty())
+                {
+                    yield return new ValidationResult("电子邮箱不符合规范，请输入正确的邮箱", new[] { "Email" });
+                }
+
+            }
+
+        }
+    }
+}
diff --git a/src/LinCms.Application/Cms/Admin/IAdminService.cs b/src/LinCms.Application.Contracts/Cms/Admins/IAdminService.cs
similarity index 64%
rename from src/LinCms.Application/Cms/Admin/IAdminService.cs
rename to src/LinCms.Application.Contracts/Cms/Admins/IAdminService.cs
index 38130dbf..6aec182f 100644
--- a/src/LinCms.Application/Cms/Admin/IAdminService.cs
+++ b/src/LinCms.Application.Contracts/Cms/Admins/IAdminService.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using LinCms.Application.Contracts.Cms.Permissions;
+using LinCms.Cms.Permissions;
 
-namespace LinCms.Application.Cms.Admin
+namespace LinCms.Cms.Admins
 {
     public interface IAdminService
     {
diff --git a/src/LinCms.Application.Contracts/Cms/Admins/ResetPasswordDto.cs b/src/LinCms.Application.Contracts/Cms/Admins/ResetPasswordDto.cs
index 63e58a64..ed961899 100644
--- a/src/LinCms.Application.Contracts/Cms/Admins/ResetPasswordDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Admins/ResetPasswordDto.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace LinCms.Application.Contracts.Cms.Admins
+namespace LinCms.Cms.Admins
 {
     public class ResetPasswordDto
     {
diff --git a/src/LinCms.Application.Contracts/Cms/Admins/UpdateUserDto.cs b/src/LinCms.Application.Contracts/Cms/Admins/UpdateUserDto.cs
index dc1e384e..dae05488 100644
--- a/src/LinCms.Application.Contracts/Cms/Admins/UpdateUserDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Admins/UpdateUserDto.cs
@@ -1,11 +1,15 @@
-using System.Collections.Generic;
+using LinCms.Data.Enums;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 
-namespace LinCms.Application.Contracts.Cms.Admins
+namespace LinCms.Cms.Admins
 {
     public class UpdateUserDto
     {
         public string Email { get; set; }
         public string Nickname { get; set; }
+        public string Username { get; set; }
+        public UserActive Active { get; set; }
         public List<long> GroupIds { get; set; }
     }
 }
diff --git a/src/LinCms.Application.Contracts/Cms/Admins/UserSearchDto.cs b/src/LinCms.Application.Contracts/Cms/Admins/UserSearchDto.cs
index 87936ab0..cebb6860 100644
--- a/src/LinCms.Application.Contracts/Cms/Admins/UserSearchDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Admins/UserSearchDto.cs
@@ -1,8 +1,8 @@
-using LinCms.Core.Data;
+using LinCms.Data;
 
-namespace LinCms.Application.Contracts.Cms.Admins
+namespace LinCms.Cms.Admins
 {
-    public class UserSearchDto:PageDto
+    public class UserSearchDto : PageDto
     {
         public int? GroupId { get; set; }
     }
diff --git a/src/LinCms.Application.Contracts/Cms/Files/FileDto.cs b/src/LinCms.Application.Contracts/Cms/Files/FileDto.cs
index f6ffa5ce..7d23c498 100644
--- a/src/LinCms.Application.Contracts/Cms/Files/FileDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Files/FileDto.cs
@@ -1,6 +1,6 @@
-using LinCms.Core.Entities;
+using LinCms.Entities;
 
-namespace LinCms.Application.Contracts.Cms.Files
+namespace LinCms.Cms.Files
 {
     public class FileDto:Entity
     {
diff --git a/src/LinCms.Application/Cms/Files/IFileService.cs b/src/LinCms.Application.Contracts/Cms/Files/IFileService.cs
similarity index 66%
rename from src/LinCms.Application/Cms/Files/IFileService.cs
rename to src/LinCms.Application.Contracts/Cms/Files/IFileService.cs
index ce8d0f4e..fa5a97a7 100644
--- a/src/LinCms.Application/Cms/Files/IFileService.cs
+++ b/src/LinCms.Application.Contracts/Cms/Files/IFileService.cs
@@ -1,17 +1,17 @@
-using LinCms.Application.Contracts.Cms.Files;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 
-namespace LinCms.Application.Cms.Files
+namespace LinCms.Cms.Files
 {
     public interface IFileService
     {
-
         /// <summary>
         /// 单文件上传，键为file
         /// </summary>
         /// <param name="file"></param>
         /// <param name="key"></param>
         /// <returns></returns>
-        FileDto Upload(IFormFile file , int key = 0);
+        Task<FileDto> UploadAsync(IFormFile file, int key = 0);
+        
     }
 }
diff --git a/src/LinCms.Application.Contracts/Cms/Groups/CreateGroupDto.cs b/src/LinCms.Application.Contracts/Cms/Groups/CreateGroupDto.cs
index 007d3758..d4c2afe3 100644
--- a/src/LinCms.Application.Contracts/Cms/Groups/CreateGroupDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Groups/CreateGroupDto.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace LinCms.Application.Contracts.Cms.Groups
+namespace LinCms.Cms.Groups
 {
     public class CreateGroupDto : UpdateGroupDto, IValidatableObject
     {
diff --git a/src/LinCms.Application.Contracts/Cms/Groups/GroupDto.cs b/src/LinCms.Application.Contracts/Cms/Groups/GroupDto.cs
index a2189fc3..a2e13679 100644
--- a/src/LinCms.Application.Contracts/Cms/Groups/GroupDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Groups/GroupDto.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using LinCms.Core.Entities;
+using LinCms.Entities;
 
-namespace LinCms.Application.Contracts.Cms.Groups
+namespace LinCms.Cms.Groups
 {
     public class GroupDto:Entity
     {
diff --git a/src/LinCms.Application.Contracts/Cms/Groups/IGroupService.cs b/src/LinCms.Application.Contracts/Cms/Groups/IGroupService.cs
new file mode 100644
index 00000000..c34fe83c
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Cms/Groups/IGroupService.cs
@@ -0,0 +1,57 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using LinCms.Entities;
+
+namespace LinCms.Cms.Groups
+{
+    public interface IGroupService
+    {
+        Task<List<LinGroup>> GetListAsync();
+
+        Task<GroupDto> GetAsync(long id);
+
+        Task CreateAsync(CreateGroupDto inputDto);
+
+        Task UpdateAsync(long id, UpdateGroupDto inputDto);
+
+        /// <summary>
+        /// 管理员删除一个权限分组
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task DeleteAsync(long id);
+
+        Task DeleteUserGroupAsync(long userId);
+        
+        /// <summary>
+        /// 检查该用户是否在root分组中
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        bool CheckIsRootByUserId(long userId);
+
+        /// <summary>
+        /// 根据用户Id得到获得用户的所有分组id
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        Task<List<long>>  GetGroupIdsByUserIdAsync(long userId);
+
+        /// <summary>
+        /// 删除用户与分组直接的关联
+        /// </summary>
+        /// <param name="userId">用户Id</param>
+        /// <param name="deleteGroupIds">删除的分组Id</param>
+        /// <returns></returns>
+        Task DeleteUserGroupAsync(long userId, List<long> deleteGroupIds);
+
+        /// <summary>
+        /// 添加用户与分组直接的关联
+        /// </summary>
+        /// <param name="userId">用户Id</param>
+        /// <param name="addGroupIds">要新增的分组Id</param>
+        /// <returns></returns>
+        Task AddUserGroupAsync(long userId, List<long> addGroupIds);
+
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Cms/Groups/UpdateGroupDto.cs b/src/LinCms.Application.Contracts/Cms/Groups/UpdateGroupDto.cs
index 2504b676..bb20a509 100644
--- a/src/LinCms.Application.Contracts/Cms/Groups/UpdateGroupDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Groups/UpdateGroupDto.cs
@@ -1,11 +1,12 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace LinCms.Application.Contracts.Cms.Groups
+namespace LinCms.Cms.Groups
 {
     public class UpdateGroupDto
     {
         [Required(ErrorMessage = "请输入分组名称")]
         public string Name { get; set; }
         public string Info { get; set; }
+        public int SortCode { get; set; }
     }
 }
diff --git a/src/LinCms.Application/Cms/Logs/ILogService.cs b/src/LinCms.Application.Contracts/Cms/Logs/ILogService.cs
similarity index 68%
rename from src/LinCms.Application/Cms/Logs/ILogService.cs
rename to src/LinCms.Application.Contracts/Cms/Logs/ILogService.cs
index bea3c219..d7e149f4 100644
--- a/src/LinCms.Application/Cms/Logs/ILogService.cs
+++ b/src/LinCms.Application.Contracts/Cms/Logs/ILogService.cs
@@ -1,14 +1,13 @@
 using System.Collections.Generic;
-using LinCms.Application.Contracts.Cms.Logs;
-using LinCms.Core.Data;
-using LinCms.Core.Entities;
+using System.Threading.Tasks;
+using LinCms.Data;
+using LinCms.Entities;
 
-namespace LinCms.Application.Cms.Logs
+namespace LinCms.Cms.Logs
 {
     public interface ILogService
     {
-        void CreateLog(LinLog linlog);
-
+        Task CreateAsync(LinLog linlog);
         PagedResultDto<LinLog> GetUserLogs(LogSearchDto searchDto);
 
         List<string> GetLoggedUsers(PageDto searchDto);
diff --git a/src/LinCms.Application.Contracts/Cms/Logs/ISerilogService.cs b/src/LinCms.Application.Contracts/Cms/Logs/ISerilogService.cs
new file mode 100644
index 00000000..d060f98f
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Cms/Logs/ISerilogService.cs
@@ -0,0 +1,12 @@
+using System.Threading.Tasks;
+using LinCms.Data;
+using LinCms.Entities;
+
+namespace LinCms.Cms.Logs
+{
+    public interface ISerilogService
+    {
+        Task<LogDashboard> GetLogDashboard();
+        Task<PagedResultDto<SerilogDO>> GetListAsync(SerilogSearchDto searchDto);
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Cms/Logs/LogDashboard.cs b/src/LinCms.Application.Contracts/Cms/Logs/LogDashboard.cs
new file mode 100644
index 00000000..1f55e8a1
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Cms/Logs/LogDashboard.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace LinCms.Cms.Logs
+{
+    public class LogDashboard
+    {
+        public long TodayCount { get; set; }
+        public long HourCount { get; set; }
+        public long AllCount { get; set; }
+        public long UniqueCount { get; set; }
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Cms/Logs/LogDto.cs b/src/LinCms.Application.Contracts/Cms/Logs/LogDto.cs
new file mode 100644
index 00000000..c0c6e062
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Cms/Logs/LogDto.cs
@@ -0,0 +1,40 @@
+namespace LinCms.Cms.Logs
+{
+    public class LogDto
+    {
+        /// <summary>
+        /// 访问哪个权限
+        /// </summary>
+        public string Authority { get; set; }
+
+        /// <summary>
+        /// 日志信息
+        /// </summary>
+        public string Message { get; set; }
+
+        /// <summary>
+        /// 请求方法
+        /// </summary>
+        public string Method { get; set; }
+
+        /// <summary>
+        /// 请求路径
+        /// </summary>
+        public string Path { get; set; }
+
+        /// <summary>
+        /// 请求的http返回码
+        /// </summary>
+        public int? StatusCode { get; set; }
+
+        /// <summary>
+        /// 用户id
+        /// </summary>
+        public long UserId { get; set; }
+
+        /// <summary>
+        /// 用户当时的昵称
+        /// </summary>
+        public string Username { get; set; }
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Cms/Logs/LogSearchDto.cs b/src/LinCms.Application.Contracts/Cms/Logs/LogSearchDto.cs
index a398c9ea..2b2e1775 100644
--- a/src/LinCms.Application.Contracts/Cms/Logs/LogSearchDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Logs/LogSearchDto.cs
@@ -1,7 +1,7 @@
 using System;
-using LinCms.Core.Data;
+using LinCms.Data;
 
-namespace LinCms.Application.Contracts.Cms.Logs
+namespace LinCms.Cms.Logs
 {
     public class LogSearchDto : PageDto
     {
diff --git a/src/LinCms.Application.Contracts/Cms/Logs/SerilogSearchDto.cs b/src/LinCms.Application.Contracts/Cms/Logs/SerilogSearchDto.cs
new file mode 100644
index 00000000..b790b14f
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Cms/Logs/SerilogSearchDto.cs
@@ -0,0 +1,19 @@
+using System;
+using LinCms.Data;
+
+namespace LinCms.Cms.Logs
+{
+    public class SerilogSearchDto:PageDto
+    {
+        public string Keyword { get; set; }
+        public int? LogLevel { get; set; }
+        /// <summary>
+        /// 起始时间
+        /// </summary>
+        public DateTime? Start { get; set; }
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public DateTime? End { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Application.Contracts/Cms/Logs/VisitLogUserDto.cs b/src/LinCms.Application.Contracts/Cms/Logs/VisitLogUserDto.cs
index 63559a2c..ae150587 100644
--- a/src/LinCms.Application.Contracts/Cms/Logs/VisitLogUserDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Logs/VisitLogUserDto.cs
@@ -1,4 +1,4 @@
-namespace LinCms.Application.Contracts.Cms.Logs
+namespace LinCms.Cms.Logs
 {
     public class VisitLogUserDto
     {
diff --git a/src/LinCms.Application.Contracts/Cms/Permissions/DispatchPermissionsDto.cs b/src/LinCms.Application.Contracts/Cms/Permissions/DispatchPermissionsDto.cs
index 7ee8ea57..8643562f 100644
--- a/src/LinCms.Application.Contracts/Cms/Permissions/DispatchPermissionsDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Permissions/DispatchPermissionsDto.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace LinCms.Application.Contracts.Cms.Permissions
+namespace LinCms.Cms.Permissions
 {
     public class DispatchPermissionsDto : IValidatableObject
     {
diff --git a/src/LinCms.Application/Cms/Permissions/IPermissionService.cs b/src/LinCms.Application.Contracts/Cms/Permissions/IPermissionService.cs
similarity index 58%
rename from src/LinCms.Application/Cms/Permissions/IPermissionService.cs
rename to src/LinCms.Application.Contracts/Cms/Permissions/IPermissionService.cs
index 7f1f5d01..4ea279a9 100644
--- a/src/LinCms.Application/Cms/Permissions/IPermissionService.cs
+++ b/src/LinCms.Application.Contracts/Cms/Permissions/IPermissionService.cs
@@ -1,14 +1,14 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using LinCms.Application.Contracts.Cms.Permissions;
-using LinCms.Core.Data;
-using LinCms.Core.Entities;
+using LinCms.Data;
+using LinCms.Entities;
 
-namespace LinCms.Application.Cms.Permissions
+namespace LinCms.Cms.Permissions
 {
     public interface IPermissionService
     {
-        Task<bool> CheckPermissionAsync( string permission);
+        IDictionary<string, List<PermissionDto>> GetAllStructualPermissions();
+        Task<bool> CheckPermissionAsync(string module, string permission);
         Task DeletePermissionsAsync(RemovePermissionDto permissionDto);
 
         Task DispatchPermissions(DispatchPermissionsDto permissionDto, List<PermissionDefinition> permissionDefinition);
@@ -17,6 +17,9 @@ public interface IPermissionService
 
         List<IDictionary<string, object>> StructuringPermissions(List<LinPermission> permissions);
 
+        Task<LinPermission> GetAsync(string permissionName);
+
+        Task<List<TreePermissionDto>> GetTreePermissionListAsync();
 
     }
 }
diff --git a/src/LinCms.Application.Contracts/Cms/Permissions/PermissionDto.cs b/src/LinCms.Application.Contracts/Cms/Permissions/PermissionDto.cs
index 3523b151..3f608b0a 100644
--- a/src/LinCms.Application.Contracts/Cms/Permissions/PermissionDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Permissions/PermissionDto.cs
@@ -1,16 +1,31 @@
-using LinCms.Core.Entities;
+using LinCms.Entities;
+using System;
+using System.Collections.Generic;
 
-namespace LinCms.Application.Contracts.Cms.Permissions
+namespace LinCms.Cms.Permissions
 {
-    public class PermissionDto:EntityDto<long>
+    public class PermissionDto : EntityDto<long>
     {
-        public PermissionDto(string name, string module)
+        public PermissionDto(string name, string module, string router)
         {
             Name = name;
             Module = module;
+            Router = router;
         }
 
         public string Name { get; set; }
         public string Module { get; set; }
+        public string Router { get; set; }
+
+    }
+
+    public class TreePermissionDto
+    {
+        public string Rowkey { get; set; }
+        public string Name { get; set; }
+        public string Router { get; set; }
+        public DateTime? CreateTime { get; set; }
+        public List<TreePermissionDto> Children { get; set; }
+
     }
 }
diff --git a/src/LinCms.Application.Contracts/Cms/Permissions/RemovePermissionDto.cs b/src/LinCms.Application.Contracts/Cms/Permissions/RemovePermissionDto.cs
index 7b53c659..1050bec1 100644
--- a/src/LinCms.Application.Contracts/Cms/Permissions/RemovePermissionDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Permissions/RemovePermissionDto.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace LinCms.Application.Contracts.Cms.Permissions
+namespace LinCms.Cms.Permissions
 {
     public class RemovePermissionDto:IValidatableObject
     {
diff --git a/src/LinCms.Application.Contracts/Cms/Settings/CreateUpdateSettingDto.cs b/src/LinCms.Application.Contracts/Cms/Settings/CreateUpdateSettingDto.cs
index fd22aa21..8167e17b 100644
--- a/src/LinCms.Application.Contracts/Cms/Settings/CreateUpdateSettingDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Settings/CreateUpdateSettingDto.cs
@@ -1,22 +1,31 @@
-namespace LinCms.Application.Contracts.Cms.Settings
+using System.ComponentModel.DataAnnotations;
+
+namespace LinCms.Cms.Settings
 {
     public class CreateUpdateSettingDto
     {
         /// <summary>
         /// 键
         /// </summary>
+        [StringLength(128)]
         public string Name { get; set; }
+
         /// <summary>
         /// 值
         /// </summary>
+        [StringLength(2048)]
         public string Value { get; set; }
+
         /// <summary>
         /// 提供者键
         /// </summary>
+        [StringLength(64)]
         public string ProviderName { get; set; }
+
         /// <summary>
         /// 提供者值
         /// </summary>
+        [StringLength(64)]
         public string ProviderKey { get; set; }
     }
 }
diff --git a/src/LinCms.Application/Cms/Settings/ISettingService.cs b/src/LinCms.Application.Contracts/Cms/Settings/ISettingService.cs
similarity index 52%
rename from src/LinCms.Application/Cms/Settings/ISettingService.cs
rename to src/LinCms.Application.Contracts/Cms/Settings/ISettingService.cs
index 600d9c00..76c24c7c 100644
--- a/src/LinCms.Application/Cms/Settings/ISettingService.cs
+++ b/src/LinCms.Application.Contracts/Cms/Settings/ISettingService.cs
@@ -1,14 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using LinCms.Application.Contracts.Cms.Settings;
-using LinCms.Core.Data;
+using LinCms.Data;
 
-namespace LinCms.Application.Cms.Settings
+namespace LinCms.Cms.Settings
 {
     public interface ISettingService
     {
-        PagedResultDto<SettingDto> GetPagedListAsync(PageDto pageDto);
+        Task<PagedResultDto<SettingDto>> GetPagedListAsync(PageDto pageDto);
 
         SettingDto Get(Guid id);
 
@@ -18,10 +17,15 @@ public interface ISettingService
 
         Task<string> GetOrNullAsync(string name, string providerName, string providerKey);
 
+        /// <summary>
+        /// 用户设置自己的一些配置
+        /// </summary>
+        /// <param name="createSetting"></param>
+        /// <returns></returns>
         Task SetAsync(CreateUpdateSettingDto createSetting);
 
-        Task PostAsync(CreateUpdateSettingDto createSettingDto);
+        Task CreateAsync(CreateUpdateSettingDto createSettingDto);
 
-        Task PutAsync(Guid id, CreateUpdateSettingDto updateSettingDto);
+        Task UpdateAsync(Guid id, CreateUpdateSettingDto updateSettingDto);
     }
-}
+}
\ No newline at end of file
diff --git a/src/LinCms.Application.Contracts/Cms/Settings/SettingDto.cs b/src/LinCms.Application.Contracts/Cms/Settings/SettingDto.cs
index c00f2446..4e442a62 100644
--- a/src/LinCms.Application.Contracts/Cms/Settings/SettingDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Settings/SettingDto.cs
@@ -1,7 +1,7 @@
 using System;
-using LinCms.Core.Entities;
+using LinCms.Entities;
 
-namespace LinCms.Application.Contracts.Cms.Settings
+namespace LinCms.Cms.Settings
 {
     public class SettingDto : EntityDto<Guid>
     {
diff --git a/src/LinCms.Application.Contracts/Cms/Users/ChangePasswordDto.cs b/src/LinCms.Application.Contracts/Cms/Users/ChangePasswordDto.cs
index 0a213ba9..4945197a 100644
--- a/src/LinCms.Application.Contracts/Cms/Users/ChangePasswordDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Users/ChangePasswordDto.cs
@@ -1,12 +1,11 @@
-using System.ComponentModel.DataAnnotations;
-using LinCms.Application.Contracts.Cms.Admins;
+using LinCms.Cms.Admins;
 
-namespace LinCms.Application.Contracts.Cms.Users
+namespace LinCms.Cms.Users
 {
     public class ChangePasswordDto: ResetPasswordDto
     {
 
-        [Required(ErrorMessage = "原密码不可为空")]
+        // [Required(ErrorMessage = "原密码不可为空")]
         public string OldPassword { get; set; }
     }
 }
diff --git a/src/LinCms.Application.Contracts/Cms/Users/CreateUserDto.cs b/src/LinCms.Application.Contracts/Cms/Users/CreateUserDto.cs
index 3e6b234b..1be46380 100644
--- a/src/LinCms.Application.Contracts/Cms/Users/CreateUserDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Users/CreateUserDto.cs
@@ -1,8 +1,9 @@
-using System.Collections.Generic;
+using LinCms.Data.Enums;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Net.Mail;
 
-namespace LinCms.Application.Contracts.Cms.Users
+namespace LinCms.Cms.Users
 {
     public class CreateUserDto : IValidatableObject
     {
@@ -43,7 +44,7 @@ public class CreateUserDto : IValidatableObject
         [Required(ErrorMessage = "请输入分组id")]
         //[Remote("/cms/admin/group/validateGroup", HttpMethod = "Post",ErrorMessage = "分组不存在")]
         public List<long> GroupIds { get; set; }
-
+        public UserActive Active { get; set; }
         public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
         {
             if (!Email.IsNullOrEmpty())
diff --git a/src/LinCms.Application.Contracts/Cms/Users/IOAuth2Service.cs b/src/LinCms.Application.Contracts/Cms/Users/IOAuth2Service.cs
new file mode 100644
index 00000000..9bf88173
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Cms/Users/IOAuth2Service.cs
@@ -0,0 +1,13 @@
+using LinCms.Data;
+using System.Security.Claims;
+using System.Threading.Tasks;
+
+namespace LinCms.Cms.Users
+{
+    public interface IOAuth2Service
+    {
+        Task<long> SaveUserAsync(ClaimsPrincipal principal, string openId);
+
+        Task<UnifyResponseDto> BindAsync(ClaimsPrincipal principal, string identityType, string openId, long userId);
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Cms/Users/IUserIdentityService.cs b/src/LinCms.Application.Contracts/Cms/Users/IUserIdentityService.cs
new file mode 100644
index 00000000..6159d04b
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Cms/Users/IUserIdentityService.cs
@@ -0,0 +1,48 @@
+using LinCms.Entities;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace LinCms.Cms.Users
+{
+
+    public interface IUserIdentityService
+    {
+        /// <summary>
+        /// 验证用户密码是否正确
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="password"></param>
+        /// <param name="salt"></param>
+        /// <returns></returns>
+        Task<bool> VerifyUserPasswordAsync(long userId, string password, string salt);
+
+        /// <summary>
+        /// 根据linUserIdentity生成密码
+        /// </summary>
+        /// <param name="linUserIdentity"></param>
+        /// <param name="newpassword"></param>
+        /// <param name="salt"></param>
+        /// <returns></returns>
+        Task ChangePasswordAsync(LinUserIdentity linUserIdentity, string newpassword, string salt);
+
+        /// <summary>
+        /// 根据用户ID，修改用户的密码
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="newpassword"></param>
+        /// <param name="salt"></param>
+        Task ChangePasswordAsync(long userId, string newpassword, string salt);
+
+        Task DeleteAsync(long userId);
+        /// <summary>
+        /// 根据用户id得到密码模式的用户授权信息
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        Task<LinUserIdentity> GetFirstByUserIdAsync(long userId);
+
+        Task<List<UserIdentityDto>> GetListAsync(long userId);
+        Task UnBind(Guid id);
+    }
+}
diff --git a/src/LinCms.Application/Cms/Users/IUserService.cs b/src/LinCms.Application.Contracts/Cms/Users/IUserService.cs
similarity index 71%
rename from src/LinCms.Application/Cms/Users/IUserService.cs
rename to src/LinCms.Application.Contracts/Cms/Users/IUserService.cs
index f7efb0e9..90eb09b7 100644
--- a/src/LinCms.Application/Cms/Users/IUserService.cs
+++ b/src/LinCms.Application.Contracts/Cms/Users/IUserService.cs
@@ -1,19 +1,14 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using LinCms.Application.Contracts.Cms.Admins;
-using LinCms.Application.Contracts.Cms.Users;
-using LinCms.Core.Data;
-using LinCms.Core.Data.Enums;
-using LinCms.Core.Entities;
+using LinCms.Cms.Admins;
+using LinCms.Data;
+using LinCms.Data.Enums;
+using LinCms.Entities;
 
-namespace LinCms.Application.Cms.Users
+namespace LinCms.Cms.Users
 {
     public interface IUserService
     {
-        /// <summary>
-        /// 后台管理员修改用户密码
-        /// </summary>
-        /// <param name="passwordDto"></param>
         Task ChangePasswordAsync(ChangePasswordDto passwordDto);
 
         /// <summary>
@@ -33,21 +28,27 @@ public interface IUserService
         /// <summary>
         /// 注册-新增一个用户
         /// </summary>
-        /// <param name="user"></param>
-        /// <param name="groupIds"></param>
-        Task Register(LinUser user,List<long>groupIds);
+        /// <param name="user">用户</param>
+        /// <param name="groupIds">分组Id集合</param>
+        /// <param name="password">密码</param>
+        Task CreateAsync(LinUser user, List<long> groupIds, string password);
 
         Task UpdateAync(long id, UpdateUserDto updateUserDto);
 
         Task DeleteAsync(long id);
 
+        /// <summary>
+        /// 后台管理员重置用户密码
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="resetPasswordDto"></param>
         Task ResetPasswordAsync(long id, ResetPasswordDto resetPasswordDto);
 
         /// <summary>
         /// 得到当前用户上下文
         /// </summary>
         /// <returns></returns>
-        LinUser GetCurrentUser();
+        Task<LinUser> GetCurrentUserAsync();
 
         Task<UserInformation> GetInformationAsync(long userId);
 
diff --git a/src/LinCms.Application.Contracts/Cms/Users/OAuthService.cs b/src/LinCms.Application.Contracts/Cms/Users/OAuthService.cs
new file mode 100644
index 00000000..87a735cf
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Cms/Users/OAuthService.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using LinCms.Data;
+using LinCms.Entities;
+using LinCms.IRepositories;
+
+namespace LinCms.Cms.Users
+{
+    public abstract class OAuthService : IOAuth2Service
+    {
+        private readonly IAuditBaseRepository<LinUserIdentity> _userIdentityRepository;
+
+        public OAuthService(IAuditBaseRepository<LinUserIdentity> userIdentityRepository)
+        {
+            _userIdentityRepository = userIdentityRepository;
+        }
+        private async Task<UnifyResponseDto> BindAsync(string identityType, string name, string openId, long userId)
+        {
+            LinUserIdentity linUserIdentity = await _userIdentityRepository.Where(r => r.IdentityType == identityType && r.Credential == openId).FirstAsync();
+            if (linUserIdentity == null)
+            {
+                var userIdentity = new LinUserIdentity(identityType, name, openId, DateTime.Now)
+                {
+                    CreateUserId = userId
+                };
+                await _userIdentityRepository.InsertAsync(userIdentity);
+                return UnifyResponseDto.Success("绑定成功");
+            }
+            else
+            {
+                return UnifyResponseDto.Error("绑定失败,该用户已绑定其他账号");
+            }
+        }
+
+        public abstract Task<long> SaveUserAsync(ClaimsPrincipal principal, string openId);
+
+        public virtual async Task<UnifyResponseDto> BindAsync(ClaimsPrincipal principal, string identityType, string openId, long userId)
+        {
+            string nickname = principal.FindFirst(ClaimTypes.Name)?.Value;
+            return await this.BindAsync(identityType, nickname, openId, userId);
+        }
+
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Cms/Users/OpenUserDto.cs b/src/LinCms.Application.Contracts/Cms/Users/OpenUserDto.cs
index 5dd2a09f..f69457e8 100644
--- a/src/LinCms.Application.Contracts/Cms/Users/OpenUserDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Users/OpenUserDto.cs
@@ -1,6 +1,6 @@
-using LinCms.Core.Entities;
+using LinCms.Entities;
 
-namespace LinCms.Application.Contracts.Cms.Users
+namespace LinCms.Cms.Users
 {
     public class OpenUserDto : EntityDto
     {
diff --git a/src/LinCms.Application.Contracts/Cms/Users/UpdateAvatarDto.cs b/src/LinCms.Application.Contracts/Cms/Users/UpdateAvatarDto.cs
index 8622714d..557e9aad 100644
--- a/src/LinCms.Application.Contracts/Cms/Users/UpdateAvatarDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Users/UpdateAvatarDto.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace LinCms.Application.Contracts.Cms.Users
+namespace LinCms.Cms.Users
 {
     public class UpdateAvatarDto
     {
diff --git a/src/LinCms.Application.Contracts/Cms/Users/UpdateNickNameDto.cs b/src/LinCms.Application.Contracts/Cms/Users/UpdateNickNameDto.cs
index 811fe706..70daca24 100644
--- a/src/LinCms.Application.Contracts/Cms/Users/UpdateNickNameDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Users/UpdateNickNameDto.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace LinCms.Application.Contracts.Cms.Users
+namespace LinCms.Cms.Users
 {
     public class UpdateNicknameDto
     {
diff --git a/src/LinCms.Application.Contracts/Cms/Users/UpdateProfileDto.cs b/src/LinCms.Application.Contracts/Cms/Users/UpdateProfileDto.cs
index 76205d86..7574e4bd 100644
--- a/src/LinCms.Application.Contracts/Cms/Users/UpdateProfileDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Users/UpdateProfileDto.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace LinCms.Application.Contracts.Cms.Users
+namespace LinCms.Cms.Users
 {
     public class UpdateProfileDto
     {
@@ -9,5 +9,7 @@ public class UpdateProfileDto
         public string Nickname { get; set; }
         [StringLength(100, ErrorMessage = "个人介绍应在100个字符内")]
         public string Introduction { get; set; }
+        [StringLength(100, ErrorMessage = "博客应在100个字符内")]
+        public string BlogAddress { get; set; }
     }
 }
diff --git a/src/LinCms.Application.Contracts/Cms/Users/UserDto.cs b/src/LinCms.Application.Contracts/Cms/Users/UserDto.cs
index fda84453..7d6209ca 100644
--- a/src/LinCms.Application.Contracts/Cms/Users/UserDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Users/UserDto.cs
@@ -1,9 +1,9 @@
-using System;
+using LinCms.Cms.Groups;
+using LinCms.Entities;
+using System;
 using System.Collections.Generic;
-using LinCms.Application.Contracts.Cms.Groups;
-using LinCms.Core.Entities;
 
-namespace LinCms.Application.Contracts.Cms.Users
+namespace LinCms.Cms.Users
 {
     public class UserDto : EntityDto
     {
diff --git a/src/LinCms.Application.Contracts/Cms/Users/UserIdentityDto.cs b/src/LinCms.Application.Contracts/Cms/Users/UserIdentityDto.cs
new file mode 100644
index 00000000..ca5c0114
--- /dev/null
+++ b/src/LinCms.Application.Contracts/Cms/Users/UserIdentityDto.cs
@@ -0,0 +1,16 @@
+using System;
+using LinCms.Entities;
+
+namespace LinCms.Cms.Users
+{
+    public class UserIdentityDto : EntityDto<Guid>
+    {
+        public string IdentityType { get; set; }
+
+        public string Identifier { get; set; }
+
+        public string ExtraProperties { get; set; }
+
+        public DateTime CreateTime { get; set; }
+    }
+}
diff --git a/src/LinCms.Application.Contracts/Cms/Users/UserInformation.cs b/src/LinCms.Application.Contracts/Cms/Users/UserInformation.cs
index 926472fe..cc12ecec 100644
--- a/src/LinCms.Application.Contracts/Cms/Users/UserInformation.cs
+++ b/src/LinCms.Application.Contracts/Cms/Users/UserInformation.cs
@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
-using LinCms.Application.Contracts.Cms.Groups;
-using LinCms.Core.Entities;
+using LinCms.Cms.Groups;
+using LinCms.Data.Enums;
+using LinCms.Entities;
 
-namespace LinCms.Application.Contracts.Cms.Users
+namespace LinCms.Cms.Users
 {
     public class UserInformation : EntityDto
     {
@@ -20,19 +21,20 @@ public class UserInformation : EntityDto
         /// </summary>
         public string Email { get; set; }
         /// <summary>
-        /// 是否为超级管理员 ;  1 -> 普通用户 |  2 -> 超级管理员
+        /// 是否为超级管理员 
         /// </summary>
         public bool Admin { get; set; } = false;
         /// <summary>
         /// 当前用户是否为激活状态，非激活状态默认失去用户权限 ; 1 -> 激活 | 2 -> 非激活
         /// </summary>
-        public int Active { get; set; }
+        public UserActive Active { get; set; }
         /// <summary>
         /// 用户所属的权限组id
         /// </summary>
         public List<GroupDto> Groups { get; set; }
 
         public string Introduction { get; set; }
+        public string BlogAddress { get; set; }
         public string Username { get; set; }
         public DateTime UpdateTime { get; set; }
         public DateTime CreateTime { get; set; }
diff --git a/src/LinCms.Application.Contracts/Cms/Users/UserNoviceDto.cs b/src/LinCms.Application.Contracts/Cms/Users/UserNoviceDto.cs
index 1aa5af66..87d82b28 100644
--- a/src/LinCms.Application.Contracts/Cms/Users/UserNoviceDto.cs
+++ b/src/LinCms.Application.Contracts/Cms/Users/UserNoviceDto.cs
@@ -1,9 +1,9 @@
-using System;
-using LinCms.Core.Entities;
+using LinCms.Entities;
+using System;
 
-namespace LinCms.Application.Contracts.Cms.Users
+namespace LinCms.Cms.Users
 {
-    public class UserNoviceDto:EntityDto
+    public class UserNoviceDto : EntityDto
     {
         public string Introduction { get; set; }
         public string Username { get; set; }
diff --git a/src/LinCms.Application.Contracts/IApplicationService.cs b/src/LinCms.Application.Contracts/IApplicationService.cs
new file mode 100644
index 00000000..7fe1696e
--- /dev/null
+++ b/src/LinCms.Application.Contracts/IApplicationService.cs
@@ -0,0 +1,7 @@
+namespace LinCms
+{
+    public interface IApplicationService
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Application.Contracts/ICrudAppService.cs b/src/LinCms.Application.Contracts/ICrudAppService.cs
new file mode 100644
index 00000000..02926f6f
--- /dev/null
+++ b/src/LinCms.Application.Contracts/ICrudAppService.cs
@@ -0,0 +1,23 @@
+using System.Threading.Tasks;
+using LinCms.Data;
+using LinCms.Entities;
+
+namespace LinCms
+{
+    public interface ICrudAppService<TGetOutputDto, TGetListOutputDto,in TKey,in TGetListInput,in TCreateInput,in TUpdateInput>
+        where TGetOutputDto : IEntityDto<TKey>
+        where TGetListOutputDto : IEntityDto<TKey>
+    {
+        Task<PagedResultDto<TGetListOutputDto>> GetListAsync(TGetListInput input);
+
+        Task<TGetOutputDto> GetAsync(TKey id);
+
+        Task<TGetOutputDto> CreateAsync(TCreateInput createInput);
+
+        Task<TGetOutputDto> UpdateAsync(TKey id, TUpdateInput updateInput);
+
+        Task DeleteAsync(TKey id);
+    }
+    
+    
+}
\ No newline at end of file
diff --git a/src/LinCms.Application.Contracts/LinCms.Application.Contracts.csproj b/src/LinCms.Application.Contracts/LinCms.Application.Contracts.csproj
index 9a819d2a..9ce06e46 100644
--- a/src/LinCms.Application.Contracts/LinCms.Application.Contracts.csproj
+++ b/src/LinCms.Application.Contracts/LinCms.Application.Contracts.csproj
@@ -1,15 +1,35 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
+    <AssemblyName>LinCms.Application.Contracts</AssemblyName>
+    <RootNamespace>LinCms</RootNamespace>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DocumentationFile>LinCms.Application.Contracts.xml</DocumentationFile>
+    <OutputPath>bin\Debug</OutputPath>
+    <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\LinCms.Core\LinCms.Core.csproj" />
+    <Compile Remove="Constracts\**" />
+    <EmbeddedResource Remove="Constracts\**" />
+    <None Remove="Constracts\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="LinCms.Application.Contracts.xml" />
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Constracts\" />
+    <Content Include="LinCms.Application.Contracts.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\LinCms.Core\LinCms.Core.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/LinCms.Application.Contracts/LinCms.Application.Contracts.xml b/src/LinCms.Application.Contracts/LinCms.Application.Contracts.xml
new file mode 100644
index 00000000..aa44a5d6
--- /dev/null
+++ b/src/LinCms.Application.Contracts/LinCms.Application.Contracts.xml
@@ -0,0 +1,634 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>LinCms.Application.Contracts</name>
+    </assembly>
+    <members>
+        <member name="P:LinCms.Blog.Articles.ArticleDto.ClassifyId">
+            <summary>
+            分类专栏Id
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Articles.ArticleDto.ChannelId">
+            <summary>
+            技术频道Id
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Articles.ArticleDto.Classify">
+            <summary>
+            类别名称
+            </summary>        
+        </member>
+        <member name="P:LinCms.Blog.Articles.ArticleDto.TimeSpan">
+            <summary>
+            几小时/秒前
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Articles.ArticleListDto.ChannelId">
+            <summary>
+            技术频道Id
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Articles.ArticleListDto.TimeSpan">
+            <summary>
+            几小时/秒前
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Channels.ChannelDto.Thumbnail">
+            <summary>
+            封面图
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Channels.ChannelDto.SortCode">
+            <summary>
+            排序
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Channels.ChannelDto.ChannelName">
+            <summary>
+            技术频道名称
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Channels.ChannelDto.ChannelCode">
+            <summary>
+            编码
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Channels.ChannelDto.Remark">
+            <summary>
+            备注描述
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Channels.CreateUpdateChannelDto.Thumbnail">
+            <summary>
+            封面图
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Channels.CreateUpdateChannelDto.SortCode">
+            <summary>
+            排序
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Channels.CreateUpdateChannelDto.ChannelName">
+            <summary>
+            技术频道名称
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Channels.CreateUpdateChannelDto.ChannelCode">
+            <summary>
+            编码
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Channels.CreateUpdateChannelDto.Remark">
+            <summary>
+            备注描述
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Channels.CreateUpdateChannelDto.Status">
+            <summary>
+            是否有效
+            </summary>
+        </member>
+        <member name="M:LinCms.Blog.Channels.IChannelService.GetNavListAsync(LinCms.Data.PageDto)">
+            <summary>
+            首页减少不必要的字段后，流量字节更少
+            </summary>
+            <param name="pageDto"></param>
+            <returns></returns>
+        </member>
+        <member name="P:LinCms.Blog.Channels.NavChannelListDto.ChannelName">
+            <summary>
+            技术频道名称
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Channels.NavChannelListDto.ChannelCode">
+            <summary>
+            编码
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Comments.CommentDto.RespId">
+            <summary>
+            回复评论Id
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Comments.CommentDto.Text">
+            <summary>
+            回复的文本内容
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Comments.CommentDto.SubjectId">
+            <summary>
+            关联随笔id
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Comments.CommentDto.UserInfo">
+            <summary>
+            评论的用户
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Comments.CommentDto.RespUserInfo">
+            <summary>
+            回复的用户
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Comments.CommentDto.TopComment">
+            <summary>
+            最新的二条回复
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Comments.CreateCommentDto.RespId">
+            <summary>
+            回复评论Id
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Comments.CreateCommentDto.RootCommentId">
+            <summary>
+            根回复id
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Comments.CreateCommentDto.Text">
+            <summary>
+            回复的文本内容
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Comments.CreateCommentDto.SubjectId">
+            <summary>
+            关联随笔id
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Comments.CreateCommentDto.RespUserId">
+            <summary>
+            被回复的用户Id
+            </summary>
+        </member>
+        <member name="M:LinCms.Blog.Comments.ICommentService.GetListByArticleAsync(LinCms.Blog.Comments.CommentSearchDto)">
+            <summary>
+            文章下的评论列表
+            </summary>
+            <param name="commentSearchDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Blog.Comments.ICommentService.GetListAsync(LinCms.Blog.Comments.CommentSearchDto)">
+            <summary>
+            评论分页项
+            </summary>
+            <param name="commentSearchDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Blog.Notifications.INotificationService.CreateOrCancelAsync(LinCms.Blog.Notifications.CreateNotificationDto)">
+            <summary>
+            新增一个消息通知,或取消消息通知
+            </summary>
+            <param name="createNotificationDto"></param>
+        </member>
+        <member name="M:LinCms.Blog.Notifications.INotificationService.SetNotificationReadAsync(System.Guid)">
+            <summary>
+            设置消息通知为已读状态
+            </summary>
+            <param name="id"></param>
+        </member>
+        <member name="F:LinCms.Blog.Notifications.NotificationSearchType.UserLike">
+            <summary>
+            用户点赞随笔、点赞评论
+            </summary>
+        </member>
+        <member name="F:LinCms.Blog.Notifications.NotificationSearchType.UserComment">
+            <summary>
+            用户评论随笔、回复别人的评论
+            </summary>
+        </member>
+        <member name="F:LinCms.Blog.Notifications.NotificationSearchType.UserLikeUser">
+            <summary>
+            用户关注用户
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.Tags.CreateUpdateTagDto.Alias">
+            <summary>
+            别名
+            </summary>
+        </member>
+        <member name="M:LinCms.Blog.Tags.ITagService.IsSubscribeAsync(System.Guid)">
+            <summary>
+            判断标签是否被关注
+            </summary>
+            <param name="tagId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Blog.Tags.ITagService.GetSubscribeTags(LinCms.Blog.UserSubscribes.UserSubscribeSearchDto)">
+            <summary>
+            得到某个用户关注的标签
+            </summary>
+            <param name="userSubscribeDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Blog.Tags.ITagService.IncreaseTagViewHits(System.Guid)">
+            <summary>
+            标签浏览量+1
+            </summary>
+            <param name="tagId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Blog.Tags.IUserTagService.CreateUserTagAsync(System.Guid)">
+            <summary>
+            用户关注标签
+            </summary>
+            <param name="tagId"></param>
+        </member>
+        <member name="M:LinCms.Blog.Tags.IUserTagService.DeleteUserTagAsync(System.Guid)">
+            <summary>
+            当前用户取消关注标签
+            </summary>
+            <param name="tagId"></param>
+            <returns></returns>
+        </member>
+        <member name="T:LinCms.Blog.Tags.TagListDto">
+            <summary>
+            后台列表List
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.UserLikes.CreateUpdateUserLikeDto.SubjectType">
+            <summary>
+            1.文章 2 评论
+            </summary>
+        </member>
+        <member name="M:LinCms.Blog.UserSubscribes.IUserSubscribeService.GetSubscribeUserIdAsync(System.Int64)">
+            <summary>
+            得到某用户的关注的用户Id
+            </summary>
+            <param name="userId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Blog.UserSubscribes.IUserSubscribeService.GetUserSubscribeeeList(LinCms.Blog.UserSubscribes.UserSubscribeSearchDto)">
+            <summary>
+            得到某个用户的关注
+            </summary>
+            <param name="searchDto"></param>
+            <returns></returns>
+        </member>
+        <member name="P:LinCms.Blog.UserSubscribes.UserSubscribeDto.SubscribeUserId">
+            <summary>
+            被关注的用户Id
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.UserSubscribes.UserSubscribeDto.CreateUserId">
+            <summary>
+            关注的用户Id
+            </summary>
+        </member>
+        <member name="P:LinCms.Blog.UserSubscribes.UserSubscribeDto.Subscribeer">
+            <summary>
+            关注者
+            </summary>
+        </member>
+        <member name="T:LinCms.Cms.Account.ITokenService">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:LinCms.Cms.Account.ITokenService.LoginAsync(LinCms.Cms.Account.LoginInputDto)">
+            <summary>
+            登录
+            </summary>
+            <param name="loginInputDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Cms.Account.ITokenService.GetRefreshTokenAsync(System.String)">
+            <summary>
+            刷新token
+            </summary>
+            <param name="refreshToken"></param>
+            <returns></returns>
+        </member>
+        <member name="P:LinCms.Cms.Account.LoginInputDto.Username">
+            <summary>
+            登录名:admin
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Account.LoginInputDto.Password">
+            <summary>
+            密码：123qwe
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Account.RegisterDto.Nickname">
+            <summary>
+            昵称
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Account.RegisterDto.Password">
+            <summary>
+            密码
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Account.RegisterDto.Email">
+            <summary>
+            邮件
+            </summary>
+        </member>
+        <member name="M:LinCms.Cms.Files.IFileService.UploadAsync(Microsoft.AspNetCore.Http.IFormFile,System.Int32)">
+            <summary>
+            单文件上传，键为file
+            </summary>
+            <param name="file"></param>
+            <param name="key"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Cms.Groups.IGroupService.DeleteAsync(System.Int64)">
+            <summary>
+            管理员删除一个权限分组
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Cms.Groups.IGroupService.CheckIsRootByUserId(System.Int64)">
+            <summary>
+            检查该用户是否在root分组中
+            </summary>
+            <param name="userId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Cms.Groups.IGroupService.GetGroupIdsByUserIdAsync(System.Int64)">
+            <summary>
+            根据用户Id得到获得用户的所有分组id
+            </summary>
+            <param name="userId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Cms.Groups.IGroupService.DeleteUserGroupAsync(System.Int64,System.Collections.Generic.List{System.Int64})">
+            <summary>
+            删除用户与分组直接的关联
+            </summary>
+            <param name="userId">用户Id</param>
+            <param name="deleteGroupIds">删除的分组Id</param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Cms.Groups.IGroupService.AddUserGroupAsync(System.Int64,System.Collections.Generic.List{System.Int64})">
+            <summary>
+            添加用户与分组直接的关联
+            </summary>
+            <param name="userId">用户Id</param>
+            <param name="addGroupIds">要新增的分组Id</param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Cms.Logs.ILogService.GetUserAndVisits">
+            <summary>
+            管理端访问与用户统计
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="P:LinCms.Cms.Logs.LogDto.Authority">
+            <summary>
+            访问哪个权限
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Logs.LogDto.Message">
+            <summary>
+            日志信息
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Logs.LogDto.Method">
+            <summary>
+            请求方法
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Logs.LogDto.Path">
+            <summary>
+            请求路径
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Logs.LogDto.StatusCode">
+            <summary>
+            请求的http返回码
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Logs.LogDto.UserId">
+            <summary>
+            用户id
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Logs.LogDto.Username">
+            <summary>
+            用户当时的昵称
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Logs.LogSearchDto.Name">
+            <summary>
+            用户昵称
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Logs.LogSearchDto.Start">
+            <summary>
+            起始时间
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Logs.LogSearchDto.End">
+            <summary>
+            结束时间
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Logs.SerilogSearchDto.Start">
+            <summary>
+            起始时间
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Logs.SerilogSearchDto.End">
+            <summary>
+            结束时间
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Logs.VisitLogUserDto.TotalVisitsCount">
+            <summary>
+            总访问量
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Logs.VisitLogUserDto.TotalUserCount">
+            <summary>
+            总用户数
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Logs.VisitLogUserDto.MonthVisitsCount">
+            <summary>
+            新增访问量 (月)
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Logs.VisitLogUserDto.MonthUserCount">
+            <summary>
+            新增用户数(月)
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Settings.CreateUpdateSettingDto.Name">
+            <summary>
+            键
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Settings.CreateUpdateSettingDto.Value">
+            <summary>
+            值
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Settings.CreateUpdateSettingDto.ProviderName">
+            <summary>
+            提供者键
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Settings.CreateUpdateSettingDto.ProviderKey">
+            <summary>
+            提供者值
+            </summary>
+        </member>
+        <member name="M:LinCms.Cms.Settings.ISettingService.SetAsync(LinCms.Cms.Settings.CreateUpdateSettingDto)">
+            <summary>
+            用户设置自己的一些配置
+            </summary>
+            <param name="createSetting"></param>
+            <returns></returns>
+        </member>
+        <member name="P:LinCms.Cms.Settings.SettingDto.Name">
+            <summary>
+            键
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Settings.SettingDto.Value">
+            <summary>
+            值
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Settings.SettingDto.ProviderName">
+            <summary>
+            提供者键
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Settings.SettingDto.ProviderKey">
+            <summary>
+            提供者值
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Users.CreateUserDto.Username">
+            <summary>
+            用户名
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Users.CreateUserDto.Nickname">
+            <summary>
+            昵称
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Users.CreateUserDto.Password">
+            <summary>
+            密码
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Users.CreateUserDto.ConfirmPassword">
+            <summary>
+            确认密码
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Users.CreateUserDto.Email">
+            <summary>
+            电子邮箱
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Users.CreateUserDto.GroupIds">
+            <summary>
+            用户所属的权限组id
+            </summary>
+        </member>
+        <member name="M:LinCms.Cms.Users.IUserIdentityService.VerifyUserPasswordAsync(System.Int64,System.String,System.String)">
+            <summary>
+            验证用户密码是否正确
+            </summary>
+            <param name="userId"></param>
+            <param name="password"></param>
+            <param name="salt"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Cms.Users.IUserIdentityService.ChangePasswordAsync(LinCms.Entities.LinUserIdentity,System.String,System.String)">
+            <summary>
+            根据linUserIdentity生成密码
+            </summary>
+            <param name="linUserIdentity"></param>
+            <param name="newpassword"></param>
+            <param name="salt"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Cms.Users.IUserIdentityService.ChangePasswordAsync(System.Int64,System.String,System.String)">
+            <summary>
+            根据用户ID，修改用户的密码
+            </summary>
+            <param name="userId"></param>
+            <param name="newpassword"></param>
+            <param name="salt"></param>
+        </member>
+        <member name="M:LinCms.Cms.Users.IUserIdentityService.GetFirstByUserIdAsync(System.Int64)">
+            <summary>
+            根据用户id得到密码模式的用户授权信息
+            </summary>
+            <param name="userId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Cms.Users.IUserService.GetUserListByGroupId(LinCms.Cms.Admins.UserSearchDto)">
+            <summary>
+            根据分组条件查询用户信息
+            </summary>
+            <param name="searchDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Cms.Users.IUserService.ChangeStatusAsync(System.Int64,LinCms.Data.Enums.UserActive)">
+            <summary>
+            修改用户状态
+            </summary>
+            <param name="id"></param>
+            <param name="userActive"></param>
+        </member>
+        <member name="M:LinCms.Cms.Users.IUserService.CreateAsync(LinCms.Entities.LinUser,System.Collections.Generic.List{System.Int64},System.String)">
+            <summary>
+            注册-新增一个用户
+            </summary>
+            <param name="user">用户</param>
+            <param name="groupIds">分组Id集合</param>
+            <param name="password">密码</param>
+        </member>
+        <member name="M:LinCms.Cms.Users.IUserService.ResetPasswordAsync(System.Int64,LinCms.Cms.Admins.ResetPasswordDto)">
+            <summary>
+            后台管理员重置用户密码
+            </summary>
+            <param name="id"></param>
+            <param name="resetPasswordDto"></param>
+        </member>
+        <member name="M:LinCms.Cms.Users.IUserService.GetCurrentUserAsync">
+            <summary>
+            得到当前用户上下文
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="P:LinCms.Cms.Users.UserInformation.Nickname">
+            <summary>
+            昵称
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Users.UserInformation.Avatar">
+            <summary>
+             用户默认生成图像，为null、头像url
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Users.UserInformation.Email">
+            <summary>
+            电子邮箱
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Users.UserInformation.Admin">
+            <summary>
+            是否为超级管理员 
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Users.UserInformation.Active">
+            <summary>
+            当前用户是否为激活状态，非激活状态默认失去用户权限 ; 1 -> 激活 | 2 -> 非激活
+            </summary>
+        </member>
+        <member name="P:LinCms.Cms.Users.UserInformation.Groups">
+            <summary>
+            用户所属的权限组id
+            </summary>
+        </member>
+    </members>
+</doc>
diff --git a/src/LinCms.Application.Contracts/v1/Books/BookDto.cs b/src/LinCms.Application.Contracts/v1/Books/BookDto.cs
index 2e4e628a..f67a4e0b 100644
--- a/src/LinCms.Application.Contracts/v1/Books/BookDto.cs
+++ b/src/LinCms.Application.Contracts/v1/Books/BookDto.cs
@@ -1,15 +1,15 @@
-using System;
-using LinCms.Core.Entities;
+using LinCms.Entities;
+using System;
 
-namespace LinCms.Application.Contracts.v1.Books
+namespace LinCms.v1.Books
 {
-    public class BookDto:EntityDto
+    public class BookDto : EntityDto
     {
-        public string Author { get; set; }
-        public string Image { get; set; }
-        public string Summary { get; set; }
-        public string Title { get; set; }
-        public DateTime CreateTime { get; set; }
-        public DateTime UpdateTime { get; set; }
+        public string Author { get; init; }
+        public string Image { get; init; }
+        public string Summary { get; init; }
+        public string Title { get; init; }
+        public DateTime CreateTime { get; init; }
+        public DateTime UpdateTime { get; init; }
     }
 }
diff --git a/src/LinCms.Application.Contracts/v1/Books/CreateUpdateBookDto.cs b/src/LinCms.Application.Contracts/v1/Books/CreateUpdateBookDto.cs
index ab6baefc..8ac331a6 100644
--- a/src/LinCms.Application.Contracts/v1/Books/CreateUpdateBookDto.cs
+++ b/src/LinCms.Application.Contracts/v1/Books/CreateUpdateBookDto.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace LinCms.Application.Contracts.v1.Books
+namespace LinCms.v1.Books
 {
     public class CreateUpdateBookDto
     {
diff --git a/src/LinCms.Application.Contracts/v1/Books/IBookService.cs b/src/LinCms.Application.Contracts/v1/Books/IBookService.cs
new file mode 100644
index 00000000..6e5b59f3
--- /dev/null
+++ b/src/LinCms.Application.Contracts/v1/Books/IBookService.cs
@@ -0,0 +1,18 @@
+using System.Threading.Tasks;
+using LinCms.Data;
+
+namespace LinCms.v1.Books
+{
+    public interface IBookService
+    {
+        Task<PagedResultDto<BookDto>> GetListAsync(PageDto pageDto);
+
+        Task<BookDto> GetAsync(long id);
+
+        Task CreateAsync(CreateUpdateBookDto inputDto);
+
+        Task UpdateAsync(long id, CreateUpdateBookDto inputDto);
+
+        Task DeleteAsync(long id);
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Application/AppService.cs b/src/LinCms.Application/AppService.cs
deleted file mode 100644
index a8ccc257..00000000
--- a/src/LinCms.Application/AppService.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using LinCms.Core.Security;
-
-namespace LinCms.Application
-{
-
-    public abstract class AppService: IAppService
-    {
-        protected CurrentUser CurrentUser;
-
-        protected AppService(CurrentUser currentUser)
-        {
-            CurrentUser = currentUser;
-        }
-
-    }
-}
diff --git a/src/LinCms.Application/AppliactionService.cs b/src/LinCms.Application/AppliactionService.cs
new file mode 100644
index 00000000..eb74159a
--- /dev/null
+++ b/src/LinCms.Application/AppliactionService.cs
@@ -0,0 +1,57 @@
+using System;
+using AutoMapper;
+using FreeSql;
+using LinCms.Security;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace LinCms
+{
+    public abstract class ApplicationService : IApplicationService
+    {
+        public IServiceProvider ServiceProvider { get; set; }
+
+        protected readonly object ServiceProviderLock = new object();
+
+        protected TService LazyGetRequiredService<TService>(ref TService reference)
+            => LazyGetRequiredService(typeof(TService), ref reference);
+
+        protected TRef LazyGetRequiredService<TRef>(Type serviceType, ref TRef reference)
+        {
+            if (reference == null)
+            {
+                lock (ServiceProviderLock)
+                {
+                    if (reference == null)
+                    {
+                        reference = (TRef)ServiceProvider.GetRequiredService(serviceType);
+                    }
+                }
+            }
+
+            return reference;
+        }
+
+        private ICurrentUser _currentUser;
+        public ICurrentUser CurrentUser => LazyGetRequiredService(ref _currentUser);
+
+        private IMapper _mapper;
+        public IMapper Mapper => LazyGetRequiredService(ref _mapper);
+
+
+        private UnitOfWorkManager unitOfWorkManager;
+        public UnitOfWorkManager UnitOfWorkManager => LazyGetRequiredService(ref unitOfWorkManager);
+
+        public ILoggerFactory LoggerFactory => LazyGetRequiredService(ref _loggerFactory);
+        private ILoggerFactory _loggerFactory;
+
+        protected ILogger Logger => LazyLogger.Value;
+        private Lazy<ILogger> LazyLogger => new Lazy<ILogger>(() => LoggerFactory?.CreateLogger(GetType().FullName) ?? NullLogger.Instance, true);
+
+        public IAuthorizationService AuthorizationService => LazyGetRequiredService(ref _authorizationService);
+        private IAuthorizationService _authorizationService;
+    }
+
+}
diff --git a/src/LinCms.Application/AutoMapper/Blog/MessageBoardProfile.cs b/src/LinCms.Application/AutoMapper/Blog/MessageBoardProfile.cs
deleted file mode 100644
index 68701811..00000000
--- a/src/LinCms.Application/AutoMapper/Blog/MessageBoardProfile.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using AutoMapper;
-using LinCms.Application.Contracts.Blog.MessageBoards;
-using LinCms.Core.Entities.Blog;
-
-namespace LinCms.Application.AutoMapper.Blog
-{
-    public class MessageBoardProfile:Profile
-    {
-        public MessageBoardProfile()
-        {
-            CreateMap<CreateMessageBoardDto, MessageBoard>();
-            CreateMap<MessageBoard, MessageBoardDto>();
-        }
-    }
-}
diff --git a/src/LinCms.Application/AutoMapper/Base/BaseItemProfile.cs b/src/LinCms.Application/Base/BaseItems/BaseItemProfile.cs
similarity index 65%
rename from src/LinCms.Application/AutoMapper/Base/BaseItemProfile.cs
rename to src/LinCms.Application/Base/BaseItems/BaseItemProfile.cs
index d951d11a..91c3043a 100644
--- a/src/LinCms.Application/AutoMapper/Base/BaseItemProfile.cs
+++ b/src/LinCms.Application/Base/BaseItems/BaseItemProfile.cs
@@ -1,8 +1,7 @@
 using AutoMapper;
-using LinCms.Application.Contracts.Base.BaseItems;
-using LinCms.Core.Entities.Base;
+using LinCms.Entities.Base;
 
-namespace LinCms.Application.AutoMapper.Base
+namespace LinCms.Base.BaseItems
 {
     public class BaseItemProfile :Profile
     {
diff --git a/src/LinCms.Application/Base/BaseItems/BaseItemService.cs b/src/LinCms.Application/Base/BaseItems/BaseItemService.cs
new file mode 100644
index 00000000..02b5ed85
--- /dev/null
+++ b/src/LinCms.Application/Base/BaseItems/BaseItemService.cs
@@ -0,0 +1,85 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using LinCms.Entities.Base;
+using LinCms.Exceptions;
+using LinCms.IRepositories;
+
+namespace LinCms.Base.BaseItems
+{
+    public class BaseItemService : ApplicationService, IBaseItemService
+    {
+        private readonly IAuditBaseRepository<BaseItem> _baseItemRepository;
+        private readonly IAuditBaseRepository<BaseType> _baseTypeRepository;
+
+        public BaseItemService(IAuditBaseRepository<BaseItem> baseItemRepository,IAuditBaseRepository<BaseType> baseTypeRepository)
+        {
+            _baseItemRepository = baseItemRepository;
+            _baseTypeRepository = baseTypeRepository;
+        }
+
+        public async Task DeleteAsync(int id)
+        {
+            await _baseItemRepository.DeleteAsync(new BaseItem { Id = id });
+        }
+
+        public async Task<List<BaseItemDto>> GetListAsync(string typeCode)
+        {
+            long baseTypeId = _baseTypeRepository.Select.Where(r => r.TypeCode == typeCode).ToOne(r => r.Id);
+
+            List<BaseItemDto> baseItems = (await _baseItemRepository.Select
+                    .OrderBy(r => r.SortCode)
+                    .OrderBy(r => r.Id)
+                    .Where(r => r.BaseTypeId == baseTypeId)
+                    .ToListAsync())
+                    .Select(r => Mapper.Map<BaseItemDto>(r)).ToList();
+
+            return baseItems;
+        }
+
+        public async Task<BaseItemDto> GetAsync(int id)
+        {
+            BaseItem baseItem = await _baseItemRepository.Select.Where(a => a.Id == id).ToOneAsync();
+            return Mapper.Map<BaseItemDto>(baseItem);
+        }
+
+        public async Task CreateAsync(CreateUpdateBaseItemDto createBaseItem)
+        {
+            bool exist = await _baseItemRepository.Select.AnyAsync(r =>
+                r.BaseTypeId == createBaseItem.BaseTypeId && r.ItemCode == createBaseItem.ItemCode);
+            if (exist)
+            {
+                throw new LinCmsException($"编码[{createBaseItem.ItemCode}]已存在");
+            }
+
+            BaseItem baseItem = Mapper.Map<BaseItem>(createBaseItem);
+            await _baseItemRepository.InsertAsync(baseItem);
+        }
+
+        public async Task UpdateAsync(int id, CreateUpdateBaseItemDto updateBaseItem)
+        {
+            BaseItem baseItem = await _baseItemRepository.Select.Where(r => r.Id == id).ToOneAsync();
+            if (baseItem == null)
+            {
+                throw new LinCmsException("该数据不存在");
+            }
+
+            bool typeExist = await _baseTypeRepository.Select.AnyAsync(r => r.Id == updateBaseItem.BaseTypeId);
+            if (!typeExist)
+            {
+                throw new LinCmsException("请选择正确的类别");
+            }
+
+            bool exist = await _baseItemRepository.Select.AnyAsync(r =>
+                r.BaseTypeId == updateBaseItem.BaseTypeId && r.ItemCode == updateBaseItem.ItemCode && r.Id != id);
+
+            if (exist)
+            {
+                throw new LinCmsException($"编码[{updateBaseItem.ItemCode}]已存在");
+            }
+
+            Mapper.Map(updateBaseItem, baseItem);
+            await _baseItemRepository.UpdateAsync(baseItem);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Application/AutoMapper/Base/BaseTypeProfile.cs b/src/LinCms.Application/Base/BaseTypes/BaseTypeProfile.cs
similarity index 65%
rename from src/LinCms.Application/AutoMapper/Base/BaseTypeProfile.cs
rename to src/LinCms.Application/Base/BaseTypes/BaseTypeProfile.cs
index 2c3e681f..cae5abce 100644
--- a/src/LinCms.Application/AutoMapper/Base/BaseTypeProfile.cs
+++ b/src/LinCms.Application/Base/BaseTypes/BaseTypeProfile.cs
@@ -1,8 +1,7 @@
 using AutoMapper;
-using LinCms.Application.Contracts.Base.BaseTypes;
-using LinCms.Core.Entities.Base;
+using LinCms.Entities.Base;
 
-namespace LinCms.Application.AutoMapper.Base
+namespace LinCms.Base.BaseTypes
 {
     public class BaseTypeProfile:Profile
     {
diff --git a/src/LinCms.Application/Base/BaseTypes/BaseTypeService.cs b/src/LinCms.Application/Base/BaseTypes/BaseTypeService.cs
new file mode 100644
index 00000000..96bf8bc0
--- /dev/null
+++ b/src/LinCms.Application/Base/BaseTypes/BaseTypeService.cs
@@ -0,0 +1,72 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using LinCms.Entities.Base;
+using LinCms.Exceptions;
+using LinCms.IRepositories;
+
+namespace LinCms.Base.BaseTypes
+{
+    public class BaseTypeService : ApplicationService, IBaseTypeService
+    {
+        private readonly IAuditBaseRepository<BaseType> _baseTypeRepository;
+
+        public BaseTypeService( IAuditBaseRepository<BaseType> baseTypeRepository)
+        {
+            _baseTypeRepository = baseTypeRepository;
+        }
+
+        public async Task DeleteAsync(int id)
+        {
+            await _baseTypeRepository.DeleteAsync(new BaseType { Id = id });
+        }
+
+        public async Task<List<BaseTypeDto>> GetListAsync()
+        {
+            List<BaseTypeDto> baseTypes = (await _baseTypeRepository.Select
+                    .OrderBy(r => r.SortCode)
+                    .OrderBy(r => r.Id)
+                    .ToListAsync())
+                .Select(r => Mapper.Map<BaseTypeDto>(r)).ToList();
+
+            return baseTypes;
+        }
+
+        public async Task<BaseTypeDto> GetAsync(int id)
+        {
+            BaseType baseType = await _baseTypeRepository.Select.Where(a => a.Id == id).ToOneAsync();
+            return Mapper.Map<BaseTypeDto>(baseType);
+        }
+
+        public async Task CreateAsync(CreateUpdateBaseTypeDto createBaseType)
+        {
+            bool exist = await _baseTypeRepository.Select.AnyAsync(r => r.TypeCode == createBaseType.TypeCode);
+            if (exist)
+            {
+                throw new LinCmsException($"类别-编码[{createBaseType.TypeCode}]已存在");
+            }
+
+            BaseType baseType = Mapper.Map<BaseType>(createBaseType);
+            await _baseTypeRepository.InsertAsync(baseType);
+        }
+
+        public async Task UpdateAsync(int id, CreateUpdateBaseTypeDto updateBaseType)
+        {
+            BaseType baseType = await _baseTypeRepository.Select.Where(r => r.Id == id).ToOneAsync();
+            if (baseType == null)
+            {
+                throw new LinCmsException("该数据不存在");
+            }
+
+            bool exist =
+                await _baseTypeRepository.Select.AnyAsync(r => r.TypeCode == updateBaseType.TypeCode && r.Id != id);
+            if (exist)
+            {
+                throw new LinCmsException($"基础类别-编码[{updateBaseType.TypeCode}]已存在");
+            }
+
+            Mapper.Map(updateBaseType, baseType);
+            await _baseTypeRepository.UpdateAsync(baseType);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Application/Base/Docs/DocProfile.cs b/src/LinCms.Application/Base/Docs/DocProfile.cs
new file mode 100644
index 00000000..2492adab
--- /dev/null
+++ b/src/LinCms.Application/Base/Docs/DocProfile.cs
@@ -0,0 +1,14 @@
+using AutoMapper;
+using LinCms.Entities.Base;
+
+namespace LinCms.Base.Docs
+{
+    public class DocProfile : Profile
+    {
+        public DocProfile()
+        {
+            CreateMap<Doc, DocDto>();
+            CreateMap<CreateUpdateDocDto, Doc>();
+        }
+    }
+}
diff --git a/src/LinCms.Application/Base/Docs/DocService.cs b/src/LinCms.Application/Base/Docs/DocService.cs
new file mode 100644
index 00000000..c2fc73c9
--- /dev/null
+++ b/src/LinCms.Application/Base/Docs/DocService.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using LinCms.Data;
+using LinCms.Entities.Base;
+using LinCms.Extensions;
+using LinCms.Exceptions;
+using LinCms.IRepositories;
+
+namespace LinCms.Base.Docs
+{
+    public class DocService :ApplicationService, IDocService
+    {
+        private readonly IAuditBaseRepository<Doc, long> Repository;
+
+        public DocService(IAuditBaseRepository<Doc, long> repository)
+        {
+            Repository = repository;
+        }
+
+        public async Task DeleteAsync(long id)
+        {
+            await Repository.DeleteAsync(new Doc {Id = id});
+        }
+
+        public async Task<PagedResultDto<DocDto>> GetListAsync(PageDto pageDto)
+        {
+            List<DocDto> docss = (await Repository.Select
+                        .ToPagerListAsync(pageDto, out long count)).Select(r => Mapper.Map<DocDto>(r)).ToList();
+
+            return new PagedResultDto<DocDto>(docss, count);
+        }
+
+        public async Task<DocDto> GetAsync(long id)
+        {
+            Doc doc = await Repository.Select.Where(a => a.Id == id).ToOneAsync();
+            return Mapper.Map<DocDto>(doc);
+        }
+
+        public async Task CreateAsync(CreateUpdateDocDto createDoc)
+        {
+            Doc doc = Mapper.Map<Doc>(createDoc);
+            await Repository.InsertAsync(doc);
+        }
+
+        public async Task UpdateAsync(long id, CreateUpdateDocDto updateDoc)
+        {
+            Doc doc = await Repository.Select.Where(r => r.Id == id).ToOneAsync();
+            if (doc == null)
+            {
+                throw new LinCmsException("该数据不存在");
+            }
+            Mapper.Map(updateDoc, doc);
+            await Repository.UpdateAsync(doc);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Application/Base/Localizations/CultureProfile.cs b/src/LinCms.Application/Base/Localizations/CultureProfile.cs
new file mode 100644
index 00000000..a4ffe506
--- /dev/null
+++ b/src/LinCms.Application/Base/Localizations/CultureProfile.cs
@@ -0,0 +1,14 @@
+using AutoMapper;
+using IGeekFan.Localization.FreeSql.Models;
+
+namespace LinCms.Base.Localizations
+{
+    public class CultureProfile : Profile
+    {
+        public CultureProfile()
+        {
+            CreateMap<LocalCulture, CultureDto>();
+            CreateMap<CultureDto, LocalCulture>();
+        }
+    }
+}
diff --git a/src/LinCms.Application/Base/Localizations/CultureService.cs b/src/LinCms.Application/Base/Localizations/CultureService.cs
new file mode 100644
index 00000000..c53de71f
--- /dev/null
+++ b/src/LinCms.Application/Base/Localizations/CultureService.cs
@@ -0,0 +1,69 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using IGeekFan.Localization.FreeSql.Models;
+using LinCms.Exceptions;
+using LinCms.IRepositories;
+
+namespace LinCms.Base.Localizations
+{
+    public class CultureService :ApplicationService, ICultureService
+    {
+        private readonly IAuditBaseRepository<LocalCulture, long> _cultureRepository;
+        public CultureService(IAuditBaseRepository<LocalCulture, long> cultureRepository)
+        {
+            _cultureRepository = cultureRepository;
+        }
+
+        public async Task DeleteAsync(long id)
+        {
+            await _cultureRepository.DeleteAsync(new LocalCulture { Id = id });
+        }
+
+        public async Task<List<CultureDto>> GetListAsync()
+        {
+            List<LocalCulture> entities = await _cultureRepository.Select.ToListAsync();
+            return Mapper.Map<List<CultureDto>>(entities);
+        }
+
+        public async Task<CultureDto> GetAsync(long id)
+        {
+            LocalCulture entity = await _cultureRepository.Select
+                .Where(a => a.Id == id).ToOneAsync();
+
+            CultureDto resourceDto = Mapper.Map<CultureDto>(entity);
+            return resourceDto;
+        }
+
+        public async Task<CultureDto> CreateAsync(CultureDto cultureDto)
+        {
+            bool exist = await _cultureRepository.Select.AnyAsync(r => r.Name == cultureDto.Name);
+            if (exist)
+            {
+                throw new LinCmsException($"Name[{cultureDto.Name}]已存在");
+            }
+
+            LocalCulture localCulture = Mapper.Map<LocalCulture>(cultureDto);
+            await _cultureRepository.InsertAsync(localCulture);
+            return Mapper.Map<CultureDto>(localCulture);
+        }
+
+        public async Task<CultureDto> UpdateAsync(CultureDto cultureDto)
+        {
+            LocalCulture localCulture = await _cultureRepository.Select.Where(r => r.Id == cultureDto.Id).ToOneAsync();
+            if (localCulture == null)
+            {
+                throw new LinCmsException("该数据不存在");
+            }
+
+            bool exist = await _cultureRepository.Select.AnyAsync(r => r.Name == cultureDto.Name && r.Id != cultureDto.Id);
+            if (exist)
+            {
+                throw new LinCmsException($"Name[{cultureDto.Name}]已存在");
+            }
+
+            Mapper.Map(cultureDto, localCulture);
+            await _cultureRepository.UpdateAsync(localCulture);
+            return Mapper.Map<CultureDto>(localCulture);
+        }
+    }
+}
diff --git a/src/LinCms.Application/Base/Localizations/ResourceProfile.cs b/src/LinCms.Application/Base/Localizations/ResourceProfile.cs
new file mode 100644
index 00000000..abeb6fef
--- /dev/null
+++ b/src/LinCms.Application/Base/Localizations/ResourceProfile.cs
@@ -0,0 +1,14 @@
+using AutoMapper;
+using IGeekFan.Localization.FreeSql.Models;
+
+namespace LinCms.Base.Localizations
+{
+    public class ResourceProfile : Profile
+    {
+        public ResourceProfile()
+        {
+            CreateMap<LocalResource, ResourceDto>();
+            CreateMap<ResourceDto, LocalResource>();
+        }
+    }
+}
diff --git a/src/LinCms.Application/Base/Localizations/ResourceService.cs b/src/LinCms.Application/Base/Localizations/ResourceService.cs
new file mode 100644
index 00000000..924d858f
--- /dev/null
+++ b/src/LinCms.Application/Base/Localizations/ResourceService.cs
@@ -0,0 +1,78 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using IGeekFan.Localization.FreeSql.Models;
+using LinCms.Data;
+using LinCms.Exceptions;
+using LinCms.Extensions;
+using LinCms.IRepositories;
+
+namespace LinCms.Base.Localizations
+{
+    public class ResourceService :ApplicationService, IResourceService
+    {
+        private readonly IAuditBaseRepository<LocalResource, long> _resourceRepository;
+
+        public ResourceService(IAuditBaseRepository<LocalResource, long> resourceRepository)
+        {
+            _resourceRepository = resourceRepository;
+        }
+
+        public async Task DeleteAsync(long id)
+        {
+            await _resourceRepository.DeleteAsync(new LocalResource { Id = id });
+        }
+
+        public async Task<PagedResultDto<ResourceDto>> GetListAsync(ResourceSearchDto searchDto)
+        {
+            List<ResourceDto> entity = (await _resourceRepository.Select
+                    .Where(r => r.CultureId == searchDto.CultureId)
+                    .WhereIf(searchDto.Key.IsNotNullOrEmpty(), r => r.Key.Contains(searchDto.Key))
+                    .ToPagerListAsync(searchDto, out long totalCount))
+                    .Select(r =>
+                    {
+                        ResourceDto resourceDto = Mapper.Map<ResourceDto>(r);
+                        return resourceDto;
+                    }).ToList();
+
+            return new PagedResultDto<ResourceDto>(entity, totalCount);
+        }
+
+        public async Task<ResourceDto> GetAsync(long id)
+        {
+            LocalResource entity = await _resourceRepository.Select.Where(a => a.Id == id).ToOneAsync();
+            ResourceDto resourceDto = Mapper.Map<ResourceDto>(entity);
+            return resourceDto;
+        }
+
+        public async Task CreateAsync(ResourceDto resourceDto)
+        {
+            bool exist = await _resourceRepository.Select.AnyAsync(r => r.Key == resourceDto.Key && r.CultureId == resourceDto.CultureId);
+            if (exist)
+            {
+                throw new LinCmsException($"Key[{resourceDto.Key}]已存在");
+            }
+
+            LocalResource entity = Mapper.Map<LocalResource>(resourceDto);
+            await _resourceRepository.InsertAsync(entity);
+        }
+
+        public async Task UpdateAsync(ResourceDto resourceDto)
+        {
+            LocalResource entity = await _resourceRepository.Select.Where(r => r.Id == resourceDto.Id).ToOneAsync();
+            if (entity == null)
+            {
+                throw new LinCmsException("该数据不存在");
+            }
+
+            bool exist = await _resourceRepository.Select.AnyAsync(r => r.Key == resourceDto.Key && r.Id != resourceDto.Id && r.CultureId == resourceDto.CultureId);
+            if (exist)
+            {
+                throw new LinCmsException($"Key[{resourceDto.Key}]已存在");
+            }
+
+            Mapper.Map(resourceDto, entity);
+            await _resourceRepository.UpdateAsync(entity);
+        }
+    }
+}
diff --git a/src/LinCms.Application/Blog/Articles/ArticleAppService.cs b/src/LinCms.Application/Blog/Articles/ArticleAppService.cs
deleted file mode 100644
index 455d13d8..00000000
--- a/src/LinCms.Application/Blog/Articles/ArticleAppService.cs
+++ /dev/null
@@ -1,234 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
-using FreeSql;
-using LinCms.Application.Blog.Classifies;
-using LinCms.Application.Blog.Tags;
-using LinCms.Application.Blog.UserSubscribes;
-using LinCms.Application.Contracts.Blog.Articles;
-using LinCms.Core.Data;
-using LinCms.Core.Entities.Blog;
-using LinCms.Core.Exceptions;
-using LinCms.Core.Extensions;
-using LinCms.Core.Security;
-using LinCms.Infrastructure.Repositories;
-
-namespace LinCms.Application.Blog.Articles
-{
-    public class ArticleAppService : IArticleService
-    {
-        private readonly AuditBaseRepository<Article> _articleRepository;
-        private readonly GuidRepository<TagArticle> _tagArticleRepository;
-        private readonly AuditBaseRepository<UserLike> _userLikeRepository;
-        private readonly AuditBaseRepository<Comment> _commentBaseRepository;
-        private readonly IMapper _mapper;
-        private readonly ICurrentUser _currentUser;
-        private readonly IClassifyService _classifyService;
-        private readonly ITagService _tagService;
-        private readonly IUserSubscribeService _userSubscribeService;
-
-        public ArticleAppService(
-                AuditBaseRepository<Article> articleRepository,
-                GuidRepository<TagArticle> tagArticleRepository,
-                IMapper mapper,
-                ICurrentUser currentUser,
-                AuditBaseRepository<UserLike> userLikeRepository,
-                AuditBaseRepository<Comment> commentBaseRepository,
-                IClassifyService classifyService,
-                ITagService tagService, IUserSubscribeService userSubscribeService)
-        {
-            _articleRepository = articleRepository;
-            _tagArticleRepository = tagArticleRepository;
-            _mapper = mapper;
-            _currentUser = currentUser;
-            _userLikeRepository = userLikeRepository;
-            _commentBaseRepository = commentBaseRepository;
-
-            _classifyService = classifyService;
-            _tagService = tagService;
-            _userSubscribeService = userSubscribeService;
-        }
-
-        public async Task<PagedResultDto<ArticleListDto>> GetArticleAsync(ArticleSearchDto searchDto)
-        {
-            DateTime monthDays = DateTime.Now.AddDays(-30);
-            DateTime weeklyDays = DateTime.Now.AddDays(-7);
-            DateTime threeDays = DateTime.Now.AddDays(-3);
-
-            long? userId = _currentUser.Id;
-            List<Article> articles = await _articleRepository
-                .Select
-                .Include(r => r.UserInfo)
-                .IncludeMany(r => r.Tags, r => r.Where(u => u.Status == true))
-                .IncludeMany(r => r.UserLikes, r => r.Where(u => u.CreateUserId == userId))
-                .Where(r => r.IsAudit == true)
-                .WhereCascade(r => r.IsDeleted == false)
-                .WhereIf(searchDto.UserId != null, r => r.CreateUserId == searchDto.UserId)
-                .WhereIf(searchDto.TagId.HasValue, r => r.Tags.AsSelect().Any(u => u.Id == searchDto.TagId))
-                .WhereIf(searchDto.ClassifyId.HasValue, r => r.ClassifyId == searchDto.ClassifyId)
-                .WhereIf(searchDto.ChannelId.HasValue, r => r.ChannelId == searchDto.ChannelId)
-                .WhereIf(searchDto.Title.IsNotNullOrEmpty(), r => r.Title.Contains(searchDto.Title))
-                .WhereIf(searchDto.Sort == "THREE_DAYS_HOTTEST", r => r.CreateTime > threeDays)
-                .WhereIf(searchDto.Sort == "WEEKLY_HOTTEST", r => r.CreateTime > weeklyDays)
-                .WhereIf(searchDto.Sort == "MONTHLY_HOTTEST", r => r.CreateTime > monthDays)
-                .OrderByDescending(
-                    searchDto.Sort == "THREE_DAYS_HOTTEST" || searchDto.Sort == "WEEKLY_HOTTEST" || searchDto.Sort == "MONTHLY_HOTTEST" ||
-                            searchDto.Sort == "HOTTEST",
-                    r => (r.ViewHits + r.LikesQuantity * 20 + r.CommentQuantity * 30))
-                .OrderByDescending(r => r.CreateTime).ToPagerListAsync(searchDto, out long totalCount);
-
-            List<ArticleListDto> articleDtos = articles
-                .Select(a =>
-                {
-                    ArticleListDto articleDto = _mapper.Map<ArticleListDto>(a);
-
-                    articleDto.IsLiked = userId != null && a.UserLikes.Any();
-                    articleDto.ThumbnailDisplay = _currentUser.GetFileUrl(articleDto.Thumbnail);
-
-                    return articleDto;
-                })
-                .ToList();
-
-            return new PagedResultDto<ArticleListDto>(articleDtos, totalCount);
-        }
-
-        public void Delete(Guid id)
-        {
-            Article article = _articleRepository.Select.Where(r => r.Id == id).IncludeMany(r => r.Tags).ToOne();
-            _classifyService.UpdateArticleCount(article.ClassifyId, 1);
-            article.Tags.ToList()
-                .ForEach(u =>
-                {
-                    _tagService.UpdateArticleCount(u.Id, -1);
-                });
-
-            _articleRepository.Delete(new Article { Id = id });
-            _tagArticleRepository.Delete(r => r.ArticleId == id);
-            _commentBaseRepository.Delete(r => r.SubjectId == id);
-            _userLikeRepository.Delete(r => r.SubjectId == id);
-        }
-
-        public async Task<ArticleDto> GetAsync(Guid id)
-        {
-            Article article = await _articleRepository.Select
-                .Include(r => r.Classify)
-                .IncludeMany(r => r.Tags)
-                .Include(r => r.UserInfo).WhereCascade(r => r.IsDeleted == false).Where(a => a.Id == id).ToOneAsync();
-
-            if (article.IsNull())
-            {
-                throw new LinCmsException("该随笔不存在");
-            }
-
-            ArticleDto articleDto = _mapper.Map<ArticleDto>(article);
-
-            if (articleDto.Tags.IsNotNull())
-            {
-                articleDto.Tags.ForEach(r => { r.ThumbnailDisplay = _currentUser.GetFileUrl(r.Thumbnail); });
-            }
-
-            if (articleDto.UserInfo.IsNotNull())
-            {
-                articleDto.UserInfo.Avatar = _currentUser.GetFileUrl(articleDto.UserInfo.Avatar);
-            }
-
-            articleDto.IsLiked = await _userLikeRepository.Select.AnyAsync(r => r.SubjectId == id && r.CreateUserId == _currentUser.Id);
-            articleDto.IsComment = await _commentBaseRepository.Select.AnyAsync(r => r.SubjectId == id && r.CreateUserId == _currentUser.Id);
-            articleDto.ThumbnailDisplay = _currentUser.GetFileUrl(article.Thumbnail);
-
-            return articleDto;
-        }
-
-        public async Task CreateAsync(CreateUpdateArticleDto createArticle)
-        {
-            Article article = _mapper.Map<Article>(createArticle);
-            article.Archive = DateTime.Now.ToString("yyy年MM月");
-            article.WordNumber = createArticle.Content.Length;
-            article.ReadingTime = createArticle.Content.Length / 800;
-
-            article.Tags = new List<Tag>();
-            foreach (var articleTagId in createArticle.TagIds)
-            {
-                article.Tags.Add(new Tag()
-                {
-                    Id = articleTagId,
-                });
-                _tagService.UpdateArticleCount(articleTagId, 1);
-            }
-
-            await _articleRepository.InsertAsync(article);
-
-            _classifyService.UpdateArticleCount(createArticle.ClassifyId, 1);
-
-        }
-
-        public async Task UpdateAsync(CreateUpdateArticleDto updateArticleDto, Article article)
-        {
-            article.WordNumber = article.Content.Length;
-            article.ReadingTime = article.Content.Length / 800;
-
-            await _articleRepository.UpdateAsync(article);
-
-            List<Guid> tagIds = await _tagArticleRepository.Select
-                                .Where(r => r.ArticleId == article.Id)
-                                .ToListAsync(r => r.TagId);
-
-            tagIds.ForEach(tagId =>
-            {
-                _tagService.UpdateArticleCount(tagId, -1);
-            });
-            _tagArticleRepository.Delete(r => r.ArticleId == article.Id);
-
-            List<TagArticle> tagArticles = new List<TagArticle>();
-            updateArticleDto.TagIds.ForEach(tagId =>
-                {
-                    tagArticles.Add(new TagArticle()
-                    {
-                        ArticleId = article.Id,
-                        TagId = tagId
-                    });
-                    _tagService.UpdateArticleCount(tagId, 1);
-                });
-            await _tagArticleRepository.InsertAsync(tagArticles);
-
-            if (article.ClassifyId != updateArticleDto.ClassifyId)
-            {
-                _classifyService.UpdateArticleCount(article.ClassifyId, -1);
-                _classifyService.UpdateArticleCount(updateArticleDto.ClassifyId, 1);
-            }
-        }
-
-
-        public PagedResultDto<ArticleListDto> GetSubscribeArticle(PageDto pageDto)
-        {
-            long userId = _currentUser.Id ?? 0;
-            List<long> subscribeUserIds = _userSubscribeService.GetSubscribeUserId(userId);
-
-            var articles = _articleRepository
-                .Select
-                .Include(r => r.Classify)
-                .Include(r => r.UserInfo)
-                .IncludeMany(r => r.Tags, r => r.Where(u => u.Status))
-                .IncludeMany(r => r.UserLikes, r => r.Where(u => u.CreateUserId == userId))
-                .Where(r => r.IsAudit)
-                .IncludeMany(r => r.Tags, r => r.Where(u => u.Status))
-                .WhereIf(subscribeUserIds.Count > 0, r => subscribeUserIds.Contains(r.CreateUserId))
-                .WhereIf(subscribeUserIds.Count == 0, r => false)
-                .OrderByDescending(r => r.CreateTime).ToPagerList(pageDto, out long totalCount);
-
-            List<ArticleListDto> articleDtos = articles
-                .Select(r =>
-                {
-                    ArticleListDto articleDto = _mapper.Map<ArticleListDto>(r);
-                    articleDto.IsLiked = r.UserLikes.Any();
-                    articleDto.ThumbnailDisplay = _currentUser.GetFileUrl(articleDto.Thumbnail);
-                    return articleDto;
-                })
-                .ToList();
-
-            return new PagedResultDto<ArticleListDto>(articleDtos, totalCount);
-        }
-    }
-}
diff --git a/src/LinCms.Application/Blog/Articles/ArticleDraftService.cs b/src/LinCms.Application/Blog/Articles/ArticleDraftService.cs
new file mode 100644
index 00000000..5ba9033f
--- /dev/null
+++ b/src/LinCms.Application/Blog/Articles/ArticleDraftService.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Threading.Tasks;
+using LinCms.Blog.ArticleDrafts;
+using LinCms.Entities.Blog;
+using LinCms.Exceptions;
+using LinCms.IRepositories;
+
+namespace LinCms.Blog.Articles
+{
+    public class ArticleDraftService : ApplicationService, IArticleDraftService
+    {
+        private readonly IAuditBaseRepository<ArticleDraft> _articleDraftRepository;
+        public ArticleDraftService(IAuditBaseRepository<ArticleDraft> articleDraftRepository)
+        {
+            _articleDraftRepository = articleDraftRepository;
+        }
+
+        public async Task<ArticleDraftDto> GetAsync(Guid id)
+        {
+            ArticleDraft articleDraft = await _articleDraftRepository.Where(r => r.Id == id && r.CreateUserId == CurrentUser.Id).ToOneAsync();
+            return Mapper.Map<ArticleDraftDto>(articleDraft);
+        }
+
+        public async Task UpdateAsync(Guid id, UpdateArticleDraftDto updateArticleDto)
+        {
+            ArticleDraft articleDraft = await _articleDraftRepository.Select.Where(r => r.Id == id).ToOneAsync();
+            if (articleDraft != null && articleDraft.CreateUserId != CurrentUser.Id)
+            {
+                throw new LinCmsException("您无权修改他人的随笔");
+            }
+            if (articleDraft == null)
+            {
+                articleDraft = new ArticleDraft { Id = id, CreateUserId = CurrentUser.Id ?? 0, CreateTime = DateTime.Now };
+            }
+            Mapper.Map(updateArticleDto, articleDraft);
+            await _articleDraftRepository.InsertOrUpdateAsync(articleDraft);
+        }
+    }
+}
diff --git a/src/LinCms.Application/AutoMapper/Blog/ArticleProfile.cs b/src/LinCms.Application/Blog/Articles/ArticleProfile.cs
similarity index 50%
rename from src/LinCms.Application/AutoMapper/Blog/ArticleProfile.cs
rename to src/LinCms.Application/Blog/Articles/ArticleProfile.cs
index d5fe7ba7..e667d177 100644
--- a/src/LinCms.Application/AutoMapper/Blog/ArticleProfile.cs
+++ b/src/LinCms.Application/Blog/Articles/ArticleProfile.cs
@@ -1,8 +1,8 @@
 using AutoMapper;
-using LinCms.Application.Contracts.Blog.Articles;
-using LinCms.Core.Entities.Blog;
+using LinCms.Blog.ArticleDrafts;
+using LinCms.Entities.Blog;
 
-namespace LinCms.Application.AutoMapper.Blog
+namespace LinCms.Blog.Articles
 {
     public class ArticleProfile : Profile
     {
@@ -11,6 +11,11 @@ public ArticleProfile()
             CreateMap<CreateUpdateArticleDto, Article>();
             CreateMap<Article, ArticleDto>();
             CreateMap<Article, ArticleListDto>();
+            
+            CreateMap<UpdateArticleDraftDto,ArticleDraft>();
+            
+            CreateMap<ArticleDraft,ArticleDraftDto>();
+            CreateMap<Article,ArticleDraft>();
         }
     }
 }
diff --git a/src/LinCms.Application/Blog/Articles/ArticleService.cs b/src/LinCms.Application/Blog/Articles/ArticleService.cs
new file mode 100644
index 00000000..ac5d79e9
--- /dev/null
+++ b/src/LinCms.Application/Blog/Articles/ArticleService.cs
@@ -0,0 +1,285 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using LinCms.Aop.Attributes;
+using LinCms.Blog.Classifys;
+using LinCms.Blog.Tags;
+using LinCms.Blog.UserSubscribes;
+using LinCms.Data;
+using LinCms.Data.Enums;
+using LinCms.Entities.Blog;
+using LinCms.Exceptions;
+using LinCms.Extensions;
+using LinCms.IRepositories;
+
+namespace LinCms.Blog.Articles
+{
+    public class ArticleService : ApplicationService, IArticleService
+    {
+        private readonly IAuditBaseRepository<Article> _articleRepository;
+        private readonly IAuditBaseRepository<ArticleDraft> _articleDraftRepository;
+        private readonly IAuditBaseRepository<UserLike> _userLikeRepository;
+        private readonly IAuditBaseRepository<Comment> _commentRepository;
+        private readonly IAuditBaseRepository<TagArticle> _tagArticleRepository;
+        private readonly IClassifyService _classifyService;
+        private readonly ITagService _tagService;
+        private readonly IUserSubscribeService _userSubscribeService;
+        private readonly IFileRepository _fileRepository;
+        public ArticleService(
+            IAuditBaseRepository<Article> articleRepository,
+            IAuditBaseRepository<TagArticle> tagArticleRepository,
+            IAuditBaseRepository<UserLike> userLikeRepository,
+            IAuditBaseRepository<Comment> commentRepository,
+            IClassifyService classifyService,
+            ITagService tagService,
+            IUserSubscribeService userSubscribeService,
+            IAuditBaseRepository<ArticleDraft> articleDraftRepository,
+            IFileRepository fileRepository
+            )
+        {
+            _articleRepository = articleRepository;
+            _tagArticleRepository = tagArticleRepository;
+            _userLikeRepository = userLikeRepository;
+            _commentRepository = commentRepository;
+
+            _classifyService = classifyService;
+            _tagService = tagService;
+            _userSubscribeService = userSubscribeService;
+            _articleDraftRepository = articleDraftRepository;
+            _fileRepository = fileRepository;
+        }
+
+        [Cacheable]
+        public async Task<PagedResultDto<ArticleListDto>> GetArticleAsync(ArticleSearchDto searchDto)
+        {
+            DateTime monthDays = DateTime.Now.AddDays(-30);
+            DateTime weeklyDays = DateTime.Now.AddDays(-7);
+            DateTime threeDays = DateTime.Now.AddDays(-3);
+
+            long? userId = CurrentUser.Id;
+            List<Article> articles = await _articleRepository
+                .Select
+                .Include(r => r.UserInfo)
+                .IncludeMany(r => r.Tags, r => r.Where(u => u.Status == true))
+                .IncludeMany(r => r.UserLikes, r => r.Where(u => u.CreateUserId == userId))
+                .Where(r => r.IsAudit == true)
+                .WhereCascade(r => r.IsDeleted == false)
+                .WhereIf(searchDto.UserId != null, r => r.CreateUserId == searchDto.UserId)
+                .WhereIf(searchDto.TagId.HasValue, r => r.Tags.AsSelect().Any(u => u.Id == searchDto.TagId))
+                .WhereIf(searchDto.ClassifyId.HasValue, r => r.ClassifyId == searchDto.ClassifyId)
+                .WhereIf(searchDto.ChannelId.HasValue, r => r.ChannelId == searchDto.ChannelId)
+                .WhereIf(searchDto.Title.IsNotNullOrEmpty(), r => r.Title.Contains(searchDto.Title))
+                .WhereIf(searchDto.Sort == "THREE_DAYS_HOTTEST", r => r.CreateTime > threeDays)
+                .WhereIf(searchDto.Sort == "WEEKLY_HOTTEST", r => r.CreateTime > weeklyDays)
+                .WhereIf(searchDto.Sort == "MONTHLY_HOTTEST", r => r.CreateTime > monthDays)
+                .OrderByDescending(
+                    searchDto.Sort == "THREE_DAYS_HOTTEST" || searchDto.Sort == "WEEKLY_HOTTEST" ||
+                    searchDto.Sort == "MONTHLY_HOTTEST" ||
+                    searchDto.Sort == "HOTTEST",
+                    r => r.ViewHits + r.LikesQuantity * 20 + r.CommentQuantity * 30)
+                .OrderByDescending(r => r.CreateTime).ToPagerListAsync(searchDto, out long totalCount);
+
+            List<ArticleListDto> articleDtos = articles
+                .Select(a =>
+                {
+                    ArticleListDto articleDto = Mapper.Map<ArticleListDto>(a);
+
+                    articleDto.IsLiked = userId != null && a.UserLikes.Any();
+                    articleDto.ThumbnailDisplay = _fileRepository.GetFileUrl(articleDto.Thumbnail);
+
+                    return articleDto;
+                })
+                .ToList();
+
+            return new PagedResultDto<ArticleListDto>(articleDtos, totalCount);
+        }
+
+        public async Task DeleteAsync(Guid id)
+        {
+            Article article = _articleRepository.Select.Where(r => r.Id == id).IncludeMany(r => r.Tags).ToOne();
+            if (article.IsNotNull())
+            {
+                await _classifyService.UpdateArticleCountAsync(article.ClassifyId, 1);
+                article.Tags?
+                    .ForEach(async (u) => { await _tagService.UpdateArticleCountAsync(u.Id, -1); });
+            }
+
+            await _articleRepository.DeleteAsync(new Article { Id = id });
+            await _tagArticleRepository.DeleteAsync(r => r.ArticleId == id);
+            await _commentRepository.DeleteAsync(r => r.SubjectId == id);
+            await _userLikeRepository.DeleteAsync(r => r.SubjectId == id);
+        }
+
+        public async Task<ArticleDto> GetAsync(Guid id)
+        {
+            Article article = await _articleRepository.Select
+                .Include(r => r.Classify).IncludeMany(r => r.Tags).Include(r => r.UserInfo).WhereCascade(r => r.IsDeleted == false).Where(a => a.Id == id).ToOneAsync();
+
+            if (article.IsNull())
+            {
+                throw new LinCmsException("该随笔不存在");
+            }
+
+            ArticleDto articleDto = Mapper.Map<ArticleDto>(article);
+
+            if (articleDto.Tags.IsNotNull())
+            {
+                articleDto.Tags.ForEach(r => { r.ThumbnailDisplay = _fileRepository.GetFileUrl(r.Thumbnail); });
+            }
+
+            if (articleDto.UserInfo.IsNotNull())
+            {
+                articleDto.UserInfo.Avatar = _fileRepository.GetFileUrl(articleDto.UserInfo.Avatar);
+            }
+
+            articleDto.IsLiked =
+                await _userLikeRepository.Select.AnyAsync(r => r.SubjectId == id && r.CreateUserId == CurrentUser.Id);
+            articleDto.IsComment =
+                await _commentRepository.Select.AnyAsync(
+                    r => r.SubjectId == id && r.CreateUserId == CurrentUser.Id);
+            articleDto.ThumbnailDisplay = _fileRepository.GetFileUrl(article.Thumbnail);
+
+            return articleDto;
+        }
+
+        public async Task<Guid> CreateAsync(CreateUpdateArticleDto createArticle)
+        {
+            Article article = Mapper.Map<Article>(createArticle);
+            article.Archive = DateTime.Now.ToString("yyy年MM月");
+            article.WordNumber = createArticle.Content.Length;
+            article.ReadingTime = createArticle.Content.Length / 800;
+
+            article.Tags = new List<Tag>();
+            foreach (var articleTagId in createArticle.TagIds)
+            {
+                article.Tags.Add(new Tag()
+                {
+                    Id = articleTagId,
+                });
+                await _tagService.UpdateArticleCountAsync(articleTagId, 1);
+            }
+            await _articleRepository.InsertAsync(article);
+
+            await _articleDraftRepository.InsertAsync(new ArticleDraft(article.Id, createArticle.Content, createArticle.Title, createArticle.Editor));
+
+            if (createArticle.ClassifyId != null)
+            {
+                await _classifyService.UpdateArticleCountAsync(createArticle.ClassifyId, 1);
+            }
+            return article.Id;
+        }
+
+        public async Task UpdateAsync(Guid id, CreateUpdateArticleDto updateArticleDto)
+        {
+            Article article = _articleRepository.Select.Where(r => r.Id == id).ToOne();
+
+
+            if (article.CreateUserId != CurrentUser.Id)
+            {
+                throw new LinCmsException("您无权修改他人的随笔");
+            }
+
+            if (article == null)
+            {
+                throw new LinCmsException("没有找到相关随笔");
+            }
+
+            if (article.ClassifyId != updateArticleDto.ClassifyId)
+            {
+                await _classifyService.UpdateArticleCountAsync(article.ClassifyId, -1);
+                await _classifyService.UpdateArticleCountAsync(updateArticleDto.ClassifyId, 1);
+            }
+
+            Mapper.Map(updateArticleDto, article);
+            article.WordNumber = article.Content.Length;
+            article.ReadingTime = article.Content.Length / 800;
+            await _articleRepository.UpdateAsync(article);
+
+            ArticleDraft articleDraft = Mapper.Map<ArticleDraft>(article);
+            bool exist = await _articleDraftRepository.Select.AnyAsync(r => r.Id == article.Id);
+            if (exist)
+            {
+                await _articleDraftRepository.UpdateAsync(articleDraft);
+            }
+            else
+            {
+                await _articleDraftRepository.InsertAsync(articleDraft);
+            }
+        }
+
+        public async Task UpdateTagAsync(Guid id, CreateUpdateArticleDto updateArticleDto)
+        {
+            List<Guid> tagIds = await _tagArticleRepository.Select.Where(r => r.ArticleId == id).ToListAsync(r => r.TagId);
+
+            tagIds.ForEach(async (tagId) => { await _tagService.UpdateArticleCountAsync(tagId, -1); });
+
+            _tagArticleRepository.Delete(r => r.ArticleId == id);
+
+            List<TagArticle> tagArticles = new List<TagArticle>();
+
+            updateArticleDto.TagIds.ForEach(async (tagId) =>
+            {
+                tagArticles.Add(new TagArticle()
+                {
+                    ArticleId = id,
+                    TagId = tagId
+                });
+                await _tagService.UpdateArticleCountAsync(tagId, 1);
+            });
+            await _tagArticleRepository.InsertAsync(tagArticles);
+        }
+
+
+        public async Task<PagedResultDto<ArticleListDto>> GetSubscribeArticleAsync(PageDto pageDto)
+        {
+            long userId = CurrentUser.Id ?? 0;
+            List<long> subscribeUserIds = await _userSubscribeService.GetSubscribeUserIdAsync(userId);
+
+            var articles = await _articleRepository
+                .Select
+                .Include(r => r.Classify)
+                .Include(r => r.UserInfo)
+                .IncludeMany(r => r.Tags, r => r.Where(u => u.Status))
+                .IncludeMany(r => r.UserLikes)//, r => r.Where(u => u.CreateUserId == userId))
+                .Where(r => r.IsAudit)
+                .WhereIf(subscribeUserIds.Count > 0, r => subscribeUserIds.Contains(r.CreateUserId))
+                .WhereIf(subscribeUserIds.Count == 0, r => false)
+                .OrderByDescending(r => r.CreateTime).ToPagerListAsync(pageDto, out long totalCount);
+
+            List<ArticleListDto> articleDtos = articles
+                .Select(r =>
+                {
+                    ArticleListDto articleDto = Mapper.Map<ArticleListDto>(r);
+                    articleDto.IsLiked = r.UserLikes.Any();
+                    articleDto.ThumbnailDisplay = _fileRepository.GetFileUrl(articleDto.Thumbnail);
+                    return articleDto;
+                })
+                .ToList();
+
+            return new PagedResultDto<ArticleListDto>(articleDtos, totalCount);
+        }
+
+        public async Task UpdateLikeQuantityAysnc(Guid subjectId, int likesQuantity)
+        {
+            Article article = await _articleRepository.Where(r => r.Id == subjectId).ToOneAsync();
+            article.UpdateLikeQuantity(likesQuantity);
+            await _articleRepository.UpdateAsync(article);
+        }
+
+        public async Task UpdateCommentable(Guid id, bool commetable)
+        {
+            Article article = await _articleRepository.Select.Where(a => a.Id == id).ToOneAsync();
+            if (article == null)
+            {
+                throw new LinCmsException("没有找到相关随笔", ErrorCode.NotFound);
+            }
+            if (article.CreateUserId != CurrentUser.Id)
+            {
+                throw new LinCmsException("不是自己的随笔", ErrorCode.NoPermission);
+            }
+            article.Commentable = commetable;
+            await _articleRepository.UpdateAsync(article);
+        }
+    }
+}
diff --git a/src/LinCms.Application/Blog/Articles/IArticleService.cs b/src/LinCms.Application/Blog/Articles/IArticleService.cs
deleted file mode 100644
index 7243920d..00000000
--- a/src/LinCms.Application/Blog/Articles/IArticleService.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using LinCms.Application.Contracts.Blog.Articles;
-using LinCms.Core.Data;
-using LinCms.Core.Entities.Blog;
-
-namespace LinCms.Application.Blog.Articles
-{
-    public interface IArticleService
-    {
-        Task<PagedResultDto<ArticleListDto>> GetArticleAsync(ArticleSearchDto searchDto);
-
-        void Delete(Guid id);
-
-        Task<ArticleDto> GetAsync(Guid id);
-
-        Task CreateAsync(CreateUpdateArticleDto createArticle);
-
-        Task UpdateAsync(CreateUpdateArticleDto updateArticleDto, Article article);
-
-
-        PagedResultDto<ArticleListDto> GetSubscribeArticle(PageDto pageDto);
-    }
-}
diff --git a/src/LinCms.Application/AutoMapper/Blog/ChannelProfile.cs b/src/LinCms.Application/Blog/Channels/ChannelProfile.cs
similarity index 69%
rename from src/LinCms.Application/AutoMapper/Blog/ChannelProfile.cs
rename to src/LinCms.Application/Blog/Channels/ChannelProfile.cs
index 18cc3f70..aedae457 100644
--- a/src/LinCms.Application/AutoMapper/Blog/ChannelProfile.cs
+++ b/src/LinCms.Application/Blog/Channels/ChannelProfile.cs
@@ -1,8 +1,7 @@
 using AutoMapper;
-using LinCms.Application.Contracts.Blog.Channels;
-using LinCms.Core.Entities.Blog;
+using LinCms.Entities.Blog;
 
-namespace LinCms.Application.AutoMapper.Blog
+namespace LinCms.Blog.Channels
 {
     public class ChannelProfile : Profile
     {
diff --git a/src/LinCms.Application/Blog/Channels/ChannelService.cs b/src/LinCms.Application/Blog/Channels/ChannelService.cs
index 8edfd75e..02e02050 100644
--- a/src/LinCms.Application/Blog/Channels/ChannelService.cs
+++ b/src/LinCms.Application/Blog/Channels/ChannelService.cs
@@ -3,54 +3,53 @@
 using System.Linq;
 using System.Threading.Tasks;
 using AutoMapper;
-using LinCms.Application.Contracts.Blog.Channels;
-using LinCms.Core.Data;
-using LinCms.Core.Entities.Blog;
-using LinCms.Core.Exceptions;
-using LinCms.Core.Extensions;
-using LinCms.Core.Security;
-using LinCms.Infrastructure.Repositories;
+using LinCms.Aop.Attributes;
+using LinCms.Data;
+using LinCms.Entities.Blog;
+using LinCms.Exceptions;
+using LinCms.Extensions;
+using LinCms.IRepositories;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LinCms.Application.Blog.Channels
+namespace LinCms.Blog.Channels
 {
-    public class ChannelService : IChannelService
+    public class ChannelService : ApplicationService, IChannelService
     {
-        private readonly AuditBaseRepository<Channel> _channelRepository;
-        private readonly AuditBaseRepository<ChannelTag> _channelTagRepository;
-        private readonly IMapper _mapper;
-        private readonly ICurrentUser _currentUser;
+        private readonly IAuditBaseRepository<Channel, Guid> _channelRepository;
+        private readonly IAuditBaseRepository<ChannelTag, Guid> _channelTagRepository;
+        private readonly IFileRepository _fileRepository;
 
-        public ChannelService(IMapper mapper, AuditBaseRepository<Channel> channelRepository, ICurrentUser currentUser, AuditBaseRepository<ChannelTag> channelTagRepository)
+        public ChannelService(IAuditBaseRepository<Channel, Guid> channelRepository, IAuditBaseRepository<ChannelTag, Guid> channelTagRepository, IFileRepository fileRepository)
         {
-            _mapper = mapper;
             _channelRepository = channelRepository;
-            _currentUser = currentUser;
             _channelTagRepository = channelTagRepository;
+            _fileRepository = fileRepository;
         }
 
-        public void Delete(Guid id)
+        public async Task DeleteAsync(Guid id)
         {
-            _channelRepository.Delete(new Channel { Id = id });
+            await _channelRepository.DeleteAsync(new Channel { Id = id });
         }
 
-        public async Task<PagedResultDto<ChannelDto>> GetListAsync(PageDto pageDto)
+        public async Task<PagedResultDto<ChannelDto>> GetListAsync(ChannelSearchDto searchDto)
         {
             List<ChannelDto> channel = (await _channelRepository.Select
                     .IncludeMany(r => r.Tags, r => r.Where(u => u.Status == true))
+                    .WhereIf(searchDto.ChannelName.IsNotNullOrEmpty(), r => r.ChannelName.Contains(searchDto.ChannelName))
                     .OrderByDescending(r => r.SortCode)
                     .OrderBy(r => r.CreateTime)
-                    .ToPagerListAsync(pageDto, out long totalCount))
-                .Select(r =>
-                {
-                    ChannelDto channelDto = _mapper.Map<ChannelDto>(r);
-                    channelDto.ThumbnailDisplay = _currentUser.GetFileUrl(channelDto.Thumbnail);
-                    return channelDto;
-                }).ToList();
+                    .ToPagerListAsync(searchDto, out long totalCount))
+                    .Select(r =>
+                    {
+                        ChannelDto channelDto = Mapper.Map<ChannelDto>(r);
+                        channelDto.ThumbnailDisplay = _fileRepository.GetFileUrl(channelDto.Thumbnail);
+                        return channelDto;
+                    }).ToList();
 
             return new PagedResultDto<ChannelDto>(channel, totalCount);
         }
 
+        [Cacheable]
         public async Task<PagedResultDto<NavChannelListDto>> GetNavListAsync(PageDto pageDto)
         {
             List<NavChannelListDto> channel = (await _channelRepository.Select
@@ -58,7 +57,7 @@ public async Task<PagedResultDto<NavChannelListDto>> GetNavListAsync(PageDto pag
                     .OrderByDescending(r => r.SortCode)
                     .OrderBy(r => r.CreateTime)
                     .ToPagerListAsync(pageDto, out long totalCount))
-                    .Select(r => _mapper.Map<NavChannelListDto>(r)).ToList();
+                    .Select(r => Mapper.Map<NavChannelListDto>(r)).ToList();
             return new PagedResultDto<NavChannelListDto>(channel, totalCount);
         }
 
@@ -69,8 +68,8 @@ public async Task<ChannelDto> GetAsync(Guid id)
                 .Where(a => a.Id == id)
                 .WhereCascade(r => r.IsDeleted == false).ToOneAsync();
 
-            ChannelDto channelDto = _mapper.Map<ChannelDto>(channel);
-            channelDto.ThumbnailDisplay = _currentUser.GetFileUrl(channelDto.Thumbnail);
+            ChannelDto channelDto = Mapper.Map<ChannelDto>(channel);
+            channelDto.ThumbnailDisplay = _fileRepository.GetFileUrl(channelDto.Thumbnail);
             return channelDto;
         }
 
@@ -82,7 +81,7 @@ public async Task CreateAsync([FromBody] CreateUpdateChannelDto createChannel)
                 throw new LinCmsException($"技术频道[{createChannel.ChannelName}]已存在");
             }
 
-            Channel channel = _mapper.Map<Channel>(createChannel);
+            Channel channel = Mapper.Map<Channel>(createChannel);
 
             channel.Tags = new List<Tag>();
             createChannel.TagIds?.ForEach(r =>
@@ -96,6 +95,7 @@ public async Task CreateAsync([FromBody] CreateUpdateChannelDto createChannel)
             await _channelRepository.InsertAsync(channel);
         }
 
+        [Transactional]
         public async Task UpdateAsync(Guid id, CreateUpdateChannelDto updateChannel)
         {
             Channel channel = await _channelRepository.Select.Where(r => r.Id == id).ToOneAsync();
@@ -104,19 +104,18 @@ public async Task UpdateAsync(Guid id, CreateUpdateChannelDto updateChannel)
                 throw new LinCmsException("该数据不存在");
             }
 
-            bool exist = _channelRepository.Select.Any(r => r.ChannelName == updateChannel.ChannelName && r.Id != id && r.ChannelCode == updateChannel.ChannelCode);
+            bool exist = await _channelRepository.Select.AnyAsync(r => r.ChannelName == updateChannel.ChannelName && r.Id != id && r.ChannelCode == updateChannel.ChannelCode);
             if (exist)
             {
                 throw new LinCmsException($"技术频道[{updateChannel.ChannelName}]已存在");
             }
 
-            _mapper.Map(updateChannel, channel);
+            Mapper.Map(updateChannel, channel);
+            await _channelRepository.UpdateAsync(channel);
+            await _channelTagRepository.DeleteAsync(r => r.ChannelId == id);
 
             var channelTagLists = new List<ChannelTag>();
             updateChannel.TagIds?.ForEach(r => { channelTagLists.Add(new ChannelTag(id, r)); });
-
-            await _channelTagRepository.DeleteAsync(r => r.ChannelId == id);
-            await _channelRepository.UpdateAsync(channel);
             await _channelTagRepository.InsertAsync(channelTagLists);
 
         }
diff --git a/src/LinCms.Application/AutoMapper/Blog/ClassifyProfile.cs b/src/LinCms.Application/Blog/Classifies/ClassifyProfile.cs
similarity index 65%
rename from src/LinCms.Application/AutoMapper/Blog/ClassifyProfile.cs
rename to src/LinCms.Application/Blog/Classifies/ClassifyProfile.cs
index fd085b5c..e56a7b9b 100644
--- a/src/LinCms.Application/AutoMapper/Blog/ClassifyProfile.cs
+++ b/src/LinCms.Application/Blog/Classifies/ClassifyProfile.cs
@@ -1,8 +1,8 @@
 using AutoMapper;
-using LinCms.Application.Contracts.Blog.Classifys;
-using LinCms.Core.Entities.Blog;
+using LinCms.Blog.Classifys;
+using LinCms.Entities.Blog;
 
-namespace LinCms.Application.AutoMapper.Blog
+namespace LinCms.Blog.Classifies
 {
     public class ClassifyProfile : Profile
     {
diff --git a/src/LinCms.Application/Blog/Classifies/ClassifyService.cs b/src/LinCms.Application/Blog/Classifies/ClassifyService.cs
index b15800c2..479c4747 100644
--- a/src/LinCms.Application/Blog/Classifies/ClassifyService.cs
+++ b/src/LinCms.Application/Blog/Classifies/ClassifyService.cs
@@ -1,36 +1,133 @@
 using System;
-using LinCms.Core.Entities.Blog;
-using LinCms.Infrastructure.Repositories;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using AutoMapper;
+using LinCms.Blog.Classifys;
+using LinCms.Data;
+using LinCms.Entities.Blog;
+using LinCms.Exceptions;
+using LinCms.Extensions;
+using LinCms.IRepositories;
+using LinCms.Security;
 
-namespace LinCms.Application.Blog.Classifies
+namespace LinCms.Blog.Classifies
 {
-    public class ClassifyService : IClassifyService
+    public class ClassifyService : CrudAppService<Classify, ClassifyDto, ClassifyDto, Guid, ClassifySearchDto, CreateUpdateClassifyDto, CreateUpdateClassifyDto>, IClassifyService
     {
-        private readonly AuditBaseRepository<Classify> _classifyBaseRepository;
+        private readonly IFileRepository _fileRepository;
 
-        public ClassifyService(AuditBaseRepository<Classify> classifyBaseRepository)
+        public ClassifyService(IAuditBaseRepository<Classify, Guid> repository, IFileRepository fileRepository) : base(repository)
         {
-            _classifyBaseRepository = classifyBaseRepository;
+            _fileRepository = fileRepository;
         }
 
-        public void UpdateArticleCount(Guid? id, int inCreaseCount)
+        public override async Task<PagedResultDto<ClassifyDto>> GetListAsync(ClassifySearchDto searchDto)
         {
-            if (id == null)
+            List<ClassifyDto> classify = (await Repository.Select
+                    .WhereIf(searchDto.ClassifyName.IsNotNullOrEmpty(),
+                        r => r.ClassifyName.Contains(searchDto.ClassifyName))
+                    .OrderByDescending(r => r.CreateTime)
+                    .ToPagerListAsync(searchDto, out long totalCount))
+                .Select(r =>
+                {
+                    ClassifyDto classifyDto = Mapper.Map<ClassifyDto>(r);
+                    classifyDto.ThumbnailDisplay = _fileRepository.GetFileUrl(classifyDto.Thumbnail);
+                    return classifyDto;
+                }).ToList();
+
+            return new PagedResultDto<ClassifyDto>(classify, totalCount);
+        }
+
+        public List<ClassifyDto> GetListByUserId(long? userId)
+        {
+            if (!userId.HasValue)
             {
-                return;
+                userId = CurrentUser.Id;
             }
-            //防止数量一直减，减到小于0
-            if (inCreaseCount < 0)
-            {
-                Classify classify = _classifyBaseRepository.Select.Where(r => r.Id == id).ToOne();
-                if (classify.ArticleCount < -inCreaseCount)
+
+            List<ClassifyDto> classify = Repository.Select
+                .Where(r => r.CreateUserId == userId)
+                .OrderByDescending(r => r.SortCode)
+                .ToList()
+                .Select(r =>
                 {
-                    return;
-                }
+                    ClassifyDto classifyDto = Mapper.Map<ClassifyDto>(r);
+                    classifyDto.ThumbnailDisplay = _fileRepository.GetFileUrl(classifyDto.Thumbnail);
+                    return classifyDto;
+                }).ToList();
+
+            return classify;
+        }
+
+        public override async Task<ClassifyDto> GetAsync(Guid id)
+        {
+            Classify classify = await Repository.Select.Where(a => a.Id == id).ToOneAsync();
+            ClassifyDto classifyDto = Mapper.Map<ClassifyDto>(classify);
+            classifyDto.ThumbnailDisplay = _fileRepository.GetFileUrl(classifyDto.Thumbnail);
+            return classifyDto;
+        }
+
+        public override async Task<ClassifyDto> CreateAsync(CreateUpdateClassifyDto createClassify)
+        {
+            bool exist = await Repository.Select.AnyAsync(r =>
+                r.ClassifyName == createClassify.ClassifyName && r.CreateUserId == CurrentUser.Id);
+            if (exist)
+            {
+                throw new LinCmsException($"分类专栏[{createClassify.ClassifyName}]已存在");
             }
 
-            _classifyBaseRepository.UpdateDiy.Set(r => r.ArticleCount + inCreaseCount).Where(r => r.Id == id)
-                .ExecuteAffrows();
+            Classify classify = Mapper.Map<Classify>(createClassify);
+            await Repository.InsertAsync(classify);
+            return Mapper.Map<ClassifyDto>(classify);
+        }
+
+        public override async Task<ClassifyDto> UpdateAsync(Guid id, CreateUpdateClassifyDto updateClassify)
+        {
+            Classify classify = await Repository.Select.Where(r => r.Id == id).ToOneAsync();
+            if (classify == null)
+            {
+                throw new LinCmsException("该数据不存在");
+            }
+
+            if (classify.CreateUserId != CurrentUser.Id)
+            {
+                throw new LinCmsException("您无权编辑他人的分类专栏");
+            }
+
+            bool exist = await Repository.Select.AnyAsync(r =>
+                r.ClassifyName == updateClassify.ClassifyName && r.Id != id && r.CreateUserId == CurrentUser.Id);
+            if (exist)
+            {
+                throw new LinCmsException($"分类专栏[{updateClassify.ClassifyName}]已存在");
+            }
+
+            Mapper.Map(updateClassify, classify);
+
+            await Repository.UpdateAsync(classify);
+            return Mapper.Map<ClassifyDto>(classify);
+        }
+
+        public override async Task DeleteAsync(Guid id)
+        {
+            Classify classify = await Repository.Select.Where(a => a.Id == id).ToOneAsync();
+            if (classify.CreateUserId != CurrentUser.Id)
+            {
+                throw new LinCmsException("您无权删除他人的分类专栏");
+            }
+
+            await Repository.DeleteAsync(new Classify { Id = id });
+        }
+
+        public async Task UpdateArticleCountAsync(Guid? id, int inCreaseCount)
+        {
+            if (id == null)
+            {
+                return;
+            }
+            Classify classify = await Repository.Select.Where(r => r.Id == id).ToOneAsync();
+            classify.UpdateArticleCount(inCreaseCount);
+            await Repository.UpdateAsync(classify);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/LinCms.Application/Blog/Classifies/IClassifyService.cs b/src/LinCms.Application/Blog/Classifies/IClassifyService.cs
deleted file mode 100644
index 9d62f601..00000000
--- a/src/LinCms.Application/Blog/Classifies/IClassifyService.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace LinCms.Application.Blog.Classifies
-{
-    public interface IClassifyService
-    {
-        void UpdateArticleCount(Guid? id, int inCreaseCount);
-    }
-}
diff --git a/src/LinCms.Application/AutoMapper/Blog/CommentProfile.cs b/src/LinCms.Application/Blog/Comments/CommentProfile.cs
similarity index 68%
rename from src/LinCms.Application/AutoMapper/Blog/CommentProfile.cs
rename to src/LinCms.Application/Blog/Comments/CommentProfile.cs
index 5ec2f2d6..84613878 100644
--- a/src/LinCms.Application/AutoMapper/Blog/CommentProfile.cs
+++ b/src/LinCms.Application/Blog/Comments/CommentProfile.cs
@@ -1,8 +1,7 @@
 using AutoMapper;
-using LinCms.Application.Contracts.Blog.Comments;
-using LinCms.Core.Entities.Blog;
+using LinCms.Entities.Blog;
 
-namespace LinCms.Application.AutoMapper.Blog
+namespace LinCms.Blog.Comments
 {
     public class CommentProfile : Profile
     {
diff --git a/src/LinCms.Application/Blog/Comments/CommentService.cs b/src/LinCms.Application/Blog/Comments/CommentService.cs
index 8a458293..f5825e7d 100644
--- a/src/LinCms.Application/Blog/Comments/CommentService.cs
+++ b/src/LinCms.Application/Blog/Comments/CommentService.cs
@@ -1,42 +1,244 @@
-using LinCms.Core.Entities.Blog;
-using LinCms.Infrastructure.Repositories;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using DotNetCore.CAP;
+using FreeSql;
+using LinCms.Aop.Attributes;
+using LinCms.Blog.Notifications;
+using LinCms.Cms.Users;
+using LinCms.Data;
+using LinCms.Entities.Blog;
+using LinCms.Exceptions;
+using LinCms.Extensions;
+using LinCms.IRepositories;
+using Microsoft.AspNetCore.Mvc;
 
-namespace LinCms.Application.Blog.Comments
+namespace LinCms.Blog.Comments
 {
-    public class CommentService : ICommentService
+    public class CommentService : ApplicationService, ICommentService
     {
-        private readonly AuditBaseRepository<Comment> _commentAuditBaseRepository;
-        private readonly AuditBaseRepository<Article> _articleRepository;
-        public CommentService(AuditBaseRepository<Comment> commentAuditBaseRepository, AuditBaseRepository<Article> articleRepository)
+        private readonly IAuditBaseRepository<Comment> _commentRepository;
+        private readonly IAuditBaseRepository<Article> _articleRepository;
+        private readonly IFileRepository _fileRepository;
+        private readonly ICapPublisher _capBus;
+
+        public CommentService(IAuditBaseRepository<Comment> commentRepository,
+            IAuditBaseRepository<Article> articleRepository,
+            IFileRepository fileRepository, ICapPublisher capBus)
         {
-            _commentAuditBaseRepository = commentAuditBaseRepository;
+            _commentRepository = commentRepository;
             _articleRepository = articleRepository;
+            _fileRepository = fileRepository;
+            _capBus = capBus;
+        }
+
+        public async Task<PagedResultDto<CommentDto>> GetListByArticleAsync([FromQuery] CommentSearchDto commentSearchDto)
+        {
+            long? userId = CurrentUser.Id;
+            List<CommentDto> comments = (await _commentRepository
+                    .Select
+                    .Include(r => r.UserInfo)
+                    .Include(r => r.RespUserInfo)
+                    .IncludeMany(r => r.Childs, t => t.Include(u => u.UserInfo).Include(u => u.RespUserInfo).IncludeMany(u => u.UserLikes))
+                    .IncludeMany(r => r.UserLikes)
+                    .WhereCascade(x => x.IsDeleted == false)
+                    .WhereIf(commentSearchDto.SubjectId.HasValue, r => r.SubjectId == commentSearchDto.SubjectId)
+                    .Where(r => r.RootCommentId == commentSearchDto.RootCommentId) // && r.IsAudit == true
+                    .OrderByDescending(!commentSearchDto.RootCommentId.HasValue, r => r.CreateTime)
+                    .OrderBy(commentSearchDto.RootCommentId.HasValue, r => r.CreateTime)
+                    .Page(commentSearchDto.Page + 1, commentSearchDto.Count).ToListAsync())
+                //.ToPagerList(commentSearchDto, out long totalCount    
+                .Select(r =>
+                {
+                    CommentDto commentDto = Mapper.Map<CommentDto>(r);
+                    if (commentDto.IsAudit == false)
+                    {
+                        commentDto.Text = "[该评论因违规被拉黑]";
+                    }
+
+                    if (commentDto.UserInfo == null)
+                    {
+                        commentDto.UserInfo = new OpenUserDto("该用户已被系统删除");
+                    }
+                    else
+                    {
+                        commentDto.UserInfo.Avatar = _fileRepository.GetFileUrl(commentDto.UserInfo.Avatar);
+                    }
+
+
+                    commentDto.IsLiked =
+                        userId != null && r.UserLikes.Where(u => u.CreateUserId == userId).IsNotEmpty();
+
+                    commentDto.TopComment = r.Childs.ToList().Select(u =>
+                    {
+                        CommentDto childrenDto = Mapper.Map<CommentDto>(u);
+                        if (childrenDto.UserInfo != null)
+                        {
+                            childrenDto.UserInfo.Avatar = _fileRepository.GetFileUrl(childrenDto.UserInfo.Avatar);
+                        }
+
+                        if (childrenDto.IsAudit == false)
+                        {
+                            childrenDto.Text = "[该评论因违规被拉黑]";
+                        }
+
+                        childrenDto.IsLiked =
+                            userId != null && u.UserLikes.Where(z => z.CreateUserId == userId).IsNotEmpty();
+                        return childrenDto;
+                    }).ToList();
+                    return commentDto;
+                }).ToList();
+
+            //计算一个文章多少个评论
+            long totalCount = GetCommentCount(commentSearchDto);
+
+            return new PagedResultDto<CommentDto>(comments, totalCount);
+        }
+
+        private long GetCommentCount(CommentSearchDto commentSearchDto)
+        {
+            return _commentRepository
+                .Select
+                .Where(r => r.IsDeleted == false && r.SubjectId == commentSearchDto.SubjectId).Count();
+        }
+
+        public async Task<PagedResultDto<CommentDto>> GetListAsync([FromQuery] CommentSearchDto commentSearchDto)
+        {
+            List<CommentDto> comments = (await _commentRepository
+                    .Select
+                    .Include(r => r.UserInfo)
+                    .WhereIf(commentSearchDto.SubjectId.HasValue, r => r.SubjectId == commentSearchDto.SubjectId)
+                    .WhereIf(commentSearchDto.Text.IsNotNullOrEmpty(), r => r.Text.Contains(commentSearchDto.Text))
+                    .OrderByDescending(r => r.CreateTime)
+                    .ToPagerListAsync(commentSearchDto, out long totalCount)
+                )
+                .Select(r =>
+                {
+                    CommentDto commentDto = Mapper.Map<CommentDto>(r);
+
+                    if (commentDto.UserInfo != null)
+                    {
+                        commentDto.UserInfo.Avatar = _fileRepository.GetFileUrl(commentDto.UserInfo.Avatar);
+                    }
+
+                    return commentDto;
+                }).ToList();
+
+            return new PagedResultDto<CommentDto>(comments, totalCount);
+        }
+
+        [Transactional]
+        public async Task CreateAsync(CreateCommentDto createCommentDto)
+        {
+
+            Comment comment = Mapper.Map<Comment>(createCommentDto);
+            await _commentRepository.InsertAsync(comment);
+
+            if (createCommentDto.RootCommentId.HasValue)
+            {
+                await _commentRepository.UpdateDiy
+                    .Set(r => r.ChildsCount + 1)
+                    .Where(r => r.Id == createCommentDto.RootCommentId)
+                    .ExecuteAffrowsAsync();
+            }
+
+            switch (createCommentDto.SubjectType)
+            {
+                case 1:
+                    await _articleRepository.UpdateDiy
+                        .Set(r => r.CommentQuantity + 1)
+                        .Where(r => r.Id == createCommentDto.SubjectId)
+                        .ExecuteAffrowsAsync();
+                    break;
+            }
+
+            if (CurrentUser.Id != createCommentDto.RespUserId)
+            {
+                using ICapTransaction capTransaction = UnitOfWorkManager.Current.BeginTransaction(_capBus, false);
+                await _capBus.PublishAsync(CreateNotificationDto.CreateOrCancelAsync, new CreateNotificationDto()
+                {
+                    NotificationType = NotificationType.UserCommentOnArticle,
+                    ArticleId = createCommentDto.SubjectId,
+                    NotificationRespUserId = createCommentDto.RespUserId,
+                    UserInfoId = CurrentUser.Id ?? 0,
+                    CreateTime = comment.CreateTime,
+                    CommentId = comment.Id
+                });
+                capTransaction.Commit(UnitOfWorkManager.Current);
+            }
+        }
+
+        public async Task DeleteAsync(Guid id)
+        {
+            Comment comment = _commentRepository.Select.Where(r => r.Id == id).First();
+            await DeleteAsync(comment);
         }
+
         /// <summary>
         /// 删除评论并同步随笔数量
         /// </summary>
         /// <param name="comment"></param>
-        public void Delete(Comment comment)
+        [Transactional]
+        public async Task DeleteAsync(Comment comment)
         {
             int affrows = 0;
             //如果是根评论，删除所有的子评论
             if (!comment.RootCommentId.HasValue)
             {
-                affrows += _commentAuditBaseRepository.Delete(r => r.RootCommentId == comment.Id);
+                affrows += await _commentRepository.DeleteAsync(r => r.RootCommentId == comment.Id);
             }
             else
             {
-                _commentAuditBaseRepository.UpdateDiy.Set(r => r.ChildsCount - 1).Where(r => r.Id == comment.RootCommentId).ExecuteAffrows();
+                await _commentRepository.UpdateDiy.Set(r => r.ChildsCount - 1).Where(r => r.Id == comment.RootCommentId)
+                    .ExecuteAffrowsAsync();
             }
-         
-            affrows += _commentAuditBaseRepository.Delete(new Comment { Id = comment.Id });
+
+            affrows += await _commentRepository.DeleteAsync(new Comment { Id = comment.Id });
 
             switch (comment.SubjectType)
             {
                 case 1:
-                    _articleRepository.UpdateDiy.Set(r => r.CommentQuantity - affrows).Where(r => r.Id == comment.SubjectId).ExecuteAffrows();
+                    await _articleRepository.UpdateDiy.Set(r => r.CommentQuantity - affrows)
+                        .Where(r => r.Id == comment.SubjectId).ExecuteAffrowsAsync();
                     break;
             }
         }
+
+        [Transactional]
+        public async Task DeleteMyComment(Guid id)
+        {
+            Comment comment = await _commentRepository.Select.Where(r => r.Id == id).FirstAsync();
+            if (comment == null)
+            {
+                throw new LinCmsException("该评论已删除");
+            }
+
+            if (comment.CreateUserId != CurrentUser.Id)
+            {
+                throw new LinCmsException("无权限删除他人的评论");
+            }
+
+            using ICapTransaction capTransaction = UnitOfWorkManager.Current.BeginTransaction(_capBus, false);
+
+            await this.DeleteAsync(comment);
+
+            await _capBus.PublishAsync(CreateNotificationDto.CreateOrCancelAsync, new CreateNotificationDto()
+            {
+                NotificationType = NotificationType.UserCommentOnArticle,
+                ArticleId = comment.SubjectId,
+                UserInfoId = (long)CurrentUser.Id,
+                CommentId = comment.Id,
+                IsCancel = true
+            });
+            capTransaction.Commit(UnitOfWorkManager.Current);
+        }
+
+        public async Task UpdateLikeQuantityAysnc(Guid subjectId, int likesQuantity)
+        {
+            Comment comment = await _commentRepository.Select.Where(r => r.Id == subjectId).ToOneAsync();
+            comment.UpdateLikeQuantity(likesQuantity);
+            await _commentRepository.UpdateAsync(comment);
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/LinCms.Application/Blog/Comments/ICommentService.cs b/src/LinCms.Application/Blog/Comments/ICommentService.cs
deleted file mode 100644
index 1929fa8c..00000000
--- a/src/LinCms.Application/Blog/Comments/ICommentService.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-
-using LinCms.Core.Entities.Blog;
-
-namespace LinCms.Application.Blog.Comments
-{
-    public interface ICommentService
-    {
-        void Delete(Comment comment);
-    }
-}
diff --git a/src/LinCms.Application/Blog/Notifications/EventService.cs b/src/LinCms.Application/Blog/Notifications/EventService.cs
index 1eb2a933..6a000837 100644
--- a/src/LinCms.Application/Blog/Notifications/EventService.cs
+++ b/src/LinCms.Application/Blog/Notifications/EventService.cs
@@ -1,4 +1,4 @@
-namespace LinCms.Application.Blog.Notifications
+namespace LinCms.Blog.Notifications
 {
     public class EventService
     {
diff --git a/src/LinCms.Application/Blog/Notifications/INotificationService.cs b/src/LinCms.Application/Blog/Notifications/INotificationService.cs
deleted file mode 100644
index 537fe50b..00000000
--- a/src/LinCms.Application/Blog/Notifications/INotificationService.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using LinCms.Application.Contracts.Blog.Notifications;
-using LinCms.Core.Data;
-
-namespace LinCms.Application.Blog.Notifications
-{
-    public interface INotificationService
-    {
-        PagedResultDto<NotificationDto> Get(NotificationSearchDto pageDto);
-
-        /// <summary>
-        /// 新增一个消息通知
-        /// </summary>
-        /// <param name="createNotificationDto"></param>
-        void Post(CreateNotificationDto createNotificationDto);
-
-        /// <summary>
-        /// 设置消息通知为已读状态
-        /// </summary>
-        /// <param name="id"></param>
-        void SetNotificationRead(Guid id);
-    }
-}
diff --git a/src/LinCms.Application/AutoMapper/Blog/NotificationProfile.cs b/src/LinCms.Application/Blog/Notifications/NotificationProfile.cs
similarity index 72%
rename from src/LinCms.Application/AutoMapper/Blog/NotificationProfile.cs
rename to src/LinCms.Application/Blog/Notifications/NotificationProfile.cs
index 8d00030c..a0c9abd3 100644
--- a/src/LinCms.Application/AutoMapper/Blog/NotificationProfile.cs
+++ b/src/LinCms.Application/Blog/Notifications/NotificationProfile.cs
@@ -1,8 +1,7 @@
 using AutoMapper;
-using LinCms.Application.Contracts.Blog.Notifications;
-using LinCms.Core.Entities.Blog;
+using LinCms.Entities.Blog;
 
-namespace LinCms.Application.AutoMapper.Blog
+namespace LinCms.Blog.Notifications
 {
     public class NotificationProfile : Profile
     {
diff --git a/src/LinCms.Application/Blog/Notifications/NotificationService.cs b/src/LinCms.Application/Blog/Notifications/NotificationService.cs
index 3ae33e30..bbfd8973 100644
--- a/src/LinCms.Application/Blog/Notifications/NotificationService.cs
+++ b/src/LinCms.Application/Blog/Notifications/NotificationService.cs
@@ -1,70 +1,100 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AutoMapper;
-using LinCms.Application.Contracts.Blog.Notifications;
-using LinCms.Core.Data;
-using LinCms.Core.Entities.Blog;
-using LinCms.Core.Extensions;
-using LinCms.Core.Security;
-using LinCms.Infrastructure.Repositories;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using LinCms.Data;
+using LinCms.Entities.Blog;
+using LinCms.Extensions;
+using LinCms.IRepositories;
 
-namespace LinCms.Application.Blog.Notifications
+namespace LinCms.Blog.Notifications
 {
-    public class NotificationService : INotificationService
+    public class NotificationService : ApplicationService, INotificationService
     {
-        private readonly AuditBaseRepository<Notification> _notificationRepository;
-        private readonly IMapper _mapper;
-        private readonly ICurrentUser _currentUser;
-        public NotificationService(AuditBaseRepository<Notification> notificationRepository, IMapper mapper, ICurrentUser currentUser)
+        private readonly IAuditBaseRepository<Notification> _notificationRepository;
+        private readonly IFileRepository _fileRepository;
+
+        public NotificationService(IAuditBaseRepository<Notification> notificationRepository, IFileRepository fileRepository)
         {
             _notificationRepository = notificationRepository;
-            _mapper = mapper;
-            _currentUser = currentUser;
+            _fileRepository = fileRepository;
         }
 
-        public PagedResultDto<NotificationDto> Get(NotificationSearchDto pageDto)
+        public async Task<PagedResultDto<NotificationDto>> GetListAsync(NotificationSearchDto pageDto)
         {
-            List<NotificationDto> notification = _notificationRepository.Select
-                .Include(r => r.ArticleEntry)
-                .Include(r => r.CommentEntry)
-                .Include(r => r.UserInfo)
-
-                .WhereIf(pageDto.NotificationSearchType == NotificationSearchType.UserComment, 
-                    r => r.NotificationType == NotificationType.UserCommentOnArticle||r.NotificationType==NotificationType.UserCommentOnComment)
-
-                .WhereIf(pageDto.NotificationSearchType == NotificationSearchType.UserLike,
-                    r => r.NotificationType == NotificationType.UserLikeArticle || r.NotificationType == NotificationType.UserLikeArticleComment)
-
-                .WhereIf(pageDto.NotificationSearchType == NotificationSearchType.UserLikeUser,
-                    r => r.NotificationType == NotificationType.UserLikeUser)
-
-                .Where(r => r.NotificationRespUserId == _currentUser.Id)
-                .OrderByDescending(r => r.CreateTime)
-                .ToPagerList(pageDto, out long totalCount)
+            List<NotificationDto> notification = (await _notificationRepository.Select
+                    .Include(r => r.ArticleEntry)
+                    .Include(r => r.CommentEntry)
+                    .Include(r => r.UserInfo)
+                    .WhereIf(pageDto.NotificationSearchType == NotificationSearchType.UserComment,
+                        r => r.NotificationType == NotificationType.UserCommentOnArticle ||
+                             r.NotificationType == NotificationType.UserCommentOnComment)
+                    .WhereIf(pageDto.NotificationSearchType == NotificationSearchType.UserLike,
+                        r => r.NotificationType == NotificationType.UserLikeArticle ||
+                             r.NotificationType == NotificationType.UserLikeArticleComment)
+                    .WhereIf(pageDto.NotificationSearchType == NotificationSearchType.UserLikeUser,
+                        r => r.NotificationType == NotificationType.UserLikeUser)
+                    .Where(r => r.NotificationRespUserId == CurrentUser.Id)
+                    .OrderByDescending(r => r.CreateTime)
+                    .ToPagerListAsync(pageDto, out long totalCount))
                 .Select(r =>
                 {
-                    NotificationDto notificationDto = _mapper.Map<NotificationDto>(r);
+                    NotificationDto notificationDto = Mapper.Map<NotificationDto>(r);
                     if (notificationDto.UserInfo != null)
                     {
-                        notificationDto.UserInfo.Avatar = _currentUser.GetFileUrl(notificationDto.UserInfo.Avatar);
+                        notificationDto.UserInfo.Avatar = _fileRepository.GetFileUrl(notificationDto.UserInfo.Avatar);
                     }
+
                     return notificationDto;
                 }).ToList();
 
             return new PagedResultDto<NotificationDto>(notification, totalCount);
         }
 
-        public void Post(CreateNotificationDto createNotificationDto)
+        public async Task CreateOrCancelAsync(CreateNotificationDto notificationDto)
         {
-            Notification linNotification = _mapper.Map<Notification>(createNotificationDto);
-            _notificationRepository.Insert(linNotification);
-            _notificationRepository.UnitOfWork.Commit();
+            if (notificationDto.IsCancel == false)
+            {
+                Notification linNotification = Mapper.Map<Notification>(notificationDto);
+                await _notificationRepository.InsertAsync(linNotification);
+            }
+            else
+            {
+                Expression<Func<Notification, bool>> exprssion = r =>
+                    r.NotificationType == notificationDto.NotificationType &&
+                    r.UserInfoId == notificationDto.UserInfoId;
+                switch (notificationDto.NotificationType)
+                {
+                    case NotificationType.UserLikeArticle://点赞随笔
+                        exprssion = exprssion.And(r => r.ArticleId == notificationDto.ArticleId);
+                        break;
+                    case NotificationType.UserCommentOnArticle: //评论随笔
+                    case NotificationType.UserLikeArticleComment: //点赞随笔下的评论
+                        exprssion = exprssion.And(r =>
+                            r.ArticleId == notificationDto.ArticleId && r.CommentId == notificationDto.CommentId);
+                        break;
+                    case NotificationType.UserCommentOnComment: //回复评论
+                        exprssion = exprssion.And(r =>
+                            r.ArticleId == notificationDto.ArticleId && r.CommentId == notificationDto.CommentId &&
+                            r.NotificationRespUserId == notificationDto.NotificationRespUserId);
+                        break;
+                    case NotificationType.UserLikeUser: //关注用户
+                        exprssion = exprssion.And(r =>
+                            r.NotificationRespUserId == notificationDto.NotificationRespUserId);
+                        break;
+                    default:
+                        exprssion = r => false;
+                        break;
+                }
+
+                await _notificationRepository.DeleteAsync(exprssion);
+            }
         }
 
-        public void SetNotificationRead(Guid id)
+        public async Task SetNotificationReadAsync(Guid id)
         {
-            _notificationRepository.UpdateDiy.Where(r => r.Id == id).Set(r => r.IsRead, true);
+            await _notificationRepository.UpdateDiy.Where(r => r.Id == id).Set(r => r.IsRead, true).ExecuteAffrowsAsync();
         }
     }
 }
diff --git a/src/LinCms.Application/AutoMapper/Blog/TagProfile.cs b/src/LinCms.Application/Blog/Tags/TagProfile.cs
similarity index 67%
rename from src/LinCms.Application/AutoMapper/Blog/TagProfile.cs
rename to src/LinCms.Application/Blog/Tags/TagProfile.cs
index 92aa6db8..34e94f78 100644
--- a/src/LinCms.Application/AutoMapper/Blog/TagProfile.cs
+++ b/src/LinCms.Application/Blog/Tags/TagProfile.cs
@@ -1,8 +1,7 @@
 using AutoMapper;
-using LinCms.Application.Contracts.Blog.Tags;
-using LinCms.Core.Entities.Blog;
+using LinCms.Entities.Blog;
 
-namespace LinCms.Application.AutoMapper.Blog
+namespace LinCms.Blog.Tags
 {
     public class TagProfile : Profile
     {
diff --git a/src/LinCms.Application/Blog/Tags/TagService.cs b/src/LinCms.Application/Blog/Tags/TagService.cs
index 918975cb..9ef2a0cb 100644
--- a/src/LinCms.Application/Blog/Tags/TagService.cs
+++ b/src/LinCms.Application/Blog/Tags/TagService.cs
@@ -2,33 +2,28 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using AutoMapper;
-using FreeSql;
-using LinCms.Application.Contracts.Blog.Tags;
-using LinCms.Application.Contracts.Blog.UserSubscribes;
-using LinCms.Core.Data;
-using LinCms.Core.Entities.Blog;
-using LinCms.Core.Exceptions;
-using LinCms.Core.Extensions;
-using LinCms.Core.Security;
-using LinCms.Infrastructure.Repositories;
-
-namespace LinCms.Application.Blog.Tags
+using LinCms.Blog.UserSubscribes;
+using LinCms.Data;
+using LinCms.Data.Enums;
+using LinCms.Entities.Blog;
+using LinCms.Exceptions;
+using LinCms.Extensions;
+using LinCms.IRepositories;
+
+namespace LinCms.Blog.Tags
 {
-    public class TagService : ITagService
+    public class TagService : ApplicationService, ITagService
     {
-        private readonly AuditBaseRepository<Tag> _tagRepository;
-        private readonly IMapper _mapper;
-        private readonly ICurrentUser _currentUser;
-        private readonly AuditBaseRepository<UserTag> _userTagRepository;
-        private readonly BaseRepository<TagArticle> _tagArticleRepository;
-        public TagService(AuditBaseRepository<Tag> tagRepository, IMapper mapper, ICurrentUser currentUser, AuditBaseRepository<UserTag> userTagRepository, BaseRepository<TagArticle> tagArticleRepository)
+        private readonly IAuditBaseRepository<UserTag> _userTagRepository;
+        private readonly IAuditBaseRepository<Tag> _tagRepository;
+        private readonly IAuditBaseRepository<TagArticle> _tagArticleRepository;
+        private readonly IFileRepository _fileRepository;
+        public TagService(IAuditBaseRepository<Tag> tagRepository, IAuditBaseRepository<UserTag> userTagRepository, IAuditBaseRepository<TagArticle> tagArticleRepository, IFileRepository fileRepository)
         {
             _tagRepository = tagRepository;
-            _mapper = mapper;
-            _currentUser = currentUser;
             _userTagRepository = userTagRepository;
             _tagArticleRepository = tagArticleRepository;
+            _fileRepository = fileRepository;
         }
 
         public async Task CreateAsync(CreateUpdateTagDto createTag)
@@ -39,7 +34,7 @@ public async Task CreateAsync(CreateUpdateTagDto createTag)
                 throw new LinCmsException($"标签[{createTag.TagName}]已存在");
             }
 
-            Tag tag = _mapper.Map<Tag>(createTag);
+            Tag tag = Mapper.Map<Tag>(createTag);
             await _tagRepository.InsertAsync(tag);
         }
 
@@ -57,7 +52,7 @@ public async Task UpdateAsync(Guid id, CreateUpdateTagDto updateTag)
                 throw new LinCmsException($"标签[{updateTag.TagName}]已存在");
             }
 
-            _mapper.Map(updateTag, tag);
+            Mapper.Map(updateTag, tag);
             await _tagRepository.UpdateAsync(tag);
         }
 
@@ -68,9 +63,9 @@ public async Task<TagListDto> GetAsync(Guid id)
             {
                 throw new LinCmsException("不存在此标签");
             }
-            TagListDto tagDto = _mapper.Map<TagListDto>(tag);
-            tagDto.IsSubscribe = this.IsSubscribe(id);
-            tagDto.ThumbnailDisplay = _currentUser.GetFileUrl(tagDto.Thumbnail);
+            TagListDto tagDto = Mapper.Map<TagListDto>(tag);
+            tagDto.IsSubscribe = await this.IsSubscribeAsync(id);
+            tagDto.ThumbnailDisplay = _fileRepository.GetFileUrl(tagDto.Thumbnail);
             return tagDto;
         }
 
@@ -86,8 +81,7 @@ public async Task<PagedResultDto<TagListDto>> GetListAsync(TagSearchDto searchDt
                 searchDto.Sort = "create_time desc";
             }
 
-            List<TagListDto> tags = (await
-                    _tagRepository.Select.IncludeMany(r => r.UserTags, r => r.Where(u => u.CreateUserId == _currentUser.Id))
+            List<TagListDto> tags = (await _tagRepository.Select.IncludeMany(r => r.UserTags, r => r.Where(u => u.CreateUserId == CurrentUser.Id))
                         .WhereIf(searchDto.TagIds.IsNotNullOrEmpty(), r => searchDto.TagIds.Contains(r.Id))
                         .WhereIf(searchDto.TagName.IsNotNullOrEmpty(), r => r.TagName.Contains(searchDto.TagName))
                         .WhereIf(searchDto.Status != null, r => r.Status == searchDto.Status)
@@ -95,8 +89,8 @@ public async Task<PagedResultDto<TagListDto>> GetListAsync(TagSearchDto searchDt
                         .ToPagerListAsync(searchDto, out long totalCount))
                         .Select(r =>
                         {
-                            TagListDto tagDto = _mapper.Map<TagListDto>(r);
-                            tagDto.ThumbnailDisplay = _currentUser.GetFileUrl(tagDto.Thumbnail);
+                            TagListDto tagDto = Mapper.Map<TagListDto>(r);
+                            tagDto.ThumbnailDisplay = _fileRepository.GetFileUrl(tagDto.Thumbnail);
                             tagDto.IsSubscribe = r.UserTags.Any();
                             return tagDto;
                         }).ToList();
@@ -104,30 +98,46 @@ public async Task<PagedResultDto<TagListDto>> GetListAsync(TagSearchDto searchDt
             return new PagedResultDto<TagListDto>(tags, totalCount);
         }
 
-        public bool IsSubscribe(Guid tagId)
+        public async Task<bool> IsSubscribeAsync(Guid tagId)
         {
-            if (_currentUser.Id == null) return false;
-            return _userTagRepository.Select.Any(r => r.TagId == tagId && r.CreateUserId == _currentUser.Id);
+            if (CurrentUser.Id == null) return false;
+            return await _userTagRepository.Select.AnyAsync(r => r.TagId == tagId && r.CreateUserId == CurrentUser.Id);
         }
 
         public PagedResultDto<TagListDto> GetSubscribeTags(UserSubscribeSearchDto userSubscribeDto)
         {
-            var userTags = _userTagRepository.Select.Include(r => r.Tag)
+            List<Guid> userTagIds = _userTagRepository.Select
+                .Where(u => u.CreateUserId == CurrentUser.Id)
+                .ToList(r => r.TagId);
+
+            List<TagListDto> tagListDtos = _userTagRepository.Select.Include(r => r.Tag)
                 .Where(r => r.CreateUserId == userSubscribeDto.UserId)
                 .OrderByDescending(r => r.CreateTime)
                 .ToPagerList(userSubscribeDto, out long count)
                 .Select(r =>
                 {
-                    TagListDto tagDto = _mapper.Map<TagListDto>(r.Tag);
-                    tagDto.ThumbnailDisplay = _currentUser.GetFileUrl(tagDto.Thumbnail);
-                    tagDto.IsSubscribe = true;
+                    TagListDto tagDto = Mapper.Map<TagListDto>(r.Tag);
+                    if (tagDto != null)
+                    {
+                        tagDto.ThumbnailDisplay = _fileRepository.GetFileUrl(tagDto.Thumbnail);
+                        tagDto.IsSubscribe = userTagIds.Any(tagId => tagId == tagDto.Id);
+                    }
+                    else
+                    {
+                        return new TagListDto()
+                        {
+                            Id = r.TagId,
+                            TagName = "该标签已被拉黑",
+                            IsSubscribe = userTagIds.Any(tagId => tagId == r.TagId)
+                        };
+                    }
                     return tagDto;
                 }).ToList();
 
-            return new PagedResultDto<TagListDto>(userTags, count);
+            return new PagedResultDto<TagListDto>(tagListDtos, count);
         }
 
-        public void UpdateArticleCount(Guid? id, int inCreaseCount)
+        public async Task UpdateArticleCountAsync(Guid? id, int inCreaseCount)
         {
             if (id == null)
             {
@@ -137,39 +147,34 @@ public void UpdateArticleCount(Guid? id, int inCreaseCount)
             //防止数量一直减，减到小于0
             if (inCreaseCount < 0)
             {
-                Tag tag = _tagRepository.Select.Where(r => r.Id == id).ToOne();
+                Tag tag = await _tagRepository.Select.Where(r => r.Id == id).ToOneAsync();
                 if (tag.ArticleCount < -inCreaseCount)
                 {
                     return;
                 }
             }
 
-            _tagRepository.UpdateDiy.Set(r => r.ArticleCount + inCreaseCount)
-                .Where(r => r.Id == id)
-                .ExecuteAffrows();
+            await _tagRepository.UpdateDiy.Set(r => r.ArticleCount + inCreaseCount)
+                 .Where(r => r.Id == id)
+                 .ExecuteAffrowsAsync();
         }
 
 
-        public void UpdateSubscribersCount(Guid? id, int inCreaseCount)
+        public async Task UpdateSubscribersCountAsync(Guid? id, int inCreaseCount)
         {
             if (id == null)
             {
                 return;
             }
 
-            //防止数量一直减，减到小于0
-            if (inCreaseCount < 0)
+            Tag tag = await _tagRepository.Select.Where(r => r.Id == id).ToOneAsync();
+            if (tag == null)
             {
-                Tag tag = _tagRepository.Select.Where(r => r.Id == id).ToOne();
-                if (tag.SubscribersCount < -inCreaseCount)
-                {
-                    return;
-                }
+                throw new LinCmsException("标签不存在", ErrorCode.NotFound);
             }
 
-            _tagRepository.UpdateDiy.Set(r => r.SubscribersCount + inCreaseCount)
-                .Where(r => r.Id == id)
-                .ExecuteAffrows();
+            tag.UpdateSubscribersCount(inCreaseCount);
+            await _tagRepository.UpdateAsync(tag);
         }
         public async Task CorrectedTagCountAsync(Guid tagId)
         {
diff --git a/src/LinCms.Application/Blog/Tags/UserTagService.cs b/src/LinCms.Application/Blog/Tags/UserTagService.cs
new file mode 100644
index 00000000..5c3712e8
--- /dev/null
+++ b/src/LinCms.Application/Blog/Tags/UserTagService.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Threading.Tasks;
+using LinCms.Aop.Attributes;
+using LinCms.Entities.Blog;
+using LinCms.Exceptions;
+using LinCms.IRepositories;
+using LinCms.Security;
+
+namespace LinCms.Blog.Tags
+{
+    public class UserTagService : ApplicationService, IUserTagService
+    {
+        private readonly IAuditBaseRepository<Tag> _tagRepository;
+        private readonly IAuditBaseRepository<UserTag> _userTagRepository;
+        private readonly ITagService _tagService;
+
+        public UserTagService(ITagService tagService, IAuditBaseRepository<Tag> tagRepository, IAuditBaseRepository<UserTag> userTagRepository)
+        {
+            _tagService = tagService;
+            _tagRepository = tagRepository;
+            _userTagRepository = userTagRepository;
+        }
+
+        [Transactional]
+        public async Task CreateUserTagAsync(Guid tagId)
+        {
+            Tag tag = await _tagRepository.Select.Where(r => r.Id == tagId).ToOneAsync();
+            if (tag == null)
+            {
+                throw new LinCmsException("该标签不存在");
+            }
+
+            if (!tag.Status)
+            {
+                throw new LinCmsException("该标签已被拉黑");
+            }
+
+            bool any = await _userTagRepository.Select.AnyAsync(r =>
+                 r.CreateUserId == CurrentUser.Id && r.TagId == tagId);
+            if (any)
+            {
+                throw new LinCmsException("您已关注该标签");
+            }
+
+            UserTag userTag = new UserTag() { TagId = tagId };
+            await _userTagRepository.InsertAsync(userTag);
+            await _tagService.UpdateSubscribersCountAsync(tagId, 1);
+        }
+
+        [Transactional]
+        public async Task DeleteUserTagAsync(Guid tagId)
+        {
+            bool any = await _userTagRepository.Select.AnyAsync(r => r.CreateUserId == CurrentUser.Id && r.TagId == tagId);
+            if (!any)
+            {
+                throw new LinCmsException("已取消关注");
+            }
+            await _userTagRepository.DeleteAsync(r => r.TagId == tagId && r.CreateUserId == CurrentUser.Id);
+            await _tagService.UpdateSubscribersCountAsync(tagId, -1);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Application/AutoMapper/Blog/UserLikeProfile.cs b/src/LinCms.Application/Blog/UserLikes/UserLikeProfile.cs
similarity index 60%
rename from src/LinCms.Application/AutoMapper/Blog/UserLikeProfile.cs
rename to src/LinCms.Application/Blog/UserLikes/UserLikeProfile.cs
index a27efd50..5fbc94b4 100644
--- a/src/LinCms.Application/AutoMapper/Blog/UserLikeProfile.cs
+++ b/src/LinCms.Application/Blog/UserLikes/UserLikeProfile.cs
@@ -1,8 +1,7 @@
 using AutoMapper;
-using LinCms.Application.Contracts.Blog.UserLikes;
-using LinCms.Core.Entities.Blog;
+using LinCms.Entities.Blog;
 
-namespace LinCms.Application.AutoMapper.Blog
+namespace LinCms.Blog.UserLikes
 {
     public class UserLikeProfile : Profile
     {
diff --git a/src/LinCms.Application/Blog/UserLikes/UserLikeService.cs b/src/LinCms.Application/Blog/UserLikes/UserLikeService.cs
new file mode 100644
index 00000000..d92cc7cd
--- /dev/null
+++ b/src/LinCms.Application/Blog/UserLikes/UserLikeService.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using LinCms.Blog.Articles;
+using LinCms.Blog.Comments;
+using LinCms.Entities.Blog;
+using LinCms.IRepositories;
+
+namespace LinCms.Blog.UserLikes
+{
+    public class UserLikeService :ApplicationService, IUserLikeService
+    {
+        private readonly IAuditBaseRepository<UserLike> _userLikeRepository;
+        private readonly IArticleService _articleService;
+        private readonly ICommentService _commentService;
+
+        public UserLikeService(
+            IAuditBaseRepository<UserLike> userLikeRepository,
+            IArticleService articleService,
+            ICommentService commentService)
+        {
+            _userLikeRepository = userLikeRepository;
+            _articleService = articleService;
+            _commentService = commentService;
+        }
+
+        public async Task<bool> CreateOrCancelAsync(CreateUpdateUserLikeDto createUpdateUserLike)
+        {
+            Expression<Func<UserLike, bool>> predicate = r =>
+                r.SubjectId == createUpdateUserLike.SubjectId && r.CreateUserId == CurrentUser.Id;
+
+            bool exist = await _userLikeRepository.Select.AnyAsync(predicate);
+            int increaseLikeQuantity = 1;
+
+            if (exist)
+            {
+                increaseLikeQuantity = -1;
+                await _userLikeRepository.DeleteAsync(predicate);
+            }
+
+            switch (createUpdateUserLike.SubjectType)
+            {
+                case UserLikeSubjectType.UserLikeArticle:
+                    await _articleService.UpdateLikeQuantityAysnc(createUpdateUserLike.SubjectId, increaseLikeQuantity);
+                    break;
+                case UserLikeSubjectType.UserLikeComment:
+                    await _commentService.UpdateLikeQuantityAysnc(createUpdateUserLike.SubjectId, increaseLikeQuantity);
+                    break;
+            }
+
+            if (exist)
+            {
+                return true;
+            }
+
+
+            UserLike userLike = Mapper.Map<UserLike>(createUpdateUserLike);
+            await _userLikeRepository.InsertAsync(userLike);
+            return false;
+        }
+    }
+}
diff --git a/src/LinCms.Application/Blog/UserSubscribes/IUserSubscribeService.cs b/src/LinCms.Application/Blog/UserSubscribes/IUserSubscribeService.cs
deleted file mode 100644
index f3a00c4b..00000000
--- a/src/LinCms.Application/Blog/UserSubscribes/IUserSubscribeService.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-
-namespace LinCms.Application.Blog.UserSubscribes
-{
-    public interface IUserSubscribeService
-    {
-        /// <summary>
-        /// 得到某用户的关注的用户Id
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns></returns>
-        List<long> GetSubscribeUserId(long userId);
-    }
-}
diff --git a/src/LinCms.Application/AutoMapper/Blog/UserFollowProfile.cs b/src/LinCms.Application/Blog/UserSubscribes/UserSubscribeProfile.cs
similarity index 60%
rename from src/LinCms.Application/AutoMapper/Blog/UserFollowProfile.cs
rename to src/LinCms.Application/Blog/UserSubscribes/UserSubscribeProfile.cs
index cfc7161d..987c187c 100644
--- a/src/LinCms.Application/AutoMapper/Blog/UserFollowProfile.cs
+++ b/src/LinCms.Application/Blog/UserSubscribes/UserSubscribeProfile.cs
@@ -1,8 +1,7 @@
 using AutoMapper;
-using LinCms.Application.Contracts.Blog.UserSubscribes;
-using LinCms.Core.Entities.Blog;
+using LinCms.Entities.Blog;
 
-namespace LinCms.Application.AutoMapper.Blog
+namespace LinCms.Blog.UserSubscribes
 {
 
     public class UserSubscribeProfile : Profile
diff --git a/src/LinCms.Application/Blog/UserSubscribes/UserSubscribeService.cs b/src/LinCms.Application/Blog/UserSubscribes/UserSubscribeService.cs
index c3faef1e..09f23336 100644
--- a/src/LinCms.Application/Blog/UserSubscribes/UserSubscribeService.cs
+++ b/src/LinCms.Application/Blog/UserSubscribes/UserSubscribeService.cs
@@ -1,23 +1,165 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using DotNetCore.CAP;
 using FreeSql;
-using LinCms.Core.Entities.Blog;
+using LinCms.Aop.Attributes;
+using LinCms.Blog.Notifications;
+using LinCms.Cms.Users;
+using LinCms.Data;
+using LinCms.Entities;
+using LinCms.Entities.Blog;
+using LinCms.Exceptions;
+using LinCms.Extensions;
+using LinCms.IRepositories;
 
-namespace LinCms.Application.Blog.UserSubscribes
+namespace LinCms.Blog.UserSubscribes
 {
-    public class UserSubscribeService : IUserSubscribeService
+    public class UserSubscribeService : ApplicationService, IUserSubscribeService
     {
-        private readonly BaseRepository<UserSubscribe> _userSubscribeRepository;
-        public UserSubscribeService(BaseRepository<UserSubscribe> userSubscribeRepository)
+        private readonly IUserRepository _userRepository;
+        private readonly IAuditBaseRepository<UserSubscribe, Guid> _userSubscribeRepository;
+        private readonly ICapPublisher _capBus;
+        private readonly IFileRepository _fileRepository;
+        public UserSubscribeService(IAuditBaseRepository<UserSubscribe, Guid> userSubscribeRepository, IUserRepository userRepository, ICapPublisher capBus, IFileRepository fileRepository)
         {
             _userSubscribeRepository = userSubscribeRepository;
+            _userRepository = userRepository;
+            _capBus = capBus;
+            _fileRepository = fileRepository;
         }
 
-        public List<long> GetSubscribeUserId(long userId)
+        public async Task<List<long>> GetSubscribeUserIdAsync(long userId)
         {
-            List<long> subscribeUserIds = _userSubscribeRepository
+            List<long> subscribeUserIds = await _userSubscribeRepository
                 .Select.Where(r => r.CreateUserId == userId)
-                .ToList(r => r.SubscribeUserId);
+                .ToListAsync(r => r.SubscribeUserId);
             return subscribeUserIds;
         }
+
+        public PagedResultDto<UserSubscribeDto> GetUserSubscribeeeList(UserSubscribeSearchDto searchDto)
+        {
+            List<UserSubscribeDto> userSubscribes = _userSubscribeRepository.Select.Include(r => r.SubscribeUser)
+                .Where(r => r.CreateUserId == searchDto.UserId)
+                .OrderByDescending(r => r.CreateTime)
+                .ToPager(searchDto, out long count)
+                .ToList(r => new UserSubscribeDto
+                {
+                    CreateUserId = r.CreateUserId,
+                    SubscribeUserId = r.SubscribeUserId,
+                    Subscribeer = new OpenUserDto()
+                    {
+                        Id = r.SubscribeUser.Id,
+                        Introduction = r.SubscribeUser.Introduction,
+                        Nickname = !r.SubscribeUser.IsDeleted ? r.SubscribeUser.Nickname : "该用户已注销",
+                        Avatar = r.SubscribeUser.Avatar,
+                        Username = r.SubscribeUser.Username,
+                    },
+                    IsSubscribeed = _userSubscribeRepository.Select.Any(r => r.CreateUserId == CurrentUser.Id && r.SubscribeUserId == r.SubscribeUserId)
+                });
+
+            userSubscribes.ForEach(r => { r.Subscribeer.Avatar = _fileRepository.GetFileUrl(r.Subscribeer.Avatar); });
+
+            return new PagedResultDto<UserSubscribeDto>(userSubscribes, count);
+        }
+
+        public PagedResultDto<UserSubscribeDto> GetUserFansList(UserSubscribeSearchDto searchDto)
+        {
+            List<UserSubscribeDto> userSubscribes = _userSubscribeRepository.Select.Include(r => r.LinUser)
+                .Where(r => r.SubscribeUserId == searchDto.UserId)
+                .OrderByDescending(r => r.CreateTime)
+                .ToPager(searchDto, out long count)
+                .ToList(r => new UserSubscribeDto
+                {
+                    CreateUserId = r.CreateUserId,
+                    SubscribeUserId = r.SubscribeUserId,
+                    Subscribeer = new OpenUserDto()
+                    {
+                        Id = r.LinUser.Id,
+                        Introduction = r.LinUser.Introduction,
+                        Nickname = !r.LinUser.IsDeleted ? r.LinUser.Nickname : "该用户已注销",
+                        Avatar = r.LinUser.Avatar,
+                        Username = r.LinUser.Username,
+                    },
+                    //当前登录的用户是否关注了这个粉丝
+                    IsSubscribeed = _userSubscribeRepository.Select.Any(
+                           u => u.CreateUserId == CurrentUser.Id && u.SubscribeUserId == r.CreateUserId)
+                });
+
+            userSubscribes.ForEach(r => { r.Subscribeer.Avatar = _fileRepository.GetFileUrl(r.Subscribeer.Avatar); });
+
+            return new PagedResultDto<UserSubscribeDto>(userSubscribes, count);
+        }
+
+        [Transactional]
+        public async Task CreateAsync(long subscribeUserId)
+        {
+            if (subscribeUserId == CurrentUser.Id)
+            {
+                throw new LinCmsException("您无法关注自己");
+            }
+
+            LinUser linUser = _userRepository.Select.Where(r => r.Id == subscribeUserId).ToOne();
+            if (linUser == null)
+            {
+                throw new LinCmsException("该用户不存在");
+            }
+
+            if (!linUser.IsActive())
+            {
+                throw new LinCmsException("该用户已被拉黑");
+            }
+
+            bool any = _userSubscribeRepository.Select.Any(r =>
+               r.CreateUserId == CurrentUser.Id && r.SubscribeUserId == subscribeUserId);
+            if (any)
+            {
+                throw new LinCmsException("您已关注该用户");
+            }
+
+            using ICapTransaction capTransaction = UnitOfWorkManager.Current.BeginTransaction(_capBus, false);
+
+            UserSubscribe userSubscribe = new UserSubscribe() { SubscribeUserId = subscribeUserId };
+            await _userSubscribeRepository.InsertAsync(userSubscribe);
+
+            await _capBus.PublishAsync(CreateNotificationDto.CreateOrCancelAsync, new CreateNotificationDto()
+            {
+                NotificationType = NotificationType.UserLikeUser,
+                NotificationRespUserId = subscribeUserId,
+                UserInfoId = CurrentUser.Id ?? 0,
+                CreateTime = DateTime.Now,
+            });
+
+            capTransaction.Commit(UnitOfWorkManager.Current);
+        }
+
+        [Transactional]
+        public async Task DeleteAsync(long subscribeUserId)
+        {
+            bool any = await _userSubscribeRepository.Select.AnyAsync(r =>
+               r.CreateUserId == CurrentUser.Id && r.SubscribeUserId == subscribeUserId);
+            if (!any)
+            {
+                throw new LinCmsException("已取消关注");
+            }
+
+
+            using ICapTransaction capTransaction = UnitOfWorkManager.Current.BeginTransaction(_capBus, false);
+
+            await _userSubscribeRepository.DeleteAsync(r => r.SubscribeUserId == subscribeUserId && r.CreateUserId == CurrentUser.Id);
+
+            await _capBus.PublishAsync(CreateNotificationDto.CreateOrCancelAsync, new CreateNotificationDto()
+            {
+                NotificationType = NotificationType.UserLikeUser,
+                NotificationRespUserId = subscribeUserId,
+                UserInfoId = CurrentUser.Id ?? 0,
+                CreateTime = DateTime.Now,
+                IsCancel = true
+            });
+
+            capTransaction.Commit(UnitOfWorkManager.Current);
+
+        }
+
     }
 }
diff --git a/src/LinCms.Application/CapUnitOfWorkExtensions.cs b/src/LinCms.Application/CapUnitOfWorkExtensions.cs
new file mode 100644
index 00000000..dddd7b3b
--- /dev/null
+++ b/src/LinCms.Application/CapUnitOfWorkExtensions.cs
@@ -0,0 +1,50 @@
+using System.Reflection;
+using DotNetCore.CAP;
+using FreeSql;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace LinCms
+{
+    public static class CapUnitOfWorkExtensions
+    {
+
+        public static void Flush(this ICapTransaction capTransaction)
+        {
+            capTransaction?.GetType().GetMethod("Flush", BindingFlags.Instance | BindingFlags.NonPublic)?.Invoke(capTransaction, null);
+        }
+
+
+        public static ICapTransaction BeginTransaction(this IUnitOfWork unitOfWork, ICapPublisher publisher, bool autoCommit = false)
+        {
+            //看了源码，换了新的写法，换不同的数据库，就需要手动修改这段代码了（MySqlCapTransaction）
+            //publisher.Transaction.Value = (ICapTransaction)publisher.ServiceProvider.GetService(typeof(ICapTransaction));新版本只能得到null
+            publisher.Transaction.Value = ActivatorUtilities.CreateInstance<MySqlCapTransaction>(publisher.ServiceProvider);
+            return publisher.Transaction.Value.Begin(unitOfWork.GetOrBeginTransaction(), autoCommit);
+        }
+
+        public static void Commit(this ICapTransaction capTransaction, IUnitOfWork unitOfWork)
+        {
+            unitOfWork.Commit();
+            capTransaction.Flush();
+        }
+
+
+        //public static ICapTransaction BeginTransaction(this UnitOfWorkManager unitOfWorkManager, ICapPublisher publisher, bool autoCommit = false)
+        //{
+        //    publisher.Transaction.Value = ActivatorUtilities.CreateInstance<MySqlCapTransaction>(publisher.ServiceProvider);
+        //    IUnitOfWork unitOfWork = unitOfWorkManager.Begin(Propagation.Required);
+
+        //    return publisher.Transaction.Value.Begin(unitOfWork.GetOrBeginTransaction(), autoCommit);
+        //}
+
+        //public static void Commit(this ICapTransaction capTransaction, UnitOfWorkManager unitOfWorkManager)
+        //{
+        //    IUnitOfWork unitOfWork = unitOfWorkManager.Current;
+        //    if (unitOfWork != null)
+        //    {
+        //        unitOfWork.Commit();
+        //    }
+        //    capTransaction.Flush();
+        //}
+    }
+}
diff --git a/src/LinCms.Application/Cms/Account/AccountService.cs b/src/LinCms.Application/Cms/Account/AccountService.cs
new file mode 100644
index 00000000..95335966
--- /dev/null
+++ b/src/LinCms.Application/Cms/Account/AccountService.cs
@@ -0,0 +1,145 @@
+using LinCms.Cms.Users;
+using LinCms.Data.Options;
+using LinCms.Email;
+using LinCms.Entities;
+using LinCms.Exceptions;
+using LinCms.IRepositories;
+using Microsoft.Extensions.Options;
+using MimeKit;
+using System;
+using System.Threading.Tasks;
+
+namespace LinCms.Cms.Account
+{
+    public class AccountService : IAccountService
+    {
+        private readonly IAuditBaseRepository<LinUser, long> _userRepository;
+        private readonly IEmailSender _emailSender;
+        private readonly MailKitOptions _mailKitOptions;
+        private readonly IUserIdentityService _userIdentityService;
+        private readonly SiteOption _siteOption;
+
+        public AccountService(
+            IAuditBaseRepository<LinUser, long> userRepository,
+            IEmailSender emailSender,
+            IOptions<MailKitOptions> options,
+            IUserIdentityService userIdentityService,
+            IOptions<SiteOption> siteOption)
+        {
+            _userRepository = userRepository;
+            _emailSender = emailSender;
+            _mailKitOptions = options.Value;
+            _userIdentityService = userIdentityService;
+            _siteOption = siteOption.Value;
+        }
+
+        public async Task<string> SendComfirmEmail(RegisterDto registerDto)
+        {
+            var message = new MimeMessage();
+            message.From.Add(new MailboxAddress(_mailKitOptions.UserName, _mailKitOptions.UserName));
+            message.To.Add(new MailboxAddress(registerDto.Nickname, registerDto.Email));
+            message.Subject = $"VVLOG-请点击这里激活您的账号";
+
+            string uuid = Guid.NewGuid().ToString();
+            await RedisHelper.SetAsync("SendComfirmEmail-" + registerDto.Email, uuid, 30 * 60);
+
+            message.Body = new TextPart("html")
+            {
+                Text = $@"{registerDto.Nickname},您好!</br>
+感谢您在 vvlog  的注册，请点击这里激活您的账号：</br>
+{_siteOption.VVLogDomain}/accounts/confirm-email/{uuid}/
+祝您使用愉快，使用过程中您有任何问题请及时联系我们。</br>"
+            };
+
+            await _emailSender.SendAsync(message);
+            return "";
+        }
+
+        public async Task SendEmailCode(RegisterDto registerDto)
+        {
+            var message = new MimeMessage();
+            message.From.Add(new MailboxAddress(_mailKitOptions.UserName, _mailKitOptions.UserName));
+            message.To.Add(new MailboxAddress(registerDto.Nickname, registerDto.Email));
+            message.Subject = $"VVLOG-你的验证码是";
+
+            string uuid = Guid.NewGuid().ToString();
+            await RedisHelper.SetAsync("SendEmailCode-" + registerDto.Email, uuid, 30 * 60);
+
+            int rand6Value = new Random().Next(100000, 999999);
+
+            message.Body = new TextPart("html")
+            {
+                Text = $@"{registerDto.Nickname},您好!</br>你此次验证码如下，请在 30 分钟内输入验证码进行下一步操作。</br>如非你本人操作，请忽略此邮件。</br>{rand6Value}"
+            };
+
+
+            await _emailSender.SendAsync(message);
+        }
+
+        public async Task<string> SendPasswordResetCode(SendEmailCodeInput sendEmailCode)
+        {
+            var user = await GetUserByChecking(sendEmailCode.Email);
+
+            if (user.IsEmailConfirmed == false)
+            {
+                throw new LinCmsException("邮件未激活,无法通过此邮件找回密码!");
+            }
+
+            user.SetNewPasswordResetCode();
+
+            int rand6Value = new Random().Next(100000, 999999);
+
+            var message = new MimeMessage();
+            message.From.Add(new MailboxAddress(_mailKitOptions.UserName, _mailKitOptions.UserName));
+            message.To.Add(new MailboxAddress(user.Username, user.Email));
+            message.Subject = $"VVLOG-你此次重置密码的验证码是:{rand6Value}";
+
+            message.Body = new TextPart("html")
+            {
+                Text = $@"{user.Nickname},您好!</br>你此次重置密码的验证码如下，请在 30 分钟内输入验证码进行下一步操作。</br>如非你本人操作，请忽略此邮件。</br>{rand6Value}"
+            };
+
+            await _userRepository.UpdateAsync(user);
+
+            //await _emailSender.SendAsync(message);
+
+            await RedisHelper.SetAsync(user.Email, rand6Value, 30 * 60);
+
+            return user.PasswordResetCode;
+        }
+
+        private async Task<LinUser> GetUserByChecking(string inputEmailAddress)
+        {
+            var user = await _userRepository.Select.Where(r => r.Email == inputEmailAddress).FirstAsync();
+            if (user == null)
+            {
+                throw new LinCmsException("InvalidEmailAddress");
+            }
+
+            return user;
+        }
+
+        public async Task ResetPassword(ResetEmailPasswordDto resetPassword)
+        {
+            string resetCode = await RedisHelper.GetAsync(resetPassword.Email);
+            if (resetCode.IsNullOrEmpty())
+            {
+                throw new LinCmsException("验证码已过期");
+            }
+            if (resetPassword.ResetCode != resetCode)
+            {
+                throw new LinCmsException("验证码不正确");//InvalidEmailConfirmationCode
+            }
+
+            var user = await _userRepository.Select.Where(r => r.Email == resetPassword.Email).FirstAsync();
+            if (user == null || resetPassword.PasswordResetCode != user.PasswordResetCode)
+            {
+                throw new LinCmsException("该请求无效，请重新获取验证码");
+            }
+
+            user.PasswordResetCode = null;
+            await _userRepository.UpdateAsync(user);
+            await _userIdentityService.ChangePasswordAsync(user.Id, resetPassword.Password, user.Salt);
+        }
+    }
+}
diff --git a/src/LinCms.Application/Cms/Account/IdentityServer4Service.cs b/src/LinCms.Application/Cms/Account/IdentityServer4Service.cs
new file mode 100644
index 00000000..30d8e795
--- /dev/null
+++ b/src/LinCms.Application/Cms/Account/IdentityServer4Service.cs
@@ -0,0 +1,121 @@
+using IdentityModel;
+using IdentityModel.Client;
+using IdentityServer4.Models;
+using LinCms.Data.Enums;
+using LinCms.Exceptions;
+using LinCms.Security;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Text.Json;
+using System.Threading.Tasks;
+
+namespace LinCms.Cms.Account
+{
+    public class IdentityServer4Service : ITokenService
+    {
+        private readonly IConfiguration _configuration;
+        private readonly ILogger<IdentityServer4Service> _logger;
+        private readonly IHttpClientFactory _httpClientFactory;
+        public IdentityServer4Service(ILogger<IdentityServer4Service> logger, IConfiguration configuration, IHttpClientFactory httpClientFactory)
+        {
+            _logger = logger;
+            _configuration = configuration;
+            _httpClientFactory = httpClientFactory;
+        }
+
+        /// <summary>
+        /// Ids4密码模式登录
+        /// </summary>
+        /// <param name="loginInputDto"></param>
+        /// <returns></returns>
+        public async Task<Tokens> LoginAsync(LoginInputDto loginInputDto)
+        {
+            _logger.LogInformation("IdentityServer4Login");
+
+            HttpClient client = _httpClientFactory.CreateClient("IdentityServer4");
+
+            DiscoveryDocumentResponse disco = await client.GetDiscoveryDocumentAsync(new DiscoveryDocumentRequest
+            {
+                Address = _configuration["Service:Authority"],
+                Policy = new DiscoveryPolicy
+                {
+                    RequireHttps = _configuration["Service:UseHttps"].ToBoolean()
+                }
+            });
+
+            if (disco.IsError)
+            {
+                throw new LinCmsException(disco.Error);
+            }
+
+            TokenResponse response = await client.RequestTokenAsync(new PasswordTokenRequest()
+            {
+                Address = disco.TokenEndpoint,
+                GrantType = GrantType.ResourceOwnerPassword,
+                ClientId = _configuration["Service:ClientId"],
+                ClientSecret = _configuration["Service:ClientSecret"],
+                Parameters = {
+                        { "UserName", loginInputDto.Username },
+                        { "Password", loginInputDto.Password }
+                    },
+                Scope = _configuration["Service:Name"],
+            });
+
+            if (response.IsError)
+            {
+                throw new LinCmsException(response.ErrorDescription);
+            }
+
+            JsonElement jsonElement = response.Json;
+
+            _logger.LogInformation($"用户{loginInputDto.Username},登录成功，{JsonConvert.SerializeObject(jsonElement)}");
+            return new Tokens(jsonElement.GetProperty("access_token").ToString(), jsonElement.GetProperty("refresh_token").ToString());
+        }
+
+        public async Task<Tokens> GetRefreshTokenAsync(string refreshToken)
+        {
+            HttpClient client = _httpClientFactory.CreateClient();
+            DiscoveryDocumentResponse disco = await client.GetDiscoveryDocumentAsync(new DiscoveryDocumentRequest
+            {
+                Address = _configuration["Service:Authority"],
+                Policy = new DiscoveryPolicy
+                {
+                    RequireHttps = _configuration["Service:UseHttps"].ToBoolean()
+                }
+            });
+
+            if (disco.IsError)
+            {
+                throw new LinCmsException(disco.Error);
+            }
+
+            Parameters parameters = new Parameters
+            {
+                new KeyValuePair<string, string>(OidcConstants.TokenRequest.RefreshToken, refreshToken)
+            };
+
+            TokenResponse response = await client.RequestTokenAsync(new TokenRequest
+            {
+                Address = disco.TokenEndpoint,
+                GrantType = OidcConstants.GrantTypes.RefreshToken,
+
+                ClientId = _configuration["Service:ClientId"],
+                ClientSecret = _configuration["Service:ClientSecret"],
+                Parameters = parameters
+            });
+
+            if (response.IsError)
+            {
+                _logger.LogError(response.Error + response.ErrorDescription);
+                throw new LinCmsException("请重新登录", ErrorCode.RefreshTokenError);
+            }
+
+            JsonElement jsonElement = response.Json;
+
+            return new Tokens(jsonElement.GetProperty("access_token").ToString(), jsonElement.GetProperty("refresh_token").ToString());
+        }
+    }
+}
diff --git a/src/LinCms.Application/Cms/Account/JwtTokenService.cs b/src/LinCms.Application/Cms/Account/JwtTokenService.cs
new file mode 100644
index 00000000..9bec8208
--- /dev/null
+++ b/src/LinCms.Application/Cms/Account/JwtTokenService.cs
@@ -0,0 +1,103 @@
+using DotNetCore.Security;
+using LinCms.Cms.Account;
+using LinCms.Data.Enums;
+using LinCms.Entities;
+using LinCms.Exceptions;
+using LinCms.IRepositories;
+using LinCms.Security;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading.Tasks;
+
+namespace LinCms.Cms.Users
+{
+    public class JwtTokenService : ITokenService
+    {
+        private readonly IUserRepository _userRepository;
+        private readonly IUserIdentityService _userIdentityService;
+        private readonly ILogger<JwtTokenService> _logger;
+        private readonly IJsonWebTokenService _jsonWebTokenService;
+
+        public JwtTokenService(IUserRepository userRepository, ILogger<JwtTokenService> logger, IUserIdentityService userIdentityService, IJsonWebTokenService jsonWebTokenService)
+        {
+            _userRepository = userRepository;
+            _logger = logger;
+            _userIdentityService = userIdentityService;
+            _jsonWebTokenService = jsonWebTokenService;
+        }
+        /// <summary>
+        /// JWT登录
+        /// </summary>
+        /// <param name="loginInputDto"></param>
+        /// <returns></returns>
+        public async Task<Tokens> LoginAsync(LoginInputDto loginInputDto)
+        {
+            _logger.LogInformation("JwtLogin");
+
+            LinUser user = await _userRepository.GetUserAsync(r => r.Username == loginInputDto.Username || r.Email == loginInputDto.Username);
+
+            if (user == null)
+            {
+                throw new LinCmsException("用户不存在", ErrorCode.NotFound);
+            }
+
+            bool valid = await _userIdentityService.VerifyUserPasswordAsync(user.Id, loginInputDto.Password, user.Salt);
+
+            if (!valid)
+            {
+                throw new LinCmsException("请输入正确密码", ErrorCode.ParameterError);
+            }
+
+            _logger.LogInformation($"用户{loginInputDto.Username},登录成功");
+
+            Tokens tokens = await CreateTokenAsync(user);
+            return tokens;
+        }
+
+
+        public async Task<Tokens> GetRefreshTokenAsync(string refreshToken)
+        {
+            LinUser user = await _userRepository.GetUserAsync(r => r.RefreshToken == refreshToken);
+
+            if (user.IsNull())
+            {
+                throw new LinCmsException("该refreshToken无效!");
+            }
+
+            if (DateTime.Compare(user.LastLoginTime, DateTime.Now) > new TimeSpan(30, 0, 0, 0).Ticks)
+            {
+                throw new LinCmsException("请重新登录", ErrorCode.RefreshTokenError);
+            }
+
+            Tokens tokens = await CreateTokenAsync(user);
+            _logger.LogInformation($"用户{user.Username},JwtRefreshToken 刷新-登录成功");
+
+            return tokens;
+        }
+
+        private async Task<Tokens> CreateTokenAsync(LinUser user)
+        {
+            List<Claim> claims = new List<Claim>()
+            {
+                new Claim (ClaimTypes.NameIdentifier, user.Id.ToString()),
+                new Claim (ClaimTypes.Email, user.Email?? ""),
+                new Claim (ClaimTypes.GivenName, user.Nickname?? ""),
+                new Claim (ClaimTypes.Name, user.Username?? ""),
+            };
+            user.LinGroups?.ForEach(r =>
+            {
+                claims.Add(new Claim(ClaimTypes.Role, r.Name));
+                claims.Add(new Claim(LinCmsClaimTypes.Groups, r.Id.ToString()));
+            });
+
+            string token = _jsonWebTokenService.Encode(claims);
+
+            user.AddRefreshToken();
+            await _userRepository.UpdateAsync(user);
+
+            return new Tokens(token, user.RefreshToken);
+        }
+    }
+}
diff --git a/src/LinCms.Application/Cms/Admin/AdminService.cs b/src/LinCms.Application/Cms/Admin/AdminService.cs
index 54ac2a17..da77b9a2 100644
--- a/src/LinCms.Application/Cms/Admin/AdminService.cs
+++ b/src/LinCms.Application/Cms/Admin/AdminService.cs
@@ -1,20 +1,19 @@
 using System.Collections.Generic;
 using System.Linq;
 using AutoMapper;
-using LinCms.Application.Contracts.Cms.Permissions;
-using LinCms.Core.Entities;
-using LinCms.Infrastructure.Repositories;
+using LinCms.Cms.Admins;
+using LinCms.Cms.Permissions;
+using LinCms.Entities;
+using LinCms.IRepositories;
 
-namespace LinCms.Application.Cms.Admin
+namespace LinCms.Cms.Admin
 {
-    public class AdminService : IAdminService
+    public class AdminService :ApplicationService, IAdminService
     {
-        private readonly AuditBaseRepository<LinPermission> _permissionRepository;
-        private readonly IMapper _mapper;
-        public AdminService(AuditBaseRepository<LinPermission> permissionRepository, IMapper mapper)
+        private readonly IAuditBaseRepository<LinPermission> _permissionRepository;
+        public AdminService(IAuditBaseRepository<LinPermission> permissionRepository)
         {
             _permissionRepository = permissionRepository;
-            _mapper = mapper;
         }
 
         public IDictionary<string, List<PermissionDto>> GetAllStructualPermissions()
@@ -24,7 +23,7 @@ public IDictionary<string, List<PermissionDto>> GetAllStructualPermissions()
                  .ToDictionary(
                      group => group.Key,
                      group =>
-                         _mapper.Map<List<PermissionDto>>(group.ToList())
+                         Mapper.Map<List<PermissionDto>>(group.ToList())
                    );
 
         }
diff --git a/src/LinCms.Application/Cms/Files/LocalFileService.cs b/src/LinCms.Application/Cms/Files/LocalFileService.cs
index b493574c..12029270 100644
--- a/src/LinCms.Application/Cms/Files/LocalFileService.cs
+++ b/src/LinCms.Application/Cms/Files/LocalFileService.cs
@@ -1,101 +1,124 @@
-using System;
-using System.IO;
-using System.Security.Cryptography;
-using LinCms.Application.Contracts.Cms.Files;
-using LinCms.Core.Common;
-using LinCms.Core.Entities;
+using LinCms.Common;
+using LinCms.Data.Options;
+using LinCms.Entities;
+using LinCms.Exceptions;
+using LinCms.IRepositories;
+using LinCms.Security;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Net.Http.Headers;
+using Microsoft.Extensions.Options;
+using System;
+using System.IO;
+using System.Security.Cryptography;
+using System.Threading.Tasks;
 
-namespace LinCms.Application.Cms.Files
+namespace LinCms.Cms.Files
 {
     public class LocalFileService : IFileService
     {
         private readonly IWebHostEnvironment _hostingEnv;
-        private readonly IFreeSql _freeSql;
-        private readonly IConfiguration _configuration;
-
-        public LocalFileService(IWebHostEnvironment hostingEnv, IFreeSql freeSql, IConfiguration configuration)
+        private readonly IAuditBaseRepository<LinFile, long> _fileRepository;
+        private readonly FileStorageOption _fileStorageOption;
+        private readonly ICurrentUser _currentUser;
+        public LocalFileService(IWebHostEnvironment hostingEnv, IAuditBaseRepository<LinFile, long> fileRepository, IOptions<FileStorageOption> fileStorageOption, ICurrentUser currentUser)
         {
             _hostingEnv = hostingEnv;
-            _freeSql = freeSql;
-            _configuration = configuration;
+            _fileRepository = fileRepository;
+            _fileStorageOption = fileStorageOption.Value;
+            _currentUser = currentUser;
         }
 
-        public FileDto Upload(IFormFile file, int key = 0)
+        /// <summary>
+        /// 本地文件上传，生成目录格式 {PrefixPath}/{yyyyMM}/{guid}.文件后缀
+        /// assets/202005/fba73a0c-f2f7-499a-8ed8-5b10554d43b0.jpg
+        /// </summary>
+        /// <param name="file"></param>
+        /// <returns></returns>
+        private async Task<Tuple<string, long>> LocalUploadAsync(IFormFile file)
         {
-            string domainUrl = _configuration[LinConsts.SITE_DOMAIN];
-            string fileDir = _configuration[LinConsts.File.STORE_DIR];
+            if (file.Length == 0)
+            {
+                throw new LinCmsException("文件为空");
+            }
 
-            string md5 = LinCmsUtils.GetHash<MD5>(file.OpenReadStream());
+            string saveFileName = Guid.NewGuid() + Path.GetExtension(file.FileName);
 
-            LinFile linFile = _freeSql.Select<LinFile>().Where(r => r.Md5 == md5 && r.Type == 1).OrderByDescending(r => r.CreateTime).First();
+            //得到 assets/202005
+            string path = Path.Combine(_fileStorageOption.LocalFile.PrefixPath, DateTime.Now.ToString("yyyyMM"));
+            //得到wwwroot/assets/202005
+            string createFolder = Path.Combine(_hostingEnv.WebRootPath, path);
+            //创建这种不存在的目录
+            if (!Directory.Exists(createFolder))
+            {
+                Directory.CreateDirectory(createFolder);
+            }
 
-            if (linFile != null && File.Exists(Path.Combine(_hostingEnv.WebRootPath, fileDir, linFile.Path)))
+            long len = 0;
+            await using (FileStream fs = File.Create(Path.Combine(createFolder, saveFileName)))
+            {
+                await file.CopyToAsync(fs);
+                len = fs.Length;
+                await fs.FlushAsync();
+            }
+
+            //windows下Path.Combine,得到的\\，不符号路径的要求。替换一下
+            //得到 路径与文件大小    assets/202005/fba73a0c-f2f7-499a-8ed8-5b10554d43b0.jpg
+            return Tuple.Create(Path.Combine(path, saveFileName).Replace("\\", "/"), len);
+        }
+
+        /// <summary>
+        /// 本地文件上传，秒传（根据lin_file表中的md5,与当前文件的路径是否在本地），如果不在，重新上传，覆盖文件表记录
+        /// </summary>
+        /// <param name="file"></param>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public async Task<FileDto> UploadAsync(IFormFile file, int key = 0)
+        {
+            string md5 = LinCmsUtils.GetHash<MD5>(file.OpenReadStream());
+            LinFile linFile = await _fileRepository.Where(r => r.Md5 == md5 && r.Type == 1).OrderByDescending(r => r.CreateTime).FirstAsync();
+
+            if (linFile != null && File.Exists(Path.Combine(_hostingEnv.WebRootPath, linFile.Path)))
             {
                 return new FileDto
                 {
                     Id = linFile.Id,
                     Key = "file_" + key,
                     Path = linFile.Path,
-                    Url = domainUrl+ fileDir + "/" + linFile.Path
+                    Url = _fileStorageOption.LocalFile.Host + linFile.Path
                 };
             }
 
-            string fileName = ContentDispositionHeaderValue.Parse(file.ContentDisposition).FileName.Trim().ToString();
-            string extension = Path.GetExtension(fileName);
-            string now = DateTime.Now.ToString("yyy/MM/dd");
-
-            string newSaveName = Guid.NewGuid() + extension;
-
-            string savePath = Path.Combine(_hostingEnv.WebRootPath, fileDir, now);
-
-            if (!Directory.Exists(savePath))
-            {
-                Directory.CreateDirectory(savePath);
-            }
+            long id;
 
-            long len;
+            var (path, len) = await this.LocalUploadAsync(file);
 
-            using (FileStream fs = File.Create(Path.Combine(savePath, newSaveName)))
-            {
-                file.CopyTo(fs);
-                len = fs.Length;
-                fs.Flush();
-            }
-
-            long id;
-            string path = Path.Combine(now, newSaveName).Replace("\\", "/");
             if (linFile == null)
             {
                 LinFile saveLinFile = new LinFile()
                 {
-                    Extension = Path.GetExtension(fileName),
+                    Extension = Path.GetExtension(file.FileName),
                     Md5 = md5,
-                    Name = fileName,
+                    Name = file.FileName,
                     Path = path,
                     Type = 1,
-                    CreateTime = DateTime.Now,
                     Size = len
                 };
-                id = _freeSql.Insert(saveLinFile).ExecuteIdentity();
+                id = (await _fileRepository.InsertAsync(saveLinFile)).Id;
             }
             else
             {
-                _freeSql.Update<LinFile>(linFile.Id).Set(a => a.Path, path).ExecuteAffrows();
+                linFile.Path = path;
+                await _fileRepository.UpdateAsync(linFile);
                 id = linFile.Id;
             }
 
             return new FileDto
             {
-                Id = (int)id,
+                Id = id,
                 Key = "file_" + key,
                 Path = path,
-                Url = domainUrl + "/" + fileDir + "/" + path
+                Url = _fileStorageOption.LocalFile.Host + path
             };
-
         }
     }
 }
diff --git a/src/LinCms.Application/Cms/Files/QiniuService.cs b/src/LinCms.Application/Cms/Files/QiniuService.cs
index 9f429334..64ec7d12 100644
--- a/src/LinCms.Application/Cms/Files/QiniuService.cs
+++ b/src/LinCms.Application/Cms/Files/QiniuService.cs
@@ -1,48 +1,74 @@
-using System;
-using System.IO;
-using System.Security.Cryptography;
-using LinCms.Application.Contracts.Cms.Files;
-using LinCms.Core.Common;
-using LinCms.Core.Entities;
-using LinCms.Core.Exceptions;
+using LinCms.Common;
+using LinCms.Data.Options;
+using LinCms.Entities;
+using LinCms.Exceptions;
+using LinCms.IRepositories;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Net.Http.Headers;
+using Microsoft.Extensions.Options;
 using Qiniu.Http;
 using Qiniu.Storage;
 using Qiniu.Util;
+using System;
+using System.IO;
+using System.Security.Cryptography;
+using System.Threading.Tasks;
 
-namespace LinCms.Application.Cms.Files
+namespace LinCms.Cms.Files
 {
     public class QiniuService : IFileService
     {
-        private readonly IConfiguration _configuration;
-        private readonly IFreeSql _freeSql;
+        private readonly IAuditBaseRepository<LinFile> _fileRepository;
+        private readonly FileStorageOption _fileStorageOption;
 
-        public QiniuService(IConfiguration configuration, IFreeSql freeSql)
+        public QiniuService(IAuditBaseRepository<LinFile> fileRepository, IOptions<FileStorageOption> fileStorageOption)
         {
-            _configuration = configuration;
-            _freeSql = freeSql;
+            _fileRepository = fileRepository;
+            _fileStorageOption = fileStorageOption.Value;
         }
 
         private string GetAccessToken()
         {
-            Mac mac = new Mac(_configuration[LinConsts.Qiniu.AK], _configuration[LinConsts.Qiniu.SK]);
-            PutPolicy putPolicy = new PutPolicy { Scope = _configuration[LinConsts.Qiniu.Bucket] };
+            Mac mac = new Mac(_fileStorageOption.Qiniu.AK, _fileStorageOption.Qiniu.SK);
+            PutPolicy putPolicy = new PutPolicy { Scope = _fileStorageOption.Qiniu.Bucket };
             return Auth.CreateUploadToken(mac, putPolicy.ToJsonString());
         }
 
         /// <summary>
-        /// 上传文件至七牛云
+        /// 七牛云上传 {PrefixPath}/{yyyyMM}/{guid}.文件后缀
+        /// </summary>
+        /// <param name="file"></param>
+        /// <returns></returns>
+        private string QiniuUpload(IFormFile file)
+        {
+            if (file.Length == 0)
+            {
+                throw new LinCmsException("文件为空");
+            }
+
+            FormUploader upload = new FormUploader(new Config()
+            {
+                Zone = Zone.ZONE_CN_South,
+                UseHttps = _fileStorageOption.Qiniu.UseHttps
+            });
+
+            string path = _fileStorageOption.Qiniu.PrefixPath + "/" + DateTime.Now.ToString("yyyyMM") + "/" + Guid.NewGuid() + Path.GetExtension(file.FileName);
+            using Stream stream = file.OpenReadStream();
+            HttpResult result = upload.UploadStream(stream, path, GetAccessToken(), null);
+            if (result.Code != (int)HttpCode.OK) throw new LinCmsException("上传失败");
+            return path;
+        }
+
+        /// <summary>
+        /// 上传文件至七牛云，如果本地存在这条记录，直接返回文件的信息
         /// </summary>
         /// <param name="file">单个文件</param>
         /// <param name="key"></param>
         /// <returns></returns>
-        public FileDto Upload(IFormFile file, int key = 0)
+        public async Task<FileDto> UploadAsync(IFormFile file, int key = 0)
         {
             string md5 = LinCmsUtils.GetHash<MD5>(file.OpenReadStream());
 
-            LinFile linFile = _freeSql.Select<LinFile>().Where(r => r.Md5 == md5 && r.Type == 2).First();
+            LinFile linFile = await _fileRepository.Where(r => r.Md5 == md5 && r.Type == 2).FirstAsync();
 
             if (linFile != null)
             {
@@ -51,67 +77,33 @@ public FileDto Upload(IFormFile file, int key = 0)
                     Id = linFile.Id,
                     Key = "file_" + key,
                     Path = linFile.Path,
-                    Url = _configuration[LinConsts.Qiniu.Host] + linFile.Path
+                    Url = _fileStorageOption.Qiniu.Host + linFile.Path
                 };
             }
 
-            string fileName = ContentDispositionHeaderValue
-                .Parse(file.ContentDisposition)
-                .FileName.Trim().ToString();
+            string path = this.QiniuUpload(file);
 
-            string extension = Path.GetExtension(fileName);
-
-            string path = this.UploadToQiniu(file);
-
-            long size = 0;
             LinFile saveLinFile = new LinFile()
             {
-                Extension = extension,
+                Extension = Path.GetExtension(file.FileName),
                 Md5 = md5,
-                Name = fileName,
+                Name = file.FileName,
                 Path = path,
                 Type = 2,
-                CreateTime = DateTime.Now,
-                Size = size
+                Size = file.Length,
             };
 
-            long id = _freeSql.Insert(saveLinFile).ExecuteIdentity();
+            long id = (await _fileRepository.InsertAsync(saveLinFile)).Id;
+
             return new FileDto
             {
-                Id = (int)id,
+                Id = id,
                 Key = "file_" + key,
                 Path = path,
-                Url = _configuration[LinConsts.Qiniu.Host] + path
+                Url = _fileStorageOption.Qiniu.Host + path
             };
 
         }
 
-
-        public string UploadToQiniu(IFormFile file)
-        {
-            if (file.Length == 0)
-            {
-                throw new LinCmsException("文件为空");
-            }
-
-            FormUploader upload = new FormUploader(new Config()
-            {
-                Zone = Zone.ZONE_CN_South,
-                UseHttps = _configuration[LinConsts.Qiniu.UseHttps].ToBoolean()
-            });
-
-            string fileName = ContentDispositionHeaderValue
-                .Parse(file.ContentDisposition)
-                .FileName.Trim().ToString();
-
-            string path = _configuration["Qiniu:PrefixPath"] + "/" + DateTime.Now.ToString("yyyyMMddHHmmssffffff") + Path.GetExtension(fileName);
-            Stream stream = file.OpenReadStream();
-            HttpResult result = upload.UploadStream(stream, path, GetAccessToken(), null);
-
-            if (result.Code != (int)HttpCode.OK) throw new LinCmsException("上传失败");
-
-            return path;
-
-        }
     }
 }
diff --git a/src/LinCms.Application/AutoMapper/Cms/GroupProfile.cs b/src/LinCms.Application/Cms/Groups/GroupProfile.cs
similarity index 69%
rename from src/LinCms.Application/AutoMapper/Cms/GroupProfile.cs
rename to src/LinCms.Application/Cms/Groups/GroupProfile.cs
index 46db63b5..f89f5de5 100644
--- a/src/LinCms.Application/AutoMapper/Cms/GroupProfile.cs
+++ b/src/LinCms.Application/Cms/Groups/GroupProfile.cs
@@ -1,8 +1,7 @@
 using AutoMapper;
-using LinCms.Application.Contracts.Cms.Groups;
-using LinCms.Core.Entities;
+using LinCms.Entities;
 
-namespace LinCms.Application.AutoMapper.Cms
+namespace LinCms.Cms.Groups
 {
     public class GroupProfile:Profile
     {
diff --git a/src/LinCms.Application/Cms/Groups/GroupService.cs b/src/LinCms.Application/Cms/Groups/GroupService.cs
index bddb5f18..b07a2a18 100644
--- a/src/LinCms.Application/Cms/Groups/GroupService.cs
+++ b/src/LinCms.Application/Cms/Groups/GroupService.cs
@@ -1,41 +1,46 @@
 using System.Collections.Generic;
+using System.Data.Common;
 using System.Linq;
 using System.Threading.Tasks;
-using AutoMapper;
-using LinCms.Application.Cms.Permissions;
-using LinCms.Application.Contracts.Cms.Groups;
-using LinCms.Core.Common;
-using LinCms.Core.Data.Enums;
-using LinCms.Core.Entities;
-using LinCms.Core.Exceptions;
-using LinCms.Core.Security;
-using LinCms.Infrastructure.Repositories;
+
+using FreeSql.Internal.ObjectPool;
+
+using LinCms.Aop.Attributes;
+using LinCms.Cms.Permissions;
+using LinCms.Common;
+using LinCms.Data.Enums;
+using LinCms.Entities;
+using LinCms.Exceptions;
+using LinCms.IRepositories;
+
 using Microsoft.AspNetCore.Http;
 
-namespace LinCms.Application.Cms.Groups
+namespace LinCms.Cms.Groups
 {
-    public class GroupService : IGroupService
+    public class GroupService : ApplicationService, IGroupService
     {
         private readonly IFreeSql _freeSql;
-        private readonly IMapper _mapper;
         private readonly IPermissionService _permissionService;
-        private readonly ICurrentUser _currentUser;
-        private readonly AuditBaseRepository<LinGroup> _groupRepository;
-        private readonly AuditBaseRepository<LinUserGroup> _userGroupRepository;
-        public GroupService(IFreeSql freeSql, IMapper mapper, IPermissionService permissionService, ICurrentUser currentUser, AuditBaseRepository<LinGroup> groupRepository, AuditBaseRepository<LinUserGroup> userGroupRepository)
+        private readonly IAuditBaseRepository<LinGroup, long> _groupRepository;
+        private readonly IAuditBaseRepository<LinUserGroup, long> _userGroupRepository;
+        private readonly IAuditBaseRepository<LinGroupPermission, long> _groupPermissionRepository;
+        public GroupService(IFreeSql freeSql,
+            IPermissionService permissionService,
+            IAuditBaseRepository<LinGroup, long> groupRepository,
+            IAuditBaseRepository<LinUserGroup, long> userGroupRepository,
+            IAuditBaseRepository<LinGroupPermission, long> groupPermissionRepository)
         {
             _freeSql = freeSql;
-            _mapper = mapper;
             _permissionService = permissionService;
-            _currentUser = currentUser;
             _groupRepository = groupRepository;
             _userGroupRepository = userGroupRepository;
+            _groupPermissionRepository = groupPermissionRepository;
         }
 
         public async Task<List<LinGroup>> GetListAsync()
         {
             List<LinGroup> linGroups = await _groupRepository.Select
-                .OrderByDescending(r => r.Id)
+                .OrderBy(r => r.SortCode)
                 .ToListAsync();
 
             return linGroups;
@@ -44,7 +49,7 @@ public async Task<List<LinGroup>> GetListAsync()
         public async Task<GroupDto> GetAsync(long id)
         {
             LinGroup group = await _groupRepository.Where(r => r.Id == id).FirstAsync();
-            GroupDto groupDto = _mapper.Map<GroupDto>(group);
+            GroupDto groupDto = Mapper.Map<GroupDto>(group);
             groupDto.Permissions = await _permissionService.GetPermissionByGroupIds(new List<long>() { id });
             return groupDto;
         }
@@ -59,17 +64,17 @@ public async Task CreateAsync(CreateGroupDto inputDto)
             bool exist = await _groupRepository.Select.AnyAsync(r => r.Name == inputDto.Name);
             if (exist)
             {
-                throw new LinCmsException("分组已存在，不可创建同名分组", ErrorCode.RepeatField);
+                throw new LinCmsException($"权限组标识符{inputDto.Name}已存在，不可创建同名权限组", ErrorCode.RepeatField);
             }
 
-            LinGroup linGroup = _mapper.Map<LinGroup>(inputDto);
+            LinGroup linGroup = Mapper.Map<LinGroup>(inputDto);
 
-            _freeSql.Transaction(() =>
+            using Object<DbConnection> conn = _freeSql.Ado.MasterPool.Get();
+            using DbTransaction transaction = await conn.Value.BeginTransactionAsync();
+            try
             {
-                long groupId = _freeSql.Insert(linGroup).ExecuteIdentity();
-
-                List<LinPermission> allPermissions = _freeSql.Select<LinPermission>().ToList();
-
+                long groupId = await _freeSql.Insert(linGroup).WithTransaction(transaction).ExecuteIdentityAsync();
+                List<LinPermission> allPermissions = await _freeSql.Select<LinPermission>().WithTransaction(transaction).ToListAsync();
                 List<LinGroupPermission> linPermissions = new List<LinGroupPermission>();
                 inputDto.PermissionIds.ForEach(r =>
                 {
@@ -81,17 +86,39 @@ public async Task CreateAsync(CreateGroupDto inputDto)
                     linPermissions.Add(new LinGroupPermission(groupId, pdDto.Id));
                 });
 
-                _freeSql.Insert<LinGroupPermission>().AppendData(linPermissions).ExecuteAffrows();
-            });
+                await _freeSql.Insert<LinGroupPermission>()
+                       .WithTransaction(transaction)
+                       .AppendData(linPermissions)
+                       .ExecuteAffrowsAsync();
+                await transaction.CommitAsync();
+            }
+            catch
+            {
+                await transaction.RollbackAsync();
+                throw;
+            }
         }
 
         public async Task UpdateAsync(long id, UpdateGroupDto updateGroupDto)
         {
-            await _freeSql.Update<LinGroup>(id).Set(a => new LinGroup()
+            LinGroup group = await _groupRepository.Where(r => r.Id == id).FirstAsync();
+
+            if (group.IsStatic)
+            {
+                if (group.Name != updateGroupDto.Name)
+                {
+                    throw new LinCmsException("静态权限组标识符不修改!");
+                }
+            }
+
+            bool anyName = await _groupRepository.Where(r => r.Name == updateGroupDto.Name && r.Id != id).AnyAsync();
+            if (anyName)
             {
-                Info = updateGroupDto.Info,
-                Name = updateGroupDto.Name
-            }).ExecuteAffrowsAsync();
+                throw new LinCmsException($"权限组标识符:{updateGroupDto.Name}已存在!", ErrorCode.RepeatField);
+            }
+
+            Mapper.Map(updateGroupDto, group);
+            await _groupRepository.UpdateAsync(group);
         }
 
         /// <summary>
@@ -99,6 +126,7 @@ public async Task UpdateAsync(long id, UpdateGroupDto updateGroupDto)
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
+        [Transactional]
         public async Task DeleteAsync(long id)
         {
             LinGroup linGroup = await _groupRepository.Where(r => r.Id == id).FirstAsync();
@@ -119,37 +147,42 @@ public async Task DeleteAsync(long id)
                 throw new LinCmsException("分组下存在用户，不可删除", ErrorCode.Inoperable);
             }
 
-            _freeSql.Transaction(() =>
-            {
-                //_freeSql.Select<LinGroupPermission>(new { GroupId = id }).ToDelete().ExecuteDeleted();
-                //_freeSql.Select<LinGroup>().Where(r => r.Id == id).ToDelete().ExecuteDeleted();
-                _freeSql.Delete<LinGroupPermission>(new LinGroupPermission { GroupId = id }).ExecuteDeleted();
-                _freeSql.Delete<LinGroup>(new LinGroup { Id = id }).ExecuteDeleted();
-            });
+            await _groupRepository.DeleteAsync(id);
+            await _groupPermissionRepository.DeleteAsync(r => r.GroupId == id);
+
+            //_freeSql.Transaction(() =>
+            //{
+            //    _freeSql.Delete<LinGroupPermission>(new LinGroupPermission { GroupId = id }).ExecuteAffrows();
+            //    _freeSql.Delete<LinGroup>(id).ExecuteAffrows();
+            //});
 
         }
 
+        [Transactional]
         public async Task DeleteUserGroupAsync(long userId)
         {
-            await _userGroupRepository.Where(r => r.UserId == userId).ToDelete().ExecuteAffrowsAsync();
+            await _userGroupRepository.DeleteAsync(r => r.UserId == userId);
         }
 
         public bool CheckIsRootByUserId(long userId)
         {
-            return _currentUser.IsInGroup(LinConsts.Group.Admin);
+            return CurrentUser.IsInGroup(LinConsts.Group.Admin);
         }
 
-        public List<long> GetUserGroupIdsByUserId(long userId)
+        public Task<List<long>> GetGroupIdsByUserIdAsync(long userId)
         {
-            return _userGroupRepository.Where(r => r.UserId == userId).ToList(r => r.GroupId);
+            return _userGroupRepository.Where(r => r.UserId == userId).ToListAsync(r => r.GroupId);
         }
 
-        public async Task DeleteUserGroupAsync(long userId, List<long> deleteGroupIds)
+        [Transactional]
+        public Task DeleteUserGroupAsync(long userId, List<long> deleteGroupIds)
         {
-            await _userGroupRepository.Where(r => r.UserId == userId && deleteGroupIds.Contains(r.GroupId)).ToDelete()
-                  .ExecuteAffrowsAsync();
+            if (deleteGroupIds == null || deleteGroupIds.IsEmpty())
+                return null;
+            return _userGroupRepository.DeleteAsync(r => r.UserId == userId && deleteGroupIds.Contains(r.GroupId));
         }
 
+        [Transactional]
         public async Task AddUserGroupAsync(long userId, List<long> addGroupIds)
         {
             if (addGroupIds == null || addGroupIds.IsEmpty())
@@ -161,26 +194,18 @@ public async Task AddUserGroupAsync(long userId, List<long> addGroupIds)
             }
             List<LinUserGroup> userGroups = new List<LinUserGroup>();
             addGroupIds.ForEach(groupId => { userGroups.Add(new LinUserGroup(userId, groupId)); });
-            await _freeSql.Insert(userGroups).ExecuteAffrowsAsync();
+            await _userGroupRepository.InsertAsync(userGroups);
         }
 
-        private async Task<bool> CheckGroupExistById(long id)
-        {
-            return await _groupRepository.Where(r => r.Id == id).AnyAsync();
-        }
 
-        private async Task<bool> CheckGroupExistByIds(List<long> ids)
+        /// <summary>
+        /// 检测新增的分组Id都存在系统中
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        private async Task<bool> CheckGroupExistByIds(List<long> addGroupIds)
         {
-            foreach (var id in ids)
-            {
-                bool valid = await CheckGroupExistById(id);
-                if (!valid)
-                {
-                    return false;
-                }
-            }
-
-            return true;
+            return (await _groupRepository.Where(r => addGroupIds.Contains(r.Id)).CountAsync()) == addGroupIds.Count;
         }
     }
 }
diff --git a/src/LinCms.Application/Cms/Groups/IGroupService.cs b/src/LinCms.Application/Cms/Groups/IGroupService.cs
deleted file mode 100644
index 97093a83..00000000
--- a/src/LinCms.Application/Cms/Groups/IGroupService.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Collections.Generic;
-using LinCms.Core.Entities;
-using System.Threading.Tasks;
-using LinCms.Application.Contracts.Cms.Groups;
-
-namespace LinCms.Application.Cms.Groups
-{
-    public interface IGroupService
-    {
-        Task<List<LinGroup>> GetListAsync();
-
-        Task<GroupDto> GetAsync(long id);
-
-        Task CreateAsync(CreateGroupDto inputDto);
-
-        Task UpdateAsync(long id, UpdateGroupDto inputDto);
-
-        /// <summary>
-        /// 管理员删除一个权限分组
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        Task DeleteAsync(long id);
-
-        Task DeleteUserGroupAsync(long userId);
-
-        bool CheckIsRootByUserId(long userId);
-
-        List<long> GetUserGroupIdsByUserId(long userId);
-
-        Task DeleteUserGroupAsync(long userId, List<long> deleteGroupIds);
-
-        Task AddUserGroupAsync(long userId, List<long> addGroupIds);
-
-    }
-}
diff --git a/src/LinCms.Application/Cms/Logs/LogService.cs b/src/LinCms.Application/Cms/Logs/LogService.cs
index 7d26e5ea..36ba1967 100644
--- a/src/LinCms.Application/Cms/Logs/LogService.cs
+++ b/src/LinCms.Application/Cms/Logs/LogService.cs
@@ -1,43 +1,40 @@
 using System;
 using System.Collections.Generic;
-using FreeSql;
-using LinCms.Application.Contracts.Cms.Logs;
-using LinCms.Core.Data;
-using LinCms.Core.Entities;
-using LinCms.Core.Extensions;
-using LinCms.Core.Security;
-using LinCms.Infrastructure.Repositories;
+using System.Threading.Tasks;
+using LinCms.Data;
+using LinCms.Entities;
+using LinCms.Extensions;
+using LinCms.IRepositories;
+using LinCms.Security;
 
-namespace LinCms.Application.Cms.Logs
+namespace LinCms.Cms.Logs
 {
-    public class LogService : ILogService
+    public class LogService :ApplicationService, ILogService
     {
-        private readonly BaseRepository<LinLog> _linLogRepository;
-        private readonly ICurrentUser _currentUser;
-        private readonly UserRepository _linUserAuditBaseRepository;
-        public LogService(BaseRepository<LinLog> linLogRepository, ICurrentUser currentUser, UserRepository linUserAuditBaseRepository)
+        private readonly IAuditBaseRepository<LinLog> _linLogRepository;
+        private readonly IUserRepository _linUserAuditBaseRepository;
+        public LogService(IAuditBaseRepository<LinLog> linLogRepository,IUserRepository linUserAuditBaseRepository)
         {
             _linLogRepository = linLogRepository;
-            _currentUser = currentUser;
             _linUserAuditBaseRepository = linUserAuditBaseRepository;
         }
 
-        public void CreateLog(LinLog linlog)
+        public async Task CreateAsync(LinLog linlog)
         {
-            linlog.Time = DateTime.Now;
-            linlog.UserName = _currentUser.UserName;
-            linlog.UserId = _currentUser.Id ?? 0;
+            linlog.CreateTime = DateTime.Now;
+            linlog.Username = CurrentUser.UserName;
+            linlog.UserId = CurrentUser.Id ?? 0;
 
-            _linLogRepository.Insert(linlog);
+            await _linLogRepository.InsertAsync(linlog);
         }
 
         public PagedResultDto<LinLog> GetUserLogs(LogSearchDto searchDto)
         {
             List<LinLog> linLogs = _linLogRepository.Select
                 .WhereIf(!string.IsNullOrEmpty(searchDto.Keyword), r => r.Message.Contains(searchDto.Keyword))
-                .WhereIf(!string.IsNullOrEmpty(searchDto.Name), r => r.UserName.Contains(searchDto.Name))
-                .WhereIf(searchDto.Start.HasValue, r => r.Time >= searchDto.Start.Value)
-                .WhereIf(searchDto.End.HasValue, r => r.Time <= searchDto.End.Value)
+                .WhereIf(!string.IsNullOrEmpty(searchDto.Name), r => r.Username.Contains(searchDto.Name))
+                .WhereIf(searchDto.Start.HasValue, r => r.CreateTime >= searchDto.Start.Value)
+                .WhereIf(searchDto.End.HasValue, r => r.CreateTime <= searchDto.End.Value)
                 .OrderByDescending(r => r.Id)
                 .ToPagerList(searchDto, out long totalCount);
 
@@ -48,10 +45,9 @@ public PagedResultDto<LinLog> GetUserLogs(LogSearchDto searchDto)
         public List<string> GetLoggedUsers(PageDto searchDto)
         {
             List<string> linLogs = _linLogRepository.Select
-                .Where(r => !string.IsNullOrEmpty(r.UserName))
-                .Select(r => r.UserName)
+                .Where(r => !string.IsNullOrEmpty(r.Username))
                 .Distinct()
-                .ToList();
+                .ToList(r => r.Username);
 
             return linLogs;
         }
@@ -64,7 +60,7 @@ public VisitLogUserDto GetUserAndVisits()
 
             long totalVisitsCount = _linLogRepository.Select.Count();
             long totalUserCount = _linUserAuditBaseRepository.Select.Count();
-            long monthVisitsCount = _linLogRepository.Select.Where(r => r.Time >= lastMonth && r.Time <= now).Count();
+            long monthVisitsCount = _linLogRepository.Select.Where(r => r.CreateTime >= lastMonth && r.CreateTime <= now).Count();
             long monthUserCount = _linUserAuditBaseRepository.Select.Where(r => r.CreateTime >= lastMonth && r.CreateTime <= now).Count();
 
             return new VisitLogUserDto()
diff --git a/src/LinCms.Application/Cms/Logs/SerilogService.cs b/src/LinCms.Application/Cms/Logs/SerilogService.cs
new file mode 100644
index 00000000..8a14b260
--- /dev/null
+++ b/src/LinCms.Application/Cms/Logs/SerilogService.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using FreeSql;
+using LinCms.Data;
+using LinCms.Entities;
+using LinCms.Extensions;
+
+namespace LinCms.Cms.Logs
+{
+    public class SerilogService : ISerilogService
+    {
+        private readonly IBaseRepository<SerilogDO> _serilogBaseRepository;
+
+        public SerilogService(IBaseRepository<SerilogDO> serilogBaseRepository)
+        {
+            _serilogBaseRepository = serilogBaseRepository;
+        }
+
+        public async Task<PagedResultDto<SerilogDO>> GetListAsync(SerilogSearchDto searchDto)
+        {
+            List<SerilogDO> serilogLists = await _serilogBaseRepository.Select
+                .WhereIf(searchDto.Start.HasValue, r => r.Timestamp >= searchDto.Start.Value)
+                .WhereIf(searchDto.End.HasValue, r => r.Timestamp <= searchDto.End.Value)
+                .WhereIf(!string.IsNullOrEmpty(searchDto.Keyword), r => r.Message.Contains(searchDto.Keyword))
+                .WhereIf(searchDto.LogLevel != null, r => r.Level == searchDto.LogLevel)
+                .OrderByDescending(r => r.Id)
+                .ToPagerListAsync(searchDto, out long count);
+            return new PagedResultDto<SerilogDO>(serilogLists, count);
+        }
+
+        public async Task<LogDashboard> GetLogDashboard()
+        {
+            DateTime now = DateTime.Now;
+
+            return new LogDashboard()
+            {
+                AllCount = await _serilogBaseRepository.Select.CountAsync(),
+                TodayCount = await _serilogBaseRepository.Select.Where(x => x.Timestamp >= now.Date && x.Timestamp <= now.Date.AddHours(23).AddMinutes(59).AddSeconds(59)).CountAsync(),
+                HourCount = await _serilogBaseRepository.Select.Where(x => x.Timestamp >= now.AddHours(-1) && x.Timestamp <= now).CountAsync(),
+                UniqueCount = await _serilogBaseRepository.Select.WithSql(@"select count(*) AS TOTAL from app_serilog group by message").CountAsync(),
+            };
+        }
+    }
+}
diff --git a/src/LinCms.Application/AutoMapper/Cms/PermissionProfile.cs b/src/LinCms.Application/Cms/Permissions/PermissionProfile.cs
similarity index 60%
rename from src/LinCms.Application/AutoMapper/Cms/PermissionProfile.cs
rename to src/LinCms.Application/Cms/Permissions/PermissionProfile.cs
index ff0dbab1..d448cc4d 100644
--- a/src/LinCms.Application/AutoMapper/Cms/PermissionProfile.cs
+++ b/src/LinCms.Application/Cms/Permissions/PermissionProfile.cs
@@ -1,8 +1,7 @@
 using AutoMapper;
-using LinCms.Application.Contracts.Cms.Permissions;
-using LinCms.Core.Entities;
+using LinCms.Entities;
 
-namespace LinCms.Application.AutoMapper.Cms
+namespace LinCms.Cms.Permissions
 {
     public class PermissionProfile : Profile
     {
diff --git a/src/LinCms.Application/Cms/Permissions/PermissionService.cs b/src/LinCms.Application/Cms/Permissions/PermissionService.cs
index f624489b..5ffb2c99 100644
--- a/src/LinCms.Application/Cms/Permissions/PermissionService.cs
+++ b/src/LinCms.Application/Cms/Permissions/PermissionService.cs
@@ -1,61 +1,78 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Dynamic;
 using System.Linq;
 using System.Threading.Tasks;
-using LinCms.Application.Contracts.Cms.Permissions;
-using LinCms.Core.Data;
-using LinCms.Core.Entities;
-using LinCms.Core.Security;
 
-namespace LinCms.Application.Cms.Permissions
+using LinCms.Data;
+using LinCms.Entities;
+using LinCms.IRepositories;
+
+namespace LinCms.Cms.Permissions
 {
-    public class PermissionService : IPermissionService
+    public class PermissionService : ApplicationService, IPermissionService
     {
-        private readonly IFreeSql _freeSql;
-        private readonly ICurrentUser _currentUser;
-        public PermissionService(IFreeSql freeSql, ICurrentUser currentUser)
+        private readonly IAuditBaseRepository<LinPermission, long> _permissionRepository;
+        private readonly IAuditBaseRepository<LinGroupPermission, long> _groupPermissionRepository;
+        public PermissionService(IAuditBaseRepository<LinPermission, long> permissionRepository, IAuditBaseRepository<LinGroupPermission, long> groupPermissionRepository)
         {
-            _freeSql = freeSql;
-            _currentUser = currentUser;
+            _permissionRepository = permissionRepository;
+            _groupPermissionRepository = groupPermissionRepository;
         }
 
+        public IDictionary<string, List<PermissionDto>> GetAllStructualPermissions()
+        {
+            return _permissionRepository.Select.ToList()
+                .GroupBy(r => r.Module)
+                .ToDictionary(
+                    group => group.Key,
+                    group =>
+                        Mapper.Map<List<PermissionDto>>(group.ToList())
+                );
 
-        public async Task<bool> CheckPermissionAsync(string permission)
+        }
+
+        /// <summary>
+        /// 检查当前登录的用户的分组权限
+        /// </summary>
+        /// <param name="permission"></param>
+        /// <returns></returns>
+        public async Task<bool> CheckPermissionAsync(string module, string permission)
         {
-            long[] groups = _currentUser.Groups;
+            long[] groups = CurrentUser.Groups;
 
-            LinPermission linPermission = await _freeSql.Select<LinPermission>().Where(r => r.Name == permission).FirstAsync();
+            LinPermission linPermission = await _permissionRepository.Where(r => r.Module == module && r.Name == permission).FirstAsync();
 
-            bool existPermission = await _freeSql.Select<LinGroupPermission>()
+            bool existPermission = await _groupPermissionRepository.Select
                 .AnyAsync(r => groups.Contains(r.GroupId) && r.PermissionId == linPermission.Id);
 
             return existPermission;
         }
-        public async Task DeletePermissionsAsync(RemovePermissionDto permissionDto)
+
+
+        public Task DeletePermissionsAsync(RemovePermissionDto permissionDto)
         {
-            await _freeSql.Delete<LinGroupPermission>()
-                .Where(r => permissionDto.PermissionIds.Contains(r.PermissionId) && r.GroupId == permissionDto.GroupId)
-                .ExecuteAffrowsAsync();
+            return _groupPermissionRepository.DeleteAsync(r =>
+                    permissionDto.PermissionIds.Contains(r.PermissionId) && r.GroupId == permissionDto.GroupId);
         }
 
-        public async Task DispatchPermissions(DispatchPermissionsDto permissionDto, List<PermissionDefinition> permissionDefinitions)
+        public Task DispatchPermissions(DispatchPermissionsDto permissionDto, List<PermissionDefinition> permissionDefinitions)
         {
             List<LinGroupPermission> linPermissions = new List<LinGroupPermission>();
             permissionDto.PermissionIds.ForEach(permissionId =>
             {
                 linPermissions.Add(new LinGroupPermission(permissionDto.GroupId, permissionId));
             });
-            await _freeSql.Insert(linPermissions).ExecuteAffrowsAsync();
+            return _groupPermissionRepository.InsertAsync(linPermissions);
         }
 
         public async Task<List<LinPermission>> GetPermissionByGroupIds(List<long> groupIds)
         {
-            List<long> permissionIds = _freeSql.Select<LinGroupPermission>()
+            List<long> permissionIds = _groupPermissionRepository
                 .Where(a => groupIds.Contains(a.GroupId))
                 .ToList(r => r.PermissionId);
 
-            List<LinPermission> listPermissions = await _freeSql
-                .Select<LinPermission>()
+            List<LinPermission> listPermissions = await _permissionRepository
                 .Where(a => permissionIds.Contains(a.Id))
                 .ToListAsync();
 
@@ -91,5 +108,40 @@ public List<IDictionary<string, object>> StructuringPermissions(List<LinPermissi
 
             return list;
         }
+
+        public Task<LinPermission> GetAsync(string permissionName)
+        {
+            return _permissionRepository.Where(r => r.Name == permissionName).FirstAsync();
+        }
+
+        public async Task<List<TreePermissionDto>> GetTreePermissionListAsync()
+        {
+            var permissions = await _permissionRepository.Select.ToListAsync();
+
+            List<TreePermissionDto> treePermissionDtos = permissions.GroupBy(r => r.Module).Select(r =>
+                      new TreePermissionDto
+                      {
+                          Rowkey = Guid.NewGuid().ToString(),
+                          Children = new List<TreePermissionDto>(),
+                          Name = r.Key,
+                      }).ToList();
+
+
+            foreach (var permission in treePermissionDtos)
+            {
+                var childrens = permissions.Where(u => u.Module == permission.Name)
+                    .Select(r => new TreePermissionDto
+                    {
+                        Rowkey = r.Id.ToString(),
+                        Name = r.Name,
+                        Router = r.Router,
+                        CreateTime = r.CreateTime
+                    })
+                    .ToList();
+                permission.Children = childrens;
+            }
+
+            return treePermissionDtos;
+        }
     }
 }
diff --git a/src/LinCms.Application/AutoMapper/Cms/SettingProfile.cs b/src/LinCms.Application/Cms/Settings/SettingProfile.cs
similarity index 65%
rename from src/LinCms.Application/AutoMapper/Cms/SettingProfile.cs
rename to src/LinCms.Application/Cms/Settings/SettingProfile.cs
index 3431484b..17ff4979 100644
--- a/src/LinCms.Application/AutoMapper/Cms/SettingProfile.cs
+++ b/src/LinCms.Application/Cms/Settings/SettingProfile.cs
@@ -1,8 +1,7 @@
 using AutoMapper;
-using LinCms.Application.Contracts.Cms.Settings;
-using LinCms.Core.Entities.Settings;
+using LinCms.Entities.Settings;
 
-namespace LinCms.Application.AutoMapper.Cms
+namespace LinCms.Cms.Settings
 {
     public class SettingProfile : Profile
     {
diff --git a/src/LinCms.Application/Cms/Settings/SettingService.cs b/src/LinCms.Application/Cms/Settings/SettingService.cs
index 2ea31895..b6627b43 100644
--- a/src/LinCms.Application/Cms/Settings/SettingService.cs
+++ b/src/LinCms.Application/Cms/Settings/SettingService.cs
@@ -1,31 +1,28 @@
-using System;
+using LinCms.Data;
+using LinCms.Entities.Settings;
+using LinCms.Exceptions;
+using LinCms.Extensions;
+using LinCms.IRepositories;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using AutoMapper;
-using LinCms.Application.Contracts.Cms.Settings;
-using LinCms.Core.Data;
-using LinCms.Core.Entities.Settings;
-using LinCms.Core.Exceptions;
-using LinCms.Core.Extensions;
-using LinCms.Infrastructure.Repositories;
-
-namespace LinCms.Application.Cms.Settings
+
+namespace LinCms.Cms.Settings
 {
-    public class SettingService : ISettingService
+    public class SettingService : ApplicationService, ISettingService
     {
-        private readonly IMapper _mapper;
-        private readonly SettingRepository _settingRepository;
+        private readonly ISettingRepository _settingRepository;
 
-        public SettingService(SettingRepository settingRepository, IMapper mapper)
+        public SettingService(ISettingRepository settingRepository)
         {
             _settingRepository = settingRepository;
-            _mapper = mapper;
         }
 
         public async Task Delete(string name, string providerName, string providerKey)
         {
-            LinSetting setting = await _settingRepository.FindAsync(name, providerName, providerKey); ;
+            LinSetting setting = await _settingRepository.FindAsync(name, providerName, providerKey);
+            ;
             if (setting != null)
             {
                 await _settingRepository.DeleteAsync(setting.Id);
@@ -36,7 +33,7 @@ public async Task<List<SettingDto>> GetListAsync(string providerName, string pro
         {
             var list = await _settingRepository.GetListAsync(providerName, providerName);
 
-            return _mapper.Map<List<SettingDto>>(list);
+            return Mapper.Map<List<SettingDto>>(list);
         }
 
         public async Task<string> GetOrNullAsync(string name, string providerName, string providerKey)
@@ -47,41 +44,47 @@ public async Task<string> GetOrNullAsync(string name, string providerName, strin
 
         public async Task SetAsync(CreateUpdateSettingDto createSetting)
         {
-            LinSetting setting = await _settingRepository.FindAsync(createSetting.Name, createSetting.ProviderName, createSetting.ProviderKey); ;
+            LinSetting setting = await _settingRepository.FindAsync(createSetting.Name, createSetting.ProviderName,
+                createSetting.ProviderKey);
+            ;
             if (setting == null)
             {
-                _settingRepository.Insert(_mapper.Map<LinSetting>(createSetting));
+                await _settingRepository.InsertAsync(Mapper.Map<LinSetting>(createSetting));
             }
             else
             {
                 setting.Value = createSetting.Value;
-                _settingRepository.Update(setting);
+                await _settingRepository.UpdateAsync(setting);
             }
         }
 
         public SettingDto Get(Guid id)
         {
-            return _mapper.Map<SettingDto>(_settingRepository.Get(id));
+            return Mapper.Map<SettingDto>(_settingRepository.Get(id));
         }
-        public PagedResultDto<SettingDto> GetPagedListAsync(PageDto pageDto)
+
+        public async Task<PagedResultDto<SettingDto>> GetPagedListAsync(PageDto pageDto)
         {
-            List<SettingDto> list = _settingRepository.Select.ToPagerList(pageDto, out long totalCount)
-                .Select(r => _mapper.Map<SettingDto>(r)).ToList();
+            List<SettingDto> list = (await _settingRepository.Select.ToPagerListAsync(pageDto, out long totalCount))
+                .Select(r => Mapper.Map<SettingDto>(r)).ToList();
 
             return new PagedResultDto<SettingDto>(list, totalCount);
         }
 
-        public async Task PostAsync(CreateUpdateSettingDto createSettingDto)
+        public async Task CreateAsync(CreateUpdateSettingDto createSettingDto)
         {
-            LinSetting setting = await _settingRepository.FindAsync(createSettingDto.Name, createSettingDto.ProviderName, createSettingDto.ProviderKey); ;
+            LinSetting setting = await _settingRepository.FindAsync(createSettingDto.Name,
+                createSettingDto.ProviderName, createSettingDto.ProviderKey);
+            ;
             if (setting != null)
             {
                 throw new LinCmsException("该配置已存在");
             }
-            await _settingRepository.InsertAsync(_mapper.Map<LinSetting>(createSettingDto));
+
+            await _settingRepository.InsertAsync(Mapper.Map<LinSetting>(createSettingDto));
         }
 
-        public async Task PutAsync(Guid id, CreateUpdateSettingDto updateSettingDto)
+        public async Task UpdateAsync(Guid id, CreateUpdateSettingDto updateSettingDto)
         {
             LinSetting setting = await _settingRepository.Select.Where(r => r.Id == id).ToOneAsync();
             if (setting == null)
@@ -90,7 +93,8 @@ public async Task PutAsync(Guid id, CreateUpdateSettingDto updateSettingDto)
             }
 
             LinSetting settingExist = await _settingRepository.Select
-                .Where(s => s.Name == updateSettingDto.Name && s.ProviderName == updateSettingDto.ProviderName && s.ProviderKey == updateSettingDto.ProviderKey && s.Id != id)
+                .Where(s => s.Name == updateSettingDto.Name && s.ProviderName == updateSettingDto.ProviderName &&
+                            s.ProviderKey == updateSettingDto.ProviderKey && s.Id != id)
                 .FirstAsync();
 
             if (settingExist != null)
@@ -98,7 +102,7 @@ public async Task PutAsync(Guid id, CreateUpdateSettingDto updateSettingDto)
                 throw new LinCmsException("该配置已存在");
             }
 
-            await _settingRepository.UpdateAsync(_mapper.Map(updateSettingDto, setting));
+            await _settingRepository.UpdateAsync(Mapper.Map(updateSettingDto, setting));
         }
     }
 }
diff --git a/src/LinCms.Application/Cms/Users/GiteeOAuth2Service.cs b/src/LinCms.Application/Cms/Users/GiteeOAuth2Service.cs
new file mode 100644
index 00000000..dbca4aa4
--- /dev/null
+++ b/src/LinCms.Application/Cms/Users/GiteeOAuth2Service.cs
@@ -0,0 +1,77 @@
+using AspNet.Security.OAuth.Gitee;
+using LinCms.Common;
+using LinCms.Data.Enums;
+using LinCms.Entities;
+using LinCms.IRepositories;
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading.Tasks;
+
+namespace LinCms.Cms.Users
+{
+    public class GiteeOAuth2Service : OAuthService, IOAuth2Service
+    {
+        private readonly IUserRepository _userRepository;
+        private readonly IAuditBaseRepository<LinUserIdentity> _userIdentityRepository;
+
+        public GiteeOAuth2Service(IAuditBaseRepository<LinUserIdentity> userIdentityRepository, IUserRepository userRepository) : base(userIdentityRepository)
+        {
+            _userIdentityRepository = userIdentityRepository;
+            _userRepository = userRepository;
+        }
+        public override async Task<long> SaveUserAsync(ClaimsPrincipal principal, string openId)
+        {
+
+            LinUserIdentity linUserIdentity = await _userIdentityRepository.Where(r => r.IdentityType == LinUserIdentity.Gitee && r.Credential == openId).FirstAsync();
+
+            long userId = 0;
+            if (linUserIdentity == null)
+            {
+
+                string email = principal.FindFirst(ClaimTypes.Email)?.Value;
+                string name = principal.FindFirst(ClaimTypes.Name)?.Value;
+
+                //string giteeUrl = principal.FindFirst(GiteeAuthenticationConstants.Claims.Url)?.Value;
+                string nickname = principal.FindFirst(GiteeAuthenticationConstants.Claims.Name)?.Value;
+
+                string avatarUrl = principal.FindFirst("urn:gitee:avatar_url")?.Value;
+                string blogAddress = principal.FindFirst("urn:gitee:blog")?.Value;
+                string bio = principal.FindFirst("urn:gitee:bio")?.Value;
+                string htmlUrl = principal.FindFirst("urn:gitee:html_url")?.Value;
+
+                LinUser user = new LinUser
+                {
+                    Active = UserActive.Active,
+                    Avatar = avatarUrl,
+                    LastLoginTime = DateTime.Now,
+                    Email = email,
+                    Introduction = bio + htmlUrl,
+                    LinUserGroups = new List<LinUserGroup>()
+                    {
+                        new LinUserGroup()
+                        {
+                            GroupId = LinConsts.Group.User
+                        }
+                    },
+                    Nickname = nickname,
+                    Username = "",
+                    BlogAddress = blogAddress,
+                    LinUserIdentitys = new List<LinUserIdentity>()
+                    {
+                        new LinUserIdentity(LinUserIdentity.Gitee,name,openId,DateTime.Now)
+                    }
+                };
+                await _userRepository.InsertAsync(user);
+                userId = user.Id;
+            }
+            else
+            {
+                userId = linUserIdentity.CreateUserId;
+            }
+
+            return userId;
+        }
+
+    }
+}
diff --git a/src/LinCms.Application/Cms/Users/GithubOAuth2Serivice.cs b/src/LinCms.Application/Cms/Users/GithubOAuth2Serivice.cs
new file mode 100644
index 00000000..a067b895
--- /dev/null
+++ b/src/LinCms.Application/Cms/Users/GithubOAuth2Serivice.cs
@@ -0,0 +1,81 @@
+using AspNet.Security.OAuth.GitHub;
+using LinCms.Common;
+using LinCms.Data.Enums;
+using LinCms.Entities;
+using LinCms.IRepositories;
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading.Tasks;
+
+namespace LinCms.Cms.Users
+{
+    public class GithubOAuth2Serivice : OAuthService, IOAuth2Service
+    {
+        private readonly IUserRepository _userRepository;
+        private readonly IAuditBaseRepository<LinUserIdentity> _userIdentityRepository;
+
+        public GithubOAuth2Serivice(IAuditBaseRepository<LinUserIdentity> userIdentityRepository, IUserRepository userRepository) : base(userIdentityRepository)
+        {
+            _userIdentityRepository = userIdentityRepository;
+            _userRepository = userRepository;
+        }
+
+
+        /// <summary>
+        /// 记录授权成功后的信息
+        /// </summary>
+        /// <param name="principal"></param>
+        /// <param name="openId"></param>
+        /// <returns></returns>
+        public override async Task<long> SaveUserAsync(ClaimsPrincipal principal, string openId)
+        {
+            LinUserIdentity linUserIdentity = await _userIdentityRepository.Where(r => r.IdentityType == LinUserIdentity.GitHub && r.Credential == openId).FirstAsync();
+
+            long userId = 0;
+            if (linUserIdentity == null)
+            {
+                string email = principal.FindFirst(ClaimTypes.Email)?.Value;
+                string name = principal.FindFirst(ClaimTypes.Name)?.Value;
+                string gitHubName = principal.FindFirst(GitHubAuthenticationConstants.Claims.Name)?.Value;
+                string gitHubApiUrl = principal.FindFirst(GitHubAuthenticationConstants.Claims.Url)?.Value;
+                string HtmlUrl = principal.FindFirst(LinConsts.Claims.HtmlUrl)?.Value;
+                string avatarUrl = principal.FindFirst(LinConsts.Claims.AvatarUrl)?.Value;
+                string bio = principal.FindFirst(LinConsts.Claims.BIO)?.Value;
+                string blogAddress = principal.FindFirst(LinConsts.Claims.BlogAddress)?.Value;
+
+                LinUser user = new LinUser
+                {
+                    Active = UserActive.Active,
+                    Avatar = avatarUrl,
+                    CreateTime = DateTime.Now,
+                    LastLoginTime = DateTime.Now,
+                    Email = email,
+                    Introduction = bio + HtmlUrl,
+                    LinUserGroups = new List<LinUserGroup>()
+                    {
+                        new LinUserGroup()
+                        {
+                            GroupId = LinConsts.Group.User
+                        }
+                    },
+                    Nickname = gitHubName,
+                    Username = "",
+                    BlogAddress = blogAddress,
+                    LinUserIdentitys = new List<LinUserIdentity>()
+                    {
+                        new LinUserIdentity(LinUserIdentity.GitHub,name,openId,DateTime.Now)
+                    }
+                };
+                await _userRepository.InsertAsync(user);
+                userId = user.Id;
+            }
+            else
+            {
+                userId = linUserIdentity.CreateUserId;
+            }
+
+            return userId;
+        }
+    }
+}
diff --git a/src/LinCms.Application/Cms/Users/IUserIdentityService.cs b/src/LinCms.Application/Cms/Users/IUserIdentityService.cs
deleted file mode 100644
index 7767ac31..00000000
--- a/src/LinCms.Application/Cms/Users/IUserIdentityService.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Security.Claims;
-using System.Threading.Tasks;
-
-namespace LinCms.Application.Cms.Users
-{
- 
-    public interface IUserIdentityService
-    {
-        Task<long> SaveGitHubAsync(ClaimsPrincipal principal, string openId);
-
-        /// <summary>
-        /// 验证用户密码是否正确
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <param name="username"></param>
-        /// <param name="password"></param>
-        /// <returns></returns>
-        bool VerifyUsernamePassword(long userId, string username, string password);
-       
-        /// <summary>
-        /// 修改某用户的密码
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <param name="newpassword"></param>
-        Task ChangePasswordAsync(long userId, string newpassword);
-
-        Task DeleteAsync(long userId);
-    }
-}
diff --git a/src/LinCms.Application/Cms/Users/QQOAuth2Service.cs b/src/LinCms.Application/Cms/Users/QQOAuth2Service.cs
new file mode 100644
index 00000000..df021105
--- /dev/null
+++ b/src/LinCms.Application/Cms/Users/QQOAuth2Service.cs
@@ -0,0 +1,81 @@
+using AspNet.Security.OAuth.QQ;
+using LinCms.Common;
+using LinCms.Data;
+using LinCms.Data.Enums;
+using LinCms.Entities;
+using LinCms.IRepositories;
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading.Tasks;
+
+namespace LinCms.Cms.Users
+{
+    public class QQOAuth2Service : OAuthService, IOAuth2Service
+    {
+        private readonly IUserRepository _userRepository;
+        private readonly IAuditBaseRepository<LinUserIdentity> _userIdentityRepository;
+
+        public QQOAuth2Service(IAuditBaseRepository<LinUserIdentity> userIdentityRepository, IUserRepository userRepository) : base(userIdentityRepository)
+        {
+            _userIdentityRepository = userIdentityRepository;
+            _userRepository = userRepository;
+        }
+
+        /// <summary>
+        /// qq快速登录的信息，唯一值openid,昵称(nickname)，性别(gender)，picture（30像素）,picture_medium(50像素），picture_full 100 像素，avatar（40像素），avatar_full(100像素）
+        /// </summary>
+        /// <param name="principal"></param>
+        /// <param name="openId"></param>
+        /// <returns></returns>
+        public override async Task<long> SaveUserAsync(ClaimsPrincipal principal, string openId)
+        {
+
+            LinUserIdentity linUserIdentity = await _userIdentityRepository.Where(r => r.IdentityType == LinUserIdentity.QQ && r.Credential == openId).FirstAsync();
+
+            long userId = 0;
+            if (linUserIdentity == null)
+            {
+
+                string nickname = principal.FindFirst(ClaimTypes.Name)?.Value ?? "默认昵称";
+                string gender = principal.FindFirst(ClaimTypes.Gender)?.Value;
+                string picture = principal.FindFirst(QQAuthenticationConstants.Claims.PictureUrl)?.Value;
+                string picture_medium = principal.FindFirst(QQAuthenticationConstants.Claims.PictureMediumUrl)?.Value;
+                string picture_full = principal.FindFirst(QQAuthenticationConstants.Claims.PictureFullUrl)?.Value;
+                string avatarUrl = principal.FindFirst(QQAuthenticationConstants.Claims.AvatarUrl)?.Value;
+                string avatarFullUrl = principal.FindFirst(QQAuthenticationConstants.Claims.AvatarFullUrl)?.Value;
+
+                LinUser user = new LinUser
+                {
+                    Active = UserActive.Active,
+                    Avatar = avatarFullUrl,
+                    LastLoginTime = DateTime.Now,
+                    Email = "",
+                    Introduction = "",
+                    LinUserGroups = new List<LinUserGroup>()
+                    {
+                        new LinUserGroup()
+                        {
+                            GroupId = LinConsts.Group.User
+                        }
+                    },
+                    Nickname = nickname,
+                    Username = "",
+                    BlogAddress = "",
+                    LinUserIdentitys = new List<LinUserIdentity>()
+                    {
+                        new LinUserIdentity(LinUserIdentity.QQ, nickname, openId,DateTime.Now)
+                    }
+                };
+                await _userRepository.InsertAsync(user);
+                userId = user.Id;
+            }
+            else
+            {
+                userId = linUserIdentity.CreateUserId;
+            }
+
+            return userId;
+        }
+    }
+}
diff --git a/src/LinCms.Application/Cms/Users/UserIdentityProfile.cs b/src/LinCms.Application/Cms/Users/UserIdentityProfile.cs
new file mode 100644
index 00000000..8e60d849
--- /dev/null
+++ b/src/LinCms.Application/Cms/Users/UserIdentityProfile.cs
@@ -0,0 +1,14 @@
+using AutoMapper;
+using LinCms.Entities;
+
+namespace LinCms.Cms.Users
+{
+    public class UserIdentityProfile : Profile
+    {
+        public UserIdentityProfile()
+        {
+            CreateMap<LinUserIdentity, UserIdentityDto>();
+
+        }
+    }
+}
diff --git a/src/LinCms.Application/Cms/Users/UserIdentityService.cs b/src/LinCms.Application/Cms/Users/UserIdentityService.cs
index ddf5dfda..499e3c44 100644
--- a/src/LinCms.Application/Cms/Users/UserIdentityService.cs
+++ b/src/LinCms.Application/Cms/Users/UserIdentityService.cs
@@ -1,113 +1,95 @@
 using System;
 using System.Collections.Generic;
-using System.Linq.Expressions;
-using System.Security.Claims;
+using System.Linq;
 using System.Threading.Tasks;
-using AspNet.Security.OAuth.GitHub;
-using LinCms.Core.Common;
-using LinCms.Core.Data.Enums;
-using LinCms.Core.Entities;
-using LinCms.Infrastructure.Repositories;
+using DotNetCore.Security;
+using LinCms.Aop.Attributes;
+using LinCms.Entities;
+using LinCms.Exceptions;
+using LinCms.IRepositories;
 
-namespace LinCms.Application.Cms.Users
+namespace LinCms.Cms.Users
 {
-    public class UserIdentityService : IUserIdentityService
+    public class UserIdentityService : ApplicationService, IUserIdentityService
     {
-        private readonly IFreeSql _freeSql;
-        private readonly UserRepository _userRepository;
-        public UserIdentityService(IFreeSql freeSql, UserRepository userRepository)
+        private readonly IAuditBaseRepository<LinUserIdentity> _userIdentityRepository;
+        private readonly ICryptographyService _cryptographyService;
+        public UserIdentityService(IAuditBaseRepository<LinUserIdentity> userIdentityRepository, ICryptographyService cryptographyService)
         {
-            _freeSql = freeSql;
-            _userRepository = userRepository;
+            _userIdentityRepository = userIdentityRepository;
+            _cryptographyService = cryptographyService;
         }
 
-        /// <summary>
-        /// 记录授权成功后的信息
-        /// </summary>
-        /// <param name="principal"></param>
-        /// <param name="openId"></param>
-        /// <returns></returns>
-        public async Task<long> SaveGitHubAsync(ClaimsPrincipal principal, string openId)
+        public async Task<bool> VerifyUserPasswordAsync(long userId, string password, string salt)
         {
-            string email = principal.FindFirst(ClaimTypes.Email)?.Value;
-            string name = principal.FindFirst(ClaimTypes.Name)?.Value;
-            string gitHubName = principal.FindFirst(GitHubAuthenticationConstants.Claims.Name)?.Value;
-            string gitHubApiUrl = principal.FindFirst(GitHubAuthenticationConstants.Claims.Url)?.Value;
-            string avatarUrl = principal.FindFirst(LinConsts.Claims.AvatarUrl)?.Value;
-            string bio = principal.FindFirst(LinConsts.Claims.BIO)?.Value;
-            string blogAddress = principal.FindFirst(LinConsts.Claims.BlogAddress)?.Value;
-            Expression<Func<LinUserIdentity, bool>> expression = r => r.IdentityType == LinUserIdentity.GitHub && r.Credential == openId;
+            LinUserIdentity userIdentity = await this.GetFirstByUserIdAsync(userId);
+            string encryptPassword = _cryptographyService.Encrypt(password, salt);
+            return userIdentity != null && userIdentity.Credential == encryptPassword;
+        }
+
+
+        public async Task ChangePasswordAsync(long userId, string newpassword, string salt)
+        {
+            var linUserIdentity = await this.GetFirstByUserIdAsync(userId); ;
+
+            await this.ChangePasswordAsync(linUserIdentity, newpassword, salt);
+        }
 
-            LinUserIdentity linUserIdentity = _freeSql.Select<LinUserIdentity>().Where(expression).First();
 
-            long userId = 0;
+        public Task ChangePasswordAsync(LinUserIdentity linUserIdentity, string newpassword, string salt)
+        {
+            string encryptPassword = _cryptographyService.Encrypt(newpassword, salt);
             if (linUserIdentity == null)
             {
-                LinUser user = new LinUser
-                {
-                    Admin = (int)UserAdmin.Common,
-                    Active = (int)UserActive.Active,
-                    Avatar = avatarUrl,
-                    CreateTime = DateTime.Now,
-                    LastLoginTime = DateTime.Now,
-                    Email = email,
-                    Introduction = bio,
-                    LinUserGroups = new List<LinUserGroup>()
-                    {
-                        new LinUserGroup()
-                        {
-                            GroupId = LinConsts.Group.User
-                        }
-                    },
-                    Nickname = gitHubName,
-                    Username = email,
-                    BlogAddress = blogAddress,
-                    LinUserIdentitys = new List<LinUserIdentity>()
-                    {
-                        new LinUserIdentity
-                        {
-                            CreateTime = DateTime.Now,
-                            Credential = openId,
-                            IdentityType = LinUserIdentity.GitHub,
-                            Identifier = name,
-                        }
-                    }
-                };
-                await _userRepository.InsertAsync(user);
-                userId = user.Id;
+                linUserIdentity = new LinUserIdentity(LinUserIdentity.Password, "", encryptPassword, DateTime.Now);
+                return _userIdentityRepository.InsertAsync(linUserIdentity);
             }
             else
             {
-                userId = linUserIdentity.CreateUserId;
-                await _userRepository.UpdateLastLoginTimeAsync(linUserIdentity.CreateUserId);
+                linUserIdentity.Credential = encryptPassword;
+                return _userIdentityRepository.UpdateAsync(linUserIdentity);
             }
-
-            return userId;
-
         }
 
-        public bool VerifyUsernamePassword(long userId, string username, string password)
+        [Transactional]
+        public Task DeleteAsync(long userId)
         {
-            LinUserIdentity userIdentity = _freeSql.Select<LinUserIdentity>()
-                .Where(r => r.CreateUserId == userId && r.Identifier == username)
-                .ToOne();
+            return _userIdentityRepository.Where(r => r.CreateUserId == userId).ToDelete().ExecuteAffrowsAsync();
+        }
 
-            return userIdentity != null && EncryptUtil.Verify(userIdentity.Credential, password);
+        public Task<LinUserIdentity> GetFirstByUserIdAsync(long userId)
+        {
+            return _userIdentityRepository
+                .Where(r => r.CreateUserId == userId && r.IdentityType == LinUserIdentity.Password)
+                .FirstAsync();
         }
 
-        public async Task ChangePasswordAsync(long userId, string newpassword)
+        public async Task<List<UserIdentityDto>> GetListAsync(long userId)
         {
-            string encryptPassword = EncryptUtil.Encrypt(newpassword);
+            List<LinUserIdentity> userIdentities = await _userIdentityRepository
+                .Where(r => r.CreateUserId == userId)
+                .ToListAsync();
 
-            await _freeSql.Update<LinUser>(userId).Set(a => new LinUser()
-            {
-                Password = encryptPassword
-            }).ExecuteAffrowsAsync();
+            return Mapper.Map<List<UserIdentityDto>>(userIdentities);
         }
 
-        public async Task DeleteAsync(long userId)
+        public async Task UnBind(Guid id)
         {
-            await _freeSql.Select<LinUserIdentity>().Where(r => r.CreateUserId == userId).ToDelete().ExecuteAffrowsAsync();
+            LinUserIdentity userIdentity = await _userIdentityRepository.GetAsync(id);
+            if (userIdentity == null || userIdentity.CreateUserId != CurrentUser.Id)
+            {
+                throw new LinCmsException("你无权解绑此账号");
+            }
+
+            List<LinUserIdentity> userIdentities = await _userIdentityRepository.Select.Where(r => r.CreateUserId == CurrentUser.Id).ToListAsync();
+
+            bool hasPwd = userIdentities.Where(r => r.IdentityType == LinUserIdentity.Password).Any();
+
+            if (!hasPwd && userIdentities.Count == 1)
+            {
+                throw new LinCmsException("你未设置密码，无法解绑最后一个第三方登录账号");
+            }
+            await _userIdentityRepository.DeleteAsync(userIdentity);
         }
     }
 }
diff --git a/src/LinCms.Application/AutoMapper/Cms/UserProfile.cs b/src/LinCms.Application/Cms/Users/UserProfile.cs
similarity index 68%
rename from src/LinCms.Application/AutoMapper/Cms/UserProfile.cs
rename to src/LinCms.Application/Cms/Users/UserProfile.cs
index 18680b64..e08534cb 100644
--- a/src/LinCms.Application/AutoMapper/Cms/UserProfile.cs
+++ b/src/LinCms.Application/Cms/Users/UserProfile.cs
@@ -1,10 +1,9 @@
 using AutoMapper;
-using LinCms.Application.Contracts.Cms.Account;
-using LinCms.Application.Contracts.Cms.Admins;
-using LinCms.Application.Contracts.Cms.Users;
-using LinCms.Core.Entities;
+using LinCms.Cms.Account;
+using LinCms.Cms.Admins;
+using LinCms.Entities;
 
-namespace LinCms.Application.AutoMapper.Cms
+namespace LinCms.Cms.Users
 {
     public class UserProfile : Profile
     {
diff --git a/src/LinCms.Application/Cms/Users/UserService.cs b/src/LinCms.Application/Cms/Users/UserService.cs
index 4ed8d6c4..349a55dd 100644
--- a/src/LinCms.Application/Cms/Users/UserService.cs
+++ b/src/LinCms.Application/Cms/Users/UserService.cs
@@ -1,110 +1,103 @@
-using System.Collections.Generic;
+using DotNetCore.Security;
+using LinCms.Aop.Attributes;
+using LinCms.Cms.Admins;
+using LinCms.Cms.Groups;
+using LinCms.Cms.Permissions;
+using LinCms.Common;
+using LinCms.Data;
+using LinCms.Data.Enums;
+using LinCms.Entities;
+using LinCms.Exceptions;
+using LinCms.Extensions;
+using LinCms.IRepositories;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using AutoMapper;
-using LinCms.Application.Cms.Groups;
-using LinCms.Application.Cms.Permissions;
-using LinCms.Application.Contracts.Cms.Admins;
-using LinCms.Application.Contracts.Cms.Groups;
-using LinCms.Application.Contracts.Cms.Users;
-using LinCms.Core.Common;
-using LinCms.Core.Data;
-using LinCms.Core.Data.Enums;
-using LinCms.Core.Entities;
-using LinCms.Core.Exceptions;
-using LinCms.Core.Extensions;
-using LinCms.Core.Security;
-using LinCms.Infrastructure.Repositories;
-
-namespace LinCms.Application.Cms.Users
+
+namespace LinCms.Cms.Users
 {
-    public class UserService : IUserService
+    public class UserService : ApplicationService, IUserService
     {
-        private readonly UserRepository _userRepository;
-        private readonly IFreeSql _freeSql;
-        private readonly IMapper _mapper;
-        private readonly ICurrentUser _currentUser;
+        private readonly IUserRepository _userRepository;
         private readonly IUserIdentityService _userIdentityService;
         private readonly IPermissionService _permissionService;
         private readonly IGroupService _groupService;
-
-        public UserService(UserRepository userRepository,
-            IFreeSql freeSql,
-            IMapper mapper,
-            ICurrentUser currentUser,
-            IUserIdentityService userIdentityService, IPermissionService permissionService, IGroupService groupService)
+        private readonly IFileRepository _fileRepository;
+        private readonly ICryptographyService _cryptographyService;
+        public UserService(IUserRepository userRepository,
+            IUserIdentityService userIdentityService,
+            IPermissionService permissionService, IGroupService groupService, IFileRepository fileRepository, ICryptographyService cryptographyService)
         {
             _userRepository = userRepository;
-            _freeSql = freeSql;
-            _mapper = mapper;
-            _currentUser = currentUser;
             _userIdentityService = userIdentityService;
             _permissionService = permissionService;
             _groupService = groupService;
+            _fileRepository = fileRepository;
+            _cryptographyService = cryptographyService;
         }
 
         public async Task ChangePasswordAsync(ChangePasswordDto passwordDto)
         {
-            long currentUserId = _currentUser.Id ?? 0;
-
-            bool valid = _userIdentityService.VerifyUsernamePassword(currentUserId, _currentUser.UserName, passwordDto.OldPassword);
-            if (valid)
+            long currentUserId = CurrentUser.Id ?? 0;
+            LinUser user = await _userRepository.Where(r => r.Id == currentUserId).FirstAsync();
+            bool valid = await _userIdentityService.VerifyUserPasswordAsync(currentUserId, passwordDto.OldPassword, user.Salt);
+            if (!valid)
             {
                 throw new LinCmsException("旧密码不正确");
             }
 
-            await _userIdentityService.ChangePasswordAsync(currentUserId, passwordDto.NewPassword);
+            await _userIdentityService.ChangePasswordAsync(user.Id, passwordDto.NewPassword, user.Salt);
         }
 
+        public Task<LinUser> GetUserAsync(string username)
+        {
+            return _userRepository.Where(r => r.Username == username).FirstAsync();
+        }
 
+        [Transactional]
         public async Task DeleteAsync(long userId)
         {
-            await _userRepository.DeleteAsync(r => r.Id == userId);
+            await _userRepository.DeleteAsync(new LinUser() { Id = userId });
             await _userIdentityService.DeleteAsync(userId);
             await _groupService.DeleteUserGroupAsync(userId);
         }
 
         public async Task ResetPasswordAsync(long id, ResetPasswordDto resetPasswordDto)
         {
-            bool userExist = await _userRepository.Where(r => r.Id == id).AnyAsync();
+            LinUser user = await _userRepository.Where(r => r.Id == id).FirstAsync();
 
-            if (userExist == false)
+            if (user == null)
             {
                 throw new LinCmsException("用户不存在", ErrorCode.NotFound);
             }
 
-            string confirmPassword = EncryptUtil.Encrypt(resetPasswordDto.ConfirmPassword);
-
-            await _freeSql.Update<LinUser>(id).Set(a => new LinUser()
-            {
-                Password = confirmPassword
-            }).ExecuteAffrowsAsync();
-
+            await _userIdentityService.ChangePasswordAsync(id, resetPasswordDto.ConfirmPassword, user.Salt);
         }
 
         public PagedResultDto<UserDto> GetUserListByGroupId(UserSearchDto searchDto)
         {
             List<UserDto> linUsers = _userRepository.Select
                 .IncludeMany(r => r.LinGroups)
-                .Where(r => r.Admin == (long)UserAdmin.Common)
-                .WhereIf(searchDto.GroupId != null, r => r.LinGroups.Any(u => u.Id == searchDto.GroupId))
+                .WhereIf(searchDto.GroupId != null, r => r.LinUserGroups.AsSelect().Any(u => u.GroupId == searchDto.GroupId))
                 .OrderByDescending(r => r.Id)
                 .ToPagerList(searchDto, out long totalCount)
                 .Select(r =>
                 {
-                    UserDto userDto = _mapper.Map<UserDto>(r);
-                    userDto.Groups = _mapper.Map<List<GroupDto>>(r.LinGroups);
+                    UserDto userDto = Mapper.Map<UserDto>(r);
+                    userDto.Groups = Mapper.Map<List<GroupDto>>(r.LinGroups);
                     return userDto;
                 }).ToList();
 
             return new PagedResultDto<UserDto>(linUsers, totalCount);
         }
 
-        public async Task Register(LinUser user, List<long> groupIds)
+        [Transactional]
+        public async Task CreateAsync(LinUser user, List<long> groupIds, string password)
         {
             if (!string.IsNullOrEmpty(user.Username))
             {
-                bool isRepeatName = _userRepository.Select.Any(r => r.Username == user.Username);
+                bool isRepeatName = await _userRepository.Select.AnyAsync(r => r.Username == user.Username);
 
                 if (isRepeatName)
                 {
@@ -114,16 +107,14 @@ public async Task Register(LinUser user, List<long> groupIds)
 
             if (!string.IsNullOrEmpty(user.Email.Trim()))
             {
-                var isRepeatEmail = _userRepository.Select.Any(r => r.Email == user.Email.Trim());
+                var isRepeatEmail = await _userRepository.Select.AnyAsync(r => r.Email == user.Email.Trim());
                 if (isRepeatEmail)
                 {
                     throw new LinCmsException("注册邮箱重复，请重新输入", ErrorCode.RepeatField);
                 }
             }
-
-            user.Active = UserActive.Active.GetHashCode();
-            user.Admin = UserAdmin.Common.GetHashCode();
-
+            user.Salt = Guid.NewGuid().ToString();
+            string encryptPassword = _cryptographyService.Encrypt(password, user.Salt);
             user.LinUserGroups = new List<LinUserGroup>();
             groupIds?.ForEach(groupId =>
             {
@@ -132,18 +123,11 @@ public async Task Register(LinUser user, List<long> groupIds)
                     GroupId = groupId
                 });
             });
-
             user.LinUserIdentitys = new List<LinUserIdentity>()
             {
-                new LinUserIdentity()
-                {
-                    IdentityType = LinUserIdentity.Password,
-                    Credential = EncryptUtil.Encrypt(user.Password),
-                    Identifier = user.Username
-                }
+                new LinUserIdentity(LinUserIdentity.Password,user.Username,encryptPassword,DateTime.Now)
             };
             await _userRepository.InsertAsync(user);
-
         }
 
         /// <summary>
@@ -152,6 +136,7 @@ public async Task Register(LinUser user, List<long> groupIds)
         /// <param name="id"></param>
         /// <param name="updateUserDto"></param>    
         /// <returns></returns>
+        [Transactional]
         public async Task UpdateAync(long id, UpdateUserDto updateUserDto)
         {
             LinUser linUser = await _userRepository.Where(r => r.Id == id).ToOneAsync();
@@ -160,21 +145,39 @@ public async Task UpdateAync(long id, UpdateUserDto updateUserDto)
                 throw new LinCmsException("用户不存在", ErrorCode.NotFound);
             }
 
-            _mapper.Map(updateUserDto, linUser);
+            if (!string.IsNullOrEmpty(updateUserDto.Username))
+            {
+                bool isRepeatName = await _userRepository.Select.AnyAsync(r => r.Username == updateUserDto.Username && r.Id != id);
+
+                if (isRepeatName)
+                {
+                    throw new LinCmsException("用户名重复，请重新输入", ErrorCode.RepeatField);
+                }
+            }
+
+            if (!string.IsNullOrEmpty(updateUserDto.Email?.Trim()))
+            {
+                var isRepeatEmail = await _userRepository.Select.AnyAsync(r => r.Email == updateUserDto.Email.Trim() && r.Id != id);
+                if (isRepeatEmail)
+                {
+                    throw new LinCmsException("注册邮箱重复，请重新输入", ErrorCode.RepeatField);
+                }
+            }
 
-            List<long> existGroupIds = _groupService.GetUserGroupIdsByUserId(id);
+            List<long> existGroupIds = await _groupService.GetGroupIdsByUserIdAsync(id);
 
             //删除existGroupIds有，而newGroupIds没有的
             List<long> deleteIds = existGroupIds.Where(r => !updateUserDto.GroupIds.Contains(r)).ToList();
+
             //添加newGroupIds有，而existGroupIds没有的
             List<long> addIds = updateUserDto.GroupIds.Where(r => !existGroupIds.Contains(r)).ToList();
 
+            Mapper.Map(updateUserDto, linUser);
             await _userRepository.UpdateAsync(linUser);
             await _groupService.DeleteUserGroupAsync(id, deleteIds);
             await _groupService.AddUserGroupAsync(id, addIds);
         }
 
-
         public async Task ChangeStatusAsync(long id, UserActive userActive)
         {
             LinUser user = await _userRepository.Select.Where(r => r.Id == id).ToOneAsync();
@@ -188,24 +191,25 @@ public async Task ChangeStatusAsync(long id, UserActive userActive)
             {
                 throw new LinCmsException("当前用户已处于禁止状态");
             }
+
             if (!user.IsActive() && userActive == UserActive.NotActive)
             {
                 throw new LinCmsException("当前用户已处于激活状态");
             }
 
-            await _freeSql.Update<LinUser>(id).Set(a => new LinUser()
-            {
-                Active = userActive.GetHashCode()
-            }).ExecuteAffrowsAsync();
+            await _userRepository.UpdateDiy.Where(r => r.Id == id)
+                                           .Set(r => new { Active = userActive.GetHashCode() })
+                                           .ExecuteUpdatedAsync();
         }
 
-        public LinUser GetCurrentUser()
+        public Task<LinUser> GetCurrentUserAsync()
         {
-            if (_currentUser.Id != null)
+            if (CurrentUser.Id != null)
             {
-                long userId = (long)_currentUser.Id;
-                return _userRepository.Select.Where(r => r.Id == userId).ToOne();
+                long userId = (long)CurrentUser.Id;
+                return _userRepository.Select.Where(r => r.Id == userId).ToOneAsync();
             }
+
             return null;
         }
 
@@ -213,11 +217,11 @@ public async Task<UserInformation> GetInformationAsync(long userId)
         {
             LinUser linUser = await _userRepository.GetUserAsync(r => r.Id == userId);
             if (linUser == null) return null;
-            linUser.Avatar = _currentUser.GetFileUrl(linUser.Avatar);
+            linUser.Avatar = _fileRepository.GetFileUrl(linUser.Avatar);
 
-            UserInformation userInformation = _mapper.Map<UserInformation>(linUser);
-            userInformation.Groups = linUser.LinGroups.Select(r => _mapper.Map<GroupDto>(r)).ToList();
-            userInformation.Admin = _currentUser.IsInGroup(LinConsts.Group.Admin);
+            UserInformation userInformation = Mapper.Map<UserInformation>(linUser);
+            userInformation.Groups = linUser.LinGroups.Select(r => Mapper.Map<GroupDto>(r)).ToList();
+            userInformation.Admin = CurrentUser.IsInGroup(LinConsts.Group.Admin);
 
             return userInformation;
         }
@@ -241,7 +245,9 @@ public async Task<List<LinPermission>> GetUserPermissions(long userId)
             {
                 return new List<LinPermission>();
             }
+
             return await _permissionService.GetPermissionByGroupIds(groupIds);
         }
+
     }
 }
diff --git a/src/LinCms.Application/CrudAppService.cs b/src/LinCms.Application/CrudAppService.cs
new file mode 100644
index 00000000..e8f3d6b1
--- /dev/null
+++ b/src/LinCms.Application/CrudAppService.cs
@@ -0,0 +1,113 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using FreeSql;
+using LinCms.Data;
+using LinCms.Entities;
+using LinCms.IRepositories;
+
+namespace LinCms
+{
+    public abstract class CrudAppService<TEntity, TGetOutputDto, TGetListOutputDto, TKey, TGetListInput, TCreateInput,
+            TUpdateInput>
+        : ApplicationService,ICrudAppService<TGetOutputDto, TGetListOutputDto, TKey, TGetListInput, TCreateInput, TUpdateInput>
+        where TEntity : class, IEntity<TKey>
+        where TGetOutputDto : IEntityDto<TKey>
+        where TGetListOutputDto : IEntityDto<TKey>
+    {
+        protected  IAuditBaseRepository<TEntity, TKey> Repository { get; }
+
+        protected CrudAppService(IAuditBaseRepository<TEntity, TKey>repository)
+        {
+            Repository = repository;
+        }
+
+        protected virtual ISelect<TEntity> CreateFilteredQuery(TGetListInput input)
+        {
+            return Repository.Select;
+        }
+
+        protected virtual TGetListOutputDto MapToGetListOutputDto(TEntity entity)
+        {
+            return Mapper.Map<TEntity, TGetListOutputDto>(entity);
+        }
+
+        protected virtual ISelect<TEntity> ApplyPaging(ISelect<TEntity> query, TGetListInput input)
+        {
+            //Try to use paging if available
+            if (input is IPageDto pageDto)
+            {
+                return query.Page(pageDto.Page + 1, pageDto.Count);
+            }
+
+            //No paging
+            return query;
+        }
+
+        /// <summary>
+        /// Should apply sorting if needed.
+        /// </summary>
+        /// <param name="query">The query.</param>
+        /// <param name="input">The input.</param>
+        protected virtual ISelect<TEntity> ApplySorting(ISelect<TEntity> query, TGetListInput input)
+        {
+            //Try to sort query if available
+            if (input is ISortedResultRequest sortInput)
+            {
+                if (!sortInput.Sorting.IsNullOrWhiteSpace())
+                {
+                    return query.OrderBy(sortInput.Sorting);
+                }
+            }
+
+            //IQueryable.Task requires sorting, so we should sort if Take will be used.
+            if (input is ILimitedResultRequest)
+            {
+                return query.OrderByDescending(e => e.Id);
+            }
+
+            //No sorting
+            return query;
+        }
+
+        public virtual async Task<PagedResultDto<TGetListOutputDto>> GetListAsync(TGetListInput input)
+        {
+            var select = CreateFilteredQuery(input);
+            long totalCount = await select.CountAsync();
+            ApplySorting(select, input);
+            List<TEntity> entities = await ApplyPaging(select, input).ToListAsync();
+            return new PagedResultDto<TGetListOutputDto>(entities.Select(MapToGetListOutputDto).ToList(), totalCount);
+        }
+
+        public virtual async Task<TGetOutputDto> GetAsync(TKey id)
+        {
+            TEntity entity = await Repository.GetAsync(id);
+            return Mapper.Map<TGetOutputDto>(entity);
+        }
+
+        public virtual async Task<TGetOutputDto> CreateAsync(TCreateInput createInput)
+        {
+            TEntity entity = Mapper.Map<TEntity>(createInput);
+            await Repository.InsertAsync(entity);
+            return Mapper.Map<TGetOutputDto>(entity);
+        }
+
+        public virtual async Task<TGetOutputDto> UpdateAsync(TKey id, TUpdateInput updateInput)
+        {
+            TEntity entity = await GetEntityByIdAsync(id);
+            Mapper.Map(updateInput, entity);
+            await Repository.UpdateAsync(entity);
+            return Mapper.Map<TGetOutputDto>(entity);
+        }
+
+        public virtual async Task DeleteAsync(TKey id)
+        {
+            await Repository.DeleteAsync(id);
+        }
+
+        protected virtual async Task<TEntity> GetEntityByIdAsync(TKey id)
+        {
+            return await Repository.GetAsync(id);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Application/IAppService.cs b/src/LinCms.Application/IAppService.cs
deleted file mode 100644
index fd5aa88f..00000000
--- a/src/LinCms.Application/IAppService.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace LinCms.Application
-{
-    public interface IAppService
-    {
-    }
-}
diff --git a/src/LinCms.Application/LinCms.Application.csproj b/src/LinCms.Application/LinCms.Application.csproj
index c926aeb1..96d38351 100644
--- a/src/LinCms.Application/LinCms.Application.csproj
+++ b/src/LinCms.Application/LinCms.Application.csproj
@@ -1,20 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
+		<AssemblyName>LinCms.Application</AssemblyName>
+		<RootNamespace>LinCms</RootNamespace>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="AspNet.Security.OAuth.GitHub" Version="3.0.0" />
-    <PackageReference Include="AutoMapper" Version="9.0.0" />
-    <PackageReference Include="DotNetCore.CAP" Version="3.0.2" />
-    <PackageReference Include="MQiniu.Core" Version="1.0.1" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="AspNet.Security.OAuth.Gitee" Version="5.0.8" />
+		<PackageReference Include="AspNet.Security.OAuth.GitHub" Version="5.0.8" />
+		<PackageReference Include="AspNet.Security.OAuth.QQ" Version="5.0.8" />
+		<PackageReference Include="AutoMapper" Version="10.1.1" />
+		<PackageReference Include="DotNetCore.CAP.MySql" Version="5.1.1" />
+		<!--<PackageReference Include="DotNetCore.CAP.SqlServer" Version="3.1.2" />-->
+		<PackageReference Include="IdentityServer4" Version="4.1.2" />
+		<PackageReference Include="DotNetCore.CAP" Version="5.1.1" />
+		<PackageReference Include="IdentityModel" Version="5.1.0" />
+		<PackageReference Include="MQiniu.Core" Version="1.0.1" />
+		<PackageReference Include="Caching.CSRedis" Version="3.6.60" />
+		<PackageReference Include="CSRedisCore" Version="3.6.6" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\LinCms.Application.Contracts\LinCms.Application.Contracts.csproj" />
-    <ProjectReference Include="..\LinCms.Core\LinCms.Core.csproj" />
-    <ProjectReference Include="..\LinCms.Infrastructure\LinCms.Infrastructure.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\LinCms.Application.Contracts\LinCms.Application.Contracts.csproj" />
+		<ProjectReference Include="..\LinCms.Core\LinCms.Core.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/src/LinCms.Application/AutoMapper/Blog/BookProfile.cs b/src/LinCms.Application/v1/Books/BookProfile.cs
similarity index 64%
rename from src/LinCms.Application/AutoMapper/Blog/BookProfile.cs
rename to src/LinCms.Application/v1/Books/BookProfile.cs
index e72a9829..4b3b831c 100644
--- a/src/LinCms.Application/AutoMapper/Blog/BookProfile.cs
+++ b/src/LinCms.Application/v1/Books/BookProfile.cs
@@ -1,8 +1,7 @@
 using AutoMapper;
-using LinCms.Application.Contracts.v1.Books;
-using LinCms.Core.Entities;
+using LinCms.Entities;
 
-namespace LinCms.Application.AutoMapper.Blog
+namespace LinCms.v1.Books
 {
     public class BookProfile:Profile
     {
diff --git a/src/LinCms.Application/v1/Books/BookService.cs b/src/LinCms.Application/v1/Books/BookService.cs
new file mode 100644
index 00000000..902b0b9b
--- /dev/null
+++ b/src/LinCms.Application/v1/Books/BookService.cs
@@ -0,0 +1,78 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+using LinCms.Data;
+using LinCms.Entities;
+using LinCms.Exceptions;
+using LinCms.Extensions;
+using LinCms.IRepositories;
+
+namespace LinCms.v1.Books
+{
+    public class BookService : ApplicationService, IBookService
+    {
+        private readonly IAuditBaseRepository<Book> _bookRepository;
+        public BookService(IAuditBaseRepository<Book> bookRepository)
+        {
+            _bookRepository = bookRepository;
+        }
+
+        public async Task CreateAsync(CreateUpdateBookDto createBook)
+        {
+            bool exist = _bookRepository.Select.Any(r => r.Title == createBook.Title);
+            if (exist)
+            {
+                throw new LinCmsException("图书已存在");
+            }
+
+            Book book = Mapper.Map<Book>(createBook);
+            await _bookRepository.InsertAsync(book);
+        }
+
+        public Task DeleteAsync(long id)
+        {
+            return _bookRepository.DeleteAsync(new Book { Id = id });
+        }
+
+        public async Task<BookDto> GetAsync(long id)
+        {
+            Book book = await _bookRepository.Select.Where(a => a.Id == id).ToOneAsync();
+            return Mapper.Map<BookDto>(book);
+        }
+
+        public async Task<PagedResultDto<BookDto>> GetListAsync(PageDto pageDto)
+        {
+            List<BookDto> items = (await _bookRepository.Select.OrderByDescending(r => r.Id)
+                        .ToPagerListAsync(pageDto, out long count)).Select(r => Mapper.Map<BookDto>(r)).ToList();
+
+            return new PagedResultDto<BookDto>(items, count);
+        }
+
+        public async Task UpdateAsync(long id, CreateUpdateBookDto updateBook)
+        {
+            Book book = await _bookRepository.Select.Where(r => r.Id == id).ToOneAsync();
+            if (book == null)
+            {
+                throw new LinCmsException("没有找到相关书籍");
+            }
+
+            bool exist = await _bookRepository.Select.AnyAsync(r => r.Title == updateBook.Title && r.Id != id);
+            if (exist)
+            {
+                throw new LinCmsException("图书已存在");
+            }
+
+            //book.Image = updateBook.Image;
+            //book.Title = updateBook.Title;
+            //book.Author = updateBook.Author;
+            //book.Summary = updateBook.Summary;
+            //book.Summary = updateBook.Summary;
+
+            //使用AutoMapper方法简化类与类之间的转换过程
+            Mapper.Map(updateBook, book);
+
+            await _bookRepository.UpdateAsync(book);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Core/Aop/Attributes/CacheableAttribute.cs b/src/LinCms.Core/Aop/Attributes/CacheableAttribute.cs
new file mode 100644
index 00000000..f1ed3270
--- /dev/null
+++ b/src/LinCms.Core/Aop/Attributes/CacheableAttribute.cs
@@ -0,0 +1,21 @@
+using System;
+
+namespace LinCms.Aop.Attributes
+{
+    [AttributeUsage(AttributeTargets.Method)]
+    public class CacheableAttribute : Attribute
+    {
+        public CacheableAttribute()
+        {
+        }
+
+        public CacheableAttribute(string cacheKey)
+        {
+            CacheKey = cacheKey;
+        }
+
+        public string CacheKey { get; set; }
+
+
+    }
+}
diff --git a/src/LinCms.Core/Aop/DisableAuditingAttribute.cs b/src/LinCms.Core/Aop/Attributes/DisableAuditingAttribute.cs
similarity index 85%
rename from src/LinCms.Core/Aop/DisableAuditingAttribute.cs
rename to src/LinCms.Core/Aop/Attributes/DisableAuditingAttribute.cs
index b13f20a4..3aa723c3 100644
--- a/src/LinCms.Core/Aop/DisableAuditingAttribute.cs
+++ b/src/LinCms.Core/Aop/Attributes/DisableAuditingAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace LinCms.Core.Aop
+namespace LinCms.Aop.Attributes
 {
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method | AttributeTargets.Property)]
     public class DisableAuditingAttribute : Attribute
diff --git a/src/LinCms.Core/Aop/IgnoreMemberAttribute.cs b/src/LinCms.Core/Aop/Attributes/IgnoreMemberAttribute.cs
similarity index 86%
rename from src/LinCms.Core/Aop/IgnoreMemberAttribute.cs
rename to src/LinCms.Core/Aop/Attributes/IgnoreMemberAttribute.cs
index 1c055082..2a348225 100644
--- a/src/LinCms.Core/Aop/IgnoreMemberAttribute.cs
+++ b/src/LinCms.Core/Aop/Attributes/IgnoreMemberAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace LinCms.Core.Aop
+namespace LinCms.Aop.Attributes
 {
     // source: https://github.com/jhewlett/ValueObject
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
diff --git a/src/LinCms.Core/Aop/AuditingLogAttribute.cs b/src/LinCms.Core/Aop/Attributes/LoggerAttribute.cs
similarity index 63%
rename from src/LinCms.Core/Aop/AuditingLogAttribute.cs
rename to src/LinCms.Core/Aop/Attributes/LoggerAttribute.cs
index 8f4e76b0..bafb5849 100644
--- a/src/LinCms.Core/Aop/AuditingLogAttribute.cs
+++ b/src/LinCms.Core/Aop/Attributes/LoggerAttribute.cs
@@ -1,13 +1,13 @@
 using System;
 
-namespace LinCms.Core.Aop
+namespace LinCms.Aop.Attributes
 {
     [AttributeUsage(AttributeTargets.Method)]
-    public class AuditingLogAttribute : Attribute
+    public class LoggerAttribute : Attribute
     {
         public string Template { get; }
 
-        public AuditingLogAttribute(string template)
+        public LoggerAttribute(string template)
         {
             Template = template ?? throw new ArgumentNullException(nameof(template));
         }
diff --git a/src/LinCms.Core/Aop/Attributes/TransactionalAttribute.cs b/src/LinCms.Core/Aop/Attributes/TransactionalAttribute.cs
new file mode 100644
index 00000000..5949fab1
--- /dev/null
+++ b/src/LinCms.Core/Aop/Attributes/TransactionalAttribute.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Data;
+using FreeSql;
+
+namespace LinCms.Aop.Attributes
+{
+    /// <summary>
+    /// 事务
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Method, Inherited = true)]
+    public class TransactionalAttribute : Attribute
+    {
+        /// <summary>
+        /// 事务传播方式
+        /// </summary>
+        public Propagation Propagation { get; set; } = Propagation.Required;
+
+        /// <summary>
+        /// 事务隔离级别
+        /// </summary>
+        public IsolationLevel? IsolationLevel { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Core/Aop/Filter/LinCmsAuthorizeAttribute.cs b/src/LinCms.Core/Aop/Filter/LinCmsAuthorizeAttribute.cs
new file mode 100644
index 00000000..bcbfcaa5
--- /dev/null
+++ b/src/LinCms.Core/Aop/Filter/LinCmsAuthorizeAttribute.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Threading.Tasks;
+using LinCms.Data.Authorization;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace LinCms.Aop.Filter
+{
+    /// <summary>
+    ///  自定义固定权限编码给动态角色及用户，支持验证登录，退出登录，权限。
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)]
+    public class LinCmsAuthorizeAttribute : Attribute, IAsyncAuthorizationFilter
+    {
+        public string Permission { get; }
+        public string Module { get; }
+
+        public LinCmsAuthorizeAttribute(string permission, string module)
+        {
+            Permission = permission;
+            Module = module;
+        }
+
+        public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
+        {
+            //ICurrentUser currentUser = (ICurrentUser)context.HttpContext.RequestServices.GetService(typeof(ICurrentUser));
+            //if (currentUser.IsInGroup(LinConsts.Group.Admin))
+            //{
+            //    return;
+            //}
+
+            IAuthorizationService authorizationService = (IAuthorizationService)context.HttpContext.RequestServices.GetService(typeof(IAuthorizationService));
+            AuthorizationResult validJti = await authorizationService.AuthorizeAsync(context.HttpContext.User, context, new ValidJtiRequirement());
+            if (!validJti.Succeeded)
+            {
+                return;
+            }
+
+            await authorizationService.AuthorizeAsync(context.HttpContext.User, context,new ModuleAuthorizationRequirement(Module,Permission));
+        }
+
+        public override string ToString()
+        {
+            return $"\"{base.ToString()}\",\"Permission:{Permission}\",\"Module:{Module}\",";
+        }
+    }
+}
diff --git a/src/LinCms.Core/Aop/LinCmsExceptionFilter.cs b/src/LinCms.Core/Aop/Filter/LinCmsExceptionFilter.cs
similarity index 70%
rename from src/LinCms.Core/Aop/LinCmsExceptionFilter.cs
rename to src/LinCms.Core/Aop/Filter/LinCmsExceptionFilter.cs
index 97f767c4..97a93965 100644
--- a/src/LinCms.Core/Aop/LinCmsExceptionFilter.cs
+++ b/src/LinCms.Core/Aop/Filter/LinCmsExceptionFilter.cs
@@ -1,21 +1,22 @@
 using System;
-using LinCms.Core.Common;
-using LinCms.Core.Data;
-using LinCms.Core.Data.Enums;
-using LinCms.Core.Exceptions;
+using LinCms.Common;
+using LinCms.Data;
+using LinCms.Data.Enums;
+using LinCms.Exceptions;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
 
-namespace LinCms.Core.Aop
+namespace LinCms.Aop.Filter
 {
     /// <summary>
     /// 出现异常时，如LinCmsException业务异常，会先执行方法过滤器 （LogActionFilterAttribute）的OnActionExecuted才会执行此异常过滤器。
     /// </summary>
-    public class LinCmsExceptionFilter : Attribute, IExceptionFilter
+    public class LinCmsExceptionFilter : IExceptionFilter
     {
         private readonly ILogger _logger;
         private readonly IWebHostEnvironment _environment;
@@ -29,14 +30,9 @@ public void OnException(ExceptionContext context)
         {
             if (context.Exception is LinCmsException cmsException)
             {
-                HandlerException(context,
-                    new UnifyResponseDto()
-                    {
-                        Message = cmsException.Message,
-                        Code = cmsException.GetErrorCode()
-                    },
-                    cmsException.GetCode()
-                    );
+                UnifyResponseDto warnResponse = new UnifyResponseDto(cmsException.GetErrorCode(), cmsException.Message, context.HttpContext);
+                _logger.LogWarning(JsonConvert.SerializeObject(warnResponse));
+                HandlerException(context, warnResponse, cmsException.GetCode());
                 return;
             }
 
@@ -50,23 +46,18 @@ void ReadException(Exception ex)
                     ReadException(ex.InnerException);
                 }
             }
+
             ReadException(context.Exception);
 
             _logger.LogError(error);
 
-            UnifyResponseDto apiResponse = new UnifyResponseDto()
-            {
-                Code = ErrorCode.UnknownError,
-                Message = _environment.IsDevelopment() ?  error : "服务器正忙，请稍后再试."
-            };
+            UnifyResponseDto apiResponse = new UnifyResponseDto(ErrorCode.UnknownError, _environment.IsDevelopment() ? error : "服务器正忙，请稍后再试.", context.HttpContext);
 
             HandlerException(context, apiResponse, StatusCodes.Status500InternalServerError);
         }
 
         private void HandlerException(ExceptionContext context, UnifyResponseDto apiResponse, int statusCode)
         {
-            apiResponse.Request = LinCmsUtils.GetRequest(context.HttpContext);
-
             context.Result = new JsonResult(apiResponse)
             {
                 StatusCode = statusCode,
diff --git a/src/LinCms.Core/Aop/Filter/LogActionFilterAttribute.cs b/src/LinCms.Core/Aop/Filter/LogActionFilterAttribute.cs
new file mode 100644
index 00000000..164e5a59
--- /dev/null
+++ b/src/LinCms.Core/Aop/Filter/LogActionFilterAttribute.cs
@@ -0,0 +1,115 @@
+using System.Linq;
+using System.Text.RegularExpressions;
+using LinCms.Aop.Attributes;
+using LinCms.Entities;
+using LinCms.IRepositories;
+using LinCms.Security;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Newtonsoft.Json;
+using Serilog;
+
+namespace LinCms.Aop.Filter
+{
+    /// <summary>
+    /// 全局日志记录
+    /// </summary>
+    public class LogActionFilterAttribute : ActionFilterAttribute
+    {
+        private readonly ICurrentUser _currentUser;
+        private readonly IDiagnosticContext _diagnosticContext;
+        private readonly IAuditBaseRepository<LinLog> _logRepository;
+        private readonly Regex regex = new Regex("(?<=\\{)[^}]*(?=\\})");
+
+        public LogActionFilterAttribute(ICurrentUser currentUser, IDiagnosticContext diagnosticContext, IAuditBaseRepository<LinLog> logRepository)
+        {
+            _currentUser = currentUser;
+            _diagnosticContext = diagnosticContext;
+            this._logRepository = logRepository;
+        }
+
+        public override void OnActionExecuting(ActionExecutingContext context)
+        {
+            _diagnosticContext.Set("ActionArguments", JsonConvert.SerializeObject(context.ActionArguments));
+            _diagnosticContext.Set("RouteData", context.ActionDescriptor.RouteValues);
+            _diagnosticContext.Set("ActionName", context.ActionDescriptor.DisplayName);
+            _diagnosticContext.Set("ActionId", context.ActionDescriptor.Id);
+            _diagnosticContext.Set("ValidationState", context.ModelState.IsValid);
+
+            base.OnActionExecuting(context);
+        }
+
+        public override void OnActionExecuted(ActionExecutedContext context)
+        {
+            //当方法或控制器上存在DisableAuditingAttribute特性标签时，不记录日志 
+            if (context.ActionDescriptor is ControllerActionDescriptor d && d.MethodInfo.IsDefined(typeof(DisableAuditingAttribute), true) ||
+                context.Controller.GetType().IsDefined(typeof(DisableAuditingAttribute), true)
+                )
+            {
+                base.OnActionExecuted(context);
+                return;
+            }
+            LoggerAttribute loggerAttribute = context.ActionDescriptor.EndpointMetadata.OfType<LoggerAttribute>().FirstOrDefault();
+            var linLog = new LinLog
+            {
+                Path = context.HttpContext.Request.Path,
+                Method = context.HttpContext.Request.Method,
+                StatusCode = context.HttpContext.Response.StatusCode,
+                UserId = _currentUser.Id ?? 0,
+                Username = _currentUser.UserName
+            };
+
+            if (loggerAttribute != null)
+            {
+                linLog.Message = this.ParseTemplate(loggerAttribute.Template, _currentUser, context.HttpContext.Request, context.HttpContext.Response);
+            }
+            else
+            {
+                linLog.Message = $"访问{linLog.Path}";
+            }
+
+            LinCmsAuthorizeAttribute linCmsAttribute = context.ActionDescriptor.EndpointMetadata.OfType<LinCmsAuthorizeAttribute>().FirstOrDefault();
+            if (linCmsAttribute != null)
+            {
+                linLog.Authority = $"{linCmsAttribute.Module}  {linCmsAttribute.Permission}";
+            }
+
+            _logRepository.Insert(linLog);
+            base.OnActionExecuted(context);
+        }
+
+        private string ParseTemplate(string template, ICurrentUser userDo, HttpRequest request, HttpResponse response)
+        {
+            foreach (Match item in regex.Matches(template))
+            {
+                string propertyValue = ExtractProperty(item.Value, userDo, request, response);
+                template = template.Replace("{" + item.Value + "}", propertyValue);
+            }
+            return template;
+        }
+
+        private string ExtractProperty(string item, ICurrentUser userDo, HttpRequest request, HttpResponse response)
+        {
+            int i = item.LastIndexOf('.');
+            string obj = item.Substring(0, i);
+            string prop = item.Substring(i + 1);
+            switch (obj)
+            {
+                case "user":
+                    return GetValueByPropName(userDo, prop);
+                case "request":
+                    return GetValueByPropName(request, prop);
+                case "response":
+                    return GetValueByPropName(response, prop);
+                default:
+                    return "";
+            }
+        }
+
+        private string GetValueByPropName<T>(T t, string prop)
+        {
+            return t.GetType().GetProperty(prop)?.GetValue(t, null)?.ToString();
+        }
+    }
+}
diff --git a/src/LinCms.Core/Aop/LinCmsAuthorizeAttribute.cs b/src/LinCms.Core/Aop/LinCmsAuthorizeAttribute.cs
deleted file mode 100644
index dc194291..00000000
--- a/src/LinCms.Core/Aop/LinCmsAuthorizeAttribute.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using LinCms.Core.Data;
-using LinCms.Core.Data.Enums;
-using LinCms.Core.Entities;
-using LinCms.Core.Security;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Authorization.Infrastructure;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-
-namespace LinCms.Core.Aop
-{
-    /// <summary>
-    ///  自定义固定权限编码给动态角色及用户，支持验证登录，指定角色、Policy
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)]
-    public class LinCmsAuthorizeAttribute : AuthorizeAttribute, IAsyncAuthorizationFilter
-    {
-        public string Permission { get; }
-        public string Module { get; }
-
-        public LinCmsAuthorizeAttribute()
-        {
-
-        }
-
-        public LinCmsAuthorizeAttribute(string permission, string module)
-        {
-            Permission = permission;
-            Module = module;
-        }
-
-        public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
-        {
-            ClaimsPrincipal claimsPrincipal = context.HttpContext.User;
-
-            if (!claimsPrincipal.Identity.IsAuthenticated)
-            {
-                HandlerAuthenticationFailed(context, "认证失败，请检查请求头或者重新登陆");
-                return;
-            }
-
-
-            if (Permission == null  && Roles == LinGroup.Admin)
-            {
-                ICurrentUser currentUser = (ICurrentUser)context.HttpContext.RequestServices.GetService(typeof(ICurrentUser));
-
-                if (currentUser.IsAdmin!=true)
-                {
-                    HandlerAuthenticationFailed(context, "只有超级管理员可操作");
-                    return;
-                }
-            }
-
-            IAuthorizationService authorizationService = (IAuthorizationService)context.HttpContext.RequestServices.GetService(typeof(IAuthorizationService));
-            AuthorizationResult authorizationResult = await authorizationService.AuthorizeAsync(context.HttpContext.User, null, new OperationAuthorizationRequirement() { Name = Permission });
-            if (!authorizationResult.Succeeded)
-            {
-                //通过报业务异常，统一返回结果，平均执行速度在500ms以上，直接返回无权限，则除第一次访问慢外，基本在80ms左右。
-                //throw new LinCmsException("权限不够，请联系超级管理员获得权限", ErrorCode.AuthenticationFailed, StatusCodes.Status401Unauthorized);
-
-                HandlerAuthenticationFailed(context,"权限不够，请联系超级管理员获得权限");
-            }
-        }
-
-        public void HandlerAuthenticationFailed(AuthorizationFilterContext context,string errorMsg)
-        {
-            context.HttpContext.Response.StatusCode = StatusCodes.Status401Unauthorized;
-            context.Result = new JsonResult(
-                new UnifyResponseDto(ErrorCode.AuthenticationFailed, errorMsg, context.HttpContext)
-            );
-        }
-
-        public override string ToString()
-        {
-            return $"\"{base.ToString()}\",\"Permission:{Permission}\",\"Module:{Module}\",\"Roles:{Roles}\",\"Policy:{Policy}\",\"AuthenticationSchemes:{AuthenticationSchemes}\"";
-        }
-    }
-}
diff --git a/src/LinCms.Core/Aop/LogActionFilterAttribute.cs b/src/LinCms.Core/Aop/LogActionFilterAttribute.cs
deleted file mode 100644
index f27bde25..00000000
--- a/src/LinCms.Core/Aop/LogActionFilterAttribute.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System.Diagnostics;
-using LinCms.Core.Common;
-using LinCms.Core.Data;
-using LinCms.Core.Entities;
-using LinCms.Core.Repositories;
-using LinCms.Core.Security;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Controllers;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-
-namespace LinCms.Core.Aop
-{
-    /// <summary>
-    /// 全局日志记录
-    /// </summary>
-    public class LogActionFilterAttribute : ActionFilterAttribute
-    {
-        /// <summary>
-        /// 操作类型CRUD
-        /// </summary>
-        //public LogEnum LogType { get; set; }
-        private readonly ILogRepository _logRepository;
-        private string ActionArguments { get; set; }
-        private Stopwatch Stopwatch { get; set; }
-        private readonly ILogger<LogActionFilterAttribute> _logger;
-        private readonly ICurrentUser _currentUser;
-        public LogActionFilterAttribute(ILogger<LogActionFilterAttribute> logger, ICurrentUser currentUser, ILogRepository logRepository)
-        {
-            _logger = logger;
-            _currentUser = currentUser;
-            _logRepository = logRepository;
-        }
-
-        public override void OnActionExecuting(ActionExecutingContext context)
-        {
-            //MiniProfiler.Current.Step($"OnActionExecuting->Begin ");
-            ActionArguments = JsonConvert.SerializeObject(context.ActionArguments);
-            Stopwatch = new Stopwatch();
-            Stopwatch.Start();
-            base.OnActionExecuting(context);
-        }
-
-        public override void OnActionExecuted(ActionExecutedContext context)
-        {
-            Stopwatch.Stop();
-            //当方法或控制器上存在DisableAuditingAttribute特性标签时，不记录日志 
-            if (context.ActionDescriptor is ControllerActionDescriptor d && d.MethodInfo.IsDefined(typeof(DisableAuditingAttribute), true) ||
-                context.Controller.GetType().IsDefined(typeof(DisableAuditingAttribute), true)
-                )
-            {
-                base.OnActionExecuted(context);
-                return;
-            }
-
-            LinLog linLog = new LinLog()
-            {
-                Method = context.HttpContext.Request.Method,
-                Path = context.HttpContext.Request.Path,
-                StatusCode = context.HttpContext.Response.StatusCode,
-                OtherMessage = $"参数：{ActionArguments}\n耗时：{Stopwatch.Elapsed.TotalMilliseconds} 毫秒"
-            };
-
-            ControllerActionDescriptor auditActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
-
-            AuditingLogAttribute auditingLogAttribute = auditActionDescriptor.GetCustomAttribute<AuditingLogAttribute>();
-            if (auditingLogAttribute != null)
-            {
-                linLog.Message = auditingLogAttribute.Template;
-            }
-
-            LinCmsAuthorizeAttribute linCmsAttribute = auditActionDescriptor.GetCustomAttribute<LinCmsAuthorizeAttribute>();
-            if (linCmsAttribute != null)
-            {
-                linLog.Authority = linCmsAttribute.Permission;
-            }
-
-
-            base.OnActionExecuted(context);
-
-            if (context.Result is ObjectResult objectResult && objectResult.Value != null)
-            {
-                if (objectResult.Value.ToString().Contains("ErrorCode"))
-                {
-                    UnifyResponseDto resultDto = JsonConvert.DeserializeObject<UnifyResponseDto>(objectResult.Value.ToString());
-
-                    resultDto.Request = LinCmsUtils.GetRequest(context.HttpContext);
-
-                    context.Result = new JsonResult(resultDto);
-
-                    if (linLog.Message.IsNullOrEmpty())
-                    {
-                        linLog.Message = resultDto.Message?.ToString();
-                    }
-                }
-            }
-
-            linLog.Message += $"{_currentUser.UserName}访问{context.HttpContext.Request.Path},耗时：{Stopwatch.Elapsed.TotalMilliseconds} 毫秒";
-
-           _logRepository.Create(linLog);
-
-            //记录文本日志
-            _logger.LogInformation(JsonConvert.SerializeObject(linLog));
-
-            //MiniProfiler.Current.CustomTiming($"OnActionExecuted ->", str);
-        }
-    }
-}
diff --git a/src/LinCms.Core/Common/EncryptUtil.cs b/src/LinCms.Core/Common/EncryptUtil.cs
index 53c27471..fa6b67e4 100644
--- a/src/LinCms.Core/Common/EncryptUtil.cs
+++ b/src/LinCms.Core/Common/EncryptUtil.cs
@@ -1,7 +1,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace LinCms.Core.Common
+namespace LinCms.Common
 {
     public class EncryptUtil
     {
diff --git a/src/LinCms.Core/Common/IpQueryResult.cs b/src/LinCms.Core/Common/IpQueryResult.cs
deleted file mode 100644
index 0d606cfa..00000000
--- a/src/LinCms.Core/Common/IpQueryResult.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace LinCms.Core.Common
-{
-    public class IpQueryResult
-    {
-        public int errno { get; set; }
-        public string errmsg { get; set; }
-        public string data { get; set; }
-    }
-}
diff --git a/src/LinCms.Core/Common/LinCmsUtils.cs b/src/LinCms.Core/Common/LinCmsUtils.cs
index 0a25a90e..0e127f07 100644
--- a/src/LinCms.Core/Common/LinCmsUtils.cs
+++ b/src/LinCms.Core/Common/LinCmsUtils.cs
@@ -1,36 +1,36 @@
 using System;
 using System.IO;
-using System.Net;
 using System.Reflection;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
-using LinCms.Core.Extensions;
+using LinCms.Extensions;
 using Microsoft.AspNetCore.Http;
-using Newtonsoft.Json;
 
-namespace LinCms.Core.Common
+namespace LinCms.Common
 {
     public class LinCmsUtils
     {
-     
         /// <summary>
         /// 继承HashAlgorithm
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="stream"></param>
         /// <returns></returns>
-        public static String GetHash<T>(Stream stream) where T : HashAlgorithm
+        public static string GetHash<T>(Stream stream) where T : HashAlgorithm
         {
             StringBuilder sb = new StringBuilder();
 
-            MethodInfo create = typeof(T).GetMethod("Create", new Type[] { });
+            MethodInfo create = typeof(T).GetMethod("Create", Array.Empty<Type>());
             using (T crypt = (T)create.Invoke(null, null))
             {
-                byte[] hashBytes = crypt.ComputeHash(stream);
-                foreach (byte bt in hashBytes)
+                if (crypt != null)
                 {
-                    sb.Append(bt.ToString("x2"));
+                    byte[] hashBytes = crypt.ComputeHash(stream);
+                    foreach (byte bt in hashBytes)
+                    {
+                        sb.Append(bt.ToString("x2"));
+                    }
                 }
             }
             return sb.ToString();
@@ -88,126 +88,6 @@ public static string GetTimeDifferNow(DateTime dt)
             return "1秒前";
         }
 
-        /// <summary>
-        /// 获取操作系统的名字
-        /// </summary>
-        /// <param name="userAgent"></param>
-        /// <returns></returns>
-        public static string GetOsNameByUserAgent(string userAgent)
-        {
-            string osVersion = "未知";
-
-            if (userAgent.Contains("NT 10.0"))
-            {
-                osVersion = "Windows 10";
-            }
-            else if (userAgent.Contains("NT 6.3"))
-            {
-                osVersion = "Windows 8.1";
-            }
-            else if (userAgent.Contains("NT 6.2"))
-            {
-                osVersion = "Windows 8";
-            }
-            else if (userAgent.Contains("NT 6.1"))
-            {
-                osVersion = "Windows 7";
-            }
-            else if (userAgent.Contains("NT 6.1"))
-            {
-                osVersion = "Windows 7";
-            }
-            else if (userAgent.Contains("NT 6.0"))
-            {
-                osVersion = "Windows Vista/Server 2008";
-            }
-            else if (userAgent.Contains("NT 5.2"))
-            {
-                osVersion = userAgent.Contains("64") ? "Windows XP" : "Windows Server 2003";
-            }
-            else if (userAgent.Contains("NT 5.1"))
-            {
-                osVersion = "Windows XP";
-            }
-            else if (userAgent.Contains("NT 5"))
-            {
-                osVersion = "Windows 2000";
-            }
-            else if (userAgent.Contains("NT 4"))
-            {
-                osVersion = "Windows NT4";
-            }
-            else if (userAgent.Contains("Me"))
-            {
-                osVersion = "Windows Me";
-            }
-            else if (userAgent.Contains("98"))
-            {
-                osVersion = "Windows 98";
-            }
-            else if (userAgent.Contains("95"))
-            {
-                osVersion = "Windows 95";
-            }
-            else if (userAgent.Contains("Mac"))
-            {
-                osVersion = "Mac";
-            }
-            else if (userAgent.Contains("Unix"))
-            {
-                osVersion = "UNIX";
-            }
-            else if (userAgent.Contains("Linux"))
-            {
-                osVersion = "Linux";
-            }
-            else if (userAgent.Contains("SunOS"))
-            {
-                osVersion = "SunOS";
-            }
-            return osVersion;
-        }
-
-
-        /// <summary>
-        /// https://cloud.tencent.com/developer/article/1152362
-        /// 获取本机IP、地区及运营商 
-        /// </summary>
-        /// <param name="ipAddres"></param>
-        /// <returns></returns>
-        public static IpQueryResult IpQueryCity(string ipAddres)
-        {
-            if (ipAddres == "::1" || ipAddres == "127.0.0.1")
-            {
-                return new IpQueryResult()
-                {
-                    data = "本地ip",
-                    errno = 0
-                };
-            }
-            if (!IPAddress.TryParse(ipAddres, out IPAddress ip))
-            {
-                return null;
-            }
-
-            Uri url = new Uri("http://ip.360.cn/IPQuery/ipquery?ip=" + ipAddres);
-            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
-            request.Timeout = 1000 * 5;
-            request.KeepAlive = false;
-            request.Method = "GET";
-            WebResponse resoponse = request.GetResponse();
-            string pageHtml;
-            // ReSharper disable once AssignNullToNotNullAttribute
-            using (var stream = new StreamReader(resoponse.GetResponseStream()))
-            {
-                pageHtml = stream.ReadToEnd();
-            }
-            IpQueryResult result = JsonConvert.DeserializeObject<IpQueryResult>(pageHtml);
-
-            return result;
-        }
-
-
         /// <summary>
         /// 校验手机号码是否符合标准。
         /// </summary>
diff --git a/src/LinCms.Core/Common/LinConsts.cs b/src/LinCms.Core/Common/LinConsts.cs
index eda5bda7..bc91fdc8 100644
--- a/src/LinCms.Core/Common/LinConsts.cs
+++ b/src/LinCms.Core/Common/LinConsts.cs
@@ -1,34 +1,21 @@
-namespace LinCms.Core.Common
+namespace LinCms.Common
 {
     public static class LinConsts
     {
-        public static string SITE_DOMAIN = "SITE_DOMAIN";
-        public static class File
-        {
-            public static string STORE_DIR = "FILE:STORE_DIR";
-        }
-
         public static class Group
         {
             public static int Admin = 1;
             public static int CmsAdmin = 2;
             public static int User = 3;
         }
-        public static class Qiniu
-        {
-            public static string AK = "Qiniu:AK";
-            public static string SK = "Qiniu:SK";
-            public static string Bucket = "Qiniu:Bucket";
-            public static string PrefixPath = "Qiniu:PrefixPath";
-            public static string Host = "Qiniu:Host";
-            public static string UseHttps = "Qiniu:UseHttps";
-        }
 
         public static class Claims
         {
             public const string BIO = "urn:github:bio";
             public const string AvatarUrl = "urn:github:avatar_url";
+            public const string HtmlUrl = "urn:github:html_url";
             public const string BlogAddress = "urn:github:blog";
         }
+
     }
 }
diff --git a/src/LinCms.Core/Data/Authorization/PermissionAuthorizationRequirement.cs b/src/LinCms.Core/Data/Authorization/PermissionAuthorizationRequirement.cs
new file mode 100644
index 00000000..934a745c
--- /dev/null
+++ b/src/LinCms.Core/Data/Authorization/PermissionAuthorizationRequirement.cs
@@ -0,0 +1,16 @@
+using Microsoft.AspNetCore.Authorization.Infrastructure;
+using System;
+
+namespace LinCms.Data.Authorization
+{
+    public class ModuleAuthorizationRequirement : OperationAuthorizationRequirement
+    {
+        public ModuleAuthorizationRequirement(string module,string permission)
+        {
+            Module = module ?? throw new ArgumentNullException(nameof(module));
+            Name = permission ?? throw new ArgumentNullException(nameof(permission));
+        }
+
+        public string Module { get; set; }
+    }
+}
diff --git a/src/LinCms.Core/Data/Authorization/ValidJtiRequirement.cs b/src/LinCms.Core/Data/Authorization/ValidJtiRequirement.cs
new file mode 100644
index 00000000..e5ffac45
--- /dev/null
+++ b/src/LinCms.Core/Data/Authorization/ValidJtiRequirement.cs
@@ -0,0 +1,8 @@
+using Microsoft.AspNetCore.Authorization;
+
+namespace LinCms.Data.Authorization
+{
+    public class ValidJtiRequirement : IAuthorizationRequirement
+    {
+    }
+}
diff --git a/src/LinCms.Core/Data/Enums/CapMessageQueueType.cs b/src/LinCms.Core/Data/Enums/CapMessageQueueType.cs
new file mode 100644
index 00000000..cbab0b67
--- /dev/null
+++ b/src/LinCms.Core/Data/Enums/CapMessageQueueType.cs
@@ -0,0 +1,8 @@
+namespace LinCms.Data.Enums
+{
+    public enum CapMessageQueueType
+    {
+        InMemoryQueue=0,
+        RabbitMQ = 1,
+    }
+}
diff --git a/src/LinCms.Core/Data/Enums/CapStorageType.cs b/src/LinCms.Core/Data/Enums/CapStorageType.cs
new file mode 100644
index 00000000..072fe304
--- /dev/null
+++ b/src/LinCms.Core/Data/Enums/CapStorageType.cs
@@ -0,0 +1,18 @@
+namespace LinCms.Data.Enums
+{
+    public enum CapStorageType
+    {
+        /// <summary>
+        /// 引用包 DotNetCore.CAP.InMemoryStorage
+        /// </summary>
+        InMemoryStorage = 0,
+        /// <summary>
+        /// 引用包  DotNetCore.CAP.MySql
+        /// </summary>
+        Mysql = 1,
+        /// <summary>
+        /// 引用包  DotNetCore.CAP.SqlServer
+        /// </summary>
+        SqlServer = 2
+    }
+}
diff --git a/src/LinCms.Core/Data/Enums/Enums.cs b/src/LinCms.Core/Data/Enums/ErrorCode.cs
similarity index 54%
rename from src/LinCms.Core/Data/Enums/Enums.cs
rename to src/LinCms.Core/Data/Enums/ErrorCode.cs
index 19aff584..b67b1817 100644
--- a/src/LinCms.Core/Data/Enums/Enums.cs
+++ b/src/LinCms.Core/Data/Enums/ErrorCode.cs
@@ -1,74 +1,12 @@
 using System.ComponentModel;
 
-namespace LinCms.Core.Data.Enums
+namespace LinCms.Data.Enums
 {
-    /**
-     * 枚举
-     */
-
-    /**
-     * 是否为超级管理员的枚举
-     * COMMON 代表 普通用户
-     * ADMIN 代表 超级管理员
-     */
-    public enum UserAdmin
-    {
-        /// <summary>
-        /// 普通用户
-        /// </summary>
-        Common = 1,
-        /// <summary>
-        /// 管理员
-        /// </summary>
-        Admin = 2
-    }
-
-    /**
-    * 当前用户是否为激活状态的枚举
-    * ACTIVE 代表 激活状态
-    * NOT_ACTIVE 代表 非激活状态
-    */
-    public enum UserActive
-    {
-        /// <summary>
-        /// 激活状态
-        /// </summary>
-        Active = 1,
-        /// <summary>
-        /// 非激活状态
-        /// </summary>
-        NotActive = 2
-    }
-
-
-    /**
-     * 令牌的类型
-     * ACCESS 代表 access token
-     * REFRESH 代表 refresh token
-     */
-    //public enum TokenType
-    //{
-    //    ACCESS,
-    //    REFRESH
-    //}
-
-    /*
-     * 令牌类型静态类
-     */
-    public class TokenType
+    public enum ErrorCode
     {
         /// <summary>
-        /// access token
-        /// </summary>
-        public static string Access = "access";
-        /// <summary>
-        /// refresh token
+        /// 操作成功
         /// </summary>
-        public static string Refresh = "refresh";
-    }
-
-    public enum ErrorCode
-    {
         Success = 0,
         /// <summary>
         /// 未知错误
@@ -89,6 +27,10 @@ public enum ErrorCode
         /// </summary>
         AuthenticationFailed = 10000,
         /// <summary>
+        /// 无权限
+        /// </summary>
+        NoPermission = 10001,
+        /// <summary>
         /// 失败
         /// </summary>
         Fail = 9999,
@@ -131,18 +73,6 @@ public enum ErrorCode
         //10130 文件扩展名不符合规范
 
         //10140 请求过于频繁，请稍后重试
-
-    }
-
-    public enum Status
-    {
-        /// <summary>
-        /// 启用
-        /// </summary>
-        Enable = 1,
-        /// <summary>
-        /// 禁用
-        /// </summary>
-        Forbidden = 2
+        ManyRequests = 10140
     }
 }
diff --git a/src/LinCms.Core/Data/Enums/Status.cs b/src/LinCms.Core/Data/Enums/Status.cs
new file mode 100644
index 00000000..e518542b
--- /dev/null
+++ b/src/LinCms.Core/Data/Enums/Status.cs
@@ -0,0 +1,14 @@
+namespace LinCms.Data.Enums
+{
+    public enum Status
+    {
+        /// <summary>
+        /// 启用
+        /// </summary>
+        Enable = 1,
+        /// <summary>
+        /// 禁用
+        /// </summary>
+        Forbidden = 2
+    }
+}
diff --git a/src/LinCms.Core/Data/Enums/TokenType.cs b/src/LinCms.Core/Data/Enums/TokenType.cs
new file mode 100644
index 00000000..cb5a2d12
--- /dev/null
+++ b/src/LinCms.Core/Data/Enums/TokenType.cs
@@ -0,0 +1,17 @@
+namespace LinCms.Data.Enums
+{
+    /*
+     * 令牌类型静态类
+     */
+    public class TokenType
+    {
+        /// <summary>
+        /// access token
+        /// </summary>
+        public static string Access = "access";
+        /// <summary>
+        /// refresh token
+        /// </summary>
+        public static string Refresh = "refresh";
+    }
+}
diff --git a/src/LinCms.Core/Data/Enums/UserActive.cs b/src/LinCms.Core/Data/Enums/UserActive.cs
new file mode 100644
index 00000000..718ecf4a
--- /dev/null
+++ b/src/LinCms.Core/Data/Enums/UserActive.cs
@@ -0,0 +1,19 @@
+namespace LinCms.Data.Enums
+{
+    /**
+    * 当前用户是否为激活状态的枚举
+    * ACTIVE 代表 激活状态
+    * NOT_ACTIVE 代表 非激活状态
+    */
+    public enum UserActive
+    {
+        /// <summary>
+        /// 激活状态
+        /// </summary>
+        Active = 1,
+        /// <summary>
+        /// 非激活状态
+        /// </summary>
+        NotActive = 2
+    }
+}
diff --git a/src/LinCms.Core/Data/Options/FileStorageOption.cs b/src/LinCms.Core/Data/Options/FileStorageOption.cs
new file mode 100644
index 00000000..769cd695
--- /dev/null
+++ b/src/LinCms.Core/Data/Options/FileStorageOption.cs
@@ -0,0 +1,26 @@
+namespace LinCms.Data.Options
+{
+    public class FileStorageOption
+    {
+        /// <summary>
+        /// 上传文件总大小
+        /// </summary>
+        public long MaxFileSize { get; set; }
+        /// <summary>
+        /// 多文件上传时，支持的最大文件数量
+        /// </summary>
+        public int NumLimit { get; set; }
+        /// <summary>
+        /// 允许某些类型文件上传，文件格式以,隔开
+        /// </summary>
+        public string Include { get; set; }
+        /// <summary>
+        /// 禁止某些类型文件上传，文件格式以,隔开
+        /// </summary>
+        public string Exclude { get; set; }
+        
+        public string ServiceName { get; set; }
+        public LocalFileOption LocalFile { get; set; }
+        public QiniuOptions Qiniu { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Core/Data/Options/LocalFileOption.cs b/src/LinCms.Core/Data/Options/LocalFileOption.cs
new file mode 100644
index 00000000..3af196e8
--- /dev/null
+++ b/src/LinCms.Core/Data/Options/LocalFileOption.cs
@@ -0,0 +1,9 @@
+
+namespace LinCms.Data.Options
+{
+    public class LocalFileOption
+    {
+        public string PrefixPath { get; set; }
+        public string Host { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Core/Data/Options/QiniuOption.cs b/src/LinCms.Core/Data/Options/QiniuOption.cs
new file mode 100644
index 00000000..ded7f2ea
--- /dev/null
+++ b/src/LinCms.Core/Data/Options/QiniuOption.cs
@@ -0,0 +1,13 @@
+namespace LinCms.Data.Options
+{
+    public class QiniuOptions
+    {
+        public string AK { get; set; }
+        public string SK { get; set; }
+        public string Bucket { get; set; }
+        public string PrefixPath { get; set; }
+        public string Host { get; set; }
+        public bool UseHttps { get; set; }
+    }
+}
+
diff --git a/src/LinCms.Core/Data/Options/SiteOption.cs b/src/LinCms.Core/Data/Options/SiteOption.cs
new file mode 100644
index 00000000..db743c12
--- /dev/null
+++ b/src/LinCms.Core/Data/Options/SiteOption.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LinCms.Data.Options
+{
+    public class SiteOption
+    {
+        public string Domain { get; set; }
+        public string VVLogDomain { get; set; }
+        public string CMSDomain { get; set; }
+        public string IdentityServer4Domain { get; set; }
+        public string Email { get; set; }
+        public string BlogUrl { get; set; }
+        public string DocUrl { get; set; }
+
+    }
+}
diff --git a/src/LinCms.Core/Data/PageDto.cs b/src/LinCms.Core/Data/PageDto.cs
deleted file mode 100644
index b5992c2f..00000000
--- a/src/LinCms.Core/Data/PageDto.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace LinCms.Core.Data
-{
-
-    /// <summary>
-    /// 分页
-    /// </summary>
-    public class PageDto: IPageDto
-    {
-        /// <summary>
-        /// 每页个数
-        /// </summary>
-        public int Count { get; set; } = 15;
-
-        /// <summary>
-        /// 从0开始，0时取第1页，1时取第二页
-        /// </summary>
-        public int Page { get; set; } = 0;
-
-        public string Sort { get; set; }
-    }
-
-    public interface IPageDto
-    {
-        int Count { get; set; }
-        int Page { get; set; }
-    }
-
-}
diff --git a/src/LinCms.Core/Data/PagedAndSortedRequestDto.cs b/src/LinCms.Core/Data/PagedAndSortedRequestDto.cs
new file mode 100644
index 00000000..cb511a83
--- /dev/null
+++ b/src/LinCms.Core/Data/PagedAndSortedRequestDto.cs
@@ -0,0 +1,64 @@
+
+
+using System.ComponentModel.DataAnnotations;
+
+namespace LinCms.Data
+{
+    public class PagedAndSortedRequestDto : PageDto, ISortedResultRequest
+    {
+        public string Sorting { get; set; }
+    }
+
+
+    /// <summary>
+    /// 分页
+    /// </summary>
+    public class PageDto : IPageDto
+    {
+        /// <summary>
+        /// 每页个数
+        /// </summary>
+        [Range(1, int.MaxValue, ErrorMessage = "每页个数最小为1")]
+        public int Count { get; set; } = 15;
+
+        /// <summary>
+        /// 从0开始，0时取第1页，1时取第二页
+        /// </summary>
+        public int Page { get; set; } = 0;
+
+        public string Sort { get; set; }
+    }
+
+    public interface IPageDto : ILimitedResultRequest
+    {
+        int Page { get; set; }
+    }
+
+    public interface ILimitedResultRequest
+    {
+        /// <summary>
+        /// Maximum result count should be returned.
+        /// This is generally used to limit result count on paging.
+        /// </summary>
+        int Count { get; set; }
+    }
+
+    /// <summary>
+    /// This interface is defined to standardize to request a sorted result.
+    /// </summary>
+    public interface ISortedResultRequest
+    {
+        /// <summary>
+        /// Sorting information.
+        /// Should include sorting field and optionally a direction (ASC or DESC)
+        /// Can contain more than one field separated by comma (,).
+        /// </summary>
+        /// <example>
+        /// Examples:
+        /// "Name"
+        /// "Name DESC"
+        /// "Name ASC, Age DESC"
+        /// </example>
+        string Sorting { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Core/Data/PagedResultDto.cs b/src/LinCms.Core/Data/PagedResultDto.cs
index 9c7bcc32..9b73ce4c 100644
--- a/src/LinCms.Core/Data/PagedResultDto.cs
+++ b/src/LinCms.Core/Data/PagedResultDto.cs
@@ -1,30 +1,23 @@
 using System.Collections.Generic;
 
-namespace LinCms.Core.Data
+namespace LinCms.Data
 {
     public class PagedResultDto<T>
     {
-        public PagedResultDto()
-        {
-        }
-
         public long Total { get; set; }
+        public IReadOnlyList<T> Items { get; set; }
+        public long Page { get; set; }
+        public long Count { get; set; }
 
-        public IReadOnlyList<T> Items
+        public PagedResultDto()
         {
-            get => _items ?? new List<T>();
-            set => _items = value;
         }
-        private IReadOnlyList<T> _items;
-
         public PagedResultDto(IReadOnlyList<T> items)
         {
             Total = items.Count;
-            _items = items;
+            Items = items;
         }
-
-
-        public PagedResultDto(IReadOnlyList<T> collection, long total) : this(collection)
+        public PagedResultDto(IReadOnlyList<T> items, long total) : this(items)
         {
             Total = total;
         }
diff --git a/src/LinCms.Core/Data/PermissionDefinition.cs b/src/LinCms.Core/Data/PermissionDefinition.cs
index 286c817f..f65ff571 100644
--- a/src/LinCms.Core/Data/PermissionDefinition.cs
+++ b/src/LinCms.Core/Data/PermissionDefinition.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace LinCms.Core.Data
+namespace LinCms.Data
 {
     public class PermissionDefinition
     {
diff --git a/src/LinCms.Core/Data/ResultDto.cs b/src/LinCms.Core/Data/UnifyResponseDto.cs
similarity index 95%
rename from src/LinCms.Core/Data/ResultDto.cs
rename to src/LinCms.Core/Data/UnifyResponseDto.cs
index 7944ee70..44e95821 100644
--- a/src/LinCms.Core/Data/ResultDto.cs
+++ b/src/LinCms.Core/Data/UnifyResponseDto.cs
@@ -1,11 +1,11 @@
 using System;
-using LinCms.Core.Common;
-using LinCms.Core.Data.Enums;
+using LinCms.Common;
+using LinCms.Data.Enums;
 using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
-namespace LinCms.Core.Data
+namespace LinCms.Data
 {
     public class UnifyResponseDto
     {
diff --git a/src/LinCms.Core/Dependency/IScopedDependency.cs b/src/LinCms.Core/Dependency/IScopedDependency.cs
index cbc46042..d85c9d0e 100644
--- a/src/LinCms.Core/Dependency/IScopedDependency.cs
+++ b/src/LinCms.Core/Dependency/IScopedDependency.cs
@@ -1,4 +1,4 @@
-namespace LinCms.Core.Dependency
+namespace LinCms.Dependency
 {
     /// <summary>
     /// 实现该接口将自动注册到Ioc容器，生命周期为每次请求创建一个实例
diff --git a/src/LinCms.Core/Dependency/ISingletonDependency.cs b/src/LinCms.Core/Dependency/ISingletonDependency.cs
index 8985c69a..94742c06 100644
--- a/src/LinCms.Core/Dependency/ISingletonDependency.cs
+++ b/src/LinCms.Core/Dependency/ISingletonDependency.cs
@@ -1,4 +1,4 @@
-namespace LinCms.Core.Dependency
+namespace LinCms.Dependency
 {
     public interface ISingletonDependency
     {
diff --git a/src/LinCms.Core/Dependency/ITransientDependency.cs b/src/LinCms.Core/Dependency/ITransientDependency.cs
index 5852ebc5..484aa56c 100644
--- a/src/LinCms.Core/Dependency/ITransientDependency.cs
+++ b/src/LinCms.Core/Dependency/ITransientDependency.cs
@@ -1,4 +1,4 @@
-namespace LinCms.Core.Dependency
+namespace LinCms.Dependency
 {
     public interface ITransientDependency
     {
diff --git a/src/LinCms.Core/Entities/Base/BaseItem.cs b/src/LinCms.Core/Entities/Base/BaseItem.cs
index 6d9a18f6..a3f6aee0 100644
--- a/src/LinCms.Core/Entities/Base/BaseItem.cs
+++ b/src/LinCms.Core/Entities/Base/BaseItem.cs
@@ -1,19 +1,41 @@
-using FreeSql.DataAnnotations;
+using System;
+using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities.Base
+namespace LinCms.Entities.Base
 {
     [Table(Name = "base_item")]
-    public class BaseItem:FullAduitEntity
+    public class BaseItem : FullAduitEntity
     {
-        public int BaseTypeId { get; set; }
+        public BaseItem()
+        {
+        }
 
-        [Column(DbType = "varchar(50)")]
+        public BaseItem(string itemCode, string itemName, int? sortCode, bool status)
+        {
+            ItemCode = itemCode ?? throw new ArgumentNullException(nameof(itemCode));
+            ItemName = itemName ?? throw new ArgumentNullException(nameof(itemName));
+            SortCode = sortCode;
+            Status = status;
+        }
+
+        public BaseItem(string itemCode, string itemName, int? sortCode, int baseTypeId, bool status) : this(itemCode, itemName, sortCode, status)
+        {
+            BaseTypeId = baseTypeId;
+        }
+
+        public long BaseTypeId { get; set; }
+
+        [Column(StringLength = 50)]
         public string ItemCode { get; set; }
 
-        [Column(DbType = "varchar(50)")]
+        [Column(StringLength = 50)]
         public string ItemName { get; set; }
 
         public int? SortCode { get; set; }
 
+        public bool Status { get; set; }
+
+        public virtual BaseType BaseType { get; set; }
+
     }
 }
diff --git a/src/LinCms.Core/Entities/Base/BaseType.cs b/src/LinCms.Core/Entities/Base/BaseType.cs
index 7ddd1de0..9f879bd0 100644
--- a/src/LinCms.Core/Entities/Base/BaseType.cs
+++ b/src/LinCms.Core/Entities/Base/BaseType.cs
@@ -1,16 +1,31 @@
-using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities.Base
+namespace LinCms.Entities.Base
 {
     [Table(Name = "base_type")]
-    public class BaseType:FullAduitEntity
+    public class BaseType : FullAduitEntity
     {
-        [Column(DbType = "varchar(50)")]
+        public BaseType()
+        {
+        }
+
+        public BaseType(string typeCode, string fullName, int? sortCode)
+        {
+            TypeCode = typeCode ?? throw new ArgumentNullException(nameof(typeCode));
+            FullName = fullName ?? throw new ArgumentNullException(nameof(fullName));
+            SortCode = sortCode;
+        }
+
+        [Column(StringLength = 50)]
         public string TypeCode { get; set; }
 
-        [Column(DbType = "varchar(50)")]
+        [Column(StringLength = 50)]
         public string FullName { get; set; }
 
         public int? SortCode { get; set; }
+
+        public virtual ICollection<BaseItem> BaseItems { get; set; }
     }
 }
diff --git a/src/LinCms.Core/Entities/Base/Doc.cs b/src/LinCms.Core/Entities/Base/Doc.cs
new file mode 100644
index 00000000..16092f31
--- /dev/null
+++ b/src/LinCms.Core/Entities/Base/Doc.cs
@@ -0,0 +1,26 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace LinCms.Entities.Base
+{
+    /// <summary>
+    /// 文档---示例代码生成。
+    /// </summary>
+    public class Doc : FullAduitEntity
+    {
+        /// <summary>
+        /// 文档名
+        /// </summary>
+        [Column(StringLength = 50)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 显示名
+        /// </summary>
+        [Column(StringLength = 50)]
+        public string DisplayName { get; set; }
+
+    }
+}
diff --git a/src/LinCms.Core/Entities/BlackRecord.cs b/src/LinCms.Core/Entities/BlackRecord.cs
new file mode 100644
index 00000000..af82e7c0
--- /dev/null
+++ b/src/LinCms.Core/Entities/BlackRecord.cs
@@ -0,0 +1,20 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace LinCms.Entities
+{
+    /// <summary>
+    /// 黑名单，实现登录Token的过期
+    /// </summary>
+    public class BlackRecord : Entity<Guid>, ICreateAduitEntity
+    {
+        [StringLength(-2)]
+        public string Jti { get; set; }
+
+        [StringLength(50)]
+        public string UserName { get; set; }
+
+        public long CreateUserId { get; set; }
+        public DateTime CreateTime { get; set; }
+    }
+}
diff --git a/src/LinCms.Core/Entities/Blog/Article.cs b/src/LinCms.Core/Entities/Blog/Article.cs
index 18b88aad..f6f597c5 100644
--- a/src/LinCms.Core/Entities/Blog/Article.cs
+++ b/src/LinCms.Core/Entities/Blog/Article.cs
@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
 using FreeSql.DataAnnotations;
+using LinCms.Exceptions;
 
-namespace LinCms.Core.Entities.Blog
+namespace LinCms.Entities.Blog
 {
     [Table(Name = "blog_article")]
     public class Article : FullAduitEntity<Guid>
@@ -15,40 +16,40 @@ public class Article : FullAduitEntity<Guid>
         /// <summary>
         /// 系统内置技术频道Id
         /// </summary>
-        public Guid? ChannelId { get; set; }
-
+        public Guid ChannelId { get; set; }
 
         /// <summary>
         /// 标题
         /// </summary>
-        [Column(DbType = "varchar(200)")]
+        [Column(StringLength = 200)]
         public string Title { get; set; }
 
         /// <summary>
         /// 关键字
         /// </summary>
-        [Column(DbType = "varchar(400)")]
+        [Column(StringLength = 400)]
         public string Keywords { get; set; }
 
         /// <summary>
         /// 来源
         /// </summary>
-        [Column(DbType = "varchar(400)")]
+        [Column(StringLength = 400)]
         public string Source { get; set; }
 
         /// <summary>
         /// 摘要
         /// </summary>
-        [Column(DbType = "varchar(400)")]
+        [Column(StringLength = 400)]
         public string Excerpt { get; set; }
 
         /// <summary>
         /// 正文
         /// </summary>
-        [Column(DbType = "longtext")]
+        [Column(StringLength =-2)]
         public string Content { get; set; }
 
         public int ViewHits { get; set; }
+
         /// <summary>
         /// 评论数量
         /// </summary>
@@ -62,11 +63,11 @@ public class Article : FullAduitEntity<Guid>
         /// <summary>
         /// 列表缩略图封面
         /// </summary>
-        [Column(DbType = "varchar(400)")]
+        [Column(StringLength = 400)]
         public string Thumbnail { get; set; }
 
         /// <summary>
-        /// 是否审核
+        /// 是否审核（默认为true),为false是代表拉黑
         /// </summary>
         public bool IsAudit { get; set; }
 
@@ -83,7 +84,7 @@ public class Article : FullAduitEntity<Guid>
         /// <summary>
         /// 随笔档案   如2019年1月
         /// </summary>
-        [Column(DbType = "varchar(50)")]
+        [Column(StringLength = 50)]
         public string Archive { get; set; }
 
         /// <summary>
@@ -99,9 +100,9 @@ public class Article : FullAduitEntity<Guid>
         public int Editor { get; set; } = 1;
 
         /// <summary>
-        /// 状态：1.暂存，2.发布文章。
+        /// 状态：1.暂存;2.发布;3.私密随笔
         /// </summary>
-        public int Status { get; set; }
+        public int Status { get; set; } = 1;
 
         /// <summary>
         /// 字数
@@ -113,18 +114,22 @@ public class Article : FullAduitEntity<Guid>
         /// </summary>
         public long ReadingTime { get; set; }
 
+        /// <summary>
+        /// 随笔是否开启评论
+        /// </summary>
+        public bool Commentable { get; set; } = true;                                                                   
+
         public virtual Classify Classify { get; set; }
 
         public virtual Channel Channel { get; set; }
 
 
-        [Navigate("CreateUserId")]
-        public virtual  LinUser UserInfo { get; set; }
-
+        [Navigate(nameof(CreateUserId))]
+        public virtual LinUser UserInfo { get; set; }
 
         public virtual ICollection<Tag> Tags { get; set; }
 
-
+        public virtual ArticleDraft ArticleDraft { get; set; }
         [Navigate("SubjectId")]
         public virtual ICollection<UserLike> UserLikes { get; set; }
 
@@ -132,6 +137,25 @@ public void IncreaseViewHits()
         {
             this.ViewHits += 1;
         }
+
+        public void UpdateLikeQuantity(int likesQuantity)
+        {
+            if (IsAudit == false)
+            {
+                throw new LinCmsException("该文章因违规被拉黑");
+            }
+
+            if (likesQuantity < 0)
+            {
+                //防止数量一直减，减到小于0
+                if (LikesQuantity < -likesQuantity)
+                {
+                    return;
+                }
+            }
+
+            this.LikesQuantity += likesQuantity;
+        }
     }
 
     /// <summary>
diff --git a/src/LinCms.Core/Entities/Blog/ArticleDraft.cs b/src/LinCms.Core/Entities/Blog/ArticleDraft.cs
new file mode 100644
index 00000000..3314d8a1
--- /dev/null
+++ b/src/LinCms.Core/Entities/Blog/ArticleDraft.cs
@@ -0,0 +1,41 @@
+using System;
+using FreeSql.DataAnnotations;
+
+namespace LinCms.Entities.Blog
+{
+    /// <summary>
+    /// 文章草稿箱
+    /// </summary>
+    [Table(Name = "blog_article_draft")]
+    public class ArticleDraft : FullAduitEntity<Guid>
+    {
+        public ArticleDraft()
+        {
+        }
+
+        public ArticleDraft(Guid id,string content, string title, int editor)
+        {
+            Id = id;
+            Content = content ?? throw new ArgumentNullException(nameof(content));
+            Title = title ?? throw new ArgumentNullException(nameof(title));
+            Editor = editor;
+        }
+
+        /// <summary>
+        /// 正文
+        /// </summary>
+        [Column(StringLength = -2)]
+        public string Content { get; set; }
+
+        [Column(StringLength = 200)]
+        public string Title { get; set; }
+
+        /// <summary>
+        ///1:MarkDown编辑器  2:富文本编辑器,
+        /// </summary>
+        public int Editor { get; set; } = 1;
+
+        public virtual Article Article { get; set; }
+
+    }
+}
diff --git a/src/LinCms.Core/Entities/Blog/Channel.cs b/src/LinCms.Core/Entities/Blog/Channel.cs
index 563c3bab..1d7fd247 100644
--- a/src/LinCms.Core/Entities/Blog/Channel.cs
+++ b/src/LinCms.Core/Entities/Blog/Channel.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities.Blog
+namespace LinCms.Entities.Blog
 {
     /// <summary>
     /// 技术频道，官方分类。标签的分类。
@@ -13,7 +13,7 @@ public class Channel : FullAduitEntity<Guid>
         /// <summary>
         /// 封面图
         /// </summary>
-        [Column(DbType = "varchar(100)")]
+         [Column(StringLength =100)]
         public string Thumbnail { get; set; }
 
         /// <summary>
@@ -24,20 +24,20 @@ public class Channel : FullAduitEntity<Guid>
         /// <summary>
         /// 技术频道名称
         /// </summary>
-        [Column(DbType = "varchar(50)")]
+        [Column(StringLength = 50)]
 
         public string ChannelName { get; set; }
 
         /// <summary>
         /// 编码
         /// </summary>
-        [Column(DbType = "varchar(50)")]
+         [Column(StringLength = 50)]
         public string ChannelCode { get; set; }
 
         /// <summary>
         /// 备注描述
         /// </summary>
-        [Column(DbType = "varchar(500)")]
+         [Column(StringLength =500)]
         public string Remark { get; set; }
         /// <summary>
         /// 是否有效
diff --git a/src/LinCms.Core/Entities/Blog/ChannelTag.cs b/src/LinCms.Core/Entities/Blog/ChannelTag.cs
index a3143b57..f932495a 100644
--- a/src/LinCms.Core/Entities/Blog/ChannelTag.cs
+++ b/src/LinCms.Core/Entities/Blog/ChannelTag.cs
@@ -1,7 +1,7 @@
 using System;
 using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities.Blog
+namespace LinCms.Entities.Blog
 {
     [Table(Name = "blog_channel_tag")]
     public class ChannelTag:Entity<Guid>
diff --git a/src/LinCms.Core/Entities/Blog/Classify.cs b/src/LinCms.Core/Entities/Blog/Classify.cs
index aca8dd64..5e1cc0b5 100644
--- a/src/LinCms.Core/Entities/Blog/Classify.cs
+++ b/src/LinCms.Core/Entities/Blog/Classify.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities.Blog
+namespace LinCms.Entities.Blog
 {
 
     /// <summary>
@@ -14,7 +14,7 @@ public class Classify:FullAduitEntity<Guid>
         /// <summary>
         /// 封面图
         /// </summary>
-        [Column(DbType = "varchar(100)")]
+         [Column(StringLength =100)]
         public string Thumbnail { get; set; }
         /// <summary>
         /// 排序
@@ -23,7 +23,7 @@ public class Classify:FullAduitEntity<Guid>
         /// <summary>
         /// 分类专栏名称
         /// </summary>
-        [Column(DbType = "varchar(50)")]
+         [Column(StringLength = 50)]
         public string ClassifyName { get; set; }
 
         /// <summary>
@@ -43,9 +43,19 @@ public void IncreaseArticleCount()
             this.ArticleCount += 1;
         }
 
-        public void UpdateDiyArticleCount(int articleCount)
+        public void UpdateArticleCount(int inCreaseCount)
         {
-            this.ArticleCount += articleCount;
+            //防止数量一直减，减到小于0
+            if (inCreaseCount < 0)
+            {
+                if (ArticleCount < -inCreaseCount)
+                {
+                    return;
+                }
+            }
+            this.ArticleCount += inCreaseCount;
         }
+
+
     }
 }
diff --git a/src/LinCms.Core/Entities/Blog/Comment.cs b/src/LinCms.Core/Entities/Blog/Comment.cs
index 9bb9a16b..e51f546b 100644
--- a/src/LinCms.Core/Entities/Blog/Comment.cs
+++ b/src/LinCms.Core/Entities/Blog/Comment.cs
@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
 using FreeSql.DataAnnotations;
+using LinCms.Exceptions;
 
-namespace LinCms.Core.Entities.Blog
+namespace LinCms.Entities.Blog
 {
     /// <summary>
     /// 用户评论信息
@@ -28,7 +29,7 @@ public class Comment : FullAduitEntity<Guid>
         /// <summary>
         /// 回复的文本内容
         /// </summary>
-        [Column(DbType = "varchar(500)")]
+        [Column(StringLength =500)]
         public string Text { get; set; }
 
         /// <summary>
@@ -65,12 +66,30 @@ public class Comment : FullAduitEntity<Guid>
         [Navigate("RootCommentId")]
         public virtual ICollection<Comment> Childs { get; set; }
 
-        [Navigate("SubjectId")]
+        [Navigate(nameof(UserLike.SubjectId))]
         public virtual ICollection<UserLike> UserLikes { get; set; }
 
 
         [Navigate("RespId")]
         public virtual Comment Parent { get; set; }
+
+        public void UpdateLikeQuantity(int likesQuantity)
+        {
+            if (IsAudit == false)
+            {
+                throw new LinCmsException("该评论因违规被拉黑");
+            }
+
+            if (likesQuantity < 0)
+            {
+                if (LikesQuantity < -likesQuantity)
+                {
+                    return;
+                }
+            }
+
+            LikesQuantity += likesQuantity;
+        }
     }
 
 }
diff --git a/src/LinCms.Core/Entities/Blog/MessageBoard.cs b/src/LinCms.Core/Entities/Blog/MessageBoard.cs
deleted file mode 100644
index 45b31d74..00000000
--- a/src/LinCms.Core/Entities/Blog/MessageBoard.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using FreeSql.DataAnnotations;
-
-namespace LinCms.Core.Entities.Blog
-{
-    [Table(Name = "blog_message_board")]
-    public class MessageBoard:FullAduitEntity<Guid>
-    {
-       
-        /// <summary>
-        /// 回复的文本内容
-        /// </summary>
-        public string Text { get; set; }
-
-        [Column(DbType = "varchar(50)")]
-        public string Ip { get; set; }
-        /// <summary>
-        /// User-Agent浏览器
-        /// </summary>
-        [Column(DbType = "varchar(200)")]
-        public string Agent { get; set; }
-        /// <summary>
-        /// 操作系统
-        /// </summary>
-        [Column(DbType = "varchar(50)")]
-        public string System { get; set; }
-        /// <summary>
-        /// 地理位置 运营商
-        /// </summary>
-        [Column(DbType = "varchar(50)")]
-        public string GeoPosition { get; set; }
-        /// <summary>
-        /// 主机名
-        /// </summary>
-        [Column(DbType = "varchar(50)")]
-        public string UserHost { get; set; }
-
-        /// <summary>
-        /// 评论人的头像，如果未登录状态下，则随机生成一个头像地址。已登录状态下，取用户表的头像地址
-        /// </summary>
-        [Column(DbType = "varchar(500)")]
-        public string Avatar { get; set; }
-
-        /// <summary>
-        /// 是否已审核
-        /// </summary>
-        public bool? IsAudit { get; set; } = true;
-
-    }
-}
diff --git a/src/LinCms.Core/Entities/Blog/Notification.cs b/src/LinCms.Core/Entities/Blog/Notification.cs
index bbd5eebe..2f81fd55 100644
--- a/src/LinCms.Core/Entities/Blog/Notification.cs
+++ b/src/LinCms.Core/Entities/Blog/Notification.cs
@@ -1,10 +1,10 @@
 using System;
 using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities.Blog
+namespace LinCms.Entities.Blog
 {
     [Table(Name = "blog_notification")]
-    public class Notification : Entity<Guid>
+    public class Notification : FullAduitEntity<Guid>
     {
         /// <summary>
         /// 消息类型
@@ -18,7 +18,6 @@ public class Notification : Entity<Guid>
         /// 当前登录人Id，消息接收者
         /// </summary>
         public long NotificationRespUserId { get; set; }
-        public DateTime CreateTime { get; set; }
 
         public Guid? ArticleId { get; set; }
 
diff --git a/src/LinCms.Core/Entities/Blog/Tag.cs b/src/LinCms.Core/Entities/Blog/Tag.cs
index dfd21347..6d3a1f6a 100644
--- a/src/LinCms.Core/Entities/Blog/Tag.cs
+++ b/src/LinCms.Core/Entities/Blog/Tag.cs
@@ -2,27 +2,30 @@
 using System.Collections.Generic;
 using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities.Blog
+namespace LinCms.Entities.Blog
 {
+    /// <summary>
+    /// 标签
+    /// </summary>
     [Table(Name = "blog_tag")]
     public class Tag : FullAduitEntity<Guid>
     {
         /// <summary>
         /// 别名
         /// </summary>
-        [Column(DbType = "varchar(200)")]
+        [Column(StringLength = 200)]
         public string Alias { get; set; }
 
         /// <summary>
         /// 标签封面图
         /// </summary>
-        [Column(DbType = "varchar(100)")]
+        [Column(StringLength = 100)]
         public string Thumbnail { get; set; }
 
         /// <summary>
         /// 标签名
         /// </summary>
-        [Column(DbType = "varchar(50)")]
+        [Column(StringLength = 50)]
         public string TagName { get; set; }
 
         /// <summary>
@@ -50,7 +53,6 @@ public class Tag : FullAduitEntity<Guid>
         /// </summary>
         public int SubscribersCount { get; set; } = 0;
 
-
         public virtual ICollection<Article> Articles { get; set; }
 
         public virtual ICollection<Channel> Channels { get; set; }
@@ -62,5 +64,17 @@ public class Tag : FullAduitEntity<Guid>
         [Navigate("CreateUserId")]
         public virtual LinUser LinUser { get; set; }
 
+
+        public Tag UpdateSubscribersCount(int inCreaseCount)
+        {
+            //防止数量一直减，减到小于0
+            if (inCreaseCount < 0 && this.SubscribersCount < -inCreaseCount)
+            {
+                return this;
+            }
+            this.SubscribersCount += inCreaseCount;
+            return this;
+        }
+
     }
 }
diff --git a/src/LinCms.Core/Entities/Blog/TagArticle.cs b/src/LinCms.Core/Entities/Blog/TagArticle.cs
index 795a1fed..2bb404fd 100644
--- a/src/LinCms.Core/Entities/Blog/TagArticle.cs
+++ b/src/LinCms.Core/Entities/Blog/TagArticle.cs
@@ -1,7 +1,7 @@
 using System;
 using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities.Blog
+namespace LinCms.Entities.Blog
 {
     [Table(Name = "blog_tag_article")]
     public class TagArticle:Entity<Guid>
diff --git a/src/LinCms.Core/Entities/Blog/UserLike.cs b/src/LinCms.Core/Entities/Blog/UserLike.cs
index ea7474ff..73732505 100644
--- a/src/LinCms.Core/Entities/Blog/UserLike.cs
+++ b/src/LinCms.Core/Entities/Blog/UserLike.cs
@@ -1,7 +1,7 @@
 using System;
 using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities.Blog
+namespace LinCms.Entities.Blog
 {
     [Table(Name = "blog_user_like")]
     public class UserLike : Entity<Guid>, ICreateAduitEntity
diff --git a/src/LinCms.Core/Entities/Blog/UserSubscribe.cs b/src/LinCms.Core/Entities/Blog/UserSubscribe.cs
index e086f098..dce9f688 100644
--- a/src/LinCms.Core/Entities/Blog/UserSubscribe.cs
+++ b/src/LinCms.Core/Entities/Blog/UserSubscribe.cs
@@ -1,7 +1,7 @@
 using System;
 using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities.Blog
+namespace LinCms.Entities.Blog
 {
     /// <summary>
     /// 用户关注用户
diff --git a/src/LinCms.Core/Entities/Blog/UserTag.cs b/src/LinCms.Core/Entities/Blog/UserTag.cs
index f6b0b215..158dc0ba 100644
--- a/src/LinCms.Core/Entities/Blog/UserTag.cs
+++ b/src/LinCms.Core/Entities/Blog/UserTag.cs
@@ -1,7 +1,7 @@
 using System;
 using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities.Blog
+namespace LinCms.Entities.Blog
 {
     [Table(Name = "blog_user_tag")]
     public class UserTag : Entity<Guid>,ICreateAduitEntity
diff --git a/src/LinCms.Core/Entities/Book.cs b/src/LinCms.Core/Entities/Book.cs
index 96472261..ce83d7c0 100644
--- a/src/LinCms.Core/Entities/Book.cs
+++ b/src/LinCms.Core/Entities/Book.cs
@@ -1,20 +1,23 @@
 using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities
+namespace LinCms.Entities
 {
+    /// <summary>
+    /// 也是demo。
+    /// </summary>
     [Table(Name = "book")]
     public class Book : FullAduitEntity
     {
-        [Column(DbType = "varchar(30)")]
+        [Column(StringLength = 30)]
         public string Author { get; set; } = string.Empty;
 
-        [Column(DbType = "varchar(50)")]
+        [Column(StringLength = 50)]
         public string Image { get; set; } = string.Empty;
 
-        [Column(DbType = "varchar(1000)")]
+        [Column(StringLength = 1000)]
         public string Summary { get; set; } = string.Empty;
 
-        [Column(DbType = "varchar(50)")]
+        [Column(StringLength = 50)]
         public string Title { get; set; } = string.Empty;
 
     }
diff --git a/src/LinCms.Core/Entities/FullAduitEntity.cs b/src/LinCms.Core/Entities/FullAduitEntity.cs
index 46634e92..2c2d4b19 100644
--- a/src/LinCms.Core/Entities/FullAduitEntity.cs
+++ b/src/LinCms.Core/Entities/FullAduitEntity.cs
@@ -1,25 +1,32 @@
 using System;
 using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities
+namespace LinCms.Entities
 {
-    public abstract class EntityDto<T>
+    public interface IEntityDto
+    {
+    }
+
+    public interface IEntityDto<TKey> : IEntityDto
+    {
+        TKey Id { get; set; }
+    }
+
+    public abstract class EntityDto<TKey> : IEntityDto<TKey>
     {
         /// <summary>
         /// 主键Id
         /// </summary>
-        public T Id { get; set; }
+        public TKey Id { get; set; }
     }
 
     public abstract class EntityDto : EntityDto<long>
     {
-
     }
 
     [Serializable]
     public class FullAduitEntity : FullAduitEntity<long>
     {
-
     }
 
     public class FullAduitEntity<T> : Entity<T>, IUpdateAuditEntity, IDeleteAduitEntity, ICreateAduitEntity
@@ -27,31 +34,45 @@ public class FullAduitEntity<T> : Entity<T>, IUpdateAuditEntity, IDeleteAduitEnt
         /// <summary>
         /// 创建者ID
         /// </summary>
+
+        [Column(Position = -7)]
         public long CreateUserId { get; set; }
+
         /// <summary>
         /// 创建时间
         /// </summary>
+        [Column(Position = -6)]
         public DateTime CreateTime { get; set; }
+
         /// <summary>
         /// 是否删除
         /// </summary>
+        [Column(Position = -5)]
         public bool IsDeleted { get; set; }
+
         /// <summary>
         /// 删除人id
         /// </summary>
+        [Column(Position = -4)]
         public long? DeleteUserId { get; set; }
+
         /// <summary>
         /// 删除时间
         /// </summary>
+        [Column(Position = -3)]
         public DateTime? DeleteTime { get; set; }
+
         /// <summary>
         /// 最后修改人Id
         /// </summary>
+        [Column(Position = -2)]
         public long? UpdateUserId { get; set; }
+
         /// <summary>
         /// 修改时间
         /// </summary>
-        public DateTime UpdateTime { get; set; }
+        [Column(Position = -1)]
+        public DateTime? UpdateTime { get; set; }
     }
 
 
@@ -60,12 +81,11 @@ public interface ICreateAduitEntity
         /// <summary>
         /// 创建者ID
         /// </summary>
-        [Column(Position = -7)]
         long CreateUserId { get; set; }
+
         /// <summary>
         /// 创建时间
         /// </summary>
-        [Column(Position = -6)]
         DateTime CreateTime { get; set; }
     }
 
@@ -74,13 +94,11 @@ public interface IUpdateAuditEntity
         /// <summary>
         /// 最后修改人Id
         /// </summary>
-        [Column(Position = -5)]
         long? UpdateUserId { get; set; }
         /// <summary>
         /// 修改时间
         /// </summary>
-        [Column(Position = -4)]
-        DateTime UpdateTime { get; set; }
+        DateTime? UpdateTime { get; set; }
     }
 
     public interface IDeleteAduitEntity
@@ -88,34 +106,32 @@ public interface IDeleteAduitEntity
         /// <summary>
         /// 是否删除
         /// </summary>
-        [Column(Position = -3)]
         bool IsDeleted { get; set; }
+
         /// <summary>
         /// 删除人id
         /// </summary>
-        [Column(Position = -2)]
         long? DeleteUserId { get; set; }
+
         /// <summary>
         /// 删除时间
         /// </summary>
-        [Column(Position = -1)]
         DateTime? DeleteTime { get; set; }
     }
 
+    //[Index("uk_id_index", "id asc", true)]
     public abstract class Entity<T> : IEntity<T>
     {
         /// <summary>
         /// 主键Id
         /// </summary>
-        [Column(IsPrimary = true,IsIdentity = true,Position = 1)]
+        [Column(IsPrimary = true, IsIdentity = true, Position = 1)]
         public T Id { get; set; }
-
     }
 
     [Serializable]
     public abstract class Entity : Entity<long>
     {
-
     }
 
     public interface IEntity<T>
@@ -126,8 +142,7 @@ public interface IEntity<T>
         T Id { get; set; }
     }
 
-    public interface IEntity : IEntity<int>
+    public interface IEntity : IEntity<long>
     {
-
     }
-}
+}
\ No newline at end of file
diff --git a/src/LinCms.Core/Entities/Image.cs b/src/LinCms.Core/Entities/Image.cs
deleted file mode 100644
index 7b45e3d0..00000000
--- a/src/LinCms.Core/Entities/Image.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using FreeSql.DataAnnotations;
-
-namespace LinCms.Core.Entities
-{
-    [Table(Name = "image")]
-    public class Image:Entity
-    {
-        public int From { get; set; }
-
-        public string Url { get; set; } = string.Empty;
-
-    }
-}
diff --git a/src/LinCms.Core/Entities/LinEvent.cs b/src/LinCms.Core/Entities/LinEvent.cs
deleted file mode 100644
index c09f087f..00000000
--- a/src/LinCms.Core/Entities/LinEvent.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using FreeSql.DataAnnotations;
-
-namespace LinCms.Core.Entities
-{
-    [Table(Name = "lin_event")]
-    public class LinEvent : Entity
-    {
-        /// <summary>
-        /// 所属权限组id
-        /// </summary>
-        public int GroupId { get; set; }
-
-        /// <summary>
-        /// 信息
-        /// </summary>
-        [Column(DbType = "varchar(250)")]
-        public string MessageEvents { get; set; } = string.Empty;
-
-    }
-}
diff --git a/src/LinCms.Core/Entities/LinFile.cs b/src/LinCms.Core/Entities/LinFile.cs
index 5de554d5..e1942e8c 100644
--- a/src/LinCms.Core/Entities/LinFile.cs
+++ b/src/LinCms.Core/Entities/LinFile.cs
@@ -1,6 +1,6 @@
 using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities
+namespace LinCms.Entities
 {
     [Table(Name = "lin_file")]
     public class LinFile : FullAduitEntity
@@ -8,25 +8,25 @@ public class LinFile : FullAduitEntity
         /// <summary>
         /// 后缀
         /// </summary>
-        [Column(DbType = "varchar(50)")]
+         [Column(StringLength = 50)]
         public string Extension { get; set; } = string.Empty;
 
         /// <summary>
         /// 图片md5值，防止上传重复图片
         /// </summary>
-        [Column(DbType = "varchar(40)")]
+         [Column(StringLength =40)]
         public string Md5 { get; set; } = string.Empty;
 
         /// <summary>
         /// 名称
         /// </summary>
-        [Column(DbType = "varchar(100)")]
+         [Column(StringLength =300)]
         public string Name { get; set; } = string.Empty;
 
         /// <summary>
         /// 路径
         /// </summary>
-        [Column(DbType = "varchar(500)")]
+         [Column(StringLength =500)]
         public string Path { get; set; } = string.Empty;
 
         /// <summary>
diff --git a/src/LinCms.Core/Entities/LinGroup.cs b/src/LinCms.Core/Entities/LinGroup.cs
index 007d2fa8..dea5ddf1 100644
--- a/src/LinCms.Core/Entities/LinGroup.cs
+++ b/src/LinCms.Core/Entities/LinGroup.cs
@@ -1,28 +1,48 @@
-
+using System;
 using System.Collections.Generic;
 using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities
+namespace LinCms.Entities
 {
+    /// <summary>
+    /// 用户组
+    /// </summary>
     [Table(Name = "lin_group")]
     public class LinGroup : Entity<long>
     {
+        public LinGroup()
+        {
+        }
+
+        public LinGroup(string name, string info, bool isStatic)
+        {
+            Name = name ?? throw new ArgumentNullException(nameof(name));
+            Info = info ?? throw new ArgumentNullException(nameof(info));
+            IsStatic = isStatic;
+        }
+
         /// <summary>
-        /// 权限组名称
+        /// 权限组唯一标识字符
         /// </summary>
-        [Column(DbType = "varchar(60)")]
+        [Column(StringLength = 60)]
         public string Name { get; set; }
+
         /// <summary>
         /// 权限组描述
         /// </summary>
-        [Column(DbType = "varchar(500)")]
+        [Column(StringLength = 100)]
         public string Info { get; set; }
 
         /// <summary>
-        /// 是否是静态分组
+        /// 是否是静态分组,是静态时无法删除此分组
         /// </summary>
         public bool IsStatic { get; set; } = false;
 
+        /// <summary>
+        /// 排序码，升序
+        /// </summary>
+        public int SortCode { get; set; }
+
         [Navigate(ManyToMany = typeof(LinUserGroup))]
         public virtual ICollection<LinUser> LinUsers { get; set; }
 
diff --git a/src/LinCms.Core/Entities/LinGroupPermission.cs b/src/LinCms.Core/Entities/LinGroupPermission.cs
index 90f70337..fcd36ea9 100644
--- a/src/LinCms.Core/Entities/LinGroupPermission.cs
+++ b/src/LinCms.Core/Entities/LinGroupPermission.cs
@@ -1,7 +1,10 @@
 using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities
+namespace LinCms.Entities
 {
+    /// <summary>
+    /// 分组权限中间表
+    /// </summary>
     [Table(Name = "lin_group_permission")]
     public class LinGroupPermission : Entity<long>
     {
diff --git a/src/LinCms.Core/Entities/LinLog.cs b/src/LinCms.Core/Entities/LinLog.cs
index 1ee73f1a..4aac1461 100644
--- a/src/LinCms.Core/Entities/LinLog.cs
+++ b/src/LinCms.Core/Entities/LinLog.cs
@@ -1,49 +1,42 @@
-using System;
-using FreeSql.DataAnnotations;
+using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities
+namespace LinCms.Entities
 {
     /// <summary>
     /// 日志表
     /// </summary>
     [Table(Name = "lin_log")]
-    public class LinLog : Entity
+    public class LinLog : FullAduitEntity
     {
         /// <summary>
         /// 访问哪个权限
         /// </summary>
-        [Column(DbType = "varchar(100)")]
-        public string Authority { get; set; } = string.Empty;
+        [Column(StringLength = 100)]
+        public string Authority { get; set; }
 
         /// <summary>
         /// 日志信息
         /// </summary>
-        [Column(DbType = "varchar(450)")]
-        public string Message { get; set; } = string.Empty;
+        [Column(StringLength = 500)]
+        public string Message { get; set; }
 
         /// <summary>
         /// 请求方法
         /// </summary>
-        [Column(DbType = "varchar(20)")]
-        public string Method { get; set; } = string.Empty;
+        [Column(StringLength = 20)]
+        public string Method { get; set; }
 
         /// <summary>
         /// 请求路径
         /// </summary>
-        [Column(DbType = "varchar(100)")]
-        public string Path { get; set; } = string.Empty;
+        [Column(StringLength = 100)]
+        public string Path { get; set; }
 
         /// <summary>
         /// 请求的http返回码
         /// </summary>
         public int? StatusCode { get; set; }
 
-        /// <summary>
-        /// 日志创建时间
-        /// </summary>
-        [Column(DbType = "datetime")]
-        public DateTime? Time { get; set; }
-
         /// <summary>
         /// 用户id
         /// </summary>
@@ -52,10 +45,8 @@ public class LinLog : Entity
         /// <summary>
         /// 用户当时的昵称
         /// </summary>
-        [Column(DbType = "varchar(20)")]
-        public string UserName { get; set; } = string.Empty;
+        [Column(StringLength = 24)]
+        public string Username { get; set; }
 
-        [Column(DbType = "longtext")]
-        public string OtherMessage { get; set; }
     }
 }
diff --git a/src/LinCms.Core/Entities/LinPermission.cs b/src/LinCms.Core/Entities/LinPermission.cs
index 8751b432..907cb086 100644
--- a/src/LinCms.Core/Entities/LinPermission.cs
+++ b/src/LinCms.Core/Entities/LinPermission.cs
@@ -1,32 +1,42 @@
 using System;
 using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities
+namespace LinCms.Entities
 {
+    /// <summary>
+    /// 权限表
+    /// </summary>
     [Table(Name = "lin_permission")]
     public class LinPermission : FullAduitEntity<long>
     {
-        public LinPermission(string name, string module)
+        public LinPermission()
         {
-            Name = name ?? throw new ArgumentNullException(nameof(name));
-            Module = module ?? throw new ArgumentNullException(nameof(module));
         }
 
-        public LinPermission()
+        public LinPermission(string name, string module, string router)
         {
+            Name = name ?? throw new ArgumentNullException(nameof(name));
+            Module = module ?? throw new ArgumentNullException(nameof(module));
+            Router = router ?? throw new ArgumentNullException(nameof(router));
         }
 
         /// <summary>
         /// 所属权限、权限名称，例如：访问首页
         /// </summary>
-        [Column(DbType = "varchar(60)")]
+        [Column(StringLength = 60)]
         public string Name { get; set; }
 
         /// <summary>
         /// 权限所属模块，例如：人员管理
         /// </summary>
-        [Column(DbType = "varchar(50)")]
-        public string Module { get;  set; }
+        [Column(StringLength = 50)]
+        public string Module { get; set; }
+
+        /// <summary>
+        /// 后台路由
+        /// </summary>
+        [Column(StringLength = 200)]
+        public string Router { get; set; }
 
         public override string ToString()
         {
diff --git a/src/LinCms.Core/Entities/LinUser.cs b/src/LinCms.Core/Entities/LinUser.cs
index 85182149..9ba8fab3 100644
--- a/src/LinCms.Core/Entities/LinUser.cs
+++ b/src/LinCms.Core/Entities/LinUser.cs
@@ -1,34 +1,27 @@
 using System;
 using System.Collections.Generic;
+using System.Security.Cryptography;
 using FreeSql.DataAnnotations;
-using LinCms.Core.Data.Enums;
+using LinCms.Data.Enums;
 
-namespace LinCms.Core.Entities
+namespace LinCms.Entities
 {
     /// <summary>
-    /// 用户信息
+    /// 用户
     /// </summary>
     [Table(Name = "lin_user")]
     public class LinUser : FullAduitEntity
     {
-        public LinUser() { }
-
-        public LinUser(string username, string password)
-        {
-            this.Username = username;
-            this.Password = password;
-        }
-
         /// <summary>
         /// 用户名
         /// </summary>
-        [Column(DbType = "varchar(24)")]
+        [Column(StringLength = 24)]
         public string Username { get; set; }
 
         /// <summary>
         /// 昵称
         /// </summary>
-        [Column(DbType = "varchar(24)")]
+        [Column(StringLength = 24)]
         public string Nickname { get; set; }
 
         /// <summary>
@@ -36,43 +29,33 @@ public LinUser(string username, string password)
         /// </summary>
         public string Avatar { get; set; }
 
-        /// <summary>
-        /// 密码
-        /// </summary>
-        [Column(DbType = "varchar(100)")]
-        public string Password { get; set; }
-
         /// <summary>
         /// 电子邮箱
         /// </summary>
-        [Column(DbType = "varchar(100)")]
+        [Column(StringLength = 100)]
         public string Email { get; set; }
 
-        /// <summary>
-        /// 是否为超级管理员 ;  1 -> 普通用户 |  2 -> 超级管理员
-        /// </summary>
-        public int Admin { get; set; } = 1;
-
         /// <summary>
         /// 当前用户是否为激活状态，非激活状态默认失去用户权限 ; 1 -> 激活 | 2 -> 非激活
         /// </summary>
-        public int Active { get; set; }
+        public UserActive Active { get; set; } = UserActive.Active;
 
         /// <summary>
         /// 手机号
         /// </summary>
-        [Column(DbType = "varchar(100)")]
+        [Column(StringLength = 100)]
         public string PhoneNumber { get; set; }
 
         /// <summary>
         /// 个人介绍
         /// </summary>
-        [Column(DbType = "varchar(100)")]
+        [Column(StringLength = 100)]
         public string Introduction { get; set; }
 
         /// <summary>
         ///  个人主页
         /// </summary>
+        [Column(StringLength = 100)]
         public string BlogAddress { get; set; }
 
         /// <summary>
@@ -80,27 +63,56 @@ public LinUser(string username, string password)
         /// </summary>
         public DateTime LastLoginTime { get; set; }
 
+        /// <summary>
+        /// JWT 登录，保存生成的随机token值。
+        /// </summary>
+        [Column(StringLength = 200)]
+        public string RefreshToken { get; set; }
+        public bool IsEmailConfirmed { get; set; } = false;
+        public string PasswordResetCode { get; set; }
+
+        /// <summary>
+        /// 盐值
+        /// </summary>
+        [Column(StringLength = 100)]
+        public string Salt { get; set; }
 
         [Navigate(ManyToMany = typeof(LinUserGroup))]
         public virtual ICollection<LinGroup> LinGroups { get; set; }
+
         [Navigate("UserId")]
         public virtual ICollection<LinUserGroup> LinUserGroups { get; set; }
+
         [Navigate("CreateUserId")]
         public virtual ICollection<LinUserIdentity> LinUserIdentitys { get; set; }
 
-        /// <summary>
-        /// 是否是管理员
-        /// </summary>
-        /// <returns></returns>
-        public bool IsAdmin()
+
+        public void SetNewPasswordResetCode()
         {
-            return Admin == (int)UserAdmin.Admin;
+            this.PasswordResetCode = Guid.NewGuid().ToString("N").Truncate(328);
         }
 
         public bool IsActive()
         {
-            return Active == (int)UserActive.Active;
+            return Active == UserActive.Active;
         }
 
+        /// <summary>
+        /// 登录后用户状态变化
+        /// </summary>
+        public void AddRefreshToken()
+        {
+            string refreshToken = GenerateToken();
+            LastLoginTime = DateTime.Now;
+            RefreshToken = refreshToken;
+        }
+
+        private string GenerateToken(int size = 32)
+        {
+            var randomNumber = new byte[size];
+            using var rng = RandomNumberGenerator.Create();
+            rng.GetBytes(randomNumber);
+            return Convert.ToBase64String(randomNumber);
+        }
     }
 }
diff --git a/src/LinCms.Core/Entities/LinUserGroup.cs b/src/LinCms.Core/Entities/LinUserGroup.cs
index 55e48105..1771089f 100644
--- a/src/LinCms.Core/Entities/LinUserGroup.cs
+++ b/src/LinCms.Core/Entities/LinUserGroup.cs
@@ -1,12 +1,10 @@
 using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities
+namespace LinCms.Entities
 {
     [Table(Name = "lin_user_group")]
     public class LinUserGroup : Entity<long>
     {
-       
-
         public LinUserGroup()
         {
         }
diff --git a/src/LinCms.Core/Entities/LinUserIdentity.cs b/src/LinCms.Core/Entities/LinUserIdentity.cs
index 4f91473e..6242d74f 100644
--- a/src/LinCms.Core/Entities/LinUserIdentity.cs
+++ b/src/LinCms.Core/Entities/LinUserIdentity.cs
@@ -1,41 +1,58 @@
-using System;
-using FreeSql.DataAnnotations;
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
 
-namespace LinCms.Core.Entities
+namespace LinCms.Entities
 {
+    /// <summary>
+    /// 用户身份认证登录表
+    /// </summary>
     [Table(Name = "lin_user_identity")]
-    public class LinUserIdentity : Entity<Guid>, ICreateAduitEntity
+    public class LinUserIdentity : FullAduitEntity<Guid>
     {
         public const string GitHub = "GitHub";
         public const string Password = "Password";
         public const string QQ = "QQ";
+        public const string Gitee = "Gitee";
         public const string WeiXin = "WeiXin";
 
+        public LinUserIdentity()
+        {
+        }
+
+        public LinUserIdentity(string identityType, string identifier, string credential, DateTime createTime)
+        {
+            IdentityType = identityType ?? throw new ArgumentNullException(nameof(identityType));
+            Identifier = identifier;
+            Credential = credential ?? throw new ArgumentNullException(nameof(credential));
+            CreateTime = createTime;
+        }
+
         /// <summary>
-        ///认证类型， GitHub、QQ、WeiXin等
+        ///认证类型， Password，GitHub、QQ、WeiXin等
         /// </summary>
-        [Column(DbType = "varchar(20)")]
+        [Column(StringLength = 20)]
         public string IdentityType { get; set; }
-      
+
         /// <summary>
-        /// 认证，例如 用户名,
+        /// 认证者，例如 用户名,手机号，邮件等，
         /// </summary>
-        [Column(DbType = "varchar(24)")]
+        [Column(StringLength = 24)]
         public string Identifier { get; set; }
 
         /// <summary>
         ///  凭证，例如 密码,存OpenId、Id，同一IdentityType的OpenId的值是唯一的
         /// </summary>
-        [Column(DbType = "varchar(50)")]
+        [Column(StringLength = 50)]
         public string Credential { get; set; }
-        /// <summary>
-        /// 绑定的用户Id
-        /// </summary>
-        public long CreateUserId { get; set; }
 
-        [Navigate("CreateUserId")]
-        public virtual LinUser LinUser { get; set; }
 
-        public DateTime CreateTime { get; set; }
+        public string ExtraProperties { get; set; }
+
+    }
+
+    public class ExtraProperties : Dictionary<string, string>
+    {
+
     }
 }
diff --git a/src/LinCms.Core/Entities/SerilogDO.cs b/src/LinCms.Core/Entities/SerilogDO.cs
new file mode 100644
index 00000000..860bbde6
--- /dev/null
+++ b/src/LinCms.Core/Entities/SerilogDO.cs
@@ -0,0 +1,17 @@
+using System;
+using FreeSql.DataAnnotations;
+
+namespace LinCms.Entities
+{
+    [Table(DisableSyncStructure = true,Name = "app_serilog")]
+    public class SerilogDO
+    {
+       public long Id { get; set; }
+       public string Exception { get; set; }
+       public int Level { get; set; }
+       public string Message { get; set; }
+       public string MessageTemplate { get; set; }
+       public string Properties { get; set; }
+       public DateTime Timestamp { get; set; }
+    }
+}
diff --git a/src/LinCms.Core/Entities/Settings/LinSetting.cs b/src/LinCms.Core/Entities/Settings/LinSetting.cs
index 43d0aa65..b1dc66d9 100644
--- a/src/LinCms.Core/Entities/Settings/LinSetting.cs
+++ b/src/LinCms.Core/Entities/Settings/LinSetting.cs
@@ -1,30 +1,37 @@
 using System;
 using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities.Settings
+namespace LinCms.Entities.Settings
 {
+    /// <summary>
+    /// all settings config
+    /// </summary>
     [Table(Name = "lin_settings")]
     public class LinSetting : FullAduitEntity<Guid>
     {
         /// <summary>
         /// 键
         /// </summary>
-        [Column(DbType = "varchar(128)", IsNullable=false)]
+        [Column(StringLength = 128)]
         public string Name { get; set; }
+
         /// <summary>
         /// 值
         /// </summary>
-        [Column(DbType = "varchar(2048)", IsNullable = false)]
+        [Column(StringLength = 2048)]
         public string Value { get; set; }
+
         /// <summary>
         /// 提供者
         /// </summary>
-        [Column(DbType = "varchar(64)")]
+
+        [Column(StringLength = 64)]
         public string ProviderName { get; set; }
+
         /// <summary>
         /// 提供者值
         /// </summary>
-        [Column(DbType = "varchar(64)")]
+        [Column(StringLength = 64)]
         public string ProviderKey { get; set; }
 
         public override string ToString()
diff --git a/src/LinCms.Core/Exceptions/LinCmsException.cs b/src/LinCms.Core/Exceptions/LinCmsException.cs
index 4dcbb18a..a8ca2120 100644
--- a/src/LinCms.Core/Exceptions/LinCmsException.cs
+++ b/src/LinCms.Core/Exceptions/LinCmsException.cs
@@ -1,7 +1,7 @@
 using System;
-using LinCms.Core.Data.Enums;
+using LinCms.Data.Enums;
 
-namespace LinCms.Core.Exceptions
+namespace LinCms.Exceptions
 {
     [Serializable]
     public class LinCmsException : ApplicationException
diff --git a/src/LinCms.Core/Extensions/CollectionsExtensions.cs b/src/LinCms.Core/Extensions/CollectionsExtensions.cs
index 1d403e23..740558df 100644
--- a/src/LinCms.Core/Extensions/CollectionsExtensions.cs
+++ b/src/LinCms.Core/Extensions/CollectionsExtensions.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using FreeSql;
-using LinCms.Core.Data;
+using LinCms.Data;
 
-namespace LinCms.Core.Extensions
+namespace LinCms.Extensions
 {
     public static class CollectionsExtensions
     {
@@ -57,8 +57,7 @@ public static PagedResultDto<TEntity> ToPagedResultDto<TEntity>(this IReadOnlyLi
         /// <returns>Value if found, default if can not found.</returns>
         public static TValue GetOrDefault<TKey, TValue>(this Dictionary<TKey, TValue> dictionary, TKey key)
         {
-            TValue obj;
-            return dictionary.TryGetValue(key, out obj) ? obj : default;
+            return dictionary.TryGetValue(key, out TValue obj) ? obj : default;
         }
     }
 }
diff --git a/src/LinCms.Core/Extensions/DateTimeExtensions.cs b/src/LinCms.Core/Extensions/DateTimeExtensions.cs
index 29a7b755..41bd36f5 100644
--- a/src/LinCms.Core/Extensions/DateTimeExtensions.cs
+++ b/src/LinCms.Core/Extensions/DateTimeExtensions.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Text;
 
-namespace LinCms.Core.Extensions
+namespace LinCms.Extensions
 {
     /// <summary>
     /// 系统扩展 - 日期
diff --git a/src/LinCms.Core/Extensions/HttpContextExtensions.cs b/src/LinCms.Core/Extensions/HttpContextExtensions.cs
index d4278635..7f81fc4d 100644
--- a/src/LinCms.Core/Extensions/HttpContextExtensions.cs
+++ b/src/LinCms.Core/Extensions/HttpContextExtensions.cs
@@ -5,7 +5,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LinCms.Core.Extensions
+namespace LinCms.Extensions
 {
     public static class HttpContextExtensions
     {
diff --git a/src/LinCms.Core/Extensions/LinCmsTimeConverter.cs b/src/LinCms.Core/Extensions/LinCmsTimeConverter.cs
index ad9e030e..b58be79c 100644
--- a/src/LinCms.Core/Extensions/LinCmsTimeConverter.cs
+++ b/src/LinCms.Core/Extensions/LinCmsTimeConverter.cs
@@ -2,7 +2,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace LinCms.Core.Extensions
+namespace LinCms.Extensions
 {
     /// <summary>
     /// 配合LinCMS中的时间戳 后台只返回 1562904163734
@@ -11,7 +11,7 @@ public class LinCmsTimeConverter : DateTimeConverterBase
     {
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
         {
-            double javaScriptTicks = 0;
+            double javaScriptTicks;
             if (value is DateTime dateTime)
             {
                 javaScriptTicks = ConvertDateTimeInt(dateTime);
@@ -28,7 +28,28 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            return ConvertIntDateTime(double.Parse(reader.Value.ToString()));
+            if (reader.Value.ToString() == "")
+            {
+                return null;
+            }
+
+            if (reader.TokenType == JsonToken.Integer)
+            {
+                return ConvertIntDateTime(double.Parse(reader.Value.ToString()));
+            }
+
+            if (objectType == typeof(DateTime) || objectType == typeof(DateTime?))
+            {
+                DateTime.TryParse(reader.Value.ToString(), out DateTime readerTime);
+                return readerTime;
+            }
+            if (objectType == typeof(DateTimeOffset) || objectType == typeof(DateTimeOffset?))
+            {
+                DateTimeOffset.TryParse(reader.Value.ToString(), out var readerTime);
+                return readerTime;
+            }
+
+            return null;
         }
 
         public static DateTime ConvertIntDateTime(double milliseconds)
diff --git a/src/LinCms.Core/Extensions/StringExtensions.cs b/src/LinCms.Core/Extensions/StringExtensions.cs
index 25f40f1a..9b141a55 100644
--- a/src/LinCms.Core/Extensions/StringExtensions.cs
+++ b/src/LinCms.Core/Extensions/StringExtensions.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Text;
 
-namespace LinCms.Core.Extensions
+namespace LinCms.Extensions
 {
     public static class StringExtensions
     {
diff --git a/src/LinCms.Core/IRepositories/IAuditBaseRepository.cs b/src/LinCms.Core/IRepositories/IAuditBaseRepository.cs
new file mode 100644
index 00000000..6b3b8e7b
--- /dev/null
+++ b/src/LinCms.Core/IRepositories/IAuditBaseRepository.cs
@@ -0,0 +1,14 @@
+using System;
+using FreeSql;
+
+namespace LinCms.IRepositories
+{
+    public interface IAuditBaseRepository<TEntity> : IBaseRepository<TEntity, Guid> where TEntity : class
+    {
+    }
+
+    public interface IAuditBaseRepository<TEntity, TKey> : IBaseRepository<TEntity, TKey> where TEntity : class
+    {
+
+    }
+}
diff --git a/src/LinCms.Core/IRepositories/IBookRepository.cs b/src/LinCms.Core/IRepositories/IBookRepository.cs
new file mode 100644
index 00000000..bff78aa8
--- /dev/null
+++ b/src/LinCms.Core/IRepositories/IBookRepository.cs
@@ -0,0 +1,9 @@
+using LinCms.Entities;
+
+namespace LinCms.IRepositories
+{
+    public interface IBookRepository : IAuditBaseRepository<Book>
+    {
+
+    }
+}
diff --git a/src/LinCms.Core/IRepositories/IDocRepository.cs b/src/LinCms.Core/IRepositories/IDocRepository.cs
new file mode 100644
index 00000000..59655abd
--- /dev/null
+++ b/src/LinCms.Core/IRepositories/IDocRepository.cs
@@ -0,0 +1,9 @@
+using LinCms.Entities.Base;
+namespace LinCms.IRepositories
+{
+    public interface IDocRepository : IAuditBaseRepository<Doc,long>
+    {
+
+    }
+}
+
diff --git a/src/LinCms.Core/IRepositories/IFileRepository.cs b/src/LinCms.Core/IRepositories/IFileRepository.cs
new file mode 100644
index 00000000..586d32e8
--- /dev/null
+++ b/src/LinCms.Core/IRepositories/IFileRepository.cs
@@ -0,0 +1,12 @@
+using LinCms.Entities;
+
+namespace LinCms.IRepositories
+{
+    public interface IFileRepository : IAuditBaseRepository<LinFile>
+    {
+        string GetFileUrl(string path);
+
+    }
+}
+
+
diff --git a/src/LinCms.Core/IRepositories/ILogRepository.cs b/src/LinCms.Core/IRepositories/ILogRepository.cs
new file mode 100644
index 00000000..23843e92
--- /dev/null
+++ b/src/LinCms.Core/IRepositories/ILogRepository.cs
@@ -0,0 +1,9 @@
+using LinCms.Entities;
+
+namespace LinCms.IRepositories
+{
+    public interface ILogRepository : IAuditBaseRepository<LinLog>
+    {
+        void Create(LinLog linlog);
+    }
+}
diff --git a/src/LinCms.Core/IRepositories/ISettingRepository.cs b/src/LinCms.Core/IRepositories/ISettingRepository.cs
new file mode 100644
index 00000000..6357db0f
--- /dev/null
+++ b/src/LinCms.Core/IRepositories/ISettingRepository.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using LinCms.Entities.Settings;
+
+namespace LinCms.IRepositories
+{
+    public interface ISettingRepository : IAuditBaseRepository<LinSetting>
+    {
+        Task<LinSetting> FindAsync(string name, string providerName, string providerKey);
+
+        Task<List<LinSetting>> GetListAsync(string providerName, string providerKey);
+    }
+}
diff --git a/src/LinCms.Core/IRepositories/IUserRepository.cs b/src/LinCms.Core/IRepositories/IUserRepository.cs
new file mode 100644
index 00000000..0a222abe
--- /dev/null
+++ b/src/LinCms.Core/IRepositories/IUserRepository.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using LinCms.Entities;
+
+namespace LinCms.IRepositories
+{
+    public interface IUserRepository : IAuditBaseRepository<LinUser>
+    {
+        /// <summary>
+        /// 根据条件得到用户信息
+        /// </summary>
+        /// <param name="expression"></param>
+        /// <returns></returns>
+        Task<LinUser> GetUserAsync(Expression<Func<LinUser, bool>> expression);
+
+        /// <summary>
+        /// 根据用户Id更新用户的最后登录时间
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        Task UpdateLastLoginTimeAsync(long userId);
+    }
+}
diff --git a/src/LinCms.Core/LinCms.Core.csproj b/src/LinCms.Core/LinCms.Core.csproj
index 48d0b354..311b29bc 100644
--- a/src/LinCms.Core/LinCms.Core.csproj
+++ b/src/LinCms.Core/LinCms.Core.csproj
@@ -1,22 +1,42 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>8</LangVersion>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
+		<LangVersion>8</LangVersion>
+		<RootNamespace>LinCms</RootNamespace>
+	</PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>bin\Debug\netcoreapp3.1\LinCms.Core.xml</DocumentationFile>
-    <OutputPath>bin\Debug\</OutputPath>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>1701;1702;1705;1591</NoWarn>
-  </PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DocumentationFile>LinCms.Core.xml</DocumentationFile>
+		<OutputPath>bin\Debug\</OutputPath>
+		<WarningLevel>4</WarningLevel>
+		<NoWarn>1701;1702;1705;1591</NoWarn>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="FreeSql" Version="1.3.0-preview4" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
-    <PackageReference Include="Z.ExtensionMethods" Version="2.1.1" />
-  </ItemGroup>
+	<ItemGroup>
+		<None Remove="LinCms.Core.xml" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Content Include="LinCms.Core.xml">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+
+	<ItemGroup>
+		<FrameworkReference Include="Microsoft.AspNetCore.App" />
+		<PackageReference Include="DotNetCore.Security" Version="15.5.0" />
+		<PackageReference Include="MailKit" Version="2.13.0" />
+		<PackageReference Include="FreeSql" Version="2.5.200" />
+		<PackageReference Include="FreeSql.DbContext" Version="2.5.200" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.8" />
+		<PackageReference Include="Serilog.Extensions.Hosting" Version="4.1.2" />
+		<PackageReference Include="Z.ExtensionMethods" Version="2.1.1" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.11.1" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\framework\src\IGeekFan.Localization.FreeSql\IGeekFan.Localization.FreeSql.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/src/LinCms.Core/LinCms.Core.xml b/src/LinCms.Core/LinCms.Core.xml
new file mode 100644
index 00000000..2b4b894d
--- /dev/null
+++ b/src/LinCms.Core/LinCms.Core.xml
@@ -0,0 +1,1249 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>LinCms.Core</name>
+    </assembly>
+    <members>
+        <member name="T:LinCms.Aop.Attributes.TransactionalAttribute">
+            <summary>
+            事务
+            </summary>
+        </member>
+        <member name="P:LinCms.Aop.Attributes.TransactionalAttribute.Propagation">
+            <summary>
+            事务传播方式
+            </summary>
+        </member>
+        <member name="P:LinCms.Aop.Attributes.TransactionalAttribute.IsolationLevel">
+            <summary>
+            事务隔离级别
+            </summary>
+        </member>
+        <member name="T:LinCms.Aop.Filter.LinCmsAuthorizeAttribute">
+            <summary>
+             自定义固定权限编码给动态角色及用户，支持验证登录，退出登录，权限。
+            </summary>
+        </member>
+        <member name="T:LinCms.Aop.Filter.LinCmsExceptionFilter">
+            <summary>
+            出现异常时，如LinCmsException业务异常，会先执行方法过滤器 （LogActionFilterAttribute）的OnActionExecuted才会执行此异常过滤器。
+            </summary>
+        </member>
+        <member name="T:LinCms.Aop.Filter.LogActionFilterAttribute">
+            <summary>
+            全局日志记录
+            </summary>
+        </member>
+        <member name="M:LinCms.Common.EncryptUtil.Encrypt(System.String)">
+            <summary>
+            通过创建哈希字符串适用于任何 MD5 哈希函数 （在任何平台） 上创建 32 个字符的十六进制格式哈希字符串
+            </summary>
+            <param name="source"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Common.EncryptUtil.Verify(System.String,System.String)">
+            <summary>
+            验证source加密码后是否生成mdPwd
+            </summary>
+            <param name="mdPwd">Md5生成的代码</param>
+            <param name="source"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Common.LinCmsUtils.GetHash``1(System.IO.Stream)">
+            <summary>
+            继承HashAlgorithm
+            </summary>
+            <typeparam name="T"></typeparam>
+            <param name="stream"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Common.LinCmsUtils.ValidateMobile(System.String)">
+            <summary>
+            校验手机号码是否符合标准。
+            </summary>
+            <param name="mobile"></param>
+            <returns></returns>
+        </member>
+        <member name="F:LinCms.Data.Enums.CapStorageType.InMemoryStorage">
+            <summary>
+            引用包 DotNetCore.CAP.InMemoryStorage
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.CapStorageType.Mysql">
+            <summary>
+            引用包  DotNetCore.CAP.MySql
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.CapStorageType.SqlServer">
+            <summary>
+            引用包  DotNetCore.CAP.SqlServer
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.ErrorCode.Success">
+            <summary>
+            操作成功
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.ErrorCode.UnknownError">
+            <summary>
+            未知错误
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.ErrorCode.ServerUnknownError">
+            <summary>
+            服务器未知错误
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.ErrorCode.Error">
+            <summary>
+            失败
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.ErrorCode.AuthenticationFailed">
+            <summary>
+            认证失败
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.ErrorCode.NoPermission">
+            <summary>
+            无权限
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.ErrorCode.Fail">
+            <summary>
+            失败
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.ErrorCode.RefreshTokenError">
+            <summary>
+            refreshToken异常
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.ErrorCode.NotFound">
+            <summary>
+            资源不存在
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.ErrorCode.ParameterError">
+            <summary>
+            参数错误
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.ErrorCode.TokenInvalidation">
+            <summary>
+            令牌失效
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.ErrorCode.TokenExpired">
+            <summary>
+            令牌过期
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.ErrorCode.RepeatField">
+            <summary>
+            字段重复
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.ErrorCode.Inoperable">
+            <summary>
+            禁止操作
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.Status.Enable">
+            <summary>
+            启用
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.Status.Forbidden">
+            <summary>
+            禁用
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.TokenType.Access">
+            <summary>
+            access token
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.TokenType.Refresh">
+            <summary>
+            refresh token
+            </summary>
+        </member>
+        <member name="T:LinCms.Data.Enums.UserActive">
+            当前用户是否为激活状态的枚举
+            ACTIVE 代表 激活状态
+            NOT_ACTIVE 代表 非激活状态
+        </member>
+        <member name="F:LinCms.Data.Enums.UserActive.Active">
+            <summary>
+            激活状态
+            </summary>
+        </member>
+        <member name="F:LinCms.Data.Enums.UserActive.NotActive">
+            <summary>
+            非激活状态
+            </summary>
+        </member>
+        <member name="P:LinCms.Data.Options.FileStorageOption.MaxFileSize">
+            <summary>
+            上传文件总大小
+            </summary>
+        </member>
+        <member name="P:LinCms.Data.Options.FileStorageOption.NumLimit">
+            <summary>
+            多文件上传时，支持的最大文件数量
+            </summary>
+        </member>
+        <member name="P:LinCms.Data.Options.FileStorageOption.Include">
+            <summary>
+            允许某些类型文件上传，文件格式以,隔开
+            </summary>
+        </member>
+        <member name="P:LinCms.Data.Options.FileStorageOption.Exclude">
+            <summary>
+            禁止某些类型文件上传，文件格式以,隔开
+            </summary>
+        </member>
+        <member name="T:LinCms.Data.PageDto">
+            <summary>
+            分页
+            </summary>
+        </member>
+        <member name="P:LinCms.Data.PageDto.Count">
+            <summary>
+            每页个数
+            </summary>
+        </member>
+        <member name="P:LinCms.Data.PageDto.Page">
+            <summary>
+            从0开始，0时取第1页，1时取第二页
+            </summary>
+        </member>
+        <member name="P:LinCms.Data.ILimitedResultRequest.Count">
+            <summary>
+            Maximum result count should be returned.
+            This is generally used to limit result count on paging.
+            </summary>
+        </member>
+        <member name="T:LinCms.Data.ISortedResultRequest">
+            <summary>
+            This interface is defined to standardize to request a sorted result.
+            </summary>
+        </member>
+        <member name="P:LinCms.Data.ISortedResultRequest.Sorting">
+            <summary>
+            Sorting information.
+            Should include sorting field and optionally a direction (ASC or DESC)
+            Can contain more than one field separated by comma (,).
+            </summary>
+            <example>
+            Examples:
+            "Name"
+            "Name DESC"
+            "Name ASC, Age DESC"
+            </example>
+        </member>
+        <member name="P:LinCms.Data.UnifyResponseDto.Code">
+             <summary>
+            错误码
+             </summary>
+        </member>
+        <member name="P:LinCms.Data.UnifyResponseDto.Message">
+             <summary>
+            错误信息
+             </summary>
+        </member>
+        <member name="P:LinCms.Data.UnifyResponseDto.Request">
+             <summary>
+            请求地址
+             </summary>
+        </member>
+        <member name="T:LinCms.Dependency.IScopedDependency">
+            <summary>
+            实现该接口将自动注册到Ioc容器，生命周期为每次请求创建一个实例
+            </summary>
+        </member>
+        <member name="T:LinCms.Entities.Base.Doc">
+            <summary>
+            文档---示例代码生成。
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Base.Doc.Name">
+            <summary>
+            文档名
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Base.Doc.DisplayName">
+            <summary>
+            显示名
+            </summary>
+        </member>
+        <member name="T:LinCms.Entities.BlackRecord">
+            <summary>
+            黑名单，实现登录Token的过期
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.ClassifyId">
+            <summary>
+            文章所在分类专栏Id
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.ChannelId">
+            <summary>
+            系统内置技术频道Id
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.Title">
+            <summary>
+            标题
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.Keywords">
+            <summary>
+            关键字
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.Source">
+            <summary>
+            来源
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.Excerpt">
+            <summary>
+            摘要
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.Content">
+            <summary>
+            正文
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.CommentQuantity">
+            <summary>
+            评论数量
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.LikesQuantity">
+            <summary>
+            点赞数量
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.Thumbnail">
+            <summary>
+            列表缩略图封面
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.IsAudit">
+            <summary>
+            是否审核（默认为true),为false是代表拉黑
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.Recommend">
+            <summary>
+            是否推荐
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.IsStickie">
+            <summary>
+            是否置顶
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.Archive">
+            <summary>
+            随笔档案   如2019年1月
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.ArticleType">
+            <summary>
+            随笔类型
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.Editor">
+             <summary>
+            1:MarkDown编辑器  2:富文本编辑器,
+             </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.Status">
+            <summary>
+            状态：1.暂存;2.发布;3.私密随笔
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.WordNumber">
+            <summary>
+            字数
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.ReadingTime">
+            <summary>
+            预计阅读时长
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Article.Commentable">
+            <summary>
+            随笔是否开启评论
+            </summary>
+        </member>
+        <member name="T:LinCms.Entities.Blog.ArticleType">
+            <summary>
+            随笔类型
+            </summary>
+        </member>
+        <member name="F:LinCms.Entities.Blog.ArticleType.Original">
+            <summary>
+            原创
+            </summary>
+        </member>
+        <member name="F:LinCms.Entities.Blog.ArticleType.Repost">
+            <summary>
+            转载
+            </summary>
+        </member>
+        <member name="F:LinCms.Entities.Blog.ArticleType.Translated">
+            <summary>
+            翻译
+            </summary>
+        </member>
+        <member name="T:LinCms.Entities.Blog.ArticleDraft">
+            <summary>
+            文章草稿箱
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.ArticleDraft.Content">
+            <summary>
+            正文
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.ArticleDraft.Editor">
+             <summary>
+            1:MarkDown编辑器  2:富文本编辑器,
+             </summary>
+        </member>
+        <member name="T:LinCms.Entities.Blog.Channel">
+            <summary>
+            技术频道，官方分类。标签的分类。
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Channel.Thumbnail">
+            <summary>
+            封面图
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Channel.SortCode">
+            <summary>
+            排序
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Channel.ChannelName">
+            <summary>
+            技术频道名称
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Channel.ChannelCode">
+            <summary>
+            编码
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Channel.Remark">
+            <summary>
+            备注描述
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Channel.Status">
+            <summary>
+            是否有效
+            </summary>
+        </member>
+        <member name="T:LinCms.Entities.Blog.Classify">
+            <summary>
+            文章专栏，由普通用户创建
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Classify.Thumbnail">
+            <summary>
+            封面图
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Classify.SortCode">
+            <summary>
+            排序
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Classify.ClassifyName">
+            <summary>
+            分类专栏名称
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Classify.ArticleCount">
+            <summary>
+            随笔数量
+            </summary>
+        </member>
+        <member name="T:LinCms.Entities.Blog.Comment">
+            <summary>
+            用户评论信息
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Comment.RespId">
+            <summary>
+            回复评论Id
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Comment.RootCommentId">
+            <summary>
+            根回复id
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Comment.RespUserId">
+            <summary>
+            被回复的用户Id
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Comment.Text">
+            <summary>
+            回复的文本内容
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Comment.LikesQuantity">
+            <summary>
+            点赞量
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Comment.IsAudit">
+            <summary>
+            是否已审核
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Comment.SubjectId">
+            <summary>
+            关联随笔id
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Comment.SubjectType">
+            <summary>
+            评论的对象 1 是随笔，其他为以后扩展
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Comment.UserInfo">
+            <summary>
+            评论的用户-OneToOne
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Comment.RespUserInfo">
+            <summary>
+            被回复的用户-OneToOne
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Notification.NotificationType">
+            <summary>
+            消息类型
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Notification.IsRead">
+            <summary>
+            默认消息未读
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Notification.NotificationRespUserId">
+            <summary>
+            当前登录人Id，消息接收者
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Notification.UserInfoId">
+            <summary>
+            创建消息者
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Notification.UserInfo">
+            <summary>
+            创建消息者 关联用户Id
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Notification.CommentEntry">
+            <summary>
+            评论消息
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Notification.ArticleEntry">
+            <summary>
+            文章内容
+            </summary>
+        </member>
+        <member name="F:LinCms.Entities.Blog.NotificationType.UserLikeArticle">
+            <summary>
+            用户点赞随笔 
+            </summary>
+        </member>
+        <member name="F:LinCms.Entities.Blog.NotificationType.UserLikeArticleComment">
+            <summary>
+            用户点赞随笔上的评论
+            </summary>
+        </member>
+        <member name="F:LinCms.Entities.Blog.NotificationType.UserCommentOnArticle">
+            <summary>
+            用户评论随笔
+            </summary>
+        </member>
+        <member name="F:LinCms.Entities.Blog.NotificationType.UserCommentOnComment">
+            <summary>
+            用户回复随笔的评论
+            </summary>
+        </member>
+        <member name="F:LinCms.Entities.Blog.NotificationType.UserLikeUser">
+            <summary>
+            用户关注用户
+            </summary>
+        </member>
+        <member name="T:LinCms.Entities.Blog.Tag">
+            <summary>
+            标签
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Tag.Alias">
+            <summary>
+            别名
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Tag.Thumbnail">
+            <summary>
+            标签封面图
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Tag.TagName">
+            <summary>
+            标签名
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Tag.Status">
+            <summary>
+            标签状态，true:正常，false：拉黑
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Tag.ArticleCount">
+            <summary>
+            随笔数量
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Tag.ViewHits">
+            <summary>
+            浏览次数
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Tag.Remark">
+            <summary>
+            标签备注情况
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.Tag.SubscribersCount">
+            <summary>
+            关注数量
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.UserLike.SubjectId">
+            <summary>
+            点赞对象
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.UserLike.SubjectType">
+            <summary>
+            点赞类型 1 是文章，2 是评论
+            </summary>
+        </member>
+        <member name="F:LinCms.Entities.Blog.UserLikeSubjectType.UserLikeArticle">
+            <summary>
+            点赞随笔
+            </summary>
+        </member>
+        <member name="F:LinCms.Entities.Blog.UserLikeSubjectType.UserLikeComment">
+            <summary>
+            点赞评论
+            </summary>
+        </member>
+        <member name="T:LinCms.Entities.Blog.UserSubscribe">
+            <summary>
+            用户关注用户
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.UserSubscribe.SubscribeUserId">
+            <summary>
+            被关注的用户Id
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Blog.UserSubscribe.CreateUserId">
+            <summary>
+            关注的用户Id
+            </summary>
+        </member>
+        <member name="T:LinCms.Entities.Book">
+            <summary>
+            也是demo。
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.EntityDto`1.Id">
+            <summary>
+            主键Id
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.FullAduitEntity`1.CreateUserId">
+            <summary>
+            创建者ID
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.FullAduitEntity`1.CreateTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.FullAduitEntity`1.IsDeleted">
+            <summary>
+            是否删除
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.FullAduitEntity`1.DeleteUserId">
+            <summary>
+            删除人id
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.FullAduitEntity`1.DeleteTime">
+            <summary>
+            删除时间
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.FullAduitEntity`1.UpdateUserId">
+            <summary>
+            最后修改人Id
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.FullAduitEntity`1.UpdateTime">
+            <summary>
+            修改时间
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.ICreateAduitEntity.CreateUserId">
+            <summary>
+            创建者ID
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.ICreateAduitEntity.CreateTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.IUpdateAuditEntity.UpdateUserId">
+            <summary>
+            最后修改人Id
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.IUpdateAuditEntity.UpdateTime">
+            <summary>
+            修改时间
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.IDeleteAduitEntity.IsDeleted">
+            <summary>
+            是否删除
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.IDeleteAduitEntity.DeleteUserId">
+            <summary>
+            删除人id
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.IDeleteAduitEntity.DeleteTime">
+            <summary>
+            删除时间
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Entity`1.Id">
+            <summary>
+            主键Id
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.IEntity`1.Id">
+            <summary>
+            主键Id
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinFile.Extension">
+            <summary>
+            后缀
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinFile.Md5">
+            <summary>
+            图片md5值，防止上传重复图片
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinFile.Name">
+            <summary>
+            名称
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinFile.Path">
+            <summary>
+            路径
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinFile.Size">
+            <summary>
+            大小
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinFile.Type">
+            <summary>
+            1 local，2 代表七牛云 3 其他表示其他地方
+            </summary>
+        </member>
+        <member name="T:LinCms.Entities.LinGroup">
+            <summary>
+            用户组
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinGroup.Name">
+            <summary>
+            权限组唯一标识字符
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinGroup.Info">
+            <summary>
+            权限组描述
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinGroup.IsStatic">
+            <summary>
+            是否是静态分组,是静态时无法删除此分组
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinGroup.SortCode">
+            <summary>
+            排序码，升序
+            </summary>
+        </member>
+        <member name="F:LinCms.Entities.LinGroup.Admin">
+            <summary>
+            超级管理员
+            </summary>
+        </member>
+        <member name="F:LinCms.Entities.LinGroup.CmsAdmin">
+            <summary>
+            Cms管理员
+            </summary>
+        </member>
+        <member name="F:LinCms.Entities.LinGroup.User">
+            <summary>
+            普通用户
+            </summary>
+        </member>
+        <member name="T:LinCms.Entities.LinGroupPermission">
+            <summary>
+            分组权限中间表
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinGroupPermission.GroupId">
+            <summary>
+            分组id
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinGroupPermission.PermissionId">
+            <summary>
+            权限Id
+            </summary>
+        </member>
+        <member name="T:LinCms.Entities.LinLog">
+            <summary>
+            日志表
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinLog.Authority">
+            <summary>
+            访问哪个权限
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinLog.Message">
+            <summary>
+            日志信息
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinLog.Method">
+            <summary>
+            请求方法
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinLog.Path">
+            <summary>
+            请求路径
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinLog.StatusCode">
+            <summary>
+            请求的http返回码
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinLog.UserId">
+            <summary>
+            用户id
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinLog.Username">
+            <summary>
+            用户当时的昵称
+            </summary>
+        </member>
+        <member name="T:LinCms.Entities.LinPermission">
+            <summary>
+            权限表
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinPermission.Name">
+            <summary>
+            所属权限、权限名称，例如：访问首页
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinPermission.Module">
+            <summary>
+            权限所属模块，例如：人员管理
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinPermission.Router">
+            <summary>
+            后台路由
+            </summary>
+        </member>
+        <member name="T:LinCms.Entities.LinUser">
+            <summary>
+            用户
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinUser.Username">
+            <summary>
+            用户名
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinUser.Nickname">
+            <summary>
+            昵称
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinUser.Avatar">
+            <summary>
+             用户默认生成图像，为null、头像url
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinUser.Email">
+            <summary>
+            电子邮箱
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinUser.Active">
+            <summary>
+            当前用户是否为激活状态，非激活状态默认失去用户权限 ; 1 -> 激活 | 2 -> 非激活
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinUser.PhoneNumber">
+            <summary>
+            手机号
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinUser.Introduction">
+            <summary>
+            个人介绍
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinUser.BlogAddress">
+            <summary>
+             个人主页
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinUser.LastLoginTime">
+            <summary>
+            最后一次登录的时间
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinUser.RefreshToken">
+            <summary>
+            JWT 登录，保存生成的随机token值。
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinUser.Salt">
+            <summary>
+            盐值
+            </summary>
+        </member>
+        <member name="M:LinCms.Entities.LinUser.AddRefreshToken">
+            <summary>
+            登录后用户状态变化
+            </summary>
+        </member>
+        <member name="T:LinCms.Entities.LinUserIdentity">
+            <summary>
+            用户身份认证登录表
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinUserIdentity.IdentityType">
+             <summary>
+            认证类型， Password，GitHub、QQ、WeiXin等
+             </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinUserIdentity.Identifier">
+            <summary>
+            认证者，例如 用户名,手机号，邮件等，
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.LinUserIdentity.Credential">
+            <summary>
+             凭证，例如 密码,存OpenId、Id，同一IdentityType的OpenId的值是唯一的
+            </summary>
+        </member>
+        <member name="T:LinCms.Entities.Settings.LinSetting">
+            <summary>
+            all settings config
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Settings.LinSetting.Name">
+            <summary>
+            键
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Settings.LinSetting.Value">
+            <summary>
+            值
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Settings.LinSetting.ProviderName">
+            <summary>
+            提供者
+            </summary>
+        </member>
+        <member name="P:LinCms.Entities.Settings.LinSetting.ProviderKey">
+            <summary>
+            提供者值
+            </summary>
+        </member>
+        <member name="F:LinCms.Exceptions.LinCmsException._code">
+            <summary>
+            状态码
+            </summary>
+        </member>
+        <member name="F:LinCms.Exceptions.LinCmsException._errorCode">
+            <summary>
+            错误码，当为0时，代表正常
+            </summary>
+        </member>
+        <member name="M:LinCms.Exceptions.LinCmsException.#ctor">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:LinCms.Exceptions.LinCmsException.GetCode">
+            <summary>
+            
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Extensions.CollectionsExtensions.ToPager``2(FreeSql.ISelect{``0,``1},LinCms.Data.PageDto,System.Int64@)">
+            <summary>
+            Page 方法是从1开始
+            </summary>
+            <typeparam name="T1"></typeparam>
+            <typeparam name="T2"></typeparam>
+            <param name="source"></param>
+            <param name="pageDto"></param>
+            <param name="count"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Extensions.CollectionsExtensions.GetOrDefault``2(System.Collections.Generic.Dictionary{``0,``1},``0)">
+            <summary>
+            Gets a value from the dictionary with given key. Returns default value if can not find.
+            </summary>
+            <param name="dictionary">Dictionary to check and get</param>
+            <param name="key">Key to find the value</param>
+            <typeparam name="TKey">Type of the key</typeparam>
+            <typeparam name="TValue">Type of the value</typeparam>
+            <returns>Value if found, default if can not found.</returns>
+        </member>
+        <member name="T:LinCms.Extensions.DateTimeExtensions">
+            <summary>
+            系统扩展 - 日期
+            </summary>
+        </member>
+        <member name="M:LinCms.Extensions.DateTimeExtensions.ToDateTimeString(System.DateTime,System.Boolean)">
+            <summary>
+            获取格式化字符串，带时分秒，格式："yyyy-MM-dd HH:mm:ss"
+            </summary>
+            <param name="dateTime">日期</param>
+            <param name="removeSecond">是否移除秒</param>
+        </member>
+        <member name="M:LinCms.Extensions.DateTimeExtensions.ToDateTimeString(System.Nullable{System.DateTime},System.Boolean)">
+            <summary>
+            获取格式化字符串，带时分秒，格式："yyyy-MM-dd HH:mm:ss"
+            </summary>
+            <param name="dateTime">日期</param>
+            <param name="removeSecond">是否移除秒</param>
+        </member>
+        <member name="M:LinCms.Extensions.DateTimeExtensions.ToDateString(System.DateTime)">
+            <summary>
+            获取格式化字符串，不带时分秒，格式："yyyy-MM-dd"
+            </summary>
+            <param name="dateTime">日期</param>
+        </member>
+        <member name="M:LinCms.Extensions.DateTimeExtensions.ToDateString(System.Nullable{System.DateTime})">
+            <summary>
+            获取格式化字符串，不带时分秒，格式："yyyy-MM-dd"
+            </summary>
+            <param name="dateTime">日期</param>
+        </member>
+        <member name="M:LinCms.Extensions.DateTimeExtensions.ToTimeString(System.DateTime)">
+            <summary>
+            获取格式化字符串，不带年月日，格式："HH:mm:ss"
+            </summary>
+            <param name="dateTime">日期</param>
+        </member>
+        <member name="M:LinCms.Extensions.DateTimeExtensions.ToTimeString(System.Nullable{System.DateTime})">
+            <summary>
+            获取格式化字符串，不带年月日，格式："HH:mm:ss"
+            </summary>
+            <param name="dateTime">日期</param>
+        </member>
+        <member name="M:LinCms.Extensions.DateTimeExtensions.ToMillisecondString(System.DateTime)">
+            <summary>
+            获取格式化字符串，带毫秒，格式："yyyy-MM-dd HH:mm:ss.fff"
+            </summary>
+            <param name="dateTime">日期</param>
+        </member>
+        <member name="M:LinCms.Extensions.DateTimeExtensions.ToMillisecondString(System.Nullable{System.DateTime})">
+            <summary>
+            获取格式化字符串，带毫秒，格式："yyyy-MM-dd HH:mm:ss.fff"
+            </summary>
+            <param name="dateTime">日期</param>
+        </member>
+        <member name="M:LinCms.Extensions.DateTimeExtensions.ToChineseDateString(System.DateTime)">
+            <summary>
+            获取格式化字符串，不带时分秒，格式："yyyy年MM月dd日"
+            </summary>
+            <param name="dateTime">日期</param>
+        </member>
+        <member name="M:LinCms.Extensions.DateTimeExtensions.ToChineseDateString(System.Nullable{System.DateTime})">
+            <summary>
+            获取格式化字符串，不带时分秒，格式："yyyy年MM月dd日"
+            </summary>
+            <param name="dateTime">日期</param>
+        </member>
+        <member name="M:LinCms.Extensions.DateTimeExtensions.ToChineseDateTimeString(System.DateTime,System.Boolean)">
+            <summary>
+            获取格式化字符串，带时分秒，格式："yyyy年MM月dd日 HH时mm分"
+            </summary>
+            <param name="dateTime">日期</param>
+            <param name="removeSecond">是否移除秒</param>
+        </member>
+        <member name="M:LinCms.Extensions.DateTimeExtensions.ToChineseDateTimeString(System.Nullable{System.DateTime},System.Boolean)">
+            <summary>
+            获取格式化字符串，带时分秒，格式："yyyy年MM月dd日 HH时mm分"
+            </summary>
+            <param name="dateTime">日期</param>
+            <param name="removeSecond">是否移除秒</param>
+        </member>
+        <member name="M:LinCms.Extensions.DateTimeExtensions.Description(System.TimeSpan)">
+            <summary>
+            获取描述
+            </summary>
+            <param name="span">时间间隔</param>
+        </member>
+        <member name="T:LinCms.Extensions.LinCmsTimeConverter">
+            <summary>
+            配合LinCMS中的时间戳 后台只返回 1562904163734
+            </summary>
+        </member>
+        <member name="M:LinCms.Extensions.LinCmsTimeConverter.ConvertDateTimeInt(System.DateTime)">
+            <summary>
+            日期转换为时间戳（时间戳单位毫秒）
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Extensions.StringExtensions.IsNullOrEmpty(System.String)">
+            <summary>
+            Indicates whether this string is null or an System.String.Empty string.
+            </summary>
+        </member>
+        <member name="M:LinCms.Extensions.StringExtensions.IsNullOrWhiteSpace(System.String)">
+            <summary>
+            indicates whether this string is null, empty, or consists only of white-space characters.
+            </summary>
+        </member>
+        <member name="M:LinCms.IRepositories.IUserRepository.GetUserAsync(System.Linq.Expressions.Expression{System.Func{LinCms.Entities.LinUser,System.Boolean}})">
+            <summary>
+            根据条件得到用户信息
+            </summary>
+            <param name="expression"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.IRepositories.IUserRepository.UpdateLastLoginTimeAsync(System.Int64)">
+            <summary>
+            根据用户Id更新用户的最后登录时间
+            </summary>
+            <param name="userId"></param>
+            <returns></returns>
+        </member>
+        <member name="T:LinCms.LinCms.Core.NameValue">
+            <summary>
+            Can be used to store Name/Value (or Key/Value) pairs.
+            </summary>
+        </member>
+        <member name="T:LinCms.LinCms.Core.NameValue`1">
+            <summary>
+            Can be used to store Name/Value (or Key/Value) pairs.
+            </summary>
+        </member>
+        <member name="P:LinCms.LinCms.Core.NameValue`1.Name">
+            <summary>
+            Name.
+            </summary>
+        </member>
+        <member name="P:LinCms.LinCms.Core.NameValue`1.Value">
+            <summary>
+            Value.
+            </summary>
+        </member>
+        <member name="M:LinCms.Email.IEmailSender.SendAsync(MimeKit.MimeMessage,System.Threading.CancellationToken)">
+            <summary>
+            Sends an email.
+            </summary>
+            <param name="message">Mail to be sent</param>
+            <param name="cancellationToken"></param>
+        </member>
+        <member name="P:LinCms.Email.MailKitOptions.Host">
+            <summary>
+            SMTP Host Server address
+            </summary>
+        </member>
+        <member name="P:LinCms.Email.MailKitOptions.Port">
+            <summary>
+            SMTP Host Server Port ,default is 25
+            </summary>
+        </member>
+        <member name="P:LinCms.Email.MailKitOptions.UserName">
+            <summary>
+            send user name
+            </summary>
+        </member>
+        <member name="P:LinCms.Email.MailKitOptions.Password">
+            <summary>
+            send user password
+            </summary>
+        </member>
+        <member name="P:LinCms.Email.MailKitOptions.Domain">
+            <summary>
+            Domain name to login to SMTP server.
+            </summary>
+        </member>
+        <member name="T:LinCms.Middleware.CustomExceptionMiddleWare">
+            <summary>
+            如果使用中间件处理异常，当异常处理后，之后 会再去执行LogActionFilterAttriute中的OnActionExecuted方法
+            </summary>
+        </member>
+        <member name="M:LinCms.Middleware.CustomExceptionMiddleWare.JsonHandle(Microsoft.AspNetCore.Http.HttpContext,System.String,LinCms.Data.Enums.ErrorCode,System.Int32)">
+            <summary>
+            处理方式：返回Json格式
+            </summary>
+            <returns></returns>
+        </member>
+    </members>
+</doc>
diff --git a/src/LinCms.Core/LinCms/Core/NameValue.cs b/src/LinCms.Core/LinCms/Core/NameValue.cs
index e4f4275e..90337748 100644
--- a/src/LinCms.Core/LinCms/Core/NameValue.cs
+++ b/src/LinCms.Core/LinCms/Core/NameValue.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace LinCms.Core.LinCms.Core
+namespace LinCms.LinCms.Core
 {
     /// <summary>
     /// Can be used to store Name/Value (or Key/Value) pairs.
diff --git a/src/LinCms.Core/Entities/ValueObject.cs b/src/LinCms.Core/LinCms/Core/ValueObject.cs
similarity index 98%
rename from src/LinCms.Core/Entities/ValueObject.cs
rename to src/LinCms.Core/LinCms/Core/ValueObject.cs
index 5b473f4c..9aa704b2 100644
--- a/src/LinCms.Core/Entities/ValueObject.cs
+++ b/src/LinCms.Core/LinCms/Core/ValueObject.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using LinCms.Core.Aop;
+using LinCms.Aop.Attributes;
 
-namespace LinCms.Core.Entities
+namespace LinCms.Core
 {
     // source: https://github.com/jhewlett/ValueObject
     public abstract class ValueObject : IEquatable<ValueObject>
diff --git a/src/LinCms.Core/LinCms/Email/EmailSender.cs b/src/LinCms.Core/LinCms/Email/EmailSender.cs
new file mode 100644
index 00000000..23c8c5b2
--- /dev/null
+++ b/src/LinCms.Core/LinCms/Email/EmailSender.cs
@@ -0,0 +1,43 @@
+using System.Net;
+using System.Security.Authentication;
+using System.Threading;
+using System.Threading.Tasks;
+using MailKit.Net.Smtp;
+using MailKit.Security;
+using Microsoft.Extensions.Options;
+using MimeKit;
+namespace LinCms.Email
+{
+    public class EmailSender : IEmailSender
+    {
+        private readonly MailKitOptions options;
+
+        public EmailSender(IOptions<MailKitOptions> options)
+        {
+            this.options = options.Value;
+        }
+
+        public async Task SendAsync(MimeMessage message, CancellationToken cancellationToken = default)
+        {
+
+            using SmtpClient client = new SmtpClient();
+
+#pragma warning disable CS0618 // Type or member is obsolete
+            client.SslProtocols = SslProtocols.Tls11 | SslProtocols.Tls12 | SslProtocols.Ssl2 | SslProtocols.Ssl3 | SslProtocols.Tls;
+#pragma warning restore CS0618 // Type or member is obsolete
+            client.Connect(options.Host, options.Port, options.EnableSsl == true ? SecureSocketOptions.StartTls : SecureSocketOptions.None, cancellationToken);
+
+
+            NetworkCredential credential = !string.IsNullOrEmpty(options.Domain)
+                       ? new NetworkCredential(options.UserName, options.Password, options.Domain)
+                       : new NetworkCredential(options.UserName, options.Password);
+
+            client.Authenticate(credential, cancellationToken);
+
+            await client.SendAsync(message, cancellationToken);
+            client.Disconnect(true, cancellationToken);
+        }
+
+
+    }
+}
diff --git a/src/LinCms.Core/LinCms/Email/IEmailSender.cs b/src/LinCms.Core/LinCms/Email/IEmailSender.cs
new file mode 100644
index 00000000..23c5092c
--- /dev/null
+++ b/src/LinCms.Core/LinCms/Email/IEmailSender.cs
@@ -0,0 +1,17 @@
+using System.Threading;
+using System.Threading.Tasks;
+using LinCms.Dependency;
+using MimeKit;
+
+namespace LinCms.Email
+{
+    public interface IEmailSender : ITransientDependency
+    {
+        /// <summary>
+        /// Sends an email.
+        /// </summary>
+        /// <param name="message">Mail to be sent</param>
+        /// <param name="cancellationToken"></param>
+        Task SendAsync(MimeMessage message, CancellationToken cancellationToken = default);
+    }
+}
diff --git a/src/LinCms.Core/LinCms/Email/MailKitOptions.cs b/src/LinCms.Core/LinCms/Email/MailKitOptions.cs
new file mode 100644
index 00000000..d6fe6050
--- /dev/null
+++ b/src/LinCms.Core/LinCms/Email/MailKitOptions.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LinCms.Email
+{
+    public class MailKitOptions
+    {
+
+        /// <summary>
+        /// SMTP Host Server address
+        /// </summary>
+        public string Host { get; set; }
+
+        /// <summary>
+        /// SMTP Host Server Port ,default is 25
+        /// </summary>
+        public int Port { get; set; } = 25;
+
+        public bool EnableSsl { get; set; } = false;
+
+        /// <summary>
+        /// send user name
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// send user password
+        /// </summary>
+        public string Password { get; set; }
+
+        /// <summary>
+        /// Domain name to login to SMTP server.
+        /// </summary>
+        public string Domain { get; set; }
+
+
+    }
+}
diff --git a/src/LinCms.Core/Middleware/CustomExceptionMiddleWare.cs b/src/LinCms.Core/Middleware/CustomExceptionMiddleWare.cs
new file mode 100644
index 00000000..1d38ea26
--- /dev/null
+++ b/src/LinCms.Core/Middleware/CustomExceptionMiddleWare.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Text;
+using System.Threading.Tasks;
+using LinCms.Common;
+using LinCms.Data;
+using LinCms.Data.Enums;
+using LinCms.Exceptions;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+namespace LinCms.Middleware
+{
+    /// <summary>
+    /// 如果使用中间件处理异常，当异常处理后，之后 会再去执行LogActionFilterAttriute中的OnActionExecuted方法
+    /// </summary>
+    public class CustomExceptionMiddleWare : IMiddleware
+    {
+        private readonly ILogger<CustomExceptionMiddleWare> _logger;
+        private readonly IWebHostEnvironment _environment;
+        public CustomExceptionMiddleWare(ILogger<CustomExceptionMiddleWare> logger, IWebHostEnvironment environment)
+        {
+            _logger = logger;
+            _environment = environment;
+        }
+
+        public async Task InvokeAsync(HttpContext context, RequestDelegate next)
+        {
+            try
+            {
+                await next(context); //调用管道执行下一个中间件
+            }
+            catch (Exception ex)
+            {
+                try
+                {
+                    await HandlerExceptionAsync(context, ex);
+                }
+                catch (Exception e)
+                {
+                    _logger.LogError(e.Message, "处理异常再出异常");
+                }
+            }
+        }
+
+        async Task HandlerExceptionAsync(HttpContext context, Exception ex)
+        {
+            if (ex is LinCmsException cmsException) //自定义业务异常
+            {
+                await JsonHandle(context, cmsException.Message, cmsException.GetErrorCode(),
+                    cmsException.GetCode());
+            }
+            else
+            {
+
+                _logger.LogError(ex, "系统异常信息");
+                if (_environment.IsDevelopment())
+                {
+                    string errorMsg = "异常信息：";
+
+                    void ReadException(Exception ex)
+                    {
+                        errorMsg += $"{ex.Message} | {ex.StackTrace}";
+                        if (ex.InnerException != null)
+                        {
+                            ReadException(ex.InnerException);
+                        }
+                    }
+                    ReadException(ex);
+                    await JsonHandle(context, errorMsg, ErrorCode.UnknownError, 500);
+                }
+                else
+                {
+                    await JsonHandle(context, "服务器正忙，请稍后再试!", ErrorCode.UnknownError, 500);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 处理方式：返回Json格式
+        /// </summary>
+        /// <returns></returns>
+        private async Task JsonHandle(HttpContext context, string errorMsg, ErrorCode errorCode, int statusCode)
+        {
+            UnifyResponseDto apiResponse = new UnifyResponseDto()
+            {
+                Message = errorMsg,
+                Code = errorCode,
+                Request = LinCmsUtils.GetRequest(context)
+            };
+
+            context.Response.ContentType = "application/json";
+            context.Response.StatusCode = statusCode;
+            await context.Response.WriteAsync(apiResponse.ToString(), Encoding.UTF8); ;
+        }
+
+    }
+}
diff --git a/src/LinCms.Core/Repositories/ILogRepository.cs b/src/LinCms.Core/Repositories/ILogRepository.cs
deleted file mode 100644
index 3af786a1..00000000
--- a/src/LinCms.Core/Repositories/ILogRepository.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using FreeSql;
-using LinCms.Core.Dependency;
-using LinCms.Core.Entities;
-
-namespace LinCms.Core.Repositories
-{
-    public interface ILogRepository : IScopedDependency
-    {
-        void Create(LinLog linlog);
-    }
-}
diff --git a/src/LinCms.Core/Security/ClaimsIdentityExtensions.cs b/src/LinCms.Core/Security/ClaimsIdentityExtensions.cs
index 92adaa2d..03f30096 100644
--- a/src/LinCms.Core/Security/ClaimsIdentityExtensions.cs
+++ b/src/LinCms.Core/Security/ClaimsIdentityExtensions.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Security.Claims;
 
-namespace LinCms.Core.Security
+namespace LinCms.Security
 {
 
     public static class ClaimsIdentityExtensions
diff --git a/src/LinCms.Core/Security/CurrentUser.cs b/src/LinCms.Core/Security/CurrentUser.cs
index 131a9685..752dc9c3 100644
--- a/src/LinCms.Core/Security/CurrentUser.cs
+++ b/src/LinCms.Core/Security/CurrentUser.cs
@@ -1,30 +1,26 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Security.Claims;
 using System.Threading;
-using LinCms.Core.Common;
-using LinCms.Core.Dependency;
+using LinCms.Dependency;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Configuration;
 
-namespace LinCms.Core.Security
+namespace LinCms.Security
 {
     public class CurrentUser : ICurrentUser, ITransientDependency
     {
-        private static readonly Claim[] EmptyClaimsArray = new Claim[0];
+        private static readonly Claim[] EmptyClaimsArray = Array.Empty<Claim>();
         private readonly ClaimsPrincipal _claimsPrincipal;
-        private readonly IConfiguration _configuration;
-
-        public CurrentUser(IHttpContextAccessor httpContextAccessor, IConfiguration configuration)
+        public CurrentUser(IHttpContextAccessor httpContextAccessor)
         {
-            _configuration = configuration;
             _claimsPrincipal = httpContextAccessor.HttpContext?.User ?? Thread.CurrentPrincipal as ClaimsPrincipal;
         }
         public long? Id => _claimsPrincipal?.FindUserId();
         public string UserName => _claimsPrincipal?.FindUserName();
+        public string Nickname => _claimsPrincipal.Claims?.FirstOrDefault(c => c.Type == ClaimTypes.GivenName)?.Value;
+        public string Email => _claimsPrincipal.Claims?.FirstOrDefault(c => c.Type == ClaimTypes.Email)?.Value;
         public long[] Groups => FindClaims(LinCmsClaimTypes.Groups).Select(c => c.Value.ToLong()).ToArray();
 
-        public bool? IsAdmin => _claimsPrincipal?.IsAdmin();
-
         public virtual Claim FindClaim(string claimType)
         {
             return _claimsPrincipal?.Claims.FirstOrDefault(c => c.Type == claimType);
@@ -45,22 +41,6 @@ public bool IsInGroup(long groupId)
             return FindClaims(LinCmsClaimTypes.Groups).Any(c => c.Value.ToLong() == groupId);
         }
 
-        public string GetFileUrl(string path)
-        {
-            if (string.IsNullOrEmpty(path)) return "";
-            if (path.StartsWith("http"))
-            {
-                return path;
-            }
-
-            if (path.StartsWith(_configuration[LinConsts.Qiniu.PrefixPath]))
-            {
-                return _configuration[LinConsts.Qiniu.Host] + path;
-            }
-
-            return _configuration[LinConsts.SITE_DOMAIN] + _configuration[LinConsts.File.STORE_DIR] + "/" + path;
-
-        }
     }
 
 }
diff --git a/src/LinCms.Core/Security/ICurrentUser.cs b/src/LinCms.Core/Security/ICurrentUser.cs
index fb81a328..8d45ee6e 100644
--- a/src/LinCms.Core/Security/ICurrentUser.cs
+++ b/src/LinCms.Core/Security/ICurrentUser.cs
@@ -1,17 +1,14 @@
 using System.Security.Claims;
 
-namespace LinCms.Core.Security
+namespace LinCms.Security
 {
     public interface ICurrentUser
     {
         long? Id { get; }
 
         string UserName { get; }
-        long[] Groups { get; }
-
-        bool? IsAdmin { get; }
 
-        string GetFileUrl(string hash);
+        long[] Groups { get; }
 
         Claim FindClaim(string claimType);
 
@@ -19,7 +16,6 @@ public interface ICurrentUser
 
         Claim[] GetAllClaims();
 
-
         bool IsInGroup(long groupId);
     }
 }
diff --git a/src/LinCms.Core/Security/LinCmsClaimTypes.cs b/src/LinCms.Core/Security/LinCmsClaimTypes.cs
index 0e582def..c1d6dee9 100644
--- a/src/LinCms.Core/Security/LinCmsClaimTypes.cs
+++ b/src/LinCms.Core/Security/LinCmsClaimTypes.cs
@@ -1,9 +1,9 @@
-namespace LinCms.Core.Security
+namespace LinCms.Security
 {
     public static class LinCmsClaimTypes
     {
-        public static string Groups { get; set; } = "LinCmsClaimTypes-Groups";
-        public static string IsActive { get; set; } = "LinCmsClaimTypes-IsActive";
-        public static string IsAdmin { get; set; } = "LinCmsClaimTypes-IsAdmin";
+        public static string Groups { get; set; } = "LinCmsClaimTypes.Groups";
+        public static string IsActive { get; set; } = "LinCmsClaimTypes.IsActive";
+        public static string IsAdmin { get; set; } = "LinCmsClaimTypes.IsAdmin";
     }
 }
diff --git a/src/LinCms.Core/Security/Tokens.cs b/src/LinCms.Core/Security/Tokens.cs
new file mode 100644
index 00000000..7b12995f
--- /dev/null
+++ b/src/LinCms.Core/Security/Tokens.cs
@@ -0,0 +1,22 @@
+using System;
+
+namespace LinCms.Security
+{
+    public class Tokens
+    {
+        public Tokens(string accessToken, string refreshToken)
+        {
+            AccessToken = accessToken ?? throw new ArgumentNullException(nameof(accessToken));
+            RefreshToken = refreshToken ?? throw new ArgumentNullException(nameof(refreshToken));
+        }
+
+        public string AccessToken { get; set; }
+
+        public string RefreshToken { get; set; }
+
+        public override string ToString()
+        {
+            return $"Tokns AccessToken:{AccessToken},RefreshToken:{RefreshToken}";
+        }
+    }
+}
diff --git a/src/LinCms.Infrastructure/FreeSql/CodeFirstExtension.cs b/src/LinCms.Infrastructure/FreeSql/CodeFirstExtension.cs
new file mode 100644
index 00000000..dfeb7ed2
--- /dev/null
+++ b/src/LinCms.Infrastructure/FreeSql/CodeFirstExtension.cs
@@ -0,0 +1,95 @@
+using FreeSql;
+using LinCms.Common;
+using LinCms.Data.Enums;
+using LinCms.Entities;
+using LinCms.Entities.Base;
+using System;
+using System.Collections.Generic;
+
+namespace LinCms.FreeSql
+{
+    public static class CodeFirstExtension
+    {
+
+        public static ICodeFirst SeedData(this ICodeFirst @this)
+        {
+            @this.Entity<LinGroup>(e =>
+            {
+                e.HasData(new List<LinGroup>()
+                    {
+                        new LinGroup(LinGroup.Admin,"系统管理员",true),
+                        new LinGroup(LinGroup.CmsAdmin,"CMS管理员",true),
+                        new LinGroup(LinGroup.User,"普通用户",true)
+                    });
+            })
+                .Entity<LinUser>(e =>
+                {
+                    e.HasData(new List<LinUser>()
+                    {
+                        new LinUser()
+                        {
+                            Nickname="系统管理员",
+                            Username="admin",
+                            Active=UserActive.Active,
+                            CreateTime=DateTime.Now,
+                            IsDeleted=false,
+                            Salt="9fd248c8-e9da-412f-bad9-aa5f7f1d7b80",
+                            LinUserIdentitys=new List<LinUserIdentity>()
+                            {
+                               new LinUserIdentity(LinUserIdentity.Password,"admin","IWxIlqMAE3SU3JTogdDAJw==",DateTime.Now) //密码是 123qwe
+                            },
+                            LinUserGroups=new List<LinUserGroup>()
+                            {
+                                new LinUserGroup(1,LinConsts.Group.Admin)
+                            },
+                        },
+                        new LinUser()
+                         {
+                             Nickname="CMS管理员",
+                             Username="CmsAdmin",
+                             Active=UserActive.Active,
+                             CreateTime=DateTime.Now,
+                             IsDeleted=false,
+                             Salt="9fd248c8-e9da-412f-bad9-aa5f7f1d7b80",
+                             LinUserIdentitys=new List<LinUserIdentity>()
+                             {
+                                 new LinUserIdentity(LinUserIdentity.Password,"CmsAdmin","IWxIlqMAE3SU3JTogdDAJw==",DateTime.Now)
+                             },
+                             LinUserGroups=new List<LinUserGroup>()
+                             {
+                                 new LinUserGroup(2,LinConsts.Group.CmsAdmin)
+                             },
+                         }
+                    });
+                })
+                .Entity<BaseType>(e =>
+                {
+                    e.HasData(new List<BaseType>()
+                    {
+                        new BaseType("Article.Type","文章类型",1)
+                        {
+                            CreateTime=DateTime.Now,IsDeleted=false,CreateUserId = 1,
+                            BaseItems=new List<BaseItem>()
+                            {
+                                new BaseItem("0","原创",1,1,true){CreateUserId = 1,CreateTime=DateTime.Now,IsDeleted=false},
+                                new BaseItem("1","转载",2,1,true){CreateUserId = 1,CreateTime=DateTime.Now,IsDeleted=false},
+                                new BaseItem("2","翻译",3,1,true){CreateUserId = 1,CreateTime=DateTime.Now,IsDeleted=false}
+                            }
+                        },
+                         new BaseType("Sex","性别",2)
+                         {
+                             CreateTime=DateTime.Now,IsDeleted=false,CreateUserId = 1,
+                             BaseItems=new List<BaseItem>()
+                             {
+                                 new BaseItem("0","男",1,2,true){CreateTime=DateTime.Now,IsDeleted=false},
+                                 new BaseItem("1","女",2,2,true){CreateTime=DateTime.Now,IsDeleted=false},
+                                 new BaseItem("2","保密",3,2,true){CreateTime=DateTime.Now,IsDeleted=false}
+                             }
+                         },
+                    });
+                })
+                ;
+            return @this;
+        }
+    }
+}
diff --git a/src/LinCms.Infrastructure/FreeSql/DataSeedContributor.cs b/src/LinCms.Infrastructure/FreeSql/DataSeedContributor.cs
new file mode 100644
index 00000000..d0454344
--- /dev/null
+++ b/src/LinCms.Infrastructure/FreeSql/DataSeedContributor.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading;
+using System.Threading.Tasks;
+using LinCms.Common;
+using LinCms.Data;
+using LinCms.Dependency;
+using LinCms.Entities;
+using LinCms.IRepositories;
+using Microsoft.Extensions.Logging;
+
+namespace LinCms.FreeSql
+{
+    public interface IDataSeedContributor
+    {
+
+        Task InitAdminPermission();
+
+        Task SeedPermissionAsync(List<PermissionDefinition> linCmsAttributes, CancellationToken cancellationToken);
+
+    }
+    public class DataSeedContributor : IDataSeedContributor, ISingletonDependency
+    {
+        private readonly IAuditBaseRepository<LinPermission> _permissionRepository;
+        private readonly IAuditBaseRepository<LinGroupPermission> _groupPermissionRepository;
+        private readonly ILogger<DataSeedContributor> _logger;
+        public DataSeedContributor(IAuditBaseRepository<LinPermission> permissionRepository, IAuditBaseRepository<LinGroupPermission> groupPermissionRepository, ILogger<DataSeedContributor> logger)
+        {
+            _permissionRepository = permissionRepository;
+            _groupPermissionRepository = groupPermissionRepository;
+            _logger = logger;
+        }
+
+        public async Task InitAdminPermission()
+        {
+            bool valid = await _groupPermissionRepository.Select.AnyAsync();
+            if (valid) return;
+
+            List<LinPermission> allPermissions = await _permissionRepository.Select.ToListAsync();
+
+            List<LinGroupPermission> groupPermissions = allPermissions.Select(u => new LinGroupPermission(LinConsts.Group.Admin, u.Id)).ToList();
+
+            await _groupPermissionRepository.InsertAsync(groupPermissions);
+
+        }
+
+        /// <summary>
+        /// 权限标签上的Permission改变时，删除数据库中存在的无效权限，并生成新的权限。
+        /// </summary>
+        /// <returns></returns>
+        public async Task SeedPermissionAsync(List<PermissionDefinition> linCmsAttributes, CancellationToken cancellationToken)
+        {
+
+            List<LinPermission> insertPermissions = new List<LinPermission>();
+            List<LinPermission> updatePermissions = new List<LinPermission>();
+
+            List<LinPermission> allPermissions = await _permissionRepository.Select.ToListAsync();
+
+            Expression<Func<LinGroupPermission, bool>> expression = u => false;
+            Expression<Func<LinPermission, bool>> permissionExpression = u => false;
+
+            allPermissions.ForEach(permissioin =>
+            {
+                if (linCmsAttributes.All(r => r.Permission != permissioin.Name))
+                {
+                    expression = expression.Or(r => r.PermissionId == permissioin.Id);
+                    permissionExpression = permissionExpression.Or(r => r.Id == permissioin.Id);
+                }
+            });
+            int effectRows = await _permissionRepository.DeleteAsync(permissionExpression, cancellationToken);
+            effectRows += await _groupPermissionRepository.DeleteAsync(expression, cancellationToken);
+            _logger.LogInformation($"删除了{effectRows}条数据");
+
+            linCmsAttributes.ForEach(r =>
+            {
+                LinPermission permissionEntity = allPermissions.FirstOrDefault(u => u.Module == r.Module && u.Name == r.Permission);
+                if (permissionEntity == null)
+                {
+                    insertPermissions.Add(new LinPermission(r.Permission, r.Module, r.Router));
+                }
+                else
+                {
+                    bool routerExist = allPermissions.Any(u => u.Module == r.Module && u.Name == r.Permission && u.Router == r.Router);
+                    if (!routerExist)
+                    {
+                        permissionEntity.Router = r.Router;
+                        updatePermissions.Add(permissionEntity);
+                    }
+                }
+            });
+
+            await _permissionRepository.InsertAsync(insertPermissions, cancellationToken);
+            _logger.LogInformation($"新增了{insertPermissions.Count}条数据");
+
+            await _permissionRepository.UpdateAsync(updatePermissions, cancellationToken);
+            _logger.LogInformation($"更新了{updatePermissions.Count}条数据");
+        }
+    }
+}
diff --git a/src/LinCms.Infrastructure/FreeSql/FreeSqlExtension.cs b/src/LinCms.Infrastructure/FreeSql/FreeSqlExtension.cs
new file mode 100644
index 00000000..79bc3c8d
--- /dev/null
+++ b/src/LinCms.Infrastructure/FreeSql/FreeSqlExtension.cs
@@ -0,0 +1,341 @@
+using System;
+using System.Data;
+using System.Data.Odbc;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using FreeSql;
+using Microsoft.Extensions.Configuration;
+using MySqlConnector;
+using Npgsql;
+using Serilog;
+
+namespace LinCms.FreeSql
+{
+    public static class FreeSqlExtension
+    {
+        public static ISelect<T> AsTable<T>(this ISelect<T> @this, string tableName, int count) where T : class
+        {
+            string[] tableNames = Array.Empty<string>();
+            for (int i = 0; i < count; i++)
+            {
+                tableNames.AddIfNotContains($"{tableName}_{i}");
+            }
+
+            @this.AsTable(tableNames);
+            return @this;
+        }
+
+        public static ISelect<T> AsTable<T>(this ISelect<T> @this, params string[] tableNames) where T : class
+        {
+            tableNames?.ToList().ForEach(tableName =>
+            {
+                @this.AsTable((type, oldname) =>
+                {
+                    if (type == typeof(T)) return tableName;
+                    return null;
+                });
+            });
+            return @this;
+        }
+
+        public static FreeSqlBuilder UseConnectionString(this FreeSqlBuilder @this, IConfiguration configuration)
+        {
+            IConfigurationSection dbTypeCode = configuration.GetSection("ConnectionStrings:DefaultDB");
+            if (Enum.TryParse(dbTypeCode.Value, out DataType dataType))
+            {
+                if (!Enum.IsDefined(typeof(DataType), dataType))
+                {
+                    Log.Error($"数据库配置ConnectionStrings:DefaultDB:{dataType}无效");
+                }
+
+                IConfigurationSection configurationSection = configuration.GetSection($"ConnectionStrings:{dataType}");
+                @this.UseConnectionString(dataType, configurationSection.Value);
+            }
+            else
+            {
+                Log.Error($"数据库配置ConnectionStrings:DefaultDB:{dbTypeCode.Value}无效");
+            }
+
+            return @this;
+        }
+
+        /// <summary>
+        /// 请在UseConnectionString配置后调用此方法
+        /// </summary>
+        /// <param name="this"></param>
+        /// <returns></returns>
+        public static FreeSqlBuilder CreateDatabaseIfNotExists(this FreeSqlBuilder @this)
+        {
+            FieldInfo dataTypeFieldInfo = @this.GetType().GetField("_dataType", BindingFlags.NonPublic | BindingFlags.Instance);
+
+            if (dataTypeFieldInfo is null)
+            {
+                throw new ArgumentException("_dataType is null");
+            }
+
+            string connectionString = GetConnectionString(@this);
+            DataType dbType = (DataType)dataTypeFieldInfo.GetValue(@this);
+
+            switch (dbType)
+            {
+                case DataType.MySql:
+                    return @this.CreateDatabaseIfNotExistsMySql(connectionString);
+                case DataType.SqlServer:
+                    return @this.CreateDatabaseIfNotExistsSqlServer(connectionString);
+                case DataType.PostgreSQL:
+                    return @this.CreateDatabaseIfNotExistsPgSql(connectionString);
+                case DataType.Oracle:
+                    break;
+                case DataType.Sqlite:
+                    return @this;
+                case DataType.OdbcOracle:
+                    break;
+                case DataType.OdbcSqlServer:
+                    return @this.CreateDatabaseIfNotExists_ODBCSqlServer(connectionString);
+                case DataType.OdbcMySql:
+                    return @this.CreateDatabaseIfNotExists_ODBCMySql(connectionString);
+                case DataType.OdbcPostgreSQL:
+                    break;
+                case DataType.Odbc:
+                    break;
+                case DataType.OdbcDameng:
+                    break;
+                case DataType.MsAccess:
+                    break;
+                case DataType.Dameng:
+                    break;
+                case DataType.OdbcKingbaseES:
+                    break;
+                case DataType.ShenTong:
+                    break;
+                case DataType.KingbaseES:
+                    break;
+                case DataType.Firebird:
+                    break;
+                default:
+                    break;
+            }
+
+            Log.Error($"不支持创建数据库");
+            return @this;
+        }
+
+
+        public static FreeSqlBuilder CreateDatabaseIfNotExistsMySql(this FreeSqlBuilder @this,
+            string connectionString = "")
+        {
+            if (connectionString == "")
+            {
+                connectionString = GetConnectionString(@this);
+            }
+
+            MySqlConnectionStringBuilder builder = new MySqlConnectionStringBuilder(connectionString);
+
+            string createDatabaseSql =
+                $"USE mysql;CREATE DATABASE IF NOT EXISTS `{builder.Database}` CHARACTER SET '{builder.CharacterSet}' COLLATE 'utf8mb4_general_ci'";
+
+            using MySqlConnection cnn = new MySqlConnection(
+                $"Data Source={builder.Server};Port={builder.Port};User ID={builder.UserID};Password={builder.Password};Initial Catalog=mysql;Charset=utf8;SslMode=none;Max pool size=1");
+            cnn.Open();
+            using (MySqlCommand cmd = cnn.CreateCommand())
+            {
+                cmd.CommandText = createDatabaseSql;
+                cmd.ExecuteNonQuery();
+            }
+
+            return @this;
+        }
+
+        public static FreeSqlBuilder CreateDatabaseIfNotExistsSqlServer(this FreeSqlBuilder @this, string connectionString = "")
+        {
+            if (connectionString == "")
+            {
+                connectionString = GetConnectionString(@this);
+            }
+            SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(connectionString);
+            string createDatabaseSql;
+            if (!string.IsNullOrEmpty(builder.AttachDBFilename))
+            {
+                string fileName = ExpandFileName(builder.AttachDBFilename);
+                string name = Path.GetFileNameWithoutExtension(fileName);
+                string logFileName = Path.ChangeExtension(fileName, ".ldf");
+                createDatabaseSql = @$"CREATE DATABASE {builder.InitialCatalog}   on  primary   
+                (
+                    name = '{name}',
+                    filename = '{fileName}'
+                )
+                log on
+                (
+                    name= '{name}_log',
+                    filename = '{logFileName}'
+                )";
+            }
+            else
+            {
+                createDatabaseSql = @$"CREATE DATABASE {builder.InitialCatalog}";
+            }
+
+            using SqlConnection cnn =
+                new SqlConnection(
+                    $"Data Source={builder.DataSource};Integrated Security = True;User ID={builder.UserID};Password={builder.Password};Initial Catalog=master;Min pool size=1");
+            cnn.Open();
+            using SqlCommand cmd = cnn.CreateCommand();
+            cmd.CommandText = $"select * from sysdatabases where name = '{builder.InitialCatalog}'";
+
+            SqlDataAdapter apter = new SqlDataAdapter(cmd);
+            DataSet ds = new DataSet();
+            apter.Fill(ds);
+
+            if (ds.Tables[0].Rows.Count == 0)
+            {
+                cmd.CommandText = createDatabaseSql;
+                cmd.ExecuteNonQuery();
+            }
+
+            return @this;
+        }
+
+        private static string ExpandFileName(string fileName)
+        {
+            if (fileName.StartsWith("|DataDirectory|", StringComparison.OrdinalIgnoreCase))
+            {
+                var dataDirectory = AppDomain.CurrentDomain.GetData("DataDirectory") as string;
+                if (string.IsNullOrEmpty(dataDirectory))
+                {
+                    dataDirectory = AppDomain.CurrentDomain.BaseDirectory;
+                }
+                string name = fileName.Replace("\\", "").Replace("/", "").Substring("|DataDirectory|".Length);
+                fileName = Path.Combine(dataDirectory, name);
+            }
+            if (!Directory.Exists(Path.GetDirectoryName(fileName)))
+            {
+                Directory.CreateDirectory(Path.GetDirectoryName(fileName));
+            }
+            return Path.GetFullPath(fileName);
+        }
+
+
+        private static string GetConnectionString(FreeSqlBuilder @this)
+        {
+            Type type = @this.GetType();
+            FieldInfo fieldInfo =
+                type.GetField("_masterConnectionString", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (fieldInfo is null)
+            {
+                throw new ArgumentException("_masterConnectionString is null");
+            }
+            return fieldInfo.GetValue(@this).ToString();
+        }
+
+
+        public static FreeSqlBuilder CreateDatabaseIfNotExistsPgSql(this FreeSqlBuilder @this,
+      string connectionString = "")
+        {
+            if (connectionString == "")
+            {
+                connectionString = GetConnectionString(@this);
+            }
+
+            NpgsqlConnectionStringBuilder builder = new NpgsqlConnectionStringBuilder(connectionString);
+
+            string createDatabaseSql =
+                $"DROP DATABASE IF EXISTS \"{builder.Database}\"; CREATE DATABASE \"{builder.Database}\" WITH OWNER = \"{builder.Username}\"";
+
+            using NpgsqlConnection cnn = new NpgsqlConnection(
+                $"Host={builder.Host};Port={builder.Port};Username={builder.Username};Password={builder.Password};Pooling=true");
+            cnn.Open();
+            using (NpgsqlCommand cmd = cnn.CreateCommand())
+            {
+                cmd.CommandText = createDatabaseSql;
+                cmd.ExecuteNonQuery();
+            }
+
+            return @this;
+        }
+
+        #region ODBC
+        public static FreeSqlBuilder CreateDatabaseIfNotExists_ODBCMySql(this FreeSqlBuilder @this,
+          string connectionString = "")
+        {
+            if (connectionString == "")
+            {
+                connectionString = GetConnectionString(@this);
+            }
+
+            OdbcConnectionStringBuilder builder = new OdbcConnectionStringBuilder(connectionString);
+
+            string createDatabaseSql =
+                $"USE mysql;CREATE DATABASE IF NOT EXISTS `{builder["DATABASE"]}` CHARACTER SET '{builder["Charset"]}' COLLATE 'utf8mb4_general_ci'";
+
+            using OdbcConnection cnn = new OdbcConnection(
+                $"Data Source={builder["Server"]};Port={builder["Port"]};User ID={builder["UID"]};Password={builder["PWD"]};Initial Catalog=mysql;Charset=utf8;SslMode=none;Max pool size=1");
+            cnn.Open();
+            using (OdbcCommand cmd = cnn.CreateCommand())
+            {
+                cmd.CommandText = createDatabaseSql;
+                cmd.ExecuteNonQuery();
+            }
+
+            return @this;
+        }
+
+
+        public static FreeSqlBuilder CreateDatabaseIfNotExists_ODBCSqlServer(this FreeSqlBuilder @this,
+            string connectionString = "")
+        {
+            if (connectionString == "")
+            {
+                connectionString = GetConnectionString(@this);
+            }
+
+            OdbcConnectionStringBuilder builder = new OdbcConnectionStringBuilder(connectionString);
+
+
+            string createDatabaseSql;
+            if (builder.ContainsKey("AttachDBFilename") && !string.IsNullOrEmpty(builder["AttachDBFilename"].ToString()))
+            {
+                string fileName = ExpandFileName(builder["AttachDBFilename"].ToString());
+                string name = Path.GetFileNameWithoutExtension(fileName);
+                string logFileName = Path.ChangeExtension(fileName, ".ldf");
+                createDatabaseSql = @$"CREATE DATABASE {builder["Initial Catalog"]}   on  primary   
+                (
+                    name = '{name}',
+                    filename = '{fileName}'
+                )
+                log on
+                (
+                    name= '{name}_log',
+                    filename = '{logFileName}'
+                )";
+            }
+            else
+            {
+                createDatabaseSql = @$"CREATE DATABASE {builder["Initial Catalog"]}";
+            }
+
+            //一个空格都不能多
+            //string MasterConnectionString = "Driver={SQL Server};Server=.;Initial Catalog=master;Uid=sa;Pwd=123456";
+            string MasterConnectionString = $"Driver={{SQL Server}};Server={ builder["Server"]};Initial Catalog=master;Uid={ builder["Uid"]};Pwd={ builder["Pwd"]};";
+            using OdbcConnection cnn = new OdbcConnection(MasterConnectionString);
+
+            cnn.Open();
+            using OdbcCommand cmd = cnn.CreateCommand();
+            cmd.CommandText = $"select * from sysdatabases where name = '{builder["Initial Catalog"]}'";
+
+            OdbcDataAdapter apter = new OdbcDataAdapter(cmd);
+            DataSet ds = new DataSet();
+            apter.Fill(ds);
+
+            if (ds.Tables[0].Rows.Count == 0)
+            {
+                cmd.CommandText = createDatabaseSql;
+                cmd.ExecuteNonQuery();
+            }
+
+            return @this;
+        }
+        #endregion
+    }
+}
diff --git a/src/LinCms.Infrastructure/LinCms.Infrastructure.csproj b/src/LinCms.Infrastructure/LinCms.Infrastructure.csproj
index fcdef789..4de9b0bf 100644
--- a/src/LinCms.Infrastructure/LinCms.Infrastructure.csproj
+++ b/src/LinCms.Infrastructure/LinCms.Infrastructure.csproj
@@ -1,19 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
+		<RootNamespace>LinCms</RootNamespace>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="FreeSql.DbContext" Version="1.3.0-preview4" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="DomainEvents\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\LinCms.Core\LinCms.Core.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\LinCms.Core\LinCms.Core.csproj" />
+		<PackageReference Include="FreeSql.Provider.MySqlConnector" Version="2.5.201" />
+		<PackageReference Include="FreeSql.Provider.PostgreSQL" Version="2.5.200" />
+		<PackageReference Include="FreeSql.Provider.Sqlite" Version="2.5.200" />
+		<PackageReference Include="FreeSql.Provider.SqlServer" Version="2.5.200" />
+		<PackageReference Include="FreeSql.Provider.Odbc" Version="2.5.200" />
+	</ItemGroup>
 
 </Project>
diff --git a/src/LinCms.Infrastructure/Repositories/AuditBaseRepository.cs b/src/LinCms.Infrastructure/Repositories/AuditBaseRepository.cs
index e46766a9..e280c6eb 100644
--- a/src/LinCms.Infrastructure/Repositories/AuditBaseRepository.cs
+++ b/src/LinCms.Infrastructure/Repositories/AuditBaseRepository.cs
@@ -2,17 +2,18 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Threading;
 using System.Threading.Tasks;
 using FreeSql;
-using LinCms.Core.Entities;
-using LinCms.Core.Security;
+using LinCms.Entities;
+using LinCms.IRepositories;
+using LinCms.Security;
 
-namespace LinCms.Infrastructure.Repositories
+namespace LinCms.Repositories
 {
-    public class AuditBaseRepository<T> : AuditBaseRepository<T, Guid> where T : class, new()
+    public class AuditBaseRepository<TEntity> : AuditBaseRepository<TEntity, Guid>, IAuditBaseRepository<TEntity> where TEntity : class, new()
     {
-        public AuditBaseRepository(IUnitOfWork uow, ICurrentUser currentUser, IFreeSql fsql, Expression<Func<T, bool>> filter = null, Func<string, string> asTable = null)
-            : base(uow,currentUser, fsql, filter, asTable)
+        public AuditBaseRepository(UnitOfWorkManager unitOfWorkManager, ICurrentUser currentUser) : base(unitOfWorkManager, currentUser)
         {
         }
     }
@@ -22,44 +23,50 @@ public AuditBaseRepository(IUnitOfWork uow, ICurrentUser currentUser, IFreeSql f
     /// 继承了IUpdateAuditEntity，更新时，修改更新时间/人
     /// 继承了ISoftDeleteAduitEntity，删除时，自动改成软删除。仅注入此仓储或继承此仓储的实现才能实现如上功能。
     /// </summary>
-    /// <typeparam name="T"></typeparam>
+    /// <typeparam name="TEntity"></typeparam>
     /// <typeparam name="TKey"></typeparam>
-    public class AuditBaseRepository<T, TKey> : BaseRepository<T, TKey> where T : class, new()
+    public class AuditBaseRepository<TEntity, TKey> : DefaultRepository<TEntity, TKey>, IAuditBaseRepository<TEntity, TKey>
+        where TEntity : class, new()
     {
         protected readonly ICurrentUser CurrentUser;
-        public AuditBaseRepository(IUnitOfWork uow,ICurrentUser currentUser,IFreeSql fsql, Expression<Func<T, bool>> filter = null, Func<string, string> asTable = null) : base(fsql, filter, asTable)
+        public AuditBaseRepository(UnitOfWorkManager unitOfWorkManager, ICurrentUser currentUser) : base(unitOfWorkManager?.Orm, unitOfWorkManager)
         {
             CurrentUser = currentUser;
-            base.UnitOfWork = uow;
         }
 
-        private void BeforeInsert(T entity)
+        private void BeforeInsert(TEntity entity)
         {
-            if (!(entity is ICreateAduitEntity e)) return;
-            e.CreateTime = DateTime.Now;
+            if (entity is not ICreateAduitEntity e)
+            {
+                return;
+            }
 
-            e.CreateUserId = CurrentUser.Id??0;
+            e.CreateTime = DateTime.Now;
+            if (e.CreateUserId == 0 && CurrentUser.Id != null)
+            {
+                e.CreateUserId = CurrentUser.Id ?? 0;
+            }
 
-            if (!(entity is IUpdateAuditEntity updateAuditEntity)) return;
+            if (entity is not IUpdateAuditEntity updateAuditEntity) return;
             updateAuditEntity.UpdateTime = DateTime.Now;
-            updateAuditEntity.UpdateUserId = CurrentUser.Id; ;
+            updateAuditEntity.UpdateUserId = CurrentUser.Id;
         }
 
-        public override T Insert(T entity)
+        public override TEntity Insert(TEntity entity)
         {
             BeforeInsert(entity);
             return base.Insert(entity);
         }
 
-        public override Task<T> InsertAsync(T entity)
+        public override Task<TEntity> InsertAsync(TEntity entity, CancellationToken cancellationToken = default)
         {
             this.BeforeInsert(entity);
-            return base.InsertAsync(entity);
+            return base.InsertAsync(entity, cancellationToken);
         }
 
-        public override List<T> Insert(IEnumerable<T> entitys)
+        public override List<TEntity> Insert(IEnumerable<TEntity> entitys)
         {
-            foreach (T entity in entitys)
+            foreach (TEntity entity in entitys)
             {
                 BeforeInsert(entity);
             }
@@ -67,35 +74,36 @@ public override List<T> Insert(IEnumerable<T> entitys)
             return base.Insert(entitys);
         }
 
-        public override Task<List<T>> InsertAsync(IEnumerable<T> entitys)
+        public override Task<List<TEntity>> InsertAsync(IEnumerable<TEntity> entitys, CancellationToken cancellationToken = default)
         {
-            foreach (T entity in entitys)
+            var enumerable = entitys as TEntity[] ?? entitys.ToArray();
+            foreach (TEntity entity in enumerable)
             {
                 BeforeInsert(entity);
             }
-            return base.InsertAsync(entitys);
+            return base.InsertAsync(enumerable, cancellationToken);
         }
 
-        private void BeforeUpdate(T entity)
+        private void BeforeUpdate(TEntity entity)
         {
-            if (!(entity is IUpdateAuditEntity e)) return;
+            if (entity is not IUpdateAuditEntity e) return;
             e.UpdateTime = DateTime.Now;
             e.UpdateUserId = CurrentUser.Id;
         }
 
-        public new int Update(T entity)
+        public new int Update(TEntity entity)
         {
             BeforeUpdate(entity);
             return base.Update(entity);
         }
 
-        public new Task<int> UpdateAsync(T entity)
+        public new Task<int> UpdateAsync(TEntity entity, CancellationToken cancellationToken = default)
         {
             BeforeUpdate(entity);
-            return base.UpdateAsync(entity);
+            return base.UpdateAsync(entity, cancellationToken);
         }
 
-        public new int Update(IEnumerable<T> entitys)
+        public override int Update(IEnumerable<TEntity> entitys)
         {
             foreach (var entity in entitys)
             {
@@ -104,20 +112,20 @@ private void BeforeUpdate(T entity)
             return base.Update(entitys);
         }
 
-        public new Task<int> UpdateAsync(IEnumerable<T> entitys)
+        public override Task<int> UpdateAsync(IEnumerable<TEntity> entitys, CancellationToken cancellationToken = default)
         {
             foreach (var entity in entitys)
             {
                 BeforeUpdate(entity);
             }
-            return base.UpdateAsync(entitys);
+            return base.UpdateAsync(entitys, cancellationToken);
         }
 
-        public new int Delete(T entity)
+        public override int Delete(TEntity entity)
         {
             if (entity is IDeleteAduitEntity)
             {
-                return Orm.Update<T>(entity)
+                return Orm.Update<TEntity>(entity)
                            .Set(a => (a as IDeleteAduitEntity).IsDeleted, true)
                            .Set(a => (a as IDeleteAduitEntity).DeleteUserId, CurrentUser.Id)
                            .Set(a => (a as IDeleteAduitEntity).DeleteTime, DateTime.Now)
@@ -127,12 +135,12 @@ private void BeforeUpdate(T entity)
             return base.Delete(entity);
         }
 
-        public new int Delete(IEnumerable<T> entitys)
+        public override int Delete(IEnumerable<TEntity> entitys)
         {
             if (entitys.Any())
             {
                 Attach(entitys);
-                foreach (T x1 in entitys)
+                foreach (TEntity x1 in entitys)
                 {
                     if (x1 is IDeleteAduitEntity softDelete)
                     {
@@ -148,13 +156,28 @@ private void BeforeUpdate(T entity)
             return base.Delete(entitys);
         }
 
+        public override async Task<int> DeleteAsync(TKey id, CancellationToken cancellationToken = default)
+        {
+            TEntity entity = await GetAsync(id, cancellationToken);
+            if (entity is IDeleteAduitEntity)
+            {
+                return Orm.Update<TEntity>(entity)
+                           .Set(a => (a as IDeleteAduitEntity).IsDeleted, true)
+                           .Set(a => (a as IDeleteAduitEntity).DeleteUserId, CurrentUser.Id)
+                           .Set(a => (a as IDeleteAduitEntity).DeleteTime, DateTime.Now)
+                           .ExecuteAffrows();
+            }
+
+            return await base.DeleteAsync(id, cancellationToken);
+        }
 
-        public new Task<int> DeleteAsync(IEnumerable<T> entitys)
+
+        public override Task<int> DeleteAsync(IEnumerable<TEntity> entitys, CancellationToken cancellationToken = default)
         {
             if (entitys.Any())
             {
                 Attach(entitys);
-                foreach (T x1 in entitys)
+                foreach (TEntity x1 in entitys)
                 {
                     if (x1 is IDeleteAduitEntity softDelete)
                     {
@@ -163,30 +186,34 @@ private void BeforeUpdate(T entity)
                         softDelete.IsDeleted = true;
                     }
                 }
-                return UpdateAsync(entitys);
+                return UpdateAsync(entitys, cancellationToken);
             }
-            return base.DeleteAsync(entitys);
+            return base.DeleteAsync(entitys, cancellationToken);
         }
 
-        public new async Task<int> DeleteAsync(T entity)
+        public override async Task<int> DeleteAsync(TEntity entity, CancellationToken cancellationToken = default)
         {
             if (entity is IDeleteAduitEntity)
             {
-                return await Orm.Update<T>(entity)
+                return await Orm.Update<TEntity>(entity)
                     .Set(a => (a as IDeleteAduitEntity).IsDeleted, true)
                     .Set(a => (a as IDeleteAduitEntity).DeleteUserId, CurrentUser.Id)
                     .Set(a => (a as IDeleteAduitEntity).DeleteTime, DateTime.Now)
-                    .ExecuteAffrowsAsync();
+.ExecuteAffrowsAsync(cancellationToken);
             }
 
             return base.Delete(entity);
         }
-        public new int Delete(Expression<Func<T, bool>> predicate)
+        public override int Delete(Expression<Func<TEntity, bool>> predicate)
         {
-            if (typeof(IDeleteAduitEntity).IsAssignableFrom(typeof(T)))
+            if (typeof(IDeleteAduitEntity).IsAssignableFrom(typeof(TEntity)))
             {
-                List<T> items = Orm.Select<T>().Where(predicate).ToList();
-                return Orm.Update<T>(items)
+                List<TEntity> items = Orm.Select<TEntity>().Where(predicate).ToList();
+                if (items.Count == 0)
+                {
+                    return 0;
+                }
+                return Orm.Update<TEntity>(items)
                     .Set(a => (a as IDeleteAduitEntity).IsDeleted, true)
                     .Set(a => (a as IDeleteAduitEntity).DeleteUserId, CurrentUser.Id)
                     .Set(a => (a as IDeleteAduitEntity).DeleteTime, DateTime.Now)
@@ -196,19 +223,30 @@ private void BeforeUpdate(T entity)
             return base.Delete(predicate);
         }
 
-        public new async Task<int> DeleteAsync(Expression<Func<T, bool>> predicate)
+        public override async Task<int> DeleteAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default)
         {
-            if (typeof(IDeleteAduitEntity).IsAssignableFrom(typeof(T)))
+            if (typeof(IDeleteAduitEntity).IsAssignableFrom(typeof(TEntity)))
             {
-                List<T> items = Orm.Select<T>().Where(predicate).ToList();
-                return await Orm.Update<T>(items)
+                List<TEntity> items = Orm.Select<TEntity>().Where(predicate).ToList();
+                if (items.Count == 0)
+                {
+                    return 0;
+                }
+                return await Orm.Update<TEntity>(items)
                      .Set(a => (a as IDeleteAduitEntity).IsDeleted, true)
                      .Set(a => (a as IDeleteAduitEntity).DeleteUserId, CurrentUser.Id)
                      .Set(a => (a as IDeleteAduitEntity).DeleteTime, DateTime.Now)
-                     .ExecuteAffrowsAsync();
+.ExecuteAffrowsAsync(cancellationToken);
             }
 
-            return await base.DeleteAsync(predicate);
+            return await base.DeleteAsync(predicate, cancellationToken);
+        }
+        public override async Task<TEntity> InsertOrUpdateAsync(TEntity entity, CancellationToken cancellationToken = default)
+        {
+            BeforeInsert(entity);
+            BeforeUpdate(entity);
+            await base.InsertOrUpdateAsync(entity, cancellationToken);
+            return entity;
         }
 
     }
diff --git a/src/LinCms.Infrastructure/Repositories/BookRepository.cs b/src/LinCms.Infrastructure/Repositories/BookRepository.cs
index 3bfd6e63..84853f14 100644
--- a/src/LinCms.Infrastructure/Repositories/BookRepository.cs
+++ b/src/LinCms.Infrastructure/Repositories/BookRepository.cs
@@ -1,21 +1,17 @@
-using System;
-using System.Linq.Expressions;
-using FreeSql;
-using LinCms.Core.Entities;
-using LinCms.Core.Security;
+using FreeSql;
+using LinCms.Entities;
+using LinCms.IRepositories;
+using LinCms.Security;
 
-namespace LinCms.Infrastructure.Repositories
+namespace LinCms.Repositories
 {
     /// <summary>
     /// 当需要给仓储增加方法时，在此方法中增加，并在构造函数中注入BookRepository
     /// </summary>
-    public class BookRepository : AuditBaseRepository<Book>
+    public class BookRepository : AuditBaseRepository<Book>, IBookRepository
     {
-        private readonly ICurrentUser _currentUser;
-        public BookRepository(IUnitOfWork unitOfWork, CurrentUser currentUser, IFreeSql fsql, Expression<Func<Book, bool>> filter = null, Func<string, string> asTable = null)
-            : base(unitOfWork, currentUser, fsql, filter, asTable)
+        public BookRepository(UnitOfWorkManager unitOfWork, ICurrentUser currentUser) : base(unitOfWork, currentUser)
         {
-            _currentUser = currentUser;
         }
 
     }
diff --git a/src/LinCms.Infrastructure/Repositories/DocRepository.cs b/src/LinCms.Infrastructure/Repositories/DocRepository.cs
new file mode 100644
index 00000000..a5ca674e
--- /dev/null
+++ b/src/LinCms.Infrastructure/Repositories/DocRepository.cs
@@ -0,0 +1,13 @@
+using FreeSql;
+using LinCms.Entities.Base;
+using LinCms.IRepositories;
+using LinCms.Security;
+namespace LinCms.Repositories
+{
+    public class DocRepository : AuditBaseRepository<Doc, long>, IDocRepository
+    {
+        public DocRepository(UnitOfWorkManager unitOfWork, ICurrentUser currentUser) : base(unitOfWork, currentUser)
+        {
+        }
+    }
+}
diff --git a/src/LinCms.Infrastructure/Repositories/FileRepository.cs b/src/LinCms.Infrastructure/Repositories/FileRepository.cs
new file mode 100644
index 00000000..7460f114
--- /dev/null
+++ b/src/LinCms.Infrastructure/Repositories/FileRepository.cs
@@ -0,0 +1,39 @@
+using FreeSql;
+using LinCms.Data.Options;
+using LinCms.Entities;
+using LinCms.IRepositories;
+using LinCms.Security;
+using Microsoft.Extensions.Options;
+
+namespace LinCms.Repositories
+{
+    public class FileRepository : AuditBaseRepository<LinFile>, IFileRepository
+    {
+        private readonly FileStorageOption _fileStorageOption;
+        public FileRepository(UnitOfWorkManager unitOfWorkManager, ICurrentUser currentUser, IOptions<FileStorageOption> fileStorageOption): base(unitOfWorkManager, currentUser)
+        {
+            _fileStorageOption = fileStorageOption.Value;
+        }
+
+        public string GetFileUrl(string path)
+        {
+            if (string.IsNullOrEmpty(path)) return "";
+            if (path.StartsWith("http")||path.StartsWith("https"))
+            {
+                return path;
+            }
+
+            LinFile linFile= base.Where(r => r.Path == path).First();
+            if (linFile == null) return path;
+            switch (linFile.Type)
+            {
+                case 1: 
+                    return _fileStorageOption.LocalFile.Host + path;
+                case 2: 
+                    return  _fileStorageOption.Qiniu.Host + path;
+                default:
+                    return path;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Infrastructure/Repositories/LogRepository.cs b/src/LinCms.Infrastructure/Repositories/LogRepository.cs
index 66a887da..c2c8878b 100644
--- a/src/LinCms.Infrastructure/Repositories/LogRepository.cs
+++ b/src/LinCms.Infrastructure/Repositories/LogRepository.cs
@@ -1,25 +1,23 @@
 using System;
-using System.Linq.Expressions;
-using System.Threading.Tasks;
 using FreeSql;
-using LinCms.Core.Entities;
-using LinCms.Core.Repositories;
-using LinCms.Core.Security;
+using LinCms.Entities;
+using LinCms.IRepositories;
+using LinCms.Security;
 
-namespace LinCms.Infrastructure.Repositories
+namespace LinCms.Repositories
 {
     public class LogRepository : AuditBaseRepository<LinLog>, ILogRepository
     {
-        public LogRepository(IUnitOfWork unitOfWork, ICurrentUser currentUser, IFreeSql fsql, Expression<Func<LinLog, bool>> filter = null, Func<string, string> asTable = null)
-            : base(unitOfWork, currentUser, fsql, filter, asTable)
+        public LogRepository(UnitOfWorkManager unitOfWorkManager, ICurrentUser currentUser)
+            : base(unitOfWorkManager, currentUser)
         {
 
         }
 
         public void Create(LinLog linlog)
         {
-            linlog.Time = DateTime.Now;
-            linlog.UserName = CurrentUser.UserName;
+            linlog.CreateTime = DateTime.Now;
+            linlog.Username = CurrentUser.UserName;
             linlog.UserId = CurrentUser.Id ?? 0;
 
             base.Insert(linlog);
diff --git a/src/LinCms.Infrastructure/Repositories/SettingRepository.cs b/src/LinCms.Infrastructure/Repositories/SettingRepository.cs
index 9e67274e..2c4d83de 100644
--- a/src/LinCms.Infrastructure/Repositories/SettingRepository.cs
+++ b/src/LinCms.Infrastructure/Repositories/SettingRepository.cs
@@ -1,19 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-using System.Text;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using FreeSql;
-using LinCms.Core.Entities;
-using LinCms.Core.Entities.Settings;
-using LinCms.Core.Security;
+using LinCms.Entities.Settings;
+using LinCms.IRepositories;
+using LinCms.Security;
 
-namespace LinCms.Infrastructure.Repositories
+namespace LinCms.Repositories
 {
-    public class SettingRepository : AuditBaseRepository<LinSetting>
+    public class SettingRepository : AuditBaseRepository<LinSetting>, ISettingRepository
     {
-        public SettingRepository(IUnitOfWork unitOfWork, ICurrentUser currentUser, IFreeSql fsql, Expression<Func<LinSetting, bool>> filter = null, Func<string, string> asTable = null)
-            : base(unitOfWork, currentUser, fsql, filter, asTable)
+        public SettingRepository(UnitOfWorkManager unitOfWorkManager, ICurrentUser currentUser): base(unitOfWorkManager, currentUser)
         {
         }
 
diff --git a/src/LinCms.Infrastructure/Repositories/UserRepository.cs b/src/LinCms.Infrastructure/Repositories/UserRepository.cs
index 17afd292..3eddafed 100644
--- a/src/LinCms.Infrastructure/Repositories/UserRepository.cs
+++ b/src/LinCms.Infrastructure/Repositories/UserRepository.cs
@@ -1,16 +1,18 @@
 using System;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
+
 using FreeSql;
-using LinCms.Core.Entities;
-using LinCms.Core.Security;
 
-namespace LinCms.Infrastructure.Repositories
+using LinCms.Entities;
+using LinCms.IRepositories;
+using LinCms.Security;
+
+namespace LinCms.Repositories
 {
-    public class UserRepository : AuditBaseRepository<LinUser>
+    public class UserRepository : AuditBaseRepository<LinUser>, IUserRepository
     {
-        public UserRepository(IUnitOfWork unitOfWork, ICurrentUser currentUser, IFreeSql fsql, Expression<Func<LinUser, bool>> filter = null, Func<string, string> asTable = null)
-            : base(unitOfWork, currentUser, fsql, filter, asTable)
+        public UserRepository(UnitOfWorkManager unitOfWorkManager, ICurrentUser currentUser) : base(unitOfWorkManager, currentUser)
         {
         }
 
diff --git a/src/LinCms.Plugins/LinCms.Plugins.csproj b/src/LinCms.Plugins/LinCms.Plugins.csproj
index 5fa274ad..0a04eba8 100644
--- a/src/LinCms.Plugins/LinCms.Plugins.csproj
+++ b/src/LinCms.Plugins/LinCms.Plugins.csproj
@@ -1,21 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="9.0.0" />
+    <PackageReference Include="AutoMapper" Version="10.1.1" />
   </ItemGroup>
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Poem\Services\" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\LinCms.Core\LinCms.Core.csproj" />
     <ProjectReference Include="..\LinCms.Infrastructure\LinCms.Infrastructure.csproj" />
diff --git a/src/LinCms.Plugins/Poem/Controllers/PoemController.cs b/src/LinCms.Plugins/Poem/Controllers/PoemController.cs
index 3a062550..9552e8b4 100644
--- a/src/LinCms.Plugins/Poem/Controllers/PoemController.cs
+++ b/src/LinCms.Plugins/Poem/Controllers/PoemController.cs
@@ -1,25 +1,26 @@
 using System.Collections.Generic;
 using System.Linq;
 using AutoMapper;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
-using LinCms.Core.Entities;
-using LinCms.Core.Exceptions;
-using LinCms.Infrastructure.Repositories;
+using LinCms.Aop.Filter;
+using LinCms.Data;
+using LinCms.Entities;
+using LinCms.Exceptions;
+using LinCms.IRepositories;
 using LinCms.Plugins.Poem.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace LinCms.Plugins.Poem.Controllers
 {
+    [ApiExplorerSettings(GroupName = "v1")]
     [Route("v1/poem")]
     [ApiController]
     [Authorize]
     public class PoemController : ControllerBase
     {
-        private readonly AuditBaseRepository<LinPoem> _poemRepository;
+        private readonly IAuditBaseRepository<LinPoem> _poemRepository;
         private readonly IMapper _mapper;
-        public PoemController(AuditBaseRepository<LinPoem> poemRepository, IMapper mapper)
+        public PoemController(IAuditBaseRepository<LinPoem> poemRepository, IMapper mapper)
         {
             _poemRepository = poemRepository;
             _mapper = mapper;
@@ -65,11 +66,8 @@ public UnifyResponseDto Put(long id, [FromBody] CreateUpdatePoemDto updatePoem)
                 throw new LinCmsException("没有找到诗词");
             }
 
-            //使用AutoMapper方法简化类与类之间的转换过程
             _mapper.Map(updatePoem, poem);
-
             _poemRepository.Update(poem);
-
             return UnifyResponseDto.Success("更新诗词成功");
         }
     }
diff --git a/src/LinCms.Core/Entities/LinPoem.cs b/src/LinCms.Plugins/Poem/Domain/LinPoem.cs
similarity index 81%
rename from src/LinCms.Core/Entities/LinPoem.cs
rename to src/LinCms.Plugins/Poem/Domain/LinPoem.cs
index 80d8fa0c..a9d0d119 100644
--- a/src/LinCms.Core/Entities/LinPoem.cs
+++ b/src/LinCms.Plugins/Poem/Domain/LinPoem.cs
@@ -1,6 +1,7 @@
-using FreeSql.DataAnnotations;
+
+using FreeSql.DataAnnotations;
 
-namespace LinCms.Core.Entities
+namespace LinCms.Entities
 {
     [Table(Name = "lin_poem")]
     public class LinPoem:FullAduitEntity
@@ -9,7 +10,7 @@ public class LinPoem:FullAduitEntity
         /// <summary>
         /// 作者
         /// </summary>
-        [Column(DbType = "varchar(50)")]
+         [Column(StringLength = 50)]
         public string Author { get; set; } = string.Empty;
 
         /// <summary>
@@ -21,7 +22,7 @@ public class LinPoem:FullAduitEntity
         /// <summary>
         /// 朝代
         /// </summary>
-        [Column(DbType = "varchar(50)")]
+         [Column(StringLength = 50)]
         public string Dynasty { get; set; } = string.Empty;
 
         /// <summary>
@@ -32,7 +33,7 @@ public class LinPoem:FullAduitEntity
         /// <summary>
         /// 标题
         /// </summary>
-        [Column(DbType = "varchar(50)")]
+         [Column(StringLength = 50)]
         public string Title { get; set; } = string.Empty;
 
 
diff --git a/src/LinCms.Plugins/Poem/Models/PoemDto.cs b/src/LinCms.Plugins/Poem/Models/PoemDto.cs
index dfd3580a..aa635b72 100644
--- a/src/LinCms.Plugins/Poem/Models/PoemDto.cs
+++ b/src/LinCms.Plugins/Poem/Models/PoemDto.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
-using LinCms.Core.Entities;
+using LinCms.Entities;
 
 namespace LinCms.Plugins.Poem.Models
 {
-    public class PoemDto:Entity
+    public class PoemDto:EntityDto
     {
         public string Author { get; set; } 
         public List<List<string>> Content { get; set; } 
diff --git a/src/LinCms.Plugins/Poem/Services/IPoemService.cs b/src/LinCms.Plugins/Poem/Services/IPoemService.cs
new file mode 100644
index 00000000..972ca999
--- /dev/null
+++ b/src/LinCms.Plugins/Poem/Services/IPoemService.cs
@@ -0,0 +1,7 @@
+namespace LinCms.Plugins.Poem.Services
+{
+    public interface IPoemService
+    {
+
+    }
+}
diff --git a/src/LinCms.Plugins/Poem/AutoMapper/PoemProfile.cs b/src/LinCms.Plugins/Poem/Services/PoemProfile.cs
similarity index 89%
rename from src/LinCms.Plugins/Poem/AutoMapper/PoemProfile.cs
rename to src/LinCms.Plugins/Poem/Services/PoemProfile.cs
index 2f270d05..1af1b235 100644
--- a/src/LinCms.Plugins/Poem/AutoMapper/PoemProfile.cs
+++ b/src/LinCms.Plugins/Poem/Services/PoemProfile.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Linq;
 using AutoMapper;
-using LinCms.Core.Entities;
+using LinCms.Entities;
 using LinCms.Plugins.Poem.Models;
 
-namespace LinCms.Plugins.Poem.AutoMapper
+namespace LinCms.Plugins.Poem.Services
 {
     public class PoemProfile : Profile
     {
diff --git a/src/LinCms.Plugins/Poem/Services/PoemService.cs b/src/LinCms.Plugins/Poem/Services/PoemService.cs
new file mode 100644
index 00000000..b875996f
--- /dev/null
+++ b/src/LinCms.Plugins/Poem/Services/PoemService.cs
@@ -0,0 +1,7 @@
+namespace LinCms.Plugins.Poem.Services
+{
+    public class PoemService : IPoemService
+    {
+
+    }
+}
diff --git a/src/LinCms.Scaffolding/App.cs b/src/LinCms.Scaffolding/App.cs
new file mode 100644
index 00000000..3a230684
--- /dev/null
+++ b/src/LinCms.Scaffolding/App.cs
@@ -0,0 +1,152 @@
+using Humanizer;
+using LinCms.Scaffolding.Entities;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace LinCms.Scaffolding
+{
+    public class App
+    {
+        private readonly ILogger<App> _logger;
+        private readonly SettingOptions _settingOptions;
+        public App(ILogger<App> logger,IOptionsMonitor<SettingOptions> settingOptions)
+        {
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            _settingOptions = settingOptions.CurrentValue;
+        }
+
+        public async Task RunAsync(string[] args)
+        {
+            _logger.LogInformation("Starting...");
+
+            ProjectInfo projectInfo = ProjectParser();
+
+            string entityPath = Path.Combine(_settingOptions.BaseDirectory, _settingOptions.EntityFilePath);
+            EntityInfo entityInfo = EntityParse(entityPath, projectInfo);
+
+            var model = new
+            {
+                ProjectInfo = projectInfo,
+                EntityInfo = entityInfo,
+                Option = new CommandOption()
+                {
+                    CustomRepository = false,
+                },
+                SettingOptions = _settingOptions
+            };
+            #region 参考值
+            /*
+                -   ProjectInfo	{LinCms.Scaffolding.Entities.ProjectInfo}	LinCms.Scaffolding.Entities.ProjectInfo
+                    BaseDirectory	"D:/code/github/lin-cms-dotnetcore/src/LinCms.Core/"	string
+                    FullName	"LinCms"	string
+                    Name	"LinCms"	string
+
+                -   EntityInfo
+                    BaseType	"FullAduitEntity"	string
+                    Name	"Doc"	string		
+                    NameCamelize	"doc"	string
+                    NamePluralized	"Docs"	string
+                    Namespace	"LinCms.v1.Docs"	string
+                    NamespaceLastPart	"Docs"	string
+                    PrimaryKey	"long"	string
+                    RelativeDirectory	"v1/Docs"	string
+                    RelativeNamespace	"v1.Docs"	string
+
+                -   SettingOptions	{LinCms.Scaffolding.SettingOptions}	LinCms.Scaffolding.SettingOptions
+                    Areas	"Base"	string
+                    AreasCamelize	"base"	string
+                    BaseDirectory	"D:/code/github/lin-cms-dotnetcore/src/LinCms.Core/"	string
+                    EntityFilePath	"Entities/Doc.cs"	string
+                    OutputDirectory	"D:/code/github/Outputs"	string
+                    ProjectName	"LinCms"	string
+                    TemplatePath	"./Templates"	string
+
+            */
+            #endregion
+            string templatePath = Path.Combine(Environment.CurrentDirectory, _settingOptions.TemplatePath);
+            CodeScaffolding codeScaffolding = new CodeScaffolding(templatePath, _settingOptions.OutputDirectory, _logger);
+            await codeScaffolding.GenerateAsync(model);
+
+            _logger.LogInformation("Finished!");
+        }
+
+        private ProjectInfo ProjectParser()
+        {
+            _logger.LogInformation($"baseDirectory：{_settingOptions.BaseDirectory}"); ;
+            string coreCsprojFile = Directory.EnumerateFiles(_settingOptions.BaseDirectory, "*.Core.csproj", SearchOption.AllDirectories).FirstOrDefault();
+
+            string fileName = Path.GetFileName(coreCsprojFile);
+            string fullName = fileName.RemovePostFix(".Core.csproj");
+            ProjectInfo projectInfo = new ProjectInfo(_settingOptions.BaseDirectory, fullName);
+
+            return projectInfo;
+        }
+
+        private EntityInfo EntityParse(string entityFilePath, ProjectInfo projectInfo)
+        {
+            string sourceText = File.ReadAllText(entityFilePath);
+
+            SyntaxTree tree = CSharpSyntaxTree.ParseText(sourceText);
+
+            CompilationUnitSyntax root = tree.GetCompilationUnitRoot();
+            string @namespace = root.DescendantNodes().OfType<NamespaceDeclarationSyntax>().Single().Name.ToString();//不满足项目命名空间
+            ClassDeclarationSyntax classDeclarationSyntax = root.DescendantNodes().OfType<ClassDeclarationSyntax>().Single();
+            string className = classDeclarationSyntax.Identifier.ToString();
+            BaseListSyntax baseList = classDeclarationSyntax.BaseList;
+            GenericNameSyntax genericNameSyntax = baseList.DescendantNodes().OfType<SimpleBaseTypeSyntax>()
+                .First(node => !node.ToFullString().StartsWith("I")) // Not interface
+                .DescendantNodes().OfType<GenericNameSyntax>()
+                .FirstOrDefault();
+
+            string baseType;
+            string primaryKey;
+            if (genericNameSyntax == null)
+            {
+                // No generic parameter -> Entity with Composite Keys
+                baseType = baseList.DescendantNodes().OfType<SimpleBaseTypeSyntax>().Single().Type.ToString();
+                primaryKey = "long";
+
+            }
+            else
+            {
+                // Normal entity
+                baseType = genericNameSyntax.Identifier.ToString();
+                primaryKey = genericNameSyntax.DescendantNodes().OfType<TypeArgumentListSyntax>().Single().Arguments[0].ToString();
+            }
+            List<PropertyInfo> properties = root.DescendantNodes().OfType<PropertyDeclarationSyntax>()
+                  .Select(prop =>
+
+                        new PropertyInfo(prop.Type.ToString(), prop.Identifier.Value.ToString())
+                  )
+                  .ToList();
+
+            string xmlPath = _settingOptions.BaseDirectory + projectInfo.FullName + ".Core.xml";
+            string entityRemark = Util.GetEntityRemarkBySummary(xmlPath, properties, @namespace + "." + className);
+
+
+            if (_settingOptions.Areas != null)
+            {
+                @namespace = projectInfo.FullName + "." + _settingOptions.Areas + "." + className.Pluralize();
+            }
+            else
+            {
+                @namespace = projectInfo.FullName + "." + className.Pluralize();
+            }
+            string relativeDirectory = @namespace.RemovePreFix(projectInfo.FullName + ".").Replace('.', '/');
+
+            EntityInfo entityInfo = new EntityInfo(@namespace, className, baseType, primaryKey, relativeDirectory);
+            entityInfo.Properties.AddRange(properties);
+            entityInfo.EntityRemark = entityRemark;
+
+            return entityInfo;
+        }
+    }
+}
diff --git a/src/LinCms.Scaffolding/CodeScaffolding.cs b/src/LinCms.Scaffolding/CodeScaffolding.cs
new file mode 100644
index 00000000..22721a27
--- /dev/null
+++ b/src/LinCms.Scaffolding/CodeScaffolding.cs
@@ -0,0 +1,64 @@
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Logging;
+using Scriban;
+using Scriban.Runtime;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LinCms.Scaffolding
+{
+    public class CodeScaffolding
+    {
+        private readonly ILogger<App> _logger;
+        public string TemplatePath { get; }
+        public string OutputDir { get; }
+        public string PostFix { get; set; } = ".txt";
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="templatePath">模板的根目录（绝对目录）</param>
+        /// <param name="outputDir">输出目录（绝对目录/相对目录）</param>
+        public CodeScaffolding(string templatePath, string outputDir, ILogger<App> logger)
+        {
+            TemplatePath = templatePath;
+            OutputDir = outputDir;
+            _logger = logger;
+        }
+
+        public async Task GenerateAsync(object model)
+        {
+            IFileProvider fileProvider = new PhysicalFileProvider(TemplatePath);
+            if (!Directory.Exists(OutputDir))
+            {
+                Directory.CreateDirectory(OutputDir);
+            }
+
+            int count = 0;
+            foreach (var (path, file) in fileProvider.GetFilesRecursively("./"))
+            {
+                string templateText = await file.ReadAsStringAsync(Encoding.UTF8);
+                _logger.LogInformation(templateText);
+
+                TemplateContext context = new TemplateContext();
+                ScriptObject scriptObject = new ScriptObject();
+                scriptObject.Import(model, renamer: member => member.Name);
+                context.PushGlobal(scriptObject);
+                context.MemberRenamer = member => member.Name;
+
+                Template template = Template.Parse(templateText);
+                string result = template.Render(context);
+                _logger.LogInformation(result);
+
+                Template pathTemplate = Template.Parse(Path.Combine(OutputDir, path.RemovePostFix(PostFix)));
+                string targetFilePathName = pathTemplate.Render(context);
+
+                string dir = Path.GetDirectoryName(targetFilePathName);
+                if (!Directory.Exists(dir)) Directory.CreateDirectory(dir);
+                File.WriteAllText(targetFilePathName, result);
+                count += 1;
+            }
+            _logger.LogInformation($"共生成{count}个");
+        }
+    }
+}
diff --git a/src/LinCms.Scaffolding/Entities/CommandOption.cs b/src/LinCms.Scaffolding/Entities/CommandOption.cs
new file mode 100644
index 00000000..2cb69c95
--- /dev/null
+++ b/src/LinCms.Scaffolding/Entities/CommandOption.cs
@@ -0,0 +1,15 @@
+namespace LinCms.Scaffolding.Entities
+{
+    public class CommandOption
+    {
+        public string Directory { get; set; } = null!;
+        public string Entity { get; set; } = null!;
+        /// <summary>
+        /// 是否拆分DTO
+        /// </summary>
+        public bool SeparateDto { get; set; }
+        public bool CustomRepository { get; set; }
+        public bool NoOverwrite { get; set; }
+        public bool SkipEntityConstructors { get; set; }
+    }
+}
diff --git a/src/LinCms.Scaffolding/Entities/EntityInfo.cs b/src/LinCms.Scaffolding/Entities/EntityInfo.cs
new file mode 100644
index 00000000..575d207a
--- /dev/null
+++ b/src/LinCms.Scaffolding/Entities/EntityInfo.cs
@@ -0,0 +1,57 @@
+using Humanizer;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace LinCms.Scaffolding.Entities
+{
+    public class EntityInfo
+    {
+        public EntityInfo(string @namespace, string name, string baseType, string primaryKey, string relativeDirectory)
+        {
+            Namespace = @namespace;
+            Name = name;
+            BaseType = baseType;
+            PrimaryKey = primaryKey;
+            RelativeDirectory = relativeDirectory.Replace('\\', '/');
+        }
+
+        /// <summary>
+        /// 实体类应用服务等的命名空间
+        /// </summary>
+        public string Namespace { get; }
+        public string RelativeNamespace => RelativeDirectory.Replace('/', '.');
+        public string RelativeDirectory { get; }
+        public string NamespaceLastPart => Namespace.Split('.').Last();
+        public string Name { get; }
+
+        /// <summary>
+        /// 复数
+        /// </summary>
+        public string NamePluralized => Name.Pluralize();
+        /// <summary>
+        /// 首字母小写
+        /// </summary>
+        public string NameCamelize => Name.Camelize();
+
+        /// <summary>
+        /// 小写+复数
+        /// </summary>
+        public string NameCamelizePluralized => Name.Camelize().Pluralize();
+
+
+        public string BaseType { get; }
+        /// <summary>
+        /// 主键类型
+        /// </summary>
+        public string PrimaryKey { get; }
+        /// <summary>
+        /// 类的属性键值对。
+        /// </summary>
+        public List<PropertyInfo> Properties { get; } = new List<PropertyInfo>();
+
+        /// <summary>
+        /// 类的备注
+        /// </summary>
+        public string EntityRemark { get; set; } = "";
+    }
+}
diff --git a/src/LinCms.Scaffolding/Entities/ProjectInfo.cs b/src/LinCms.Scaffolding/Entities/ProjectInfo.cs
new file mode 100644
index 00000000..8ee826ba
--- /dev/null
+++ b/src/LinCms.Scaffolding/Entities/ProjectInfo.cs
@@ -0,0 +1,17 @@
+using System.Linq;
+
+namespace LinCms.Scaffolding.Entities
+{
+    public class ProjectInfo
+    {
+        public ProjectInfo(string baseDirectory, string fullName)
+        {
+            BaseDirectory = baseDirectory;
+            FullName = fullName;
+        }
+
+        public string BaseDirectory { get; }
+        public string FullName { get; }
+        public string Name => FullName.Split('.').Last();
+    }
+}
diff --git a/src/LinCms.Scaffolding/Entities/PropertyInfo.cs b/src/LinCms.Scaffolding/Entities/PropertyInfo.cs
new file mode 100644
index 00000000..55708735
--- /dev/null
+++ b/src/LinCms.Scaffolding/Entities/PropertyInfo.cs
@@ -0,0 +1,45 @@
+using Humanizer;
+using System;
+
+namespace LinCms.Scaffolding.Entities
+{
+    /// <summary>
+    /// 属性
+    /// </summary>
+    public class PropertyInfo
+    {
+        public PropertyInfo(string type, string name)
+        {
+            Type = type;
+            Name = name;
+        }
+
+        public PropertyInfo(string type, string name, string remarks) : this(type, name)
+        {
+            Remarks = remarks ?? throw new ArgumentNullException(nameof(remarks));
+        }
+
+        /// <summary>
+        /// 属性类型
+        /// </summary>
+        public string Type { get; }
+
+        /// <summary>
+        /// 属性名
+        /// </summary>
+        public string Name { get; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remarks { get; set; }
+
+
+        /// <summary>
+        /// 属性名转下划线
+        /// </summary>
+        public string NameUnderscore => Name.Underscore();
+
+
+    }
+}
diff --git a/src/LinCms.Scaffolding/Entities/SettingOptions.cs b/src/LinCms.Scaffolding/Entities/SettingOptions.cs
new file mode 100644
index 00000000..06e50261
--- /dev/null
+++ b/src/LinCms.Scaffolding/Entities/SettingOptions.cs
@@ -0,0 +1,18 @@
+using Humanizer;
+
+namespace LinCms.Scaffolding.Entities
+{
+    public class SettingOptions
+    {
+        public static string Name = "SettingOptions";
+        public string BaseDirectory { get; set; }
+        public string ProjectName { get; set; }
+        public string Areas { get; set; }
+        public string EntityFilePath { get; set; }
+        public string TemplatePath { get; set; }
+        public string OutputDirectory { get; set; }
+        //区域小写
+        public string AreasCamelize => Areas.Camelize();
+
+    }
+}
diff --git a/src/LinCms.Scaffolding/Extensions.cs b/src/LinCms.Scaffolding/Extensions.cs
new file mode 100644
index 00000000..04cb3da6
--- /dev/null
+++ b/src/LinCms.Scaffolding/Extensions.cs
@@ -0,0 +1,162 @@
+using Microsoft.Extensions.FileProviders;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LinCms.Scaffolding
+{
+    public static class Extensions
+    {
+        public static IEnumerable<(string, IFileInfo)> GetFilesRecursively(this IFileProvider fileProvider, string subpath)
+        {
+            var contents = fileProvider.GetDirectoryContents(subpath);
+            foreach (var content in contents)
+            {
+                if (content.IsDirectory)
+                {
+                    string path = subpath + "/" + content.Name;
+                    foreach (var file in fileProvider.GetFilesRecursively(path))
+                    {
+                        yield return file;
+                    }
+                }
+                else
+                {
+                    IFileInfo fileInfo = fileProvider.GetFileInfo(subpath + "/" + content.Name);
+
+                    yield return (subpath + "/" + content.Name, fileInfo);
+                }
+            }
+        }
+        public static async Task<string> ReadAsStringAsync(this IFileInfo fileInfo, Encoding encoding)
+        {
+
+            using (var stream = fileInfo.CreateReadStream())
+            {
+                using (var streamReader = new StreamReader(stream, encoding, true))
+                {
+                    return await streamReader.ReadToEndAsync();
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// Gets a substring of a string from end of the string.
+        /// </summary>
+        /// <exception cref="ArgumentNullException">Thrown if <paramref name="str"/> is null</exception>
+        /// <exception cref="ArgumentException">Thrown if <paramref name="len"/> is bigger that string's length</exception>
+        public static string Right(this string str, int len)
+        {
+            if (str.Length < len)
+            {
+                throw new ArgumentException("len argument can not be bigger than given string's length!");
+            }
+
+            return str.Substring(str.Length - len, len);
+        }
+
+        /// <summary>
+        /// Removes first occurrence of the given prefixes from beginning of the given string.
+        /// </summary>
+        /// <param name="str">The string.</param>
+        /// <param name="preFixes">one or more prefix.</param>
+        /// <returns>Modified string or the same string if it has not any of given prefixes</returns>
+        public static string RemovePreFix(this string str, params string[] preFixes)
+        {
+            return str.RemovePreFix(StringComparison.Ordinal, preFixes);
+        }
+        public static string RemovePreFix(this string str, StringComparison comparisonType, params string[] preFixes)
+        {
+            if (str.IsNullOrEmpty())
+            {
+                return null;
+            }
+
+            if (preFixes.IsNullOrEmpty())
+            {
+                return str;
+            }
+
+            foreach (var preFix in preFixes)
+            {
+                if (str.StartsWith(preFix, comparisonType))
+                {
+                    return str.Right(str.Length - preFix.Length);
+                }
+            }
+
+            return str;
+        }
+        public static bool IsNullOrEmpty(this string str)
+        {
+            return string.IsNullOrEmpty(str);
+        }
+
+        /// <summary>
+        /// Checks whatever given collection object is null or has no item.
+        /// </summary>
+        public static bool IsNullOrEmpty<T>(this ICollection<T> source)
+        {
+            return source == null || source.Count <= 0;
+        }
+
+        /// <summary>
+        /// Gets a substring of a string from beginning of the string.
+        /// </summary>
+        /// <exception cref="ArgumentNullException">Thrown if <paramref name="str"/> is null</exception>
+        /// <exception cref="ArgumentException">Thrown if <paramref name="len"/> is bigger that string's length</exception>
+        public static string Left(this string str, int len)
+        {
+            if (str.Length < len)
+            {
+                throw new ArgumentException("len argument can not be bigger than given string's length!");
+            }
+
+            return str.Substring(0, len);
+        }
+
+        /// <summary>
+        /// Removes first occurrence of the given postfixes from end of the given string.
+        /// </summary>
+        /// <param name="str">The string.</param>
+        /// <param name="postFixes">one or more postfix.</param>
+        /// <returns>Modified string or the same string if it has not any of given postfixes</returns>
+        public static string RemovePostFix(this string str, params string[] postFixes)
+        {
+            return str.RemovePostFix(StringComparison.Ordinal, postFixes);
+        }
+
+        /// <summary>
+        /// Removes first occurrence of the given postfixes from end of the given string.
+        /// </summary>
+        /// <param name="str">The string.</param>
+        /// <param name="comparisonType">String comparison type</param>
+        /// <param name="postFixes">one or more postfix.</param>
+        /// <returns>Modified string or the same string if it has not any of given postfixes</returns>
+        public static string RemovePostFix(this string str, StringComparison comparisonType, params string[] postFixes)
+        {
+            if (str.IsNullOrEmpty())
+            {
+                return null;
+            }
+
+            if (postFixes.IsNullOrEmpty())
+            {
+                return str;
+            }
+
+            foreach (var postFix in postFixes)
+            {
+                if (str.EndsWith(postFix, comparisonType))
+                {
+                    return str.Left(str.Length - postFix.Length);
+                }
+            }
+
+            return str;
+        }
+    }
+}
diff --git a/src/LinCms.Scaffolding/LinCms.Scaffolding.csproj b/src/LinCms.Scaffolding/LinCms.Scaffolding.csproj
new file mode 100644
index 00000000..81ed431d
--- /dev/null
+++ b/src/LinCms.Scaffolding/LinCms.Scaffolding.csproj
@@ -0,0 +1,40 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net5.0</TargetFramework>
+	</PropertyGroup>
+
+
+	<ItemGroup>
+		<Content Include="appsettings.json">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
+		<PackageReference Include="HtmlAgilityPack" Version="1.11.33" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="Serilog.Extensions.Hosting" Version="4.1.2" />
+		<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
+		<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
+		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0-dev-00862" />
+		<PackageReference Include="Humanizer.Core" Version="2.10.1" />
+		<PackageReference Include="Scriban" Version="4.0.1" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Update="Templates\**\**">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+
+	<ProjectExtensions>
+		<VisualStudio>
+			<UserProperties />
+		</VisualStudio>
+	</ProjectExtensions>
+</Project>
diff --git a/src/LinCms.Scaffolding/Program.cs b/src/LinCms.Scaffolding/Program.cs
new file mode 100644
index 00000000..dd7e3b48
--- /dev/null
+++ b/src/LinCms.Scaffolding/Program.cs
@@ -0,0 +1,58 @@
+using System.IO;
+using System.Threading.Tasks;
+using LinCms.Scaffolding.Entities;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Serilog;
+
+namespace LinCms.Scaffolding
+{
+    class Program
+    {
+        static async Task Main(string[] args)
+        {
+            var host = AppStartup();
+
+            var service = ActivatorUtilities.CreateInstance<App>(host.Services);
+
+            await service.RunAsync(args);
+
+        }
+
+        static void BuildConfig(IConfigurationBuilder builder)
+        {
+            builder.SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
+                ;
+        }
+
+        static IHost AppStartup()
+        {
+            ConfigurationBuilder builder = new ConfigurationBuilder();
+            BuildConfig(builder);
+            IConfigurationRoot configuration = builder.Build();
+       
+            Log.Logger = new LoggerConfiguration() 
+                            .ReadFrom.Configuration(configuration)
+                            .Enrich.FromLogContext() 
+                            .CreateLogger();
+
+            Log.Logger.Information("Application Starting");
+
+            var host = Host.CreateDefaultBuilder() 
+                        .ConfigureServices((context, services) =>
+                        { 
+                            services.Configure<SettingOptions>(configuration.GetSection(SettingOptions.Name));
+                            services.AddTransient<App>();
+                        })
+                        .ConfigureAppConfiguration((host, config) =>
+                        {
+                        })
+                        .UseSerilog() 
+                        .Build();
+
+            return host;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Scaffolding/Templates/lin-cms-vue/model/{{EntityInfo.NameCamelize}}.js.txt b/src/LinCms.Scaffolding/Templates/lin-cms-vue/model/{{EntityInfo.NameCamelize}}.js.txt
new file mode 100644
index 00000000..d7fdd2a8
--- /dev/null
+++ b/src/LinCms.Scaffolding/Templates/lin-cms-vue/model/{{EntityInfo.NameCamelize}}.js.txt
@@ -0,0 +1,32 @@
+import { post, get, put, _delete } from "@/lin/plugin/axios";
+
+class {{EntityInfo.Name}} {
+
+  async get{{EntityInfo.NamePluralized}}(params) {
+    const res = await get("api/{{SettingOptions.AreasCamelize}}/{{EntityInfo.NameCamelizePluralized}}", params);
+    return res;
+  }
+
+  async get{{EntityInfo.Name}}(id) {
+    const res = await get(`api/{{SettingOptions.AreasCamelize}}/{{EntityInfo.NameCamelizePluralized}}/${id}`);
+    return res;
+  }
+
+  async add{{EntityInfo.Name}}(params) {
+    const res = await post("api/{{SettingOptions.AreasCamelize}}/{{EntityInfo.NameCamelizePluralized}}", params);
+    return res;
+  }
+
+  async edit{{EntityInfo.Name}}(id, data) {
+    const res = await put(`api/{{SettingOptions.AreasCamelize}}/{{EntityInfo.NameCamelizePluralized}}/${id}`, data);
+    return res;
+  }
+
+  async delete{{EntityInfo.Name}}(id) {
+    const res = await _delete(`api/{{SettingOptions.AreasCamelize}}/{{EntityInfo.NameCamelizePluralized}}/${id}`);
+    return res;
+  }
+ 
+}
+
+export default new {{EntityInfo.Name}}();
diff --git a/src/LinCms.Scaffolding/Templates/lin-cms-vue/stage-config.js.txt b/src/LinCms.Scaffolding/Templates/lin-cms-vue/stage-config.js.txt
new file mode 100644
index 00000000..d412605b
--- /dev/null
+++ b/src/LinCms.Scaffolding/Templates/lin-cms-vue/stage-config.js.txt
@@ -0,0 +1,24 @@
+const {{SettingOptions.AreasCamelize}}Router = {
+  route: null,
+  name: null,
+  title: "工作台",
+  type: "folder", // 类型: folder, tab, view
+  icon: "iconfont icon-tushuguanli",
+  filePath: "view/{{SettingOptions.AreasCamelize}}/",
+  order: null,
+  inNav: true,
+  children: [
+    {
+      name: null,
+      title: "{{EntityInfo.EntityRemark}}管理",
+      type: "view",
+      name: "{{EntityInfo.Name}}List",
+      route: "/{{SettingOptions.AreasCamelize}}/{{EntityInfo.NameCamelize}}/list",
+      filePath: "plugin/{{SettingOptions.AreasCamelize}}/view/{{EntityInfo.NameCamelize}}/{{EntityInfo.NameCamelize}}-list.vue",
+      inNav: true,
+      permission: ["所有{{EntityInfo.EntityRemark}}"]
+    }
+  ]
+};
+
+export default {{SettingOptions.AreasCamelize}}Router;
diff --git a/src/LinCms.Scaffolding/Templates/lin-cms-vue/view/{{EntityInfo.NameCamelize}}/{{EntityInfo.NameCamelize}}-form.vue.txt b/src/LinCms.Scaffolding/Templates/lin-cms-vue/view/{{EntityInfo.NameCamelize}}/{{EntityInfo.NameCamelize}}-form.vue.txt
new file mode 100644
index 00000000..5aa47efb
--- /dev/null
+++ b/src/LinCms.Scaffolding/Templates/lin-cms-vue/view/{{EntityInfo.NameCamelize}}/{{EntityInfo.NameCamelize}}-form.vue.txt
@@ -0,0 +1,122 @@
+<template>
+  <div>
+    <sticky-top>
+      <div class="title">
+        <span>{%{{{title[this.id==0?0:1]}}}%}</span>
+        <span class="back" @click="back">
+          <i class="iconfont icon-fanhui"></i> 返回
+        </span>
+      </div>
+    </sticky-top>
+    <div class="container">
+      <div class="wrap">
+        <el-row>
+          <el-col :lg="16" :md="20" :sm="24" :xs="24">
+            <el-form
+              status-icon
+              ref="form"
+              label-width="120px"
+              :model="form"
+              label-position="labelPosition"
+              :rules="rules"
+              style="margin-left:-35px;margin-bottom:-35px;margin-top:15px;"
+            >
+            {{~ for prop in EntityInfo.Properties ~}}
+               <el-form-item label="{{ prop.Remarks}}" prop="{{ prop.NameUnderscore}}">
+                <el-input size="medium" clearable v-model="form.{{ prop.NameUnderscore}}"></el-input>
+              </el-form-item>
+            {{~ end ~}}
+              <el-form-item class="submit">
+                <el-button type="primary" @click="confirmEdit('form')">保 存</el-button>
+                <el-button @click="resetForm('form')">重 置</el-button>
+              </el-form-item>
+            </el-form>
+          </el-col>
+        </el-row>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {{EntityInfo.NameCamelize}}Api from '../../model/{{EntityInfo.NameCamelize}}'
+export default {
+  name: '{{EntityInfo.Name}}Form',
+  props: {},
+  data() {
+    return {
+      title: ['新增{{EntityInfo.EntityRemark}}', '编辑{{EntityInfo.EntityRemark}}'],
+      loading: false,
+      // 表单信息
+      form: {
+        {{~ for prop in EntityInfo.Properties ~}}
+        {{prop.NameUnderscore}}:'',
+        {{~ end ~}}
+      },
+      // 表单验证规则
+      rules: {
+        {{EntityInfo.NameCamelize}}_name: [{ required: true, message: '请输入{{EntityInfo.EntityRemark}}', trigger: 'blur' }],
+      },
+    }
+  },
+  props: {
+    id: {
+      type: [String, Number],
+    },
+  },
+  async created() {
+    this.show()
+  },
+  methods: {
+    async show() {
+      if (this.id != 0) {
+        let {{EntityInfo.NameCamelize}} = await {{EntityInfo.NameCamelize}}Api.get{{EntityInfo.Name}}(this.id)
+        this.form = {{EntityInfo.NameCamelize}}
+  
+      } else {
+        Object.assign(this.form, {
+        {{~ for prop in EntityInfo.Properties ~}}
+           {{prop.NameUnderscore}}:'',
+        {{~ end ~}}
+        })
+      }
+    },
+    async submitForm() {
+      if (this.id == 0) {
+        return await {{EntityInfo.NameCamelize}}Api.add{{EntityInfo.Name}}(this.form)
+      } else {
+        return await {{EntityInfo.NameCamelize}}Api.edit{{EntityInfo.Name}}(this.id, this.form)
+      }
+    },
+    async confirmEdit(formName) {
+
+      this.$refs[formName].validate(async valid => {
+        if (valid) {
+          let res
+          this.loading = true
+
+          res = await this.submitForm().finally(() => {
+            this.loading = false
+          })
+
+          this.$message.success(`${res.message}`)
+          this.$emit('editClose')
+        } else {
+          this.$message.error('请填写正确的信息')
+        }
+      })
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+    },
+    back() {
+      this.$emit('editClose')
+    },
+  },
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import 'https://github.com/@/assets/style/form.scss';
+</style>
diff --git a/src/LinCms.Scaffolding/Templates/lin-cms-vue/view/{{EntityInfo.NameCamelize}}/{{EntityInfo.NameCamelize}}-list.vue.txt b/src/LinCms.Scaffolding/Templates/lin-cms-vue/view/{{EntityInfo.NameCamelize}}/{{EntityInfo.NameCamelize}}-list.vue.txt
new file mode 100644
index 00000000..3bdd4621
--- /dev/null
+++ b/src/LinCms.Scaffolding/Templates/lin-cms-vue/view/{{EntityInfo.NameCamelize}}/{{EntityInfo.NameCamelize}}-list.vue.txt
@@ -0,0 +1,148 @@
+<template>
+  <div>
+    <div class="container" v-if="!showEdit">
+      <div class="header">
+        <div class="header-left">
+          <div class="title">{{EntityInfo.EntityRemark}}</div>
+        </div>
+        <div class="header-right">
+         <!-- <el-input
+            size="medium"
+            style="margin-right:30px"
+            v-model="pagination.{{EntityInfo.NameCamelize}}_name"
+            placeholder="{{EntityInfo.EntityRemark}}名"
+          ></el-input>-->
+          <el-button
+            type="primary"
+            icon="el-icon-edit"
+            v-permission="'新增{{EntityInfo.EntityRemark}}'"
+            @click="()=>{
+                this.showEdit = true;
+                this.id=0;
+            }"
+          >新增{{EntityInfo.EntityRemark}}</el-button>
+          <el-button type="default" icon="el-icon-search" @click="refresh">刷新</el-button>
+        </div>
+      </div>
+      <!-- 表格 -->
+      <lin-table
+        :tableColumn="tableColumn"
+        :tableData="tableData"
+        :operate="operate"
+        :operateWidth="230"
+        @handleEdit="handleEdit"
+        @handleDelete="handleDelete"
+        v-loading="loading"
+        :pagination="pagination"
+        @currentChange="handleCurrentChange"
+      >
+      </lin-table>
+      <!--表格结束-->
+    </div>
+    <{{EntityInfo.NameCamelize}}-form v-else :id="id" ref="{{EntityInfo.NameCamelize}}Form" @editClose="editClose"></{{EntityInfo.NameCamelize}}-form>
+  </div>
+</template>
+
+<script>
+import {{EntityInfo.NameCamelize}}Api from '../../model/{{EntityInfo.NameCamelize}}'
+import LinTable from '@/component/base/table/lin-table'
+import {{EntityInfo.Name}}Form from './{{EntityInfo.NameCamelize}}-form'
+export default {
+  name: '{{EntityInfo.Name}}List',
+  components: { LinTable, {{EntityInfo.Name}}Form },
+  inject: ['eventBus'],
+  data() {
+    return {
+      id: 0,
+      showEdit: false,
+      tableData: [], // 表格数据
+      tableColumn: [], // 表头数据
+      operate: [], // 表格按键操作区
+      loading: false,
+      pagination: {
+        pageSize: 10,
+        pageTotal: 0,
+        currentPage: 1, // 默认获取第一页的数据
+      },
+    }
+  },
+  methods: {
+    async get{{EntityInfo.Name}}s() {
+      const currentPage = this.pagination.currentPage - 1
+      this.loading = true
+      let res = await {{EntityInfo.NameCamelize}}Api
+        .get{{EntityInfo.Name}}s({
+          count: this.pagination.pageSize,
+          page: currentPage,
+        })
+        .finally(r => {
+          this.loading = false
+        })
+      this.tableData = [...res.items]
+      this.pagination.pageTotal = res.total
+    },
+    async handleEdit(val) {
+      this.showEdit = true
+      this.id = val.row.id
+    },
+    async handleCurrentChange(val) {
+      this.pagination.currentPage = val
+      this.loading = true
+      await this.get{{EntityInfo.Name}}s()
+      this.loading = false
+    },
+    handleDelete(val) {
+      let res
+      this.$confirm('此操作将永久删除该{{EntityInfo.EntityRemark}}项, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(async () => {
+        try {
+          this.loading = true
+          res = await {{EntityInfo.NameCamelize}}Api.delete{{EntityInfo.Name}}(val.row.id)
+        } catch (e) {
+          this.loading = false
+        }
+        if (res.code === 0) {
+          this.loading = false
+          await this.get{{EntityInfo.Name}}s()
+
+          this.$message({
+            type: 'success',
+            message: `${res.message}`,
+          })
+        } else {
+          this.loading = false
+          this.$message.error(`${res.message}`)
+        }
+      })
+    },
+    async refresh() {
+      await this.get{{EntityInfo.Name}}s()
+    },
+    async editClose() {
+      this.showEdit = false
+      await this.get{{EntityInfo.Name}}s()
+    }
+  },
+  async created() {
+    this.tableColumn = [
+        {{~ for prop in EntityInfo.Properties ~}}
+          { prop: '{{ prop.NameUnderscore}}', label: '{{ prop.Remarks}}'},
+        {{~ end ~}}
+    ]
+    this.operate = [
+      { name: '编辑', func: 'handleEdit', type: 'primary', permission: '编辑{{EntityInfo.EntityRemark}}' },
+      { name: '删除', func: 'handleDelete', type: 'danger', permission: '删除{{EntityInfo.EntityRemark}}' }
+    ]
+
+    await this.get{{EntityInfo.Name}}s()
+  },
+  beforeDestroy() {},
+}
+</script>
+
+<style lang="scss" scoped>
+@import 'https://github.com/@/assets/style/list.scss';
+</style>
diff --git a/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Application.Contracts/{{SettingOptions.Areas}}/{{EntityInfo.NamePluralized}}/CreateUpdate{{EntityInfo.Name}}Dto.cs.txt b/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Application.Contracts/{{SettingOptions.Areas}}/{{EntityInfo.NamePluralized}}/CreateUpdate{{EntityInfo.Name}}Dto.cs.txt
new file mode 100644
index 00000000..584c3cb5
--- /dev/null
+++ b/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Application.Contracts/{{SettingOptions.Areas}}/{{EntityInfo.NamePluralized}}/CreateUpdate{{EntityInfo.Name}}Dto.cs.txt
@@ -0,0 +1,13 @@
+
+namespace {{ EntityInfo.Namespace }}
+{
+    public class CreateUpdate{{EntityInfo.Name }}Dto
+    {
+        {{~ for prop in EntityInfo.Properties ~}}
+        public {{ prop.Type}} {{ prop.Name }} { get; set; }
+        {{~ if !for.last ~}}
+
+        {{~ end ~}}
+        {{~ end ~}}
+    }
+}
diff --git a/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Application.Contracts/{{SettingOptions.Areas}}/{{EntityInfo.NamePluralized}}/I{{EntityInfo.Name}}Service.cs.txt b/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Application.Contracts/{{SettingOptions.Areas}}/{{EntityInfo.NamePluralized}}/I{{EntityInfo.Name}}Service.cs.txt
new file mode 100644
index 00000000..fe4118fb
--- /dev/null
+++ b/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Application.Contracts/{{SettingOptions.Areas}}/{{EntityInfo.NamePluralized}}/I{{EntityInfo.Name}}Service.cs.txt
@@ -0,0 +1,18 @@
+using System.Threading.Tasks;
+using LinCms.Data;
+
+namespace {{ EntityInfo.Namespace }}
+{
+    public interface I{{ EntityInfo.Name }}Service
+    {
+        Task DeleteAsync({{EntityInfo.PrimaryKey}} id);
+
+        Task<PagedResultDto<{{ EntityInfo.Name }}Dto>> GetListAsync(PageDto pageDto);
+
+        Task<{{ EntityInfo.Name }}Dto> GetAsync({{EntityInfo.PrimaryKey}} id);
+
+        Task CreateAsync(CreateUpdate{{ EntityInfo.Name }}Dto create{{ EntityInfo.Name }});
+
+        Task UpdateAsync({{EntityInfo.PrimaryKey}} id, CreateUpdate{{ EntityInfo.Name }}Dto update{{ EntityInfo.Name }});
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Application.Contracts/{{SettingOptions.Areas}}/{{EntityInfo.NamePluralized}}/{{EntityInfo.Name}}Dto.cs.txt b/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Application.Contracts/{{SettingOptions.Areas}}/{{EntityInfo.NamePluralized}}/{{EntityInfo.Name}}Dto.cs.txt
new file mode 100644
index 00000000..05e2393c
--- /dev/null
+++ b/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Application.Contracts/{{SettingOptions.Areas}}/{{EntityInfo.NamePluralized}}/{{EntityInfo.Name}}Dto.cs.txt
@@ -0,0 +1,14 @@
+using LinCms.Entities;
+namespace {{ EntityInfo.Namespace }}
+{
+    public class {{EntityInfo.Name }}Dto:EntityDto<{{ EntityInfo.PrimaryKey }}>
+    {
+       {{~ for prop in EntityInfo.Properties ~}}
+        public {{ prop.Type}} {{ prop.Name }} { get; set; }
+        {{~ if !for.last ~}}
+
+        {{~ end ~}}
+        {{~ end ~}}
+
+    }
+}
diff --git a/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Application/{{SettingOptions.Areas}}/{{EntityInfo.NamePluralized}}/{{EntityInfo.Name}}Profile.cs.txt b/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Application/{{SettingOptions.Areas}}/{{EntityInfo.NamePluralized}}/{{EntityInfo.Name}}Profile.cs.txt
new file mode 100644
index 00000000..c547074c
--- /dev/null
+++ b/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Application/{{SettingOptions.Areas}}/{{EntityInfo.NamePluralized}}/{{EntityInfo.Name}}Profile.cs.txt
@@ -0,0 +1,14 @@
+using AutoMapper;
+using {{ProjectInfo.FullName}}.Entities.{{SettingOptions.Areas}};
+
+namespace {{ EntityInfo.Namespace }}
+{
+    public class {{ EntityInfo.Name }}Profile : Profile
+    {
+        public {{ EntityInfo.Name }}Profile()
+        {
+            CreateMap<{{ EntityInfo.Name }}, {{ EntityInfo.Name }}Dto>();
+            CreateMap<CreateUpdate{{ EntityInfo.Name }}Dto, {{ EntityInfo.Name }}>();
+        }
+    }
+}
diff --git a/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Application/{{SettingOptions.Areas}}/{{EntityInfo.NamePluralized}}/{{EntityInfo.Name}}Service.cs.txt b/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Application/{{SettingOptions.Areas}}/{{EntityInfo.NamePluralized}}/{{EntityInfo.Name}}Service.cs.txt
new file mode 100644
index 00000000..e002025e
--- /dev/null
+++ b/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Application/{{SettingOptions.Areas}}/{{EntityInfo.NamePluralized}}/{{EntityInfo.Name}}Service.cs.txt
@@ -0,0 +1,66 @@
+{{-
+if Option.CustomRepository
+    repositoryType = "I" + EntityInfo.Name + "Repository"
+    repositoryName = "_repository"
+else
+    repositoryType = "IAuditBaseRepository<" + EntityInfo.Name + ", " + EntityInfo.PrimaryKey + ">"
+    repositoryName = "Repository"
+end ~}}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using {{ProjectInfo.FullName}}.Data;
+using {{ProjectInfo.FullName}}.Entities.{{SettingOptions.Areas}};
+using {{ProjectInfo.FullName}}.Extensions;
+using {{ProjectInfo.FullName}}.Exceptions;
+using {{ProjectInfo.FullName}}.IRepositories;
+
+namespace {{ EntityInfo.Namespace }}
+{
+    public class {{ EntityInfo.Name }}Service :ApplicationService, I{{ EntityInfo.Name }}Service
+    {
+        private readonly {{repositoryType}} {{repositoryName}};
+
+        public {{ EntityInfo.Name }}Service({{repositoryType}} repository)
+        {
+            {{repositoryName}} = repository;
+        }
+
+        public async Task DeleteAsync({{EntityInfo.PrimaryKey}} id)
+        {
+            await {{repositoryName}}.DeleteAsync(new {{ EntityInfo.Name }} {Id = id});
+        }
+
+        public async Task<PagedResultDto<{{ EntityInfo.Name }}Dto>> GetListAsync(PageDto pageDto)
+        {
+            List<{{EntityInfo.Name}}Dto> {{EntityInfo.NameCamelizePluralized}}s = (await {{repositoryName}}.Select
+                        .ToPagerListAsync(pageDto, out long count)).Select(r => Mapper.Map<{{EntityInfo.Name}}Dto>(r)).ToList();
+
+            return new PagedResultDto<{{EntityInfo.Name}}Dto>({{EntityInfo.NameCamelizePluralized}}s, count);
+        }
+
+        public async Task<{{ EntityInfo.Name }}Dto> GetAsync({{EntityInfo.PrimaryKey}} id)
+        {
+            {{ EntityInfo.Name }} {{EntityInfo.NameCamelize}} = await {{repositoryName}}.Select.Where(a => a.Id == id).ToOneAsync();
+            return Mapper.Map<{{ EntityInfo.Name }}Dto>({{EntityInfo.NameCamelize}});
+        }
+
+        public async Task CreateAsync(CreateUpdate{{ EntityInfo.Name }}Dto create{{ EntityInfo.Name }})
+        {
+            {{ EntityInfo.Name }} {{EntityInfo.NameCamelize}} = Mapper.Map<{{ EntityInfo.Name }}>(create{{ EntityInfo.Name }});
+            await {{repositoryName}}.InsertAsync({{EntityInfo.NameCamelize}});
+        }
+
+        public async Task UpdateAsync({{EntityInfo.PrimaryKey}} id, CreateUpdate{{ EntityInfo.Name }}Dto update{{ EntityInfo.Name }})
+        {
+            {{ EntityInfo.Name }} {{EntityInfo.NameCamelize}} = await {{repositoryName}}.Select.Where(r => r.Id == id).ToOneAsync();
+            if ({{EntityInfo.NameCamelize}} == null)
+            {
+                throw new LinCmsException("该数据不存在");
+            }
+            Mapper.Map(update{{ EntityInfo.Name }}, {{EntityInfo.NameCamelize}});
+            await {{repositoryName}}.UpdateAsync({{EntityInfo.NameCamelize}});
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Core/IRepositories/I{{EntityInfo.Name}}Repository.cs.txt b/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Core/IRepositories/I{{EntityInfo.Name}}Repository.cs.txt
new file mode 100644
index 00000000..6d9fa0db
--- /dev/null
+++ b/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Core/IRepositories/I{{EntityInfo.Name}}Repository.cs.txt
@@ -0,0 +1,9 @@
+using {{ProjectInfo.FullName}}.Entities.{{SettingOptions.Areas}};
+namespace {{ProjectInfo.FullName}}.IRepositories
+{
+    public interface I{{ EntityInfo.Name }}Repository : IAuditBaseRepository<{{ EntityInfo.Name }},{{EntityInfo.PrimaryKey}}>
+    {
+
+    }
+}
+
diff --git a/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Infrastructure/Repositories/{{EntityInfo.Name}}Repository.cs.txt b/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Infrastructure/Repositories/{{EntityInfo.Name}}Repository.cs.txt
new file mode 100644
index 00000000..bd7b72a4
--- /dev/null
+++ b/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Infrastructure/Repositories/{{EntityInfo.Name}}Repository.cs.txt
@@ -0,0 +1,16 @@
+using FreeSql;
+using {{ProjectInfo.FullName}}.Entities.{{SettingOptions.Areas}};
+using {{ProjectInfo.FullName}}.IRepositories;
+using {{ProjectInfo.FullName}}.Security;
+namespace {{ProjectInfo.FullName}}.Repositories
+{
+    public class {{ EntityInfo.Name }}Repository : AuditBaseRepository<{{ EntityInfo.Name }},{{EntityInfo.PrimaryKey}}>, I{{ EntityInfo.Name }}Repository
+    {
+        private readonly ICurrentUser _currentUser;
+        public  {{ EntityInfo.Name }}Repository(UnitOfWorkManager unitOfWork, ICurrentUser currentUser): base(unitOfWork, currentUser)
+        {
+            _currentUser = currentUser;
+        }
+    }
+}
+
diff --git a/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Web/Controllers/{{SettingOptions.Areas}}/{{EntityInfo.Name}}Controller.cs.txt b/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Web/Controllers/{{SettingOptions.Areas}}/{{EntityInfo.Name}}Controller.cs.txt
new file mode 100644
index 00000000..0fcfcad0
--- /dev/null
+++ b/src/LinCms.Scaffolding/Templates/{{ProjectInfo.FullName}}.Web/Controllers/{{SettingOptions.Areas}}/{{EntityInfo.Name}}Controller.cs.txt
@@ -0,0 +1,57 @@
+using System.Threading.Tasks;
+using {{ProjectInfo.FullName}}.Aop.Filter;
+using {{ProjectInfo.FullName}}.Data;
+using {{ProjectInfo.FullName}}.{{SettingOptions.Areas}}.{{ EntityInfo.NamePluralized }};
+using Microsoft.AspNetCore.Mvc;
+
+namespace {{ProjectInfo.FullName}}.Controllers.{{SettingOptions.Areas}}
+{
+    [Route("api/{{SettingOptions.AreasCamelize}}/{{ EntityInfo.NameCamelizePluralized }}")]
+    [ApiController]
+    public class {{ EntityInfo.Name }}Controller : ControllerBase
+    {
+        private readonly I{{ EntityInfo.Name }}Service _{{ EntityInfo.NameCamelize }}Service;
+        public {{ EntityInfo.Name }}Controller(I{{ EntityInfo.Name }}Service {{ EntityInfo.NameCamelize }}Service)
+        {
+            _{{ EntityInfo.NameCamelize }}Service = {{ EntityInfo.NameCamelize }}Service;
+        }
+
+        [LinCmsAuthorize("删除{{EntityInfo.EntityRemark}}", "{{EntityInfo.EntityRemark}}管理")]
+        [HttpDelete("{id}")]
+        public async Task<UnifyResponseDto> DeleteAsync({{ EntityInfo.PrimaryKey }} id)
+        {
+            await _{{ EntityInfo.NameCamelize }}Service.DeleteAsync(id);
+            return UnifyResponseDto.Success();
+
+        }
+
+        [LinCmsAuthorize("所有{{EntityInfo.EntityRemark}}", "{{EntityInfo.EntityRemark}}管理")]
+        [HttpGet]
+        public async Task<PagedResultDto<{{ EntityInfo.Name }}Dto>> GetListAsync([FromQuery] PageDto pageDto)
+        {
+            return await _{{ EntityInfo.NameCamelize }}Service.GetListAsync(pageDto);
+        }
+
+        [HttpGet("{id}")]
+        public async Task<{{ EntityInfo.Name }}Dto> GetAsync({{ EntityInfo.PrimaryKey }} id)
+        {
+            return await _{{ EntityInfo.NameCamelize }}Service.GetAsync(id);
+        }
+
+        [LinCmsAuthorize("新增{{EntityInfo.EntityRemark}}", "{{EntityInfo.EntityRemark}}管理")]
+        [HttpPost]
+        public async Task<UnifyResponseDto> CreateAsync([FromBody] CreateUpdate{{ EntityInfo.Name }}Dto create{{ EntityInfo.Name }})
+        {
+            await _{{ EntityInfo.NameCamelize }}Service.CreateAsync(create{{ EntityInfo.Name }});
+            return UnifyResponseDto.Success("新增{{EntityInfo.EntityRemark}}成功");
+        }
+
+        [LinCmsAuthorize("编辑{{EntityInfo.EntityRemark}}", "{{EntityInfo.EntityRemark}}管理")]
+        [HttpPut("{id}")]
+        public async Task<UnifyResponseDto> UpdateAsync({{ EntityInfo.PrimaryKey }} id, [FromBody] CreateUpdate{{ EntityInfo.Name }}Dto update{{ EntityInfo.Name }})
+        {
+            await _{{ EntityInfo.NameCamelize }}Service.UpdateAsync(id, update{{ EntityInfo.Name }});
+            return UnifyResponseDto.Success("编辑{{EntityInfo.EntityRemark}}成功");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Scaffolding/Util.cs b/src/LinCms.Scaffolding/Util.cs
new file mode 100644
index 00000000..5a12e96a
--- /dev/null
+++ b/src/LinCms.Scaffolding/Util.cs
@@ -0,0 +1,54 @@
+using LinCms.Scaffolding.Entities;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml;
+using System.Xml.XPath;
+
+namespace LinCms.Scaffolding
+{
+    public class Util
+    {
+        /// <summary>
+        /// 获取类的属性的注释文本，通过 xml和（类的命名空间+类名）读取。获取类的注释
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns>Dict：key=属性名，value=注释</returns>
+        public static string GetEntityRemarkBySummary(string xmlPath, List<PropertyInfo> propertyInfos, string className)
+        {
+            var entityRemark =String.Empty;
+            var sReader = new StringReader(File.ReadAllText(xmlPath));
+            using (var xmlReader = XmlReader.Create(sReader))
+            {
+                XPathDocument xpath = null;
+                try
+                {
+                    xpath = new XPathDocument(xmlReader);
+                }
+                catch
+                {
+                    return null;
+                }
+                var xmlNav = xpath.CreateNavigator();
+
+                var node = xmlNav.SelectSingleNode($"/doc/members/member[@name='T:{className}']/summary");
+                if (node != null)
+                {
+                    var comment = node.InnerXml.Trim(' ', '\r', '\n', '\t');
+                    if (string.IsNullOrEmpty(comment) == false) entityRemark=comment; //class注释
+                }
+
+                foreach (var prop in propertyInfos)
+                {
+                    node = xmlNav.SelectSingleNode($"/doc/members/member[@name='P:{className}.{prop.Name}']/summary");
+                    if (node == null) continue;
+                    var comment = node.InnerXml.Trim(' ', '\r', '\n', '\t');
+                    if (string.IsNullOrEmpty(comment)) continue;
+
+                    prop.Remarks = comment;
+                }
+            }
+            return entityRemark;
+        }
+    }
+}
diff --git a/src/LinCms.Scaffolding/appsettings.json b/src/LinCms.Scaffolding/appsettings.json
new file mode 100644
index 00000000..ebac1755
--- /dev/null
+++ b/src/LinCms.Scaffolding/appsettings.json
@@ -0,0 +1,39 @@
+  {
+    "Serilog": {
+      "Using": [
+        "Serilog.Sinks.Console",
+        "Serilog.Sinks.File"
+      ],
+      "MinimalLevel": {
+        "Default": "Information",
+        "Override": {
+          "Microsoft": "Information",
+          "System": "Information"
+        }
+      },
+      "WriteTo": [
+        {
+          "Name": "File",
+          "Args": {
+            "path": "Logs/log.txt",
+            "rollingInterval": "Day"
+          }
+        },
+        {
+          "Name": "Console",
+          "Args": {
+            "theme": "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Code, Serilog.Sinks.Console",
+            "outputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} <s:{SourceContext}>{NewLine}{Exception}"
+          }
+        }
+      ]
+    },
+    "SettingOptions": {
+      "ProjectName": "LinCms", //����
+      "BaseDirectory": "../../../../LinCms.Core/", // LinCms.Core����Ŀ¼��
+      "EntityFilePath": "Entities/Book.cs", //ʵ���������ļ�λ��
+      "Areas": "Base", //����ģ����
+      "TemplatePath": "./Templates", //���·������ǰ��Ŀ�µ�TemplatesĿ¼
+      "OutputDirectory": "./code-scaffolding" //���������·����Ҳ�����Ǿ���·��
+    }
+  } 
\ No newline at end of file
diff --git a/src/LinCms.Web/.config/dotnet-tools.json b/src/LinCms.Web/.config/dotnet-tools.json
deleted file mode 100644
index 6b2cf2df..00000000
--- a/src/LinCms.Web/.config/dotnet-tools.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "dotnet-ef": {
-      "version": "3.1.0",
-      "commands": [
-        "dotnet-ef"
-      ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/LinCms.Web/Controllers/ApiControllerBase.cs b/src/LinCms.Web/Controllers/ApiControllerBase.cs
index c0b5508d..395a62da 100644
--- a/src/LinCms.Web/Controllers/ApiControllerBase.cs
+++ b/src/LinCms.Web/Controllers/ApiControllerBase.cs
@@ -1,19 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using FreeSql;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
+using System;
 
-namespace LinCms.Web.Controllers
+namespace LinCms.Controllers
 {
+    [ApiController]
     public abstract class ApiControllerBase : ControllerBase
     {
-        internal readonly IUnitOfWork UnitOfWork;
-        protected ApiControllerBase(IUnitOfWork unitOfWork)
-        {
-            UnitOfWork = unitOfWork;
-        }
+        public IServiceProvider? ServiceProvider { get; set; }
 
     }
 }
diff --git a/src/LinCms.Web/Controllers/Base/BaseItemController.cs b/src/LinCms.Web/Controllers/Base/BaseItemController.cs
index 0bb232b5..85bc8805 100644
--- a/src/LinCms.Web/Controllers/Base/BaseItemController.cs
+++ b/src/LinCms.Web/Controllers/Base/BaseItemController.cs
@@ -1,102 +1,59 @@
 using System.Collections.Generic;
-using System.Linq;
-using AutoMapper;
-using LinCms.Application.Contracts.Base.BaseItems;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
-using LinCms.Core.Entities.Base;
-using LinCms.Core.Exceptions;
-using LinCms.Infrastructure.Repositories;
+using System.Threading.Tasks;
+
+using LinCms.Aop.Filter;
+using LinCms.Base.BaseItems;
+using LinCms.Data;
+
 using Microsoft.AspNetCore.Mvc;
 
-namespace LinCms.Web.Controllers.Base
+namespace LinCms.Controllers.Base
 {
-    [Route("v1/item")]
+    [Area("base")]
+    [Route("api/base/item")]
     [ApiController]
     public class BaseItemController : ControllerBase
     {
-        private readonly AuditBaseRepository<BaseItem> _baseItemRepository;
-        private readonly AuditBaseRepository<BaseType> _baseTypeRepository;
-        private readonly IMapper _mapper;
-        public BaseItemController(AuditBaseRepository<BaseItem> baseItemRepository, IMapper mapper, AuditBaseRepository<BaseType> baseTypeRepository)
+        private readonly IBaseItemService _baseItemService;
+
+        public BaseItemController(IBaseItemService baseItemService)
         {
-            _baseItemRepository = baseItemRepository;
-            _mapper = mapper;
-            _baseTypeRepository = baseTypeRepository;
+            _baseItemService = baseItemService;
         }
 
         [HttpDelete("{id}")]
         [LinCmsAuthorize("删除字典", "字典管理")]
-        public UnifyResponseDto DeleteBaseItem(int id)
+        public async Task<UnifyResponseDto> DeleteAsync(int id)
         {
-            _baseItemRepository.Delete(new BaseItem { Id = id });
+            await _baseItemService.DeleteAsync(id);
             return UnifyResponseDto.Success();
         }
 
         [HttpGet]
-        public List<BaseItemDto> Get([FromQuery]string typeCode)
+        public Task<List<BaseItemDto>> GetListAsync([FromQuery] string typeCode)
         {
-            long baseTypeId =_baseTypeRepository.Select.Where(r => r.TypeCode == typeCode).ToOne(r => r.Id);
-
-            List<BaseItemDto> baseItems = _baseItemRepository.Select
-                .OrderBy(r => r.SortCode)
-                .OrderBy(r => r.Id)
-                .Where( r => r.BaseTypeId == baseTypeId)
-                .ToList()
-                .Select(r => _mapper.Map<BaseItemDto>(r)).ToList();
-
-            return baseItems;
+            return _baseItemService.GetListAsync(typeCode); ;
         }
 
         [HttpGet("{id}")]
-        public BaseItemDto Get(int id)
+        public Task<BaseItemDto> GetAsync(int id)
         {
-            BaseItem baseItem = _baseItemRepository.Select.Where(a => a.Id == id).ToOne();
-            return _mapper.Map<BaseItemDto>(baseItem);
+            return _baseItemService.GetAsync(id);
         }
 
         [HttpPost]
         [LinCmsAuthorize("新增字典", "字典管理")]
-        public UnifyResponseDto Create([FromBody] CreateUpdateBaseItemDto createBaseItem)
+        public async Task<UnifyResponseDto> CreateAsync([FromBody] CreateUpdateBaseItemDto createBaseItem)
         {
-            bool exist = _baseItemRepository.Select.Any(r => r.BaseTypeId == createBaseItem.BaseTypeId && r.ItemCode == createBaseItem.ItemCode);
-            if (exist)
-            {
-                throw new LinCmsException($"编码[{createBaseItem.ItemCode}]已存在");
-            }
-
-            BaseItem baseItem = _mapper.Map<BaseItem>(createBaseItem);
-            _baseItemRepository.Insert(baseItem);
+            await _baseItemService.CreateAsync(createBaseItem);
             return UnifyResponseDto.Success("新建字典成功");
         }
 
         [HttpPut("{id}")]
         [LinCmsAuthorize("编辑字典", "字典管理")]
-        public UnifyResponseDto Update(int id, [FromBody] CreateUpdateBaseItemDto updateBaseItem)
+        public async Task<UnifyResponseDto> UpdateAsync(int id, [FromBody] CreateUpdateBaseItemDto updateBaseItem)
         {
-            BaseItem baseItem = _baseItemRepository.Select.Where(r => r.Id == id).ToOne();
-            if (baseItem == null)
-            {
-                throw new LinCmsException("该数据不存在");
-            }
-
-            bool typeExist= _baseTypeRepository.Select.Any(r => r.Id == updateBaseItem.BaseTypeId);
-
-            if (!typeExist)
-            {
-                throw new LinCmsException("请选择正确的类别");
-            }
-
-            bool exist = _baseItemRepository.Select.Any(r => r.BaseTypeId == updateBaseItem.BaseTypeId && r.ItemCode == updateBaseItem.ItemCode && r.Id != id);
-            if (exist)
-            {
-                throw new LinCmsException($"编码[{updateBaseItem.ItemCode}]已存在");
-            }
-
-            _mapper.Map(updateBaseItem, baseItem);
-
-            _baseItemRepository.Update(baseItem);
-
+            await _baseItemService.UpdateAsync(id, updateBaseItem);
             return UnifyResponseDto.Success("更新字典成功");
         }
     }
diff --git a/src/LinCms.Web/Controllers/Base/BaseTypeController.cs b/src/LinCms.Web/Controllers/Base/BaseTypeController.cs
index d72138d7..870c9004 100644
--- a/src/LinCms.Web/Controllers/Base/BaseTypeController.cs
+++ b/src/LinCms.Web/Controllers/Base/BaseTypeController.cs
@@ -1,90 +1,58 @@
 using System.Collections.Generic;
-using System.Linq;
-using AutoMapper;
-using LinCms.Application.Contracts.Base.BaseTypes;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
-using LinCms.Core.Entities.Base;
-using LinCms.Core.Exceptions;
-using LinCms.Infrastructure.Repositories;
+using System.Threading.Tasks;
+
+using LinCms.Aop.Filter;
+using LinCms.Base.BaseTypes;
+using LinCms.Data;
+
 using Microsoft.AspNetCore.Mvc;
 
-namespace LinCms.Web.Controllers.Base
+namespace LinCms.Controllers.Base
 {
-    [Route("v1/type")]
+    [Area("base")]
+    [Route("api/base/type")]
     [ApiController]
     public class BaseTypeController : ControllerBase
     {
-        private readonly AuditBaseRepository<BaseType> _baseTypeRepository;
-        private readonly IMapper _mapper;
-        public BaseTypeController(IMapper mapper, AuditBaseRepository<BaseType> baseTypeRepository)
+        private readonly IBaseTypeService _baseTypeService;
+        public BaseTypeController(IBaseTypeService baseTypeService)
         {
-            _mapper = mapper;
-            _baseTypeRepository = baseTypeRepository;
+            _baseTypeService = baseTypeService;
         }
 
         [HttpDelete("{id}")]
         [LinCmsAuthorize("删除字典类别", "字典类别")]
-        public UnifyResponseDto DeleteBaseType(int id)
+        public async Task<UnifyResponseDto> DeleteAsync(int id)
         {
-            _baseTypeRepository.Delete(new BaseType { Id = id });
+            await _baseTypeService.DeleteAsync(id);
             return UnifyResponseDto.Success();
         }
 
         [HttpGet]
-        public List<BaseTypeDto> Get()
+        public Task<List<BaseTypeDto>> GetListAsync()
         {
-            List<BaseTypeDto> baseTypes = _baseTypeRepository.Select
-                .OrderBy(r => r.SortCode)
-                .OrderBy(r => r.Id)
-                .ToList()
-                .Select(r => _mapper.Map<BaseTypeDto>(r)).ToList();
-
-            return baseTypes;
+            return _baseTypeService.GetListAsync();
         }
 
         [HttpGet("{id}")]
-        public BaseTypeDto Get(int id)
+        public Task<BaseTypeDto> GetAsync(int id)
         {
-            BaseType baseType = _baseTypeRepository.Select.Where(a => a.Id == id).ToOne();
-            return _mapper.Map<BaseTypeDto>(baseType);
+            return _baseTypeService.GetAsync(id);
         }
 
-        [LinCmsAuthorize("新增字典类别", "字典类别")]
         [HttpPost]
-        public UnifyResponseDto Create([FromBody] CreateUpdateBaseTypeDto createBaseType)
+        [LinCmsAuthorize("新增字典类别", "字典类别")]
+        public async Task<UnifyResponseDto> CreateAsync([FromBody] CreateUpdateBaseTypeDto createBaseType)
         {
-            bool exist = _baseTypeRepository.Select.Any(r => r.TypeCode == createBaseType.TypeCode);
-            if (exist)
-            {
-                throw new LinCmsException($"类别-编码[{createBaseType.TypeCode}]已存在");
-            }
-
-            BaseType baseType = _mapper.Map<BaseType>(createBaseType);
-            _baseTypeRepository.Insert(baseType);
+            await _baseTypeService.CreateAsync(createBaseType);
             return UnifyResponseDto.Success("新建类别成功");
         }
 
-        [LinCmsAuthorize("编辑字典类别", "字典类别")]
         [HttpPut("{id}")]
-        public UnifyResponseDto Update(int id, [FromBody] CreateUpdateBaseTypeDto updateBaseType)
+        [LinCmsAuthorize("编辑字典类别", "字典类别")]
+        public async Task<UnifyResponseDto> UpdateAsync(int id, [FromBody] CreateUpdateBaseTypeDto updateBaseType)
         {
-            BaseType baseType = _baseTypeRepository.Select.Where(r => r.Id == id).ToOne();
-            if (baseType == null)
-            {
-                throw new LinCmsException("该数据不存在");
-            }
-
-            bool exist = _baseTypeRepository.Select.Any(r => r.TypeCode == updateBaseType.TypeCode && r.Id != id);
-            if (exist)
-            {
-                throw new LinCmsException($"基础类别-编码[{updateBaseType.TypeCode}]已存在");
-            }
-
-            _mapper.Map(updateBaseType, baseType);
-
-            _baseTypeRepository.Update(baseType);
-
+            await _baseTypeService.UpdateAsync(id, updateBaseType);
             return UnifyResponseDto.Success("更新类别成功");
         }
     }
diff --git a/src/LinCms.Web/Controllers/Base/CultureController.cs b/src/LinCms.Web/Controllers/Base/CultureController.cs
new file mode 100644
index 00000000..06e8feda
--- /dev/null
+++ b/src/LinCms.Web/Controllers/Base/CultureController.cs
@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using LinCms.Aop.Filter;
+using LinCms.Base.Localizations;
+using Microsoft.AspNetCore.Mvc;
+
+namespace LinCms.Controllers.Base
+{
+    [Area("base")]
+    [Route("api/base/culture")]
+    [ApiController]
+    public class CultureController : ControllerBase
+    {
+        private readonly ICultureService _cultureService;
+        public CultureController(ICultureService cultureService)
+        {
+            _cultureService = cultureService;
+        }
+
+        [HttpDelete("{id}")]
+        [LinCmsAuthorize("删除本地化 ", "本地化语言")]
+        public Task DeleteAsync(long id)
+        {
+            return _cultureService.DeleteAsync(id);
+        }
+
+        [HttpGet]
+        public Task<List<CultureDto>> GetListAsync()
+        {
+            return _cultureService.GetListAsync();
+        }
+
+        [HttpGet("{id}")]
+        public Task<CultureDto> GetAsync(long id)
+        {
+            return _cultureService.GetAsync(id);
+        }
+
+        [HttpPost]
+        [LinCmsAuthorize("创建本地化", "本地化语言")]
+        public Task<CultureDto> CreateAsync([FromBody] CultureDto createCulture)
+        {
+            return _cultureService.CreateAsync(createCulture);
+        }
+
+        [HttpPut]
+        [LinCmsAuthorize("更新本地化", "本地化语言")]
+        public Task<CultureDto> UpdateAsync([FromBody] CultureDto updateCulture)
+        {
+            return _cultureService.UpdateAsync(updateCulture);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Web/Controllers/Base/DocController.cs b/src/LinCms.Web/Controllers/Base/DocController.cs
new file mode 100644
index 00000000..f678ddd1
--- /dev/null
+++ b/src/LinCms.Web/Controllers/Base/DocController.cs
@@ -0,0 +1,57 @@
+using System.Threading.Tasks;
+using LinCms.Aop.Filter;
+using LinCms.Data;
+using LinCms.Base.Docs;
+using Microsoft.AspNetCore.Mvc;
+
+namespace LinCms.Controllers.Base
+{
+    [Route("api/base/docs")]
+    [ApiController]
+    public class DocController : ControllerBase
+    {
+        private readonly IDocService _docService;
+        public DocController(IDocService docService)
+        {
+            _docService = docService;
+        }
+
+        [LinCmsAuthorize("删除文档", "文档管理")]
+        [HttpDelete("{id}")]
+        public async Task<UnifyResponseDto> DeleteAsync(long id)
+        {
+            await _docService.DeleteAsync(id);
+            return UnifyResponseDto.Success();
+
+        }
+
+        [LinCmsAuthorize("所有文档", "文档管理")]
+        [HttpGet]
+        public Task<PagedResultDto<DocDto>> GetListAsync([FromQuery] PageDto pageDto)
+        {
+            return _docService.GetListAsync(pageDto);
+        }
+
+        [HttpGet("{id}")]
+        public Task<DocDto> GetAsync(long id)
+        {
+            return _docService.GetAsync(id);
+        }
+
+        [LinCmsAuthorize("新增文档", "文档管理")]
+        [HttpPost]
+        public async Task<UnifyResponseDto> CreateAsync([FromBody] CreateUpdateDocDto createDoc)
+        {
+            await _docService.CreateAsync(createDoc);
+            return UnifyResponseDto.Success("新增文档成功");
+        }
+
+        [LinCmsAuthorize("编辑文档", "文档管理")]
+        [HttpPut("{id}")]
+        public async Task<UnifyResponseDto> UpdateAsync(long id, [FromBody] CreateUpdateDocDto updateDoc)
+        {
+            await _docService.UpdateAsync(id, updateDoc);
+            return UnifyResponseDto.Success("编辑文档成功");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Web/Controllers/Base/ResourceController.cs b/src/LinCms.Web/Controllers/Base/ResourceController.cs
new file mode 100644
index 00000000..bbbc06de
--- /dev/null
+++ b/src/LinCms.Web/Controllers/Base/ResourceController.cs
@@ -0,0 +1,53 @@
+using System.Threading.Tasks;
+using LinCms.Aop.Filter;
+using LinCms.Base.Localizations;
+using LinCms.Data;
+using Microsoft.AspNetCore.Mvc;
+
+namespace LinCms.Controllers.Base
+{
+    [Area("base")]
+    [Route("api/base/resource")]
+    [ApiController]
+    public class ResourceController : ControllerBase
+    {
+        private readonly IResourceService _resourceService;
+        public ResourceController(IResourceService resourceService)
+        {
+            _resourceService = resourceService;
+        }
+
+        [HttpDelete("{id}")]
+        [LinCmsAuthorize("删除本地化资源", "本地化资源管理")]
+        public Task DeleteAsync(long id)
+        {
+            return _resourceService.DeleteAsync(id);
+        }
+
+        [HttpGet]
+        public Task<PagedResultDto<ResourceDto>> GetListAsync([FromQuery] ResourceSearchDto searchDto)
+        {
+            return _resourceService.GetListAsync(searchDto);
+        }
+
+        [HttpGet("{id}")]
+        public Task<ResourceDto> GetAsync(long id)
+        {
+            return _resourceService.GetAsync(id);
+        }
+
+        [HttpPost]
+        [LinCmsAuthorize("创建本地化资源 ", "本地化资源管理")]
+        public Task CreateAsync([FromBody] ResourceDto createResource)
+        {
+            return _resourceService.CreateAsync(createResource);
+        }
+
+        [HttpPut]
+        [LinCmsAuthorize("更新本地化资源 ", "本地化资源管理")]
+        public Task UpdateAsync([FromBody] ResourceDto updateResource)
+        {
+            return _resourceService.UpdateAsync(updateResource);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Web/Controllers/Blog/ArticleController.cs b/src/LinCms.Web/Controllers/Blog/ArticleController.cs
index 2bdecc49..32dd9182 100644
--- a/src/LinCms.Web/Controllers/Blog/ArticleController.cs
+++ b/src/LinCms.Web/Controllers/Blog/ArticleController.cs
@@ -2,59 +2,61 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using AutoMapper;
-using DotNetCore.CAP;
-using LinCms.Application.Blog.Articles;
-using LinCms.Application.Contracts.Blog.Articles;
-using LinCms.Application.Contracts.Blog.Notifications;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
-using LinCms.Core.Entities.Blog;
-using LinCms.Core.Exceptions;
-using LinCms.Core.Extensions;
-using LinCms.Core.Security;
-using LinCms.Infrastructure.Repositories;
+
+using LinCms.Aop.Filter;
+using LinCms.Blog.Articles;
+using LinCms.Blog.Classifys;
+using LinCms.Common;
+using LinCms.Data;
+using LinCms.Entities.Blog;
+using LinCms.Exceptions;
+using LinCms.Extensions;
+using LinCms.IRepositories;
+using LinCms.Security;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LinCms.Web.Controllers.Blog
+using Newtonsoft.Json;
+
+namespace LinCms.Controllers.Blog
 {
-    [Route("v1/article")]
+    [Area("blog")]
+    [Route("api/blog/articles")]
     [ApiController]
     [Authorize]
     public class ArticleController : ControllerBase
     {
-        private readonly AuditBaseRepository<Article> _articleRepository;
+        private readonly IAuditBaseRepository<Article> _articleRepository;
         private readonly IArticleService _articleService;
         private readonly IMapper _mapper;
         private readonly ICurrentUser _currentUser;
-        private readonly ICapPublisher _capBus;
-        public ArticleController(AuditBaseRepository<Article> articleRepository,
-            IMapper mapper,
-            ICurrentUser currentUser,
-            IArticleService articleService,
-            ICapPublisher capBus)
+
+        public ArticleController(IAuditBaseRepository<Article> articleRepository, IMapper mapper, ICurrentUser currentUser, IArticleService articleService)
         {
             _articleRepository = articleRepository;
             _mapper = mapper;
             _currentUser = currentUser;
             _articleService = articleService;
-            _capBus = capBus;
         }
+
         /// <summary>
         /// 删除自己的随笔
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
         [HttpDelete("{id}")]
-        public UnifyResponseDto DeleteMyArticle(Guid id)
+        public async Task<UnifyResponseDto> DeleteMyArticleAsync(Guid id)
         {
             bool isCreateArticle = _articleRepository.Select.Any(r => r.Id == id && r.CreateUserId == _currentUser.Id);
             if (!isCreateArticle)
             {
                 throw new LinCmsException("无法删除别人的随笔!");
             }
-            _articleService.Delete(id);
+
+            await _articleService.DeleteAsync(id);
             return UnifyResponseDto.Success();
         }
 
@@ -65,9 +67,9 @@ public UnifyResponseDto DeleteMyArticle(Guid id)
         /// <returns></returns>
         [HttpDelete("cms/{id}")]
         [LinCmsAuthorize("删除随笔", "随笔")]
-        public UnifyResponseDto Delete(Guid id)
+        public async Task<UnifyResponseDto> Delete(Guid id)
         {
-            _articleService.Delete(id);
+            await _articleService.DeleteAsync(id);
             return UnifyResponseDto.Success();
         }
 
@@ -78,7 +80,7 @@ public UnifyResponseDto Delete(Guid id)
         /// <returns></returns>
         [HttpGet]
         [AllowAnonymous]
-        public PagedResultDto<ArticleListDto> Get([FromQuery]ArticleSearchDto searchDto)
+        public PagedResultDto<ArticleListDto> Get([FromQuery] ArticleSearchDto searchDto)
         {
             List<ArticleListDto> articles = _articleRepository
                 .Select
@@ -102,23 +104,28 @@ public PagedResultDto<ArticleListDto> Get([FromQuery]ArticleSearchDto searchDto)
         /// <returns></returns>
         [HttpGet("query")]
         [AllowAnonymous]
-        public async Task<PagedResultDto<ArticleListDto>> GetArticleAsync([FromQuery]ArticleSearchDto searchDto)
+        public Task<PagedResultDto<ArticleListDto>> GetArticleAsync([FromQuery] ArticleSearchDto searchDto)
         {
-            return await _articleService.GetArticleAsync(searchDto);
-            //string redisKey = "article:query:" + searchDto.ToString();
-            //return await RedisHelper.CacheShellAsync(
-            //    redisKey, 3600, async () => await _articleService.GetArticleAsync(searchDto)
-            //   );
+            return _articleService.GetArticleAsync(searchDto);
+
+            //string redisKey = "article:query:" + EncryptUtil.Encrypt(JsonConvert.SerializeObject(searchDto, Formatting.Indented, new JsonSerializerSettings
+            //{
+            //    DefaultValueHandling = DefaultValueHandling.Ignore
+            //}));
+
+            //return RedisHelper.CacheShellAsync(
+            //    redisKey, 60, () => _articleService.GetArticleAsync(searchDto)
+            // );
         }
 
         /// <summary>
-        /// 得到所有已审核过的随笔
+        /// 得到所有的随笔
         /// </summary>
         /// <param name="searchDto"></param>
         /// <returns></returns>
         [HttpGet("all")]
         [LinCmsAuthorize("所有随笔", "随笔")]
-        public PagedResultDto<ArticleListDto> GetAllArticles([FromQuery]ArticleSearchDto searchDto)
+        public PagedResultDto<ArticleListDto> GetAllArticles([FromQuery] ArticleSearchDto searchDto)
         {
             var articles = _articleRepository
                 .Select
@@ -139,42 +146,24 @@ public PagedResultDto<ArticleListDto> GetAllArticles([FromQuery]ArticleSearchDto
         /// <returns></returns>
         [HttpGet("{id}")]
         [AllowAnonymous]
-        public Task<ArticleDto> GetAsync(Guid id)
+        public async Task<ArticleDto> GetAsync(Guid id)
         {
-            _articleRepository.UpdateDiy.Set(r => r.ViewHits + 1).Where(r => r.Id == id).ExecuteAffrows();
-            return _articleService.GetAsync(id);
+            await _articleRepository.UpdateDiy.Set(r => r.ViewHits + 1).Where(r => r.Id == id).ExecuteAffrowsAsync();
+            return await _articleService.GetAsync(id);
         }
 
         [HttpPost]
-        public async Task<UnifyResponseDto> CreateAsync([FromBody] CreateUpdateArticleDto createArticle)
+        public async Task<Guid> CreateAsync([FromBody] CreateUpdateArticleDto createArticle)
         {
-            await _articleService.CreateAsync(createArticle);
-
-            _capBus.Publish("NotificationController.Post", new CreateNotificationDto()
-            {
-
-            });
-
-            return UnifyResponseDto.Success("新建随笔成功");
+            Guid id = await _articleService.CreateAsync(createArticle);
+            return id;
         }
 
-
         [HttpPut("{id}")]
-        public async Task<UnifyResponseDto> UpdateAsync(Guid id, [FromBody] CreateUpdateArticleDto updateArticle)
+        public async Task<UnifyResponseDto> UpdateAsync([FromServices] IClassifyService _classifyService, Guid id, [FromBody] CreateUpdateArticleDto updateArticleDto)
         {
-            Article article = _articleRepository.Select.Where(r => r.Id == id).ToOne();
-            if (article.CreateUserId != _currentUser.Id)
-            {
-                throw new LinCmsException("您无权修改他人的随笔");
-            }
-            if (article == null)
-            {
-                throw new LinCmsException("没有找到相关随笔");
-            }
-
-            _mapper.Map(updateArticle, article);
-            await _articleService.UpdateAsync(updateArticle, article);
-
+            await _articleService.UpdateAsync(id, updateArticleDto);
+            await _articleService.UpdateTagAsync(id, updateArticleDto);
             return UnifyResponseDto.Success("更新随笔成功");
         }
 
@@ -205,9 +194,21 @@ public async Task<UnifyResponseDto> AuditAsync(Guid id, bool isAudit)
         /// <param name="pageDto"></param>
         /// <returns></returns>
         [HttpGet("subscribe")]
-        public PagedResultDto<ArticleListDto> GetSubscribeArticle([FromQuery]PageDto pageDto)
+        public Task<PagedResultDto<ArticleListDto>> GetSubscribeArticleAsync([FromQuery] PageDto pageDto)
+        {
+            return _articleService.GetSubscribeArticleAsync(pageDto);
+        }
+
+        /// <summary>
+        /// 修改随笔是否验证评论
+        /// </summary>
+        /// <param name="id">随笔主键</param>
+        /// <param name="commetable">true:允许评论;false:不允许评论</param>
+        /// <returns></returns>
+        [HttpPut("{id}/comment-able/{commentable}")]
+        public Task UpdateCommentable(Guid id, bool commetable)
         {
-            return _articleService.GetSubscribeArticle(pageDto);
+            return _articleService.UpdateCommentable(id, commetable);
         }
     }
 }
\ No newline at end of file
diff --git a/src/LinCms.Web/Controllers/Blog/ArticleDraftController.cs b/src/LinCms.Web/Controllers/Blog/ArticleDraftController.cs
new file mode 100644
index 00000000..8b38863f
--- /dev/null
+++ b/src/LinCms.Web/Controllers/Blog/ArticleDraftController.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Threading.Tasks;
+
+using LinCms.Blog.ArticleDrafts;
+
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace LinCms.Controllers.Blog
+{
+    /// <summary>
+    /// 文章草稿箱，自动保存文章
+    /// </summary>
+    [Area("blog")]
+    [Route("api/blog/articles/draft")]
+    [ApiController]
+    [Authorize]
+    public class ArticleDraftController : ControllerBase
+    {
+        private readonly IArticleDraftService _articleDraftService;
+        public ArticleDraftController(IArticleDraftService articleDraftService)
+        {
+            _articleDraftService = articleDraftService;
+        }
+
+        [HttpPut("{id}")]
+        public Task UpdateAsync(Guid id, [FromBody] UpdateArticleDraftDto updateArticleDto)
+        {
+            return _articleDraftService.UpdateAsync(id, updateArticleDto);
+        }
+
+        /// <summary>
+        /// 用户的随笔草稿详情
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet("{id}")]
+        public Task<ArticleDraftDto> GetAsync(Guid id)
+        {
+            return _articleDraftService.GetAsync(id);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Web/Controllers/Blog/ChannelController.cs b/src/LinCms.Web/Controllers/Blog/ChannelController.cs
index 77faf672..f79c8b41 100644
--- a/src/LinCms.Web/Controllers/Blog/ChannelController.cs
+++ b/src/LinCms.Web/Controllers/Blog/ChannelController.cs
@@ -1,17 +1,19 @@
 using System;
 using System.Threading.Tasks;
-using LinCms.Application.Blog.Channels;
-using LinCms.Application.Contracts.Blog.Channels;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
+
+using LinCms.Aop.Filter;
+using LinCms.Blog.Channels;
+using LinCms.Data;
+
 using Microsoft.AspNetCore.Mvc;
 
-namespace LinCms.Web.Controllers.Blog
+namespace LinCms.Controllers.Blog
 {
     /// <summary>
     /// 技术频道
     /// </summary>
-    [Route("v1/channel")]
+    [Area("blog")]
+    [Route("api/blog/channels")]
     [ApiController]
     public class ChannelController : ControllerBase
     {
@@ -23,21 +25,21 @@ public ChannelController(IChannelService channelService)
 
         [LinCmsAuthorize("删除技术频道", "技术频道")]
         [HttpDelete("{id}")]
-        public UnifyResponseDto Delete(Guid id)
+        public async Task<UnifyResponseDto> DeleteAsync(Guid id)
         {
-            _channelService.Delete(id);
+            await _channelService.DeleteAsync(id);
             return UnifyResponseDto.Success();
         }
 
         [LinCmsAuthorize("技术频道列表", "技术频道")]
         [HttpGet]
-        public Task<PagedResultDto<ChannelDto>> GetListAsync([FromQuery]PageDto pageDto)
+        public Task<PagedResultDto<ChannelDto>> GetListAsync([FromQuery] ChannelSearchDto searchDto)
         {
-            return _channelService.GetListAsync(pageDto);
+            return _channelService.GetListAsync(searchDto);
         }
 
         [HttpGet("nav")]
-        public Task<PagedResultDto<NavChannelListDto>> GetNavListAsync([FromQuery]PageDto pageDto)
+        public Task<PagedResultDto<NavChannelListDto>> GetNavListAsync([FromQuery] PageDto pageDto)
         {
             return _channelService.GetNavListAsync(pageDto);
         }
@@ -50,9 +52,9 @@ public Task<ChannelDto> GetAsync(Guid id)
 
         [LinCmsAuthorize("新增技术频道", "技术频道")]
         [HttpPost]
-        public UnifyResponseDto CreateAsync([FromBody] CreateUpdateChannelDto createChannel)
+        public async Task<UnifyResponseDto> CreateAsync([FromBody] CreateUpdateChannelDto createChannel)
         {
-            _channelService.CreateAsync(createChannel);
+            await _channelService.CreateAsync(createChannel);
             return UnifyResponseDto.Success("新建技术频道成功");
         }
 
@@ -64,4 +66,4 @@ public async Task<UnifyResponseDto> UpdateAsync(Guid id, [FromBody] CreateUpdate
             return UnifyResponseDto.Success("更新技术频道成功");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/LinCms.Web/Controllers/Blog/ClassifyController.cs b/src/LinCms.Web/Controllers/Blog/ClassifyController.cs
index 16956129..956f7087 100644
--- a/src/LinCms.Web/Controllers/Blog/ClassifyController.cs
+++ b/src/LinCms.Web/Controllers/Blog/ClassifyController.cs
@@ -1,141 +1,73 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using AutoMapper;
-using LinCms.Application.Contracts.Blog.Classifys;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
-using LinCms.Core.Entities.Blog;
-using LinCms.Core.Exceptions;
-using LinCms.Core.Extensions;
-using LinCms.Core.Security;
-using LinCms.Infrastructure.Repositories;
+using System.Threading.Tasks;
+
+using LinCms.Aop.Filter;
+using LinCms.Blog.Classifys;
+using LinCms.Data;
+
 using Microsoft.AspNetCore.Mvc;
 
-namespace LinCms.Web.Controllers.Blog
+namespace LinCms.Controllers.Blog
 {
-    [Route("v1/classify")]
+    [Area("blog")]
+    [Route("api/blog/classifies")]
     [ApiController]
     public class ClassifyController : ControllerBase
     {
-        private readonly AuditBaseRepository<Classify> _classifyRepository;
-        private readonly IMapper _mapper;
-        private readonly ICurrentUser _currentUser;
-        public ClassifyController(AuditBaseRepository<Classify> classifyRepository, IMapper mapper, ICurrentUser currentUser)
+        private readonly IClassifyService _classifyService;
+
+        public ClassifyController(IClassifyService classifyService)
         {
-            _classifyRepository = classifyRepository;
-            _mapper = mapper;
-            _currentUser = currentUser;
+            _classifyService = classifyService;
         }
 
         [HttpDelete("{id}")]
-        public UnifyResponseDto DeleteClassify(Guid id)
+        public async Task<UnifyResponseDto> DeleteClassify(Guid id)
         {
-            Classify classify = _classifyRepository.Select.Where(a => a.Id == id).ToOne();
-            if (classify.CreateUserId != _currentUser.Id)
-            {
-                throw new LinCmsException("您无权删除他人的分类专栏");
-            }
-            _classifyRepository.Delete(new Classify { Id = id });
+            await _classifyService.DeleteAsync(id);
             return UnifyResponseDto.Success();
         }
 
         [HttpGet]
-        public List<ClassifyDto> Get(long? userId)
+        public List<ClassifyDto> GetListByUserId(long? userId)
         {
-            if (!userId.HasValue)
-            {
-                userId = _currentUser.Id;
-            }
-            List<ClassifyDto> classify = _classifyRepository.Select.OrderBy(r => r.SortCode)
-                .Where(r => r.CreateUserId == userId)
-                .OrderByDescending(r => r.SortCode)
-                .ToList()
-                .Select(r =>
-                {
-                    ClassifyDto classifyDto = _mapper.Map<ClassifyDto>(r);
-                    classifyDto.ThumbnailDisplay = _currentUser.GetFileUrl(classifyDto.Thumbnail);
-                    return classifyDto;
-                }).ToList();
-
-            return classify;
+            return _classifyService.GetListByUserId(userId);
         }
 
         [LinCmsAuthorize("删除", "分类专栏")]
         [HttpDelete("cms/{id}")]
-        public UnifyResponseDto Delete(Guid id)
+        public async Task<UnifyResponseDto> Delete(Guid id)
         {
-            _classifyRepository.Delete(new Classify { Id = id });
+            await _classifyService.DeleteAsync(id);
             return UnifyResponseDto.Success();
         }
 
         [LinCmsAuthorize("分类专栏列表", "分类专栏")]
         [HttpGet("cms")]
-        public PagedResultDto<ClassifyDto> Get([FromQuery]ClassifySearchDto pageDto)
+        public Task<PagedResultDto<ClassifyDto>> GetListAsync([FromQuery] ClassifySearchDto pageDto)
         {
-            List<ClassifyDto> classify = _classifyRepository.Select
-                .WhereIf(pageDto.ClassifyName.IsNotNullOrEmpty(),r=>r.ClassifyName.Contains(pageDto.ClassifyName))
-                .OrderByDescending(r => r.CreateTime)
-                .ToPagerList(pageDto,out long totalCount)
-                .Select(r =>
-                {
-                    ClassifyDto classifyDto = _mapper.Map<ClassifyDto>(r);
-                    classifyDto.ThumbnailDisplay = _currentUser.GetFileUrl(classifyDto.Thumbnail);
-                    return classifyDto;
-                }).ToList();
-
-            return new PagedResultDto<ClassifyDto>(classify, totalCount);
+            return _classifyService.GetListAsync(pageDto);
         }
 
         [HttpGet("{id}")]
-        public ClassifyDto Get(Guid id)
+        public Task<ClassifyDto> GetAsync(Guid id)
         {
-            Classify classify = _classifyRepository.Select.Where(a => a.Id == id).ToOne();
-            ClassifyDto classifyDto = _mapper.Map<ClassifyDto>(classify);
-            classifyDto.ThumbnailDisplay = _currentUser.GetFileUrl(classifyDto.Thumbnail);
-            return classifyDto;
+            return _classifyService.GetAsync(id);
         }
 
         [HttpPost]
-        public UnifyResponseDto Post([FromBody] CreateUpdateClassifyDto createClassify)
+        public async Task<UnifyResponseDto> CreateAsync([FromBody] CreateUpdateClassifyDto createClassify)
         {
-            bool exist = _classifyRepository.Select.Any(r => r.ClassifyName == createClassify.ClassifyName && r.CreateUserId == _currentUser.Id);
-            if (exist)
-            {
-                throw new LinCmsException($"分类专栏[{createClassify.ClassifyName}]已存在");
-            }
-
-            Classify classify = _mapper.Map<Classify>(createClassify);
-            _classifyRepository.Insert(classify);
+            await _classifyService.CreateAsync(createClassify);
             return UnifyResponseDto.Success("新建分类专栏成功");
         }
 
         [HttpPut("{id}")]
-        public UnifyResponseDto Put(Guid id, [FromBody] CreateUpdateClassifyDto updateClassify)
+        public async Task<UnifyResponseDto> UpdateAsync(Guid id, [FromBody] CreateUpdateClassifyDto updateClassify)
         {
-            Classify classify = _classifyRepository.Select.Where(r => r.Id == id).ToOne();
-            if (classify == null)
-            {
-                throw new LinCmsException("该数据不存在");
-            }
-
-            if (classify.CreateUserId != _currentUser.Id)
-            {
-                throw new LinCmsException("您无权编辑他人的分类专栏");
-            }
-
-            bool exist = _classifyRepository.Select.Any(r => r.ClassifyName == updateClassify.ClassifyName && r.Id != id && r.CreateUserId == _currentUser.Id);
-            if (exist)
-            {
-                throw new LinCmsException($"分类专栏[{updateClassify.ClassifyName}]已存在");
-            }
-
-            _mapper.Map(updateClassify, classify);
-
-            _classifyRepository.Update(classify);
-
+            await _classifyService.UpdateAsync(id, updateClassify);
             return UnifyResponseDto.Success("更新分类专栏成功");
         }
-
     }
 }
\ No newline at end of file
diff --git a/src/LinCms.Web/Controllers/Blog/CommentController.cs b/src/LinCms.Web/Controllers/Blog/CommentController.cs
index b802ab40..a3296207 100644
--- a/src/LinCms.Web/Controllers/Blog/CommentController.cs
+++ b/src/LinCms.Web/Controllers/Blog/CommentController.cs
@@ -1,53 +1,36 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using AutoMapper;
-using DotNetCore.CAP;
-using LinCms.Application.Blog.Comments;
-using LinCms.Application.Cms.Users;
-using LinCms.Application.Contracts.Blog.Comments;
-using LinCms.Application.Contracts.Blog.Notifications;
-using LinCms.Application.Contracts.Cms.Users;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
-using LinCms.Core.Entities.Blog;
-using LinCms.Core.Exceptions;
-using LinCms.Core.Extensions;
-using LinCms.Core.Security;
-using LinCms.Infrastructure.Repositories;
+using System.Threading.Tasks;
+using LinCms.Aop.Filter;
+using LinCms.Blog.Comments;
+using LinCms.Data;
+using LinCms.Entities.Blog;
+using LinCms.Exceptions;
+using LinCms.IRepositories;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LinCms.Web.Controllers.Blog
+namespace LinCms.Controllers.Blog
 {
     /// <summary>
     /// 随笔评论
     /// </summary>
-    [Route("v1/comment")]
+    [Area("blog")]
+    [Route("api/blog/comments")]
     [ApiController]
     [Authorize]
     public class CommentController : ControllerBase
     {
-
-        private readonly AuditBaseRepository<Comment> _commentAuditBaseRepository;
-        private readonly IMapper _mapper;
-        private readonly ICurrentUser _currentUser;
-        private readonly IUserService _userService;
+        private readonly IAuditBaseRepository<Comment> _commentRepository;
         private readonly ICommentService _commentService;
-        private readonly ICapPublisher _capBus;
-        private readonly AuditBaseRepository<Article> _articleRepository;
+        private readonly IAuditBaseRepository<Article> _articleRepository;
 
-        public CommentController(AuditBaseRepository<Comment> commentAuditBaseRepository, IMapper mapper,
-            ICurrentUser currentUser, IUserService userService, ICommentService commentService,
-            AuditBaseRepository<Article> articleRepository, ICapPublisher capBus)
+        public CommentController(
+            IAuditBaseRepository<Comment> commentAuditBaseRepository,
+            ICommentService commentService, IAuditBaseRepository<Article> articleRepository)
         {
-            _commentAuditBaseRepository = commentAuditBaseRepository;
-            _mapper = mapper;
-            _currentUser = currentUser;
-            _userService = userService;
+            _commentRepository = commentAuditBaseRepository;
             _commentService = commentService;
             _articleRepository = articleRepository;
-            _capBus = capBus;
         }
 
         /// <summary>
@@ -57,118 +40,33 @@ public CommentController(AuditBaseRepository<Comment> commentAuditBaseRepository
         /// <returns></returns>
         [HttpGet("public")]
         [AllowAnonymous]
-        public PagedResultDto<CommentDto> Get([FromQuery] CommentSearchDto commentSearchDto)
-        {
-            long? userId = _currentUser.Id;
-            List<CommentDto> comments = _commentAuditBaseRepository
-                .Select
-                .Include(r => r.UserInfo)
-                .Include(r => r.RespUserInfo)
-                .IncludeMany(r => r.Childs, //.Take(2)
-                    t => t.Include(u => u.UserInfo).Include(u => u.RespUserInfo).IncludeMany(u => u.UserLikes))
-                .IncludeMany(r => r.UserLikes)
-                .WhereCascade(x => x.IsDeleted == false)
-                .WhereIf(commentSearchDto.SubjectId.HasValue, r => r.SubjectId == commentSearchDto.SubjectId)
-                .Where(r => r.RootCommentId == commentSearchDto.RootCommentId)// && r.IsAudit == true
-                .OrderByDescending(!commentSearchDto.RootCommentId.HasValue, r => r.CreateTime)
-                .OrderBy(commentSearchDto.RootCommentId.HasValue, r => r.CreateTime)
-                .Page(commentSearchDto.Page + 1, commentSearchDto.Count).ToList()
-                //.ToPagerList(commentSearchDto, out long totalCount)
-                .Select(r =>
-                {
-                    CommentDto commentDto = _mapper.Map<CommentDto>(r);
-                    if (commentDto.IsAudit == false)
-                    {
-                        commentDto.Text = "[该评论因违规被拉黑]";
-                    }
-
-                    if (commentDto.UserInfo == null)
-                    {
-                        commentDto.UserInfo = new OpenUserDto("该用户已被系统删除");
-                    }
-                    else
-                    {
-                        commentDto.UserInfo.Avatar = _currentUser.GetFileUrl(commentDto.UserInfo.Avatar);
-                    }
-
-
-                    commentDto.IsLiked =
-                        userId != null && r.UserLikes.Where(u => u.CreateUserId == userId).IsNotEmpty();
-
-                    commentDto.TopComment = r.Childs.ToList().Select(u =>
-                    {
-                        CommentDto childrenDto = _mapper.Map<CommentDto>(u);
-                        if (childrenDto.UserInfo != null)
-                        {
-                            childrenDto.UserInfo.Avatar = _currentUser.GetFileUrl(childrenDto.UserInfo.Avatar);
-                        }
-
-                        if (childrenDto.IsAudit == false)
-                        {
-                            childrenDto.Text = "[该评论因违规被拉黑]";
-                        }
-
-                        childrenDto.IsLiked =
-                            userId != null && u.UserLikes.Where(z => z.CreateUserId == userId).IsNotEmpty();
-                        return childrenDto;
-                    }).ToList();
-                    return commentDto;
-                }).ToList();
-
-            //计算一个文章多少个评论
-            long totalCount = GetCommentCount(commentSearchDto);
-
-            return new PagedResultDto<CommentDto>(comments, totalCount);
-        }
-
-        private long GetCommentCount(CommentSearchDto commentSearchDto)
+        public Task<PagedResultDto<CommentDto>> GetListByArticleAsync([FromQuery] CommentSearchDto commentSearchDto)
         {
-            return _commentAuditBaseRepository
-                 .Select
-                 .Where(r => r.IsDeleted == false && r.SubjectId == commentSearchDto.SubjectId).Count();
+            return _commentService.GetListByArticleAsync(commentSearchDto);
         }
 
         /// <summary>
-        /// 查询出此随笔的评论
+        /// 后台权限-评论列表页
         /// </summary>
         /// <param name="commentSearchDto"></param>
         /// <returns></returns>
         [HttpGet]
         [LinCmsAuthorize("评论列表", "评论")]
-        public PagedResultDto<CommentDto> GetAll([FromQuery] CommentSearchDto commentSearchDto)
+        public Task<PagedResultDto<CommentDto>> GetListAsync([FromQuery] CommentSearchDto commentSearchDto)
         {
-            List<CommentDto> comments = _commentAuditBaseRepository
-                .Select
-                .Include(r => r.UserInfo)
-                .WhereIf(commentSearchDto.SubjectId.HasValue, r => r.SubjectId == commentSearchDto.SubjectId)
-                .WhereIf(commentSearchDto.Text.IsNotNullOrEmpty(), r => r.Text.Contains(commentSearchDto.Text))
-                .OrderByDescending(r => r.CreateTime)
-                .ToPagerList(commentSearchDto, out long totalCount)
-                .Select(r =>
-                {
-                    CommentDto commentDto = _mapper.Map<CommentDto>(r);
-
-                    if (commentDto.UserInfo != null)
-                    {
-                        commentDto.UserInfo.Avatar = _currentUser.GetFileUrl(commentDto.UserInfo.Avatar);
-                    }
-                    return commentDto;
-                }).ToList();
-
-            return new PagedResultDto<CommentDto>(comments, totalCount);
+            return _commentService.GetListAsync(commentSearchDto);
         }
 
         /// <summary>
-        /// 删除评论
+        /// 后台权限-删除评论
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
         [HttpDelete("cms/{id}")]
         [LinCmsAuthorize("删除评论", "评论")]
-        public UnifyResponseDto Delete(Guid id)
+        public async Task<UnifyResponseDto> DeleteAsync(Guid id)
         {
-            Comment comment = _commentAuditBaseRepository.Select.Where(r => r.Id == id).First();
-            _commentService.Delete(comment);
+            await _commentService.DeleteAsync(id);
             return UnifyResponseDto.Success();
         }
 
@@ -178,20 +76,10 @@ public UnifyResponseDto Delete(Guid id)
         /// <param name="id"></param>
         /// <returns></returns>
         [HttpDelete("{id}")]
-        public UnifyResponseDto DeleteMyComment(Guid id)
+        public async Task<UnifyResponseDto> DeleteMyComment(Guid id)
         {
-            Comment comment = _commentAuditBaseRepository.Select.Where(r => r.Id == id).First();
-            if (comment == null)
-            {
-                return UnifyResponseDto.Error("该评论已删除");
-            }
-            if (comment.CreateUserId != _currentUser.Id)
-            {
-                return UnifyResponseDto.Error("无权限删除他人的评论");
-            }
-            _commentService.Delete(comment);
+            await _commentService.DeleteMyComment(id);
             return UnifyResponseDto.Success();
-
         }
 
         /// <summary>
@@ -200,39 +88,9 @@ public UnifyResponseDto DeleteMyComment(Guid id)
         /// <param name="createCommentDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public UnifyResponseDto Post([FromBody] CreateCommentDto createCommentDto)
+        public async Task<UnifyResponseDto> CreateAsync([FromBody] CreateCommentDto createCommentDto)
         {
-            Comment comment = _mapper.Map<Comment>(createCommentDto);
-            _commentAuditBaseRepository.Insert(comment);
-
-            if (createCommentDto.RootCommentId.HasValue)
-            {
-                _commentAuditBaseRepository.UpdateDiy.Set(r => r.ChildsCount + 1).Where(r => r.Id == createCommentDto.RootCommentId).ExecuteAffrows();
-            }
-
-            switch (createCommentDto.SubjectType)
-            {
-                case 1:
-                    _articleRepository.UpdateDiy
-                        .Set(r => r.CommentQuantity + 1)
-                        .Where(r => r.Id == createCommentDto.SubjectId)
-                        .ExecuteAffrows();
-                    break;
-            }
-
-            if (_currentUser.Id != createCommentDto.RespUserId)
-            {
-                _capBus.Publish("NotificationController.Post", new CreateNotificationDto()
-                {
-                    NotificationType = NotificationType.UserCommentOnArticle,
-                    ArticleId = createCommentDto.SubjectId,
-                    NotificationRespUserId = createCommentDto.RespUserId,
-                    UserInfoId = _currentUser.Id ?? 0,
-                    CreateTime = comment.CreateTime,
-                    CommentId = comment.Id
-                });
-            }
-
+            await _commentService.CreateAsync(createCommentDto);
             return UnifyResponseDto.Success("评论成功");
         }
 
@@ -244,16 +102,16 @@ public UnifyResponseDto Post([FromBody] CreateCommentDto createCommentDto)
         /// <returns></returns>
         [LinCmsAuthorize("审核评论", "评论")]
         [HttpPut("{id}")]
-        public UnifyResponseDto Put(Guid id, bool isAudit)
+        public async Task<UnifyResponseDto> UpdateAsync(Guid id, bool isAudit)
         {
-            Comment comment = _commentAuditBaseRepository.Select.Where(r => r.Id == id).ToOne();
+            Comment comment = _commentRepository.Select.Where(r => r.Id == id).ToOne();
             if (comment == null)
             {
                 throw new LinCmsException("没有找到相关评论");
             }
 
             comment.IsAudit = isAudit;
-            _commentAuditBaseRepository.Update(comment);
+            await _commentRepository.UpdateAsync(comment);
             return UnifyResponseDto.Success();
         }
 
@@ -267,14 +125,16 @@ public UnifyResponseDto Put(Guid id, bool isAudit)
         [HttpPut("{subjectId}/type/${subject_type}")]
         public UnifyResponseDto CorrectedComment(Guid subjectId, int subjectType)
         {
-            long count = _commentAuditBaseRepository.Select.Where(r => r.SubjectId == subjectId).Count();
+            long count = _commentRepository.Select.Where(r => r.SubjectId == subjectId).Count();
 
             switch (subjectType)
             {
                 case 1:
-                    _articleRepository.UpdateDiy.Set(r => r.CommentQuantity, count).Where(r => r.Id == subjectId).ExecuteAffrows();
+                    _articleRepository.UpdateDiy.Set(r => r.CommentQuantity, count).Where(r => r.Id == subjectId)
+                        .ExecuteAffrows();
                     break;
             }
+
             return UnifyResponseDto.Success();
         }
 
diff --git a/src/LinCms.Web/Controllers/Blog/MessageBoardController.cs b/src/LinCms.Web/Controllers/Blog/MessageBoardController.cs
deleted file mode 100644
index eb1620be..00000000
--- a/src/LinCms.Web/Controllers/Blog/MessageBoardController.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using AutoMapper;
-using LinCms.Application.Cms.Users;
-using LinCms.Application.Contracts.Blog.MessageBoards;
-using LinCms.Core.Aop;
-using LinCms.Core.Common;
-using LinCms.Core.Data;
-using LinCms.Core.Entities;
-using LinCms.Core.Entities.Blog;
-using LinCms.Core.Exceptions;
-using LinCms.Core.Extensions;
-using LinCms.Core.Security;
-using LinCms.Infrastructure.Repositories;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-
-namespace LinCms.Web.Controllers.Blog
-{
-    /// <summary>
-    /// 留言板
-    /// </summary>
-    [Route("v1/message-board")]
-    [ApiController]
-    public class MessageBoardController : ControllerBase
-    {
-        private readonly AuditBaseRepository<MessageBoard> _messageBoardRepository;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IUserService _userService;
-        private readonly IMapper _mapper;
-        private readonly ICurrentUser _currentUser;
-        public MessageBoardController(AuditBaseRepository<MessageBoard> messageBoardRepository, IMapper mapper, IHttpContextAccessor httpContextAccessor, IUserService userService, ICurrentUser currentUser)
-        {
-            _messageBoardRepository = messageBoardRepository;
-            _mapper = mapper;
-            _httpContextAccessor = httpContextAccessor;
-            _userService = userService;
-            _currentUser = currentUser;
-        }
-
-        /// <summary>
-        /// 留言板倒序
-        /// </summary>
-        /// <param name="pageDto"></param>
-        /// <returns></returns>
-        [HttpGet]
-        public PagedResultDto<MessageBoardDto> Get([FromQuery]PageDto pageDto)
-        {
-            List<MessageBoardDto> entitiesBoardDtos = _messageBoardRepository
-                .Select
-                .OrderByDescending(r=>r.CreateTime)
-                .ToPagerList(pageDto, out long totalCount)
-                .Select(r => _mapper.Map<MessageBoardDto>(r)).ToList();
-
-            return new PagedResultDto<MessageBoardDto>(entitiesBoardDtos, totalCount);
-        }
-
-
-        private string GetIp()
-        {
-            string ip = HttpContext.Request.Headers["X-Real-IP"].FirstOrDefault();
-
-            if (string.IsNullOrEmpty(ip))
-            {
-
-                ip = _httpContextAccessor.HttpContext.Connection.RemoteIpAddress.ToString();
-
-            }
-            return ip;
-        }
-
-        /// <summary>
-        /// 用户留言，无须登录
-        /// </summary>
-        /// <param name="createMessageBoardDto"></param>
-        /// <returns></returns>
-
-        [AllowAnonymous]
-        [HttpPost]
-        public UnifyResponseDto Post([FromBody] CreateMessageBoardDto createMessageBoardDto)
-        {
-            MessageBoard messageBoard = _mapper.Map<MessageBoard>(createMessageBoardDto);
-
-            messageBoard.Ip = this.GetIp();
-            messageBoard.Agent = Request.Headers["User-agent"].ToString();
-            messageBoard.UserHost = Dns.GetHostName();
-            messageBoard.System = LinCmsUtils.GetOsNameByUserAgent(messageBoard.Agent);
-            if (messageBoard.Ip.IsNotNullOrEmpty())
-            {
-                IpQueryResult ipQueryResult = LinCmsUtils.IpQueryCity(messageBoard.Ip);
-                messageBoard.GeoPosition = ipQueryResult.errno == 0 ? ipQueryResult.data : ipQueryResult.errmsg;
-            }
-
-            LinUser linUser = _userService.GetCurrentUser();
-            if (linUser == null)
-            {
-                messageBoard.Avatar = "/assets/user/" + new Random().Next(1, 360) + ".png";
-            }
-            else
-            {
-                messageBoard.Avatar = _currentUser.GetFileUrl(linUser.Avatar);
-            }
-
-            _messageBoardRepository.Insert(messageBoard);
-            return UnifyResponseDto.Success("留言成功");
-        }
-
-        /// <summary>
-        /// 审核评论-拉黑/取消拉黑
-        /// </summary>
-        /// <param name="id">审论Id</param>
-        /// <param name="isAudit"></param>
-        /// <returns></returns>
-        [LinCmsAuthorize("审核留言", "留言板")]
-        [HttpPut("{id}")]
-        public UnifyResponseDto Put(Guid id, bool isAudit)
-        {
-            MessageBoard messageBoard = _messageBoardRepository.Select.Where(r => r.Id == id).ToOne();
-            if (messageBoard == null)
-            {
-                throw new LinCmsException("没有找到相关留言");
-            }
-
-            messageBoard.IsAudit = isAudit;
-            _messageBoardRepository.Update(messageBoard);
-            return UnifyResponseDto.Success();
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/src/LinCms.Web/Controllers/Blog/NotificationController.cs b/src/LinCms.Web/Controllers/Blog/NotificationController.cs
index 6026e062..c541892a 100644
--- a/src/LinCms.Web/Controllers/Blog/NotificationController.cs
+++ b/src/LinCms.Web/Controllers/Blog/NotificationController.cs
@@ -1,40 +1,42 @@
 using System;
+using System.Threading.Tasks;
 using DotNetCore.CAP;
-using LinCms.Application.Blog.Notifications;
-using LinCms.Application.Contracts.Blog.Notifications;
-using LinCms.Core.Data;
+using LinCms.Blog.Notifications;
+using LinCms.Data;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LinCms.Web.Controllers.Blog
+namespace LinCms.Controllers.Blog
 {
-    [Route("v1/notification")]
+    [Area("blog")]
+    [Route("api/blog/notifications")]
     [ApiController]
     public class NotificationController : ControllerBase
     {
         private readonly INotificationService _notificationService;
+
         public NotificationController(INotificationService notificationService)
         {
             _notificationService = notificationService;
         }
 
         [HttpGet]
-        public PagedResultDto<NotificationDto> Get([FromQuery]NotificationSearchDto pageDto)
+        public async Task<PagedResultDto<NotificationDto>> GetListAsync([FromQuery] NotificationSearchDto pageDto)
         {
-            return _notificationService.Get(pageDto);
+            return await _notificationService.GetListAsync(pageDto);
         }
-        
+
         [NonAction]
-        [CapSubscribe("NotificationController.Post")]
-        public UnifyResponseDto Post([FromBody] CreateNotificationDto createNotification)
+        [CapSubscribe(CreateNotificationDto.CreateOrCancelAsync)]
+        public async Task<UnifyResponseDto> CreateOrCancelAsync([FromBody] CreateNotificationDto createNotification)
         {
-            _notificationService.Post(createNotification);
+            await _notificationService.CreateOrCancelAsync(createNotification);
             return UnifyResponseDto.Success("新建消息成功");
         }
 
         [HttpPut("{id}")]
-        public void SetNotificationRead(Guid id)
+        public async Task SetNotificationReadAsync(Guid id)
         {
-            _notificationService.SetNotificationRead(id);
+            await _notificationService.SetNotificationReadAsync(id);
         }
     }
 }
\ No newline at end of file
diff --git a/src/LinCms.Web/Controllers/Blog/TagController.cs b/src/LinCms.Web/Controllers/Blog/TagController.cs
index 747486a1..343060c2 100644
--- a/src/LinCms.Web/Controllers/Blog/TagController.cs
+++ b/src/LinCms.Web/Controllers/Blog/TagController.cs
@@ -1,22 +1,25 @@
 using System;
 using System.Threading.Tasks;
-using LinCms.Application.Blog.Tags;
-using LinCms.Application.Contracts.Blog.Tags;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
-using LinCms.Core.Entities.Blog;
-using LinCms.Infrastructure.Repositories;
+using Autofac.Extras.DynamicProxy;
+using LinCms.Aop.Attributes;
+using LinCms.Aop.Filter;
+using LinCms.Blog.Tags;
+using LinCms.Data;
+using LinCms.Entities.Blog;
+using LinCms.IRepositories;
+using LinCms.Middleware;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LinCms.Web.Controllers.Blog
+namespace LinCms.Controllers.Blog
 {
-    [Route("v1/tag")]
+    [Area("blog")]
+    [Route("api/blog/tags")]
     [ApiController]
     public class TagController : ControllerBase
     {
-        private readonly AuditBaseRepository<Tag> _tagRepository;
+        private readonly IAuditBaseRepository<Tag> _tagRepository;
         private readonly ITagService _tagService;
-        public TagController(AuditBaseRepository<Tag> tagRepository, ITagService tagService)
+        public TagController(IAuditBaseRepository<Tag> tagRepository, ITagService tagService)
         {
             _tagRepository = tagRepository;
             _tagService = tagService;
@@ -24,24 +27,25 @@ public TagController(AuditBaseRepository<Tag> tagRepository, ITagService tagServ
 
         [HttpDelete("{id}")]
         [LinCmsAuthorize("删除标签", "标签管理")]
-        public UnifyResponseDto DeleteTag(Guid id)
+        public async Task<UnifyResponseDto> DeleteAsync(Guid id)
         {
-            _tagRepository.Delete(new Tag { Id = id });
+            await _tagRepository.DeleteAsync(new Tag { Id = id });
             return UnifyResponseDto.Success();
         }
 
         [HttpGet]
         [LinCmsAuthorize("所有标签", "标签管理")]
-        public Task<PagedResultDto<TagListDto>> GetAllAsync([FromQuery]TagSearchDto searchDto)
+        public async Task<PagedResultDto<TagListDto>> GetAllAsync([FromQuery] TagSearchDto searchDto)
         {
-            return _tagService.GetListAsync(searchDto);
+            return await _tagService.GetListAsync(searchDto);
         }
 
+        [Cacheable]
         [HttpGet("public")]
-        public Task<PagedResultDto<TagListDto>> GetListAsync([FromQuery]TagSearchDto searchDto)
+        public virtual async Task<PagedResultDto<TagListDto>> GetListAsync([FromQuery] TagSearchDto searchDto)
         {
             searchDto.Status = true;
-            return _tagService.GetListAsync(searchDto);
+            return await _tagService.GetListAsync(searchDto);
         }
 
         [HttpGet("{id}")]
diff --git a/src/LinCms.Web/Controllers/Blog/UserLikeController.cs b/src/LinCms.Web/Controllers/Blog/UserLikeController.cs
index 59670604..68e4262a 100644
--- a/src/LinCms.Web/Controllers/Blog/UserLikeController.cs
+++ b/src/LinCms.Web/Controllers/Blog/UserLikeController.cs
@@ -1,49 +1,48 @@
 using System;
-using System.Linq.Expressions;
-using AutoMapper;
+using System.Threading.Tasks;
 using DotNetCore.CAP;
 using FreeSql;
-using LinCms.Application.Contracts.Blog.Notifications;
-using LinCms.Application.Contracts.Blog.UserLikes;
-using LinCms.Core.Data;
-using LinCms.Core.Entities.Blog;
-using LinCms.Core.Exceptions;
-using LinCms.Core.Security;
-using LinCms.Infrastructure.Repositories;
+using LinCms.Blog.Notifications;
+using LinCms.Blog.UserLikes;
+using LinCms.Data;
+using LinCms.Entities.Blog;
+using LinCms.IRepositories;
+using LinCms.Security;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LinCms.Web.Controllers.Blog
+namespace LinCms.Controllers.Blog
 {
     /// <summary>
     ///  用户点赞随笔
     /// </summary>
-    [Route("v1/user-like")]
+    [Area("blog")]
+    [Route("api/blog/user-like")]
     [ApiController]
     [Authorize]
     public class UserLikeController : ApiControllerBase
     {
-        private readonly AuditBaseRepository<Article> _articleAuditBaseRepository;
-        private readonly AuditBaseRepository<UserLike> _userLikeRepository;
-        private readonly IMapper _mapper;
+        private readonly IAuditBaseRepository<Article> _articleRepository;
         private readonly ICurrentUser _currentUser;
-        private readonly AuditBaseRepository<Comment> _commentRepository;
+        private readonly IAuditBaseRepository<Comment> _commentRepository;
         private readonly ICapPublisher _capBus;
-
-        public UserLikeController(IMapper mapper,
+        private readonly IUserLikeService _userLikeService;
+        private readonly UnitOfWorkManager _unitOfWorkManager;
+        public UserLikeController(
             ICurrentUser currentUser,
-            AuditBaseRepository<UserLike> userLikeRepository,
-            AuditBaseRepository<Article> articleAuditBaseRepository,
-            AuditBaseRepository<Comment> commentRepository,
+            IAuditBaseRepository<Article> articleRepository,
+            IAuditBaseRepository<Comment> commentRepository,
             ICapPublisher capBus,
-            IUnitOfWork unitOfWork) : base(unitOfWork)
+            UnitOfWorkManager unitOfWorkManager,
+            IUserLikeService userLikeService
+        ) : base()
         {
-            _mapper = mapper;
             _currentUser = currentUser;
-            _userLikeRepository = userLikeRepository;
-            _articleAuditBaseRepository = articleAuditBaseRepository;
+            _articleRepository = articleRepository;
             _commentRepository = commentRepository;
             _capBus = capBus;
+            _userLikeService = userLikeService;
+            _unitOfWorkManager = unitOfWorkManager;
         }
 
         /// <summary>
@@ -52,95 +51,40 @@ public UserLikeController(IMapper mapper,
         /// <param name="createUpdateUserLike"></param>
         /// <returns></returns>
         [HttpPost]
-        public UnifyResponseDto Create([FromBody] CreateUpdateUserLikeDto createUpdateUserLike)
+        public async Task<UnifyResponseDto> CreateOrCancelAsync([FromBody] CreateUpdateUserLikeDto createUpdateUserLike)
         {
-            Expression<Func<UserLike, bool>> predicate = r =>
-                r.SubjectId == createUpdateUserLike.SubjectId && r.CreateUserId == _currentUser.Id;
-
-            bool exist = _userLikeRepository.Select.Any(predicate);
-            int increaseLikeQuantity = 1;
-
-            if (exist)
-            {
-                increaseLikeQuantity = -1;
-                _userLikeRepository.Delete(predicate);
-            }
-
-            switch (createUpdateUserLike.SubjectType)
-            {
-                case UserLikeSubjectType.UserLikeArticle:
-                    this.UpdateArticleLike(createUpdateUserLike.SubjectId, increaseLikeQuantity);
-                    break;
-                case UserLikeSubjectType.UserLikeComment:
-                    this.UpdateCommentLike(createUpdateUserLike.SubjectId, increaseLikeQuantity);
-                    break;
-            }
+            IUnitOfWork unitOfWork = _unitOfWorkManager.Begin();
+            using ICapTransaction capTransaction = unitOfWork.BeginTransaction(_capBus, false);
 
-            if (exist)
-            {
-                return UnifyResponseDto.Success("取消点赞成功");
-            }
-  
-            UserLike userLike = _mapper.Map<UserLike>(createUpdateUserLike);
-            _userLikeRepository.Insert(userLike);
-
-            this.PublishUserLikeNotification(createUpdateUserLike);
-
-            return UnifyResponseDto.Success("点赞成功");
-        }
+            bool isCancel = await _userLikeService.CreateOrCancelAsync(createUpdateUserLike);
 
-        private void UpdateArticleLike(Guid subjectId, int likesQuantity)
-        {
-            Article article = _articleAuditBaseRepository.Where(r => r.Id == subjectId).ToOne();
-            if (article.IsAudit == false)
-            {
-                throw new LinCmsException("该文章因违规被拉黑");
-            }
-            //防止数量一直减，减到小于0
-            if (likesQuantity < 0)
-            {
-                if (article.LikesQuantity < -likesQuantity)
-                {
-                    return;
-                }
-            }
+            await PublishUserLikeNotification(createUpdateUserLike, isCancel);
 
-            _articleAuditBaseRepository
-                .UpdateDiy.Set(r => r.LikesQuantity + likesQuantity).Where(r => r.Id == subjectId).ExecuteAffrows();
-        }
+            capTransaction.Commit(unitOfWork);
 
-        private void UpdateCommentLike(Guid subjectId, int likesQuantity)
-        {
-            Comment comment = _commentRepository.Select.Where(r => r.Id == subjectId).ToOne();
-            if (comment.IsAudit == false)
-            {
-                throw new LinCmsException("该评论因违规被拉黑");
-            }
-            //防止数量一直减，减到小于0
-            if (likesQuantity < 0)
-            {
-                if (comment.LikesQuantity < -likesQuantity)
-                {
-                    return;
-                }
-            }
-            _commentRepository.UpdateDiy.Set(r => r.LikesQuantity + likesQuantity).Where(r => r.Id == subjectId).ExecuteAffrows();
+            return UnifyResponseDto.Success(isCancel == false ? "点赞成功" : "已取消点赞");
         }
 
-        private void PublishUserLikeNotification(CreateUpdateUserLikeDto createUpdateUserLike)
+        /// <summary>
+        /// 根据用户点赞类型：文章、评论，得到消息的NotificationRespUserId的值
+        /// </summary>
+        /// <param name="createUpdateUserLike"></param>
+        /// <param name="isCancel"></param>
+        /// <returns></returns>
+        private async Task PublishUserLikeNotification(CreateUpdateUserLikeDto createUpdateUserLike, bool isCancel)
         {
-            //根据用户点赞类型：文章、评论，得到消息的NotificationRespUserId的值
             var createNotificationDto = new CreateNotificationDto()
             {
                 UserInfoId = _currentUser.Id ?? 0,
                 CreateTime = DateTime.Now,
+                IsCancel = isCancel
             };
 
             switch (createUpdateUserLike.SubjectType)
             {
                 case UserLikeSubjectType.UserLikeArticle:
 
-                    Article subjectArticle = _articleAuditBaseRepository.Where(r => r.Id == createUpdateUserLike.SubjectId).ToOne();
+                    Article subjectArticle = await _articleRepository.Where(r => r.Id == createUpdateUserLike.SubjectId).ToOneAsync();
 
                     createNotificationDto.NotificationRespUserId = subjectArticle.CreateUserId;
                     createNotificationDto.NotificationType = NotificationType.UserLikeArticle;
@@ -149,7 +93,7 @@ private void PublishUserLikeNotification(CreateUpdateUserLikeDto createUpdateUse
 
                 case UserLikeSubjectType.UserLikeComment:
 
-                    Comment subjectComment = _commentRepository.Where(r => r.Id == createUpdateUserLike.SubjectId).ToOne();
+                    Comment subjectComment = await _commentRepository.Where(r => r.Id == createUpdateUserLike.SubjectId).ToOneAsync();
 
                     createNotificationDto.NotificationRespUserId = subjectComment.CreateUserId;
                     createNotificationDto.NotificationType = NotificationType.UserLikeArticleComment;
@@ -158,14 +102,9 @@ private void PublishUserLikeNotification(CreateUpdateUserLikeDto createUpdateUse
                     break;
             }
 
-
             if (createNotificationDto.NotificationRespUserId != 0 && _currentUser.Id != createNotificationDto.NotificationRespUserId)
             {
-                using ICapTransaction trans = UnitOfWork.BeginTransaction(_capBus, false);
-
-                _capBus.Publish("NotificationController.Post", createNotificationDto);
-
-                trans.Commit();
+                await _capBus.PublishAsync(CreateNotificationDto.CreateOrCancelAsync, createNotificationDto);
             }
         }
     }
diff --git a/src/LinCms.Web/Controllers/Blog/UserSubscribeController.cs b/src/LinCms.Web/Controllers/Blog/UserSubscribeController.cs
index 1b456960..9e2f735f 100644
--- a/src/LinCms.Web/Controllers/Blog/UserSubscribeController.cs
+++ b/src/LinCms.Web/Controllers/Blog/UserSubscribeController.cs
@@ -1,46 +1,38 @@
-using System;
-using System.Collections.Generic;
-using AutoMapper;
-using DotNetCore.CAP;
-using FreeSql;
-using LinCms.Application.Contracts.Blog.Notifications;
-using LinCms.Application.Contracts.Blog.UserSubscribes;
-using LinCms.Application.Contracts.Cms.Users;
-using LinCms.Core.Data;
-using LinCms.Core.Entities;
-using LinCms.Core.Entities.Blog;
-using LinCms.Core.Exceptions;
-using LinCms.Core.Extensions;
-using LinCms.Core.Security;
-using LinCms.Infrastructure.Repositories;
+using System.Threading.Tasks;
+
+using LinCms.Blog.UserSubscribes;
+using LinCms.Data;
+using LinCms.Entities.Blog;
+using LinCms.IRepositories;
+using LinCms.Security;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LinCms.Web.Controllers.Blog
+namespace LinCms.Controllers.Blog
 {
     /// <summary>
     /// 用户订阅
     /// </summary>
-    [Route("v1/subscribe")]
+    [Area("blog")]
+    [Route("api/blog/subscribe")]
     [ApiController]
     [Authorize]
     public class UserSubscribeController : ControllerBase
     {
-        private readonly AuditBaseRepository<UserSubscribe> _userSubscribeRepository;
-        private readonly UserRepository _userRepository;
-        private readonly IMapper _mapper;
+        private readonly IAuditBaseRepository<UserSubscribe> _userSubscribeRepository;
         private readonly ICurrentUser _currentUser;
-        private readonly BaseRepository<UserTag> _userTagRepository;
-        private readonly ICapPublisher _capBus;
-        public UserSubscribeController(AuditBaseRepository<UserSubscribe> userSubscribeRepository, IMapper mapper, ICurrentUser currentUser, UserRepository userRepository, BaseRepository<UserTag> userTagRepository, ICapPublisher capPublisher)
+        private readonly IUserSubscribeService userSubscribeService;
+
+        public UserSubscribeController(IAuditBaseRepository<UserSubscribe> userSubscribeRepository,
+            ICurrentUser currentUser,
+             IUserSubscribeService userSubscribeService)
         {
             _userSubscribeRepository = userSubscribeRepository;
-            _mapper = mapper;
             _currentUser = currentUser;
-            _userRepository = userRepository;
-            _userTagRepository = userTagRepository;
-            _capBus = capPublisher;
+            this.userSubscribeService = userSubscribeService;
         }
+
         /// <summary>
         /// 判断当前登录的用户是否关注了beSubscribeUserId
         /// </summary>
@@ -59,14 +51,9 @@ public bool Get(long subscribeUserId)
         /// </summary>
         /// <param name="subscribeUserId"></param>
         [HttpDelete("{subscribeUserId}")]
-        public void Delete(long subscribeUserId)
+        public Task DeleteAsync(long subscribeUserId)
         {
-            bool any = _userSubscribeRepository.Select.Any(r => r.CreateUserId == _currentUser.Id && r.SubscribeUserId == subscribeUserId);
-            if (!any)
-            {
-                throw new LinCmsException("已取消关注");
-            }
-            _userSubscribeRepository.Delete(r => r.SubscribeUserId == subscribeUserId && r.CreateUserId == _currentUser.Id);
+            return userSubscribeService.DeleteAsync(subscribeUserId);
         }
 
         /// <summary>
@@ -74,41 +61,9 @@ public void Delete(long subscribeUserId)
         /// </summary>
         /// <param name="subscribeUserId"></param>
         [HttpPost("{subscribeUserId}")]
-        public void Post(long subscribeUserId)
+        public Task CreateAsync(long subscribeUserId)
         {
-            if (subscribeUserId == _currentUser.Id)
-            {
-                throw new LinCmsException("您无法关注自己");
-            }
-            LinUser linUser = _userRepository.Select.Where(r => r.Id == subscribeUserId).ToOne();
-            if (linUser == null)
-            {
-                throw new LinCmsException("该用户不存在");
-            }
-
-            if (!linUser.IsActive())
-            {
-                throw new LinCmsException("该用户已被拉黑");
-            }
-
-            bool any = _userSubscribeRepository.Select.Any(r =>
-                  r.CreateUserId == _currentUser.Id && r.SubscribeUserId == subscribeUserId);
-            if (any)
-            {
-                throw new LinCmsException("您已关注该用户");
-            }
-
-            UserSubscribe userSubscribe = new UserSubscribe() { SubscribeUserId = subscribeUserId };
-            _userSubscribeRepository.Insert(userSubscribe);
-
-            _capBus.Publish("NotificationController.Post", new CreateNotificationDto()
-            {
-                NotificationType= NotificationType.UserLikeUser,
-                NotificationRespUserId = subscribeUserId,
-                UserInfoId = _currentUser.Id ?? 0,
-                CreateTime = DateTime.Now,
-            });
-
+            return userSubscribeService.CreateAsync(subscribeUserId);
         }
 
         /// <summary>
@@ -117,75 +72,30 @@ public void Post(long subscribeUserId)
         /// <returns></returns>
         [HttpGet]
         [AllowAnonymous]
-        public PagedResultDto<UserSubscribeDto> GetUserSubscribeeeList([FromQuery]UserSubscribeSearchDto searchDto)
+        public PagedResultDto<UserSubscribeDto> GetUserSubscribeeeList([FromQuery] UserSubscribeSearchDto searchDto)
         {
-            var userSubscribes = _userSubscribeRepository.Select.Include(r => r.SubscribeUser)
-                .Where(r => r.CreateUserId == searchDto.UserId)
-                .OrderByDescending(r => r.CreateTime)
-                .ToPager(searchDto, out long count)
-                .ToList(r => new UserSubscribeDto
-                {
-                    CreateUserId = r.CreateUserId,
-                    SubscribeUserId = r.SubscribeUserId,
-                    Subscribeer = new OpenUserDto()
-                    {
-                        Id = r.SubscribeUser.Id,
-                        Introduction = r.SubscribeUser.Introduction,
-                        Nickname = r.SubscribeUser.Nickname,
-                        Avatar = r.SubscribeUser.Avatar,
-                        Username = r.SubscribeUser.Username,
-                    },
-                    IsSubscribeed = _userSubscribeRepository.Select.Any(u =>
-                        u.CreateUserId == _currentUser.Id && u.SubscribeUserId == r.SubscribeUserId)
-                });
-
-            userSubscribes.ForEach(r => { r.Subscribeer.Avatar = _currentUser.GetFileUrl(r.Subscribeer.Avatar); });
-
-            return new PagedResultDto<UserSubscribeDto>(userSubscribes, count);
+            return userSubscribeService.GetUserSubscribeeeList(searchDto);
         }
 
-
         /// <summary>
         /// 得到某个用户的粉丝
         /// </summary>
         /// <returns></returns>
         [HttpGet("fans")]
         [AllowAnonymous]
-        public PagedResultDto<UserSubscribeDto> GetUserFansList([FromQuery]UserSubscribeSearchDto searchDto)
+        public PagedResultDto<UserSubscribeDto> GetUserFansList([FromQuery] UserSubscribeSearchDto searchDto)
         {
-            List<UserSubscribeDto> userSubscribes = _userSubscribeRepository.Select.Include(r => r.LinUser)
-                .Where(r => r.SubscribeUserId == searchDto.UserId)
-                .OrderByDescending(r => r.CreateTime)
-                .ToPager(searchDto, out long count)
-                .ToList(r => new UserSubscribeDto
-                {
-                    CreateUserId = r.CreateUserId,
-                    SubscribeUserId = r.SubscribeUserId,
-                    Subscribeer = new OpenUserDto()
-                    {
-                        Id = r.LinUser.Id,
-                        Introduction = r.LinUser.Introduction,
-                        Nickname = r.LinUser.Nickname,
-                        Avatar = r.LinUser.Avatar,
-                        Username = r.LinUser.Username,
-                    },
-                    //当前登录的用户是否关注了这个粉丝
-                    IsSubscribeed = _userSubscribeRepository.Select.Any(u =>
-                        u.CreateUserId == _currentUser.Id && u.SubscribeUserId == r.CreateUserId)
-                });
-
-            userSubscribes.ForEach(r => { r.Subscribeer.Avatar = _currentUser.GetFileUrl(r.Subscribeer.Avatar); });
-
-            return new PagedResultDto<UserSubscribeDto>(userSubscribes, count);
+            return userSubscribeService.GetUserFansList(searchDto);
         }
 
         /// <summary>
         /// 得到某个用户的关注了、关注者、标签总数
         /// </summary>
         /// <param name="userId"></param>
+        /// <param name="_userTagRepository"></param>
         [HttpGet("user/{userId}")]
         [AllowAnonymous]
-        public SubscribeCountDto GetUserSubscribeInfo(long userId)
+        public SubscribeCountDto GetUserSubscribeInfo(long userId, [FromServices] IAuditBaseRepository<UserTag> _userTagRepository)
         {
             long subscribeCount = _userSubscribeRepository.Select
                 .Where(r => r.CreateUserId == userId)
diff --git a/src/LinCms.Web/Controllers/Blog/UserTagController.cs b/src/LinCms.Web/Controllers/Blog/UserTagController.cs
index 29cc50d1..b73baf3d 100644
--- a/src/LinCms.Web/Controllers/Blog/UserTagController.cs
+++ b/src/LinCms.Web/Controllers/Blog/UserTagController.cs
@@ -1,34 +1,27 @@
 using System;
-using LinCms.Application.Blog.Tags;
-using LinCms.Application.Contracts.Blog.Tags;
-using LinCms.Application.Contracts.Blog.UserSubscribes;
-using LinCms.Core.Data;
-using LinCms.Core.Entities.Blog;
-using LinCms.Core.Exceptions;
-using LinCms.Core.Security;
-using LinCms.Infrastructure.Repositories;
+using System.Threading.Tasks;
+
+using LinCms.Blog.Tags;
+using LinCms.Blog.UserSubscribes;
+using LinCms.Data;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LinCms.Web.Controllers.Blog
+namespace LinCms.Controllers.Blog
 {
-    [Route("v1/user-tag")]
+    [Area("blog")]
+    [Route("api/blog/user-tag")]
     [ApiController]
     [Authorize]
     public class UserTagController : ControllerBase
     {
-        private readonly ICurrentUser _currentUser;
-        private readonly AuditBaseRepository<Tag> _tagRepository;
-        private readonly AuditBaseRepository<UserTag> _userTagRepository;
         private readonly ITagService _tagService;
+        private readonly IUserTagService _userTagService;
 
-        public UserTagController(ICurrentUser currentUser,
-            AuditBaseRepository<Tag> tagRepository,
-            AuditBaseRepository<UserTag> userTagRepository, ITagService tagService)
+        public UserTagController(ITagService tagService, IUserTagService userTagService)
         {
-            _currentUser = currentUser;
-            _tagRepository = tagRepository;
-            _userTagRepository = userTagRepository;
+            _userTagService = userTagService;
             _tagService = tagService;
         }
 
@@ -37,30 +30,9 @@ public UserTagController(ICurrentUser currentUser,
         /// </summary>
         /// <param name="tagId"></param>
         [HttpPost("{tagId}")]
-        public void Post(Guid tagId)
+        public Task CreateUserTagAsync(Guid tagId)
         {
-            Tag tag = _tagRepository.Select.Where(r => r.Id == tagId).ToOne();
-            if (tag == null)
-            {
-                throw new LinCmsException("该标签不存在");
-            }
-
-            if (!tag.Status)
-            {
-                throw new LinCmsException("该标签已被拉黑");
-            }
-
-            bool any = _userTagRepository.Select.Any(r =>
-                  r.CreateUserId == _currentUser.Id && r.TagId == tagId);
-            if (any)
-            {
-                throw new LinCmsException("您已关注该标签");
-            }
-
-            UserTag userTag = new UserTag() { TagId = tagId };
-            _userTagRepository.Insert(userTag);
-
-            _tagService.UpdateSubscribersCount(tagId, 1);
+            return _userTagService.CreateUserTagAsync(tagId);
         }
 
         /// <summary>
@@ -68,15 +40,9 @@ public void Post(Guid tagId)
         /// </summary>
         /// <param name="tagId"></param>
         [HttpDelete("{tagId}")]
-        public void Delete(Guid tagId)
+        public Task DeleteUserTagAsync(Guid tagId)
         {
-            bool any = _userTagRepository.Select.Any(r => r.CreateUserId == _currentUser.Id && r.TagId == tagId);
-            if (!any)
-            {
-                throw new LinCmsException("已取消关注");
-            }
-            _userTagRepository.Delete(r => r.TagId == tagId && r.CreateUserId == _currentUser.Id);
-            _tagService.UpdateSubscribersCount(tagId, -1);
+            return _userTagService.DeleteUserTagAsync(tagId);
         }
 
         /// <summary>
diff --git a/src/LinCms.Web/Controllers/Cms/AccountController.cs b/src/LinCms.Web/Controllers/Cms/AccountController.cs
index 61e10160..eaf1bcf5 100644
--- a/src/LinCms.Web/Controllers/Cms/AccountController.cs
+++ b/src/LinCms.Web/Controllers/Cms/AccountController.cs
@@ -1,139 +1,120 @@
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading.Tasks;
+using Autofac;
 using AutoMapper;
-using IdentityModel;
-using IdentityModel.Client;
-using IdentityServer4.Models;
-using LinCms.Application.Cms.Users;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
-using LinCms.Core.Data.Enums;
-using LinCms.Core.Entities;
-using LinCms.Core.Exceptions;
-using LinCms.Application.Contracts.Cms.Account;
+using LinCms.Aop.Attributes;
+using LinCms.Cms.Account;
+using LinCms.Cms.Users;
+using LinCms.Data;
+using LinCms.Data.Enums;
+using LinCms.Entities;
+using LinCms.Exceptions;
+using LinCms.IRepositories;
+using LinCms.Middleware;
+using LinCms.Security;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
-namespace LinCms.Web.Controllers.Cms
+namespace LinCms.Controllers.Cms
 {
+    [ApiExplorerSettings(GroupName = "cms")]
+    [AllowAnonymous]
     [ApiController]
     [Route("cms/user")]
-    public class AccountController : ControllerBase
+    public class AccountController : ApiControllerBase
     {
-        private readonly IConfiguration _configuration;
-        private readonly ILogger<AccountController> _logger;
-        private readonly IUserService _userSevice;
-        private readonly IMapper _mapper;
-        public AccountController(IConfiguration configuration, ILogger<AccountController> logger, IUserService userSevice, IMapper mapper)
+        private readonly ITokenService _tokenService;
+        private readonly IAccountService _accountService;
+        private readonly IAuditBaseRepository<BlackRecord> _blackRecordRepository;
+        public AccountController(IComponentContext componentContext, IConfiguration configuration, IAccountService accountService, IAuditBaseRepository<BlackRecord> blackRecordRepository)
         {
-            _configuration = configuration;
-            _logger = logger;
-            _userSevice = userSevice;
-            _mapper = mapper;
+            bool isIdentityServer4 = configuration.GetSection("Service:IdentityServer4").Value?.ToBoolean() ?? false;
+            _tokenService = componentContext.ResolveNamed<ITokenService>(isIdentityServer4 ? typeof(IdentityServer4Service).Name : typeof(JwtTokenService).Name);
+            _accountService = accountService;
+            _blackRecordRepository = blackRecordRepository;
         }
-
         /// <summary>
         /// 登录接口
         /// </summary>
         /// <param name="loginInputDto">用户名/密码：admin/123qwe</param>
         [DisableAuditing]
+        [ServiceFilter(typeof(RecaptchaVerifyActionFilter))]
         [HttpPost("login")]
-        public async Task<JObject> Login(LoginInputDto loginInputDto)
+        public Task<Tokens> Login(LoginInputDto loginInputDto)
         {
-            _logger.LogInformation("login");
-
-            string authority = $"{_configuration["Identity:Protocol"]}://{_configuration["Identity:IP"]}:{_configuration["Identity:Port"]}";
-
-            HttpClient client = new HttpClient();
-
-            TokenResponse response = await client.RequestTokenAsync(new PasswordTokenRequest()
-            {
-                Address = authority + "/connect/token",
-                GrantType = GrantType.ResourceOwnerPassword,
-
-                ClientId = _configuration["Service:ClientId"],
-                ClientSecret = _configuration["Service:ClientSecrets"],
-
-                Parameters =
-                {
-                    { "UserName",loginInputDto.Username},
-                    { "Password",loginInputDto.Password}
-                },
-                Scope = _configuration["Service:Name"]
-            });
-            client.Dispose();
-            if (response.IsError)
-            {
-                throw new LinCmsException(response.ErrorDescription);
-            }
-            return response.Json;
+            return _tokenService.LoginAsync(loginInputDto);
         }
 
-
         /// <summary>
         /// 刷新用户的token
         /// </summary>
         /// <returns></returns>
-        [AllowAnonymous]
         [HttpGet("refresh")]
-        public async Task<JObject> GetRefreshToken()
+        public async Task<Tokens> GetRefreshTokenAsync()
         {
-            string refreshToken;
-
-            string authHeader = Request.Headers["Authorization"];
-
-            if (authHeader != null && authHeader.StartsWith("Bearer"))
-            {
-                refreshToken = authHeader.Substring("Bearer ".Length).Trim();
-            }
-            else
+            string? refreshToken = await HttpContext.GetTokenAsync("Bearer", "access_token");
+            if (refreshToken == null)
             {
-                throw new LinCmsException(" 请先登录.", ErrorCode.RefreshTokenError);
+                throw new LinCmsException("请先登录.", ErrorCode.RefreshTokenError);
             }
 
-            string authority = $"{_configuration["Identity:Protocol"]}://{_configuration["Identity:IP"]}:{_configuration["Identity:Port"]}";
-
-            HttpClient client = new HttpClient();
-
-            TokenResponse response = await client.RequestTokenAsync(new TokenRequest
-            {
-                Address = authority + "/connect/token",
-                GrantType = OidcConstants.GrantTypes.RefreshToken,
-
-                ClientId = _configuration["Service:ClientId"],
-                ClientSecret = _configuration["Service:ClientSecrets"],
-
-                Parameters = new Dictionary<string, string>
-                    {
-                        { OidcConstants.TokenRequest.RefreshToken, refreshToken }
-                    }
-            });
-
-            if (response.IsError)
-            {
-                throw new LinCmsException("请重新登录", ErrorCode.RefreshTokenError);
-            }
+            return await _tokenService.GetRefreshTokenAsync(refreshToken);
+        }
 
-            return response.Json;
+        /// <summary>
+        /// TODO
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("logout")]
+        [Authorize]
+        public async Task<UnifyResponseDto> LogoutAsync()
+        {
+            var username = User.FindUserName();
+            string? Jti = await HttpContext.GetTokenAsync("Bearer", "access_token");
+            //string Jti = Request.Headers["Authorization"].ToString().Substring(JwtBearerDefaults.AuthenticationScheme.Length + 1).Trim();
+            _blackRecordRepository.Insert(new BlackRecord { Jti = Jti, UserName = username });
+            return UnifyResponseDto.Success("退出登录");
         }
 
+
         /// <summary>
         /// 注册
         /// </summary>
         /// <param name="registerDto"></param>
-        [AuditingLog("用户注册")]
+        /// <param name="_mapper"></param>
+        /// <param name="_userSevice"></param>
+        [Logger("用户注册")]
+        [ServiceFilter(typeof(RecaptchaVerifyActionFilter))]
         [HttpPost("account/register")]
-        public UnifyResponseDto Post([FromBody] RegisterDto registerDto)
+        public async Task<UnifyResponseDto> Register([FromBody] RegisterDto registerDto, [FromServices] IMapper _mapper, [FromServices] IUserService _userSevice)
         {
             LinUser user = _mapper.Map<LinUser>(registerDto);
+            await _userSevice.CreateAsync(user, new List<long>(), registerDto.Password);
+            return UnifyResponseDto.Success("注册成功");
+        }
 
-            _userSevice.Register(user,new List<long>());
+        /// <summary>
+        /// 发送邮件：重置密码的验证码
+        /// </summary>
+        /// <param name="sendEmailCode"></param>
+        /// <returns></returns>
+        [HttpPost("account/send_password_reset_code")]
+        public Task<string> SendPasswordResetCode(SendEmailCodeInput sendEmailCode)
+        {
+            return _accountService.SendPasswordResetCode(sendEmailCode);
+        }
 
-            return UnifyResponseDto.Success("注册成功");
+        /// <summary>
+        /// 修改密码
+        /// </summary>
+        /// <param name="resetPassword"></param>
+        /// <returns></returns>
+        [HttpPost("account/reset_password")]
+        public Task ResetPassword([FromBody] ResetEmailPasswordDto resetPassword)
+        {
+            return _accountService.ResetPassword(resetPassword);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/LinCms.Web/Controllers/Cms/AdminController.cs b/src/LinCms.Web/Controllers/Cms/AdminController.cs
index c37bdb7b..ac2d1c22 100644
--- a/src/LinCms.Web/Controllers/Cms/AdminController.cs
+++ b/src/LinCms.Web/Controllers/Cms/AdminController.cs
@@ -1,31 +1,24 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using AutoMapper;
-using LinCms.Application.Cms.Admin;
-using LinCms.Application.Cms.Users;
-using LinCms.Application.Contracts.Cms.Admins;
-using LinCms.Application.Contracts.Cms.Permissions;
-using LinCms.Application.Contracts.Cms.Users;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
-using LinCms.Core.Entities;
+using System.Threading.Tasks;
+using LinCms.Aop.Attributes;
+using LinCms.Aop.Filter;
+using LinCms.Cms.Admins;
+using LinCms.Cms.Users;
+using LinCms.Data;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LinCms.Web.Controllers.Cms
+namespace LinCms.Controllers.Cms
 {
+    [ApiExplorerSettings(GroupName = "cms")]
     [Route("cms/admin")]
     [ApiController]
-    [LinCmsAuthorize(Roles = LinGroup.Admin)]
     public class AdminController : ControllerBase
     {
         private readonly IUserService _userSevice;
         private readonly IAdminService _adminService;
-        private readonly IMapper _mapper;
-        public AdminController(IUserService userSevice, IAdminService adminService, IMapper mapper)
+        public AdminController(IUserService userSevice, IAdminService adminService)
         {
             _userSevice = userSevice;
             _adminService = adminService;
-            _mapper = mapper;
         }
 
         /// <summary>
@@ -34,7 +27,8 @@ public AdminController(IUserService userSevice, IAdminService adminService, IMap
         /// <param name="searchDto"></param>
         /// <returns></returns>
         [HttpGet("users")]
-        public PagedResultDto<UserDto> GetUserListByGroupId([FromQuery]UserSearchDto searchDto)
+        [LinCmsAuthorize("查询所有用户", "管理员")]
+        public PagedResultDto<UserDto> GetUserListByGroupId([FromQuery] UserSearchDto searchDto)
         {
             return _userSevice.GetUserListByGroupId(searchDto);
         }
@@ -46,9 +40,10 @@ public PagedResultDto<UserDto> GetUserListByGroupId([FromQuery]UserSearchDto sea
         /// <param name="updateUserDto"></param>
         /// <returns></returns>
         [HttpPut("user/{id}")]
-        public UnifyResponseDto Put(long id, [FromBody] UpdateUserDto updateUserDto)
+        [LinCmsAuthorize("管理员更新用户信息", "管理员")]
+        public async Task<UnifyResponseDto> UpdateAsync(long id, [FromBody] UpdateUserDto updateUserDto)
         {
-            _userSevice.UpdateAync(id, updateUserDto);
+            await _userSevice.UpdateAync(id, updateUserDto);
             return UnifyResponseDto.Success();
         }
 
@@ -57,8 +52,9 @@ public UnifyResponseDto Put(long id, [FromBody] UpdateUserDto updateUserDto)
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        [AuditingLog("管理员删除了一个用户")]
-        [HttpDelete("{id}")]
+        [Logger("管理员删除了一个用户")]
+        [HttpDelete("user/{id}")]
+        [LinCmsAuthorize("删除用户", "管理员")]
         public async Task<UnifyResponseDto> DeleteAsync(long id)
         {
             await _userSevice.DeleteAsync(id);
@@ -71,21 +67,13 @@ public async Task<UnifyResponseDto> DeleteAsync(long id)
         /// <param name="id">用户id</param>
         /// <param name="resetPasswordDto"></param>
         /// <returns></returns>
-        [HttpPut("password/{id}")]
+        [HttpPut("user/{id}/password")]
+        [LinCmsAuthorize("修改用户密码", "管理员")]
         public async Task<UnifyResponseDto> ResetPasswordAsync(long id, [FromBody] ResetPasswordDto resetPasswordDto)
         {
             await _userSevice.ResetPasswordAsync(id, resetPasswordDto);
             return UnifyResponseDto.Success("密码修改成功");
         }
 
-        /// <summary>
-        /// 查询所有可分配的权限
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("permission")]
-        public IDictionary<string, List<PermissionDto>> GetAllPermissions()
-        {
-            return _adminService.GetAllStructualPermissions();
-        }
     }
 }
\ No newline at end of file
diff --git a/src/LinCms.Web/Controllers/Cms/FileController.cs b/src/LinCms.Web/Controllers/Cms/FileController.cs
index c14cdd3e..16386103 100644
--- a/src/LinCms.Web/Controllers/Cms/FileController.cs
+++ b/src/LinCms.Web/Controllers/Cms/FileController.cs
@@ -1,32 +1,64 @@
-using System.Collections.Generic;
-using LinCms.Application.Cms.Files;
-using LinCms.Application.Contracts.Cms.Files;
+using Autofac;
+using LinCms.Cms.Files;
+using LinCms.Data.Options;
+using LinCms.Exceptions;
+using LinCms.Utils;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
 
-namespace LinCms.Web.Controllers.Cms
+namespace LinCms.Controllers.Cms
 {
+    [ApiExplorerSettings(GroupName = "cms")]
     [Route("cms/file")]
     [ApiController]
-    //[Authorize]
+    [Authorize]
     public class FileController : ControllerBase
     {
+        private readonly FileStorageOption _fileStorageOption;
         private readonly IFileService _fileService;
-        public FileController(IFileService fileService)
+        public FileController(IOptionsSnapshot<FileStorageOption> optionsSnapshot, IComponentContext componentContext)
         {
-            _fileService = fileService;
+            _fileStorageOption = optionsSnapshot.Value;
+            _fileService = componentContext.ResolveNamed<IFileService>(_fileStorageOption.ServiceName);
         }
 
         /// <summary>
-        /// 上传多文件至本地或七牛云，swagger无法正常生成
+        /// 多文件上传
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public List<FileDto> UploadFiles()
+        public async Task<List<FileDto>> UploadFiles()
         {
             IFormFileCollection files = Request.Form.Files;
+
+            if (files.Count > _fileStorageOption.NumLimit)
+            {
+                throw new LinCmsException($"最大文件数量{_fileStorageOption.NumLimit}");
+            }
+            long len = 0;
+            foreach (var file in files)
+            {
+                len += file.Length;
+                this.ValidFile(file);
+            }
+
+            if (len > _fileStorageOption.MaxFileSize)
+            {
+                throw new LinCmsException($"文件总大小{len}，超过上传文件总大小{_fileStorageOption.MaxFileSize}");
+            }
+
+            int i = 0;
             List<FileDto> fileDtos = new List<FileDto>();
-            files.ForEach((file, index) => { fileDtos.Add(_fileService.Upload(file, index)); });
+            foreach (var file in files)
+            {
+                FileDto fileDto = await _fileService.UploadAsync(file, i++);
+                fileDtos.Add(fileDto);
+            }
             return fileDtos;
         }
 
@@ -36,10 +68,40 @@ public List<FileDto> UploadFiles()
         /// <param name="file"></param>
         /// <param name="key"></param>
         /// <returns></returns>
-       [HttpPost("upload")]
-        public FileDto Upload(IFormFile file, int key = 0)
+        [HttpPost("upload")]
+        public Task<FileDto> UploadAsync(IFormFile file, int key = 0)
+        {
+            if (!MultipartRequestHelper.IsMultipartContentType(Request.ContentType))
+            {
+                throw new LinCmsException($"The request couldn't be processed (Error 1).");
+            }
+
+            this.ValidFile(file);
+            return _fileService.UploadAsync(file, key);
+        }
+
+        private void ValidFile(IFormFile file)
         {
-            return _fileService.Upload(file, key);
+            string? ext = Path.GetExtension(file.FileName)?.ToLowerInvariant();
+            if (string.IsNullOrEmpty(ext))
+            {
+                throw new LinCmsException($"不支持的文件类型");
+            }
+
+            if (_fileStorageOption.Include.IsNotNullOrEmpty())
+            {
+                if (!_fileStorageOption.Include.Contains(ext))
+                {
+                    throw new LinCmsException($"不支持文件类型{ext}");
+                }
+                return;
+            }
+
+            if (_fileStorageOption.Exclude.IsNotNullOrEmpty() && _fileStorageOption.Exclude.Contains(ext))
+            {
+                throw new LinCmsException($"文件类型{ext}被禁止上传");
+            }
         }
+
     }
-}
\ No newline at end of file
+}
diff --git a/src/LinCms.Web/Controllers/Cms/GroupController.cs b/src/LinCms.Web/Controllers/Cms/GroupController.cs
index 4e0ae2b9..3b75a14d 100644
--- a/src/LinCms.Web/Controllers/Cms/GroupController.cs
+++ b/src/LinCms.Web/Controllers/Cms/GroupController.cs
@@ -1,17 +1,16 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using LinCms.Application.Cms.Groups;
-using LinCms.Application.Contracts.Cms.Groups;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
-using LinCms.Core.Entities;
+using LinCms.Aop.Filter;
+using LinCms.Cms.Groups;
+using LinCms.Data;
+using LinCms.Entities;
 using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
-namespace LinCms.Web.Controllers.Cms
+namespace LinCms.Controllers.Cms
 {
+    [ApiExplorerSettings(GroupName = "cms")]
     [Route("cms/admin/group")]
     [ApiController]
-    [LinCmsAuthorize(Roles = LinGroup.Admin)]
     public class GroupController : ControllerBase
     {
         private readonly IGroupService _groupService;
@@ -21,20 +20,22 @@ public GroupController(IGroupService groupService)
         }
 
         [HttpGet("all")]
+        [LinCmsAuthorize("查询所有权限组", "管理员")]
         public Task<List<LinGroup>> GetListAsync()
         {
             return _groupService.GetListAsync();
         }
 
         [HttpGet("{id}")]
+        [LinCmsAuthorize("查询一个权限组及其权限", "管理员")]
         public async Task<GroupDto> GetAsync(long id)
         {
             GroupDto groupDto = await _groupService.GetAsync(id);
             return groupDto;
         }
 
-        [AuditingLog("管理员新建了一个权限组")]
         [HttpPost]
+        [LinCmsAuthorize("新建权限组", "管理员")]
         public async Task<UnifyResponseDto> CreateAsync([FromBody] CreateGroupDto inputDto)
         {
             await _groupService.CreateAsync(inputDto);
@@ -42,6 +43,7 @@ public async Task<UnifyResponseDto> CreateAsync([FromBody] CreateGroupDto inputD
         }
 
         [HttpPut("{id}")]
+        [LinCmsAuthorize("更新一个权限组", "管理员")]
         public async Task<UnifyResponseDto> UpdateAsync(long id, [FromBody] UpdateGroupDto updateGroupDto)
         {
             await _groupService.UpdateAsync(id, updateGroupDto);
@@ -49,7 +51,7 @@ public async Task<UnifyResponseDto> UpdateAsync(long id, [FromBody] UpdateGroupD
         }
 
         [HttpDelete("{id}")]
-        [AuditingLog("管理员删除一个权限分组")]
+        [LinCmsAuthorize("删除一个权限组", "管理员")]
         public async Task<UnifyResponseDto> DeleteAsync(long id)
         {
             await _groupService.DeleteAsync(id);
diff --git a/src/LinCms.Web/Controllers/Cms/LogController.cs b/src/LinCms.Web/Controllers/Cms/LogController.cs
index b66100e4..17eef4af 100644
--- a/src/LinCms.Web/Controllers/Cms/LogController.cs
+++ b/src/LinCms.Web/Controllers/Cms/LogController.cs
@@ -1,24 +1,27 @@
-using System.Collections.Generic;
-using FreeSql;
-using LinCms.Application.Cms.Logs;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
-using LinCms.Core.Entities;
-using LinCms.Application.Contracts.Cms.Logs;
+using LinCms.Aop.Attributes;
+using LinCms.Aop.Filter;
+using LinCms.Cms.Logs;
+using LinCms.Data;
+using LinCms.Entities;
 using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
-namespace LinCms.Web.Controllers.Cms
+namespace LinCms.Controllers.Cms
 {
+    [ApiExplorerSettings(GroupName = "cms")]
     [Route("cms/log")]
     [ApiController]
     [DisableAuditing]
     public class LogController : ControllerBase
     {
         private readonly ILogService _logService;
+        private readonly ISerilogService _serilogService;
 
-        public LogController(ILogService logService, BaseRepository<LinLog> linLogBaseRepository)
+        public LogController(ILogService logService, ISerilogService serilogService)
         {
             _logService = logService;
+            _serilogService = serilogService;
         }
 
         /// <summary>
@@ -27,7 +30,7 @@ public LogController(ILogService logService, BaseRepository<LinLog> linLogBaseRe
         /// <returns></returns>
         [HttpGet("users")]
         [LinCmsAuthorize("查询日志记录的用户", "日志")]
-        public List<string> GetUsers([FromQuery]PageDto pageDto)
+        public List<string> GetUsers([FromQuery] PageDto pageDto)
         {
             return _logService.GetLoggedUsers(pageDto);
         }
@@ -38,7 +41,7 @@ public List<string> GetUsers([FromQuery]PageDto pageDto)
         /// <returns></returns>
         [HttpGet]
         [LinCmsAuthorize("查询所有日志", "日志")]
-        public PagedResultDto<LinLog> GetLogs([FromQuery]LogSearchDto searchDto)
+        public PagedResultDto<LinLog> GetLogs([FromQuery] LogSearchDto searchDto)
         {
             return _logService.GetUserLogs(searchDto);
         }
@@ -50,16 +53,33 @@ public PagedResultDto<LinLog> GetLogs([FromQuery]LogSearchDto searchDto)
         /// <returns></returns>
         [HttpGet("search")]
         [LinCmsAuthorize("搜索日志", "日志")]
-        public PagedResultDto<LinLog> GetUserLogs([FromQuery]LogSearchDto searchDto)
+        public PagedResultDto<LinLog> GetUserLogs([FromQuery] LogSearchDto searchDto)
         {
             return _logService.GetUserLogs(searchDto);
         }
 
+        /// <summary>
+        /// Serilog日志
+        /// </summary>
+        /// <param name="searchDto"></param>
+        /// <returns></returns>
+        [HttpGet("serilog")]
+        [LinCmsAuthorize("Serilog日志", "日志")]
+        public Task<PagedResultDto<SerilogDO>> GetSerilogListAsync([FromQuery] SerilogSearchDto searchDto)
+        {
+            return _serilogService.GetListAsync(searchDto);
+        }
+
         [HttpGet("visitis")]
         public VisitLogUserDto GetUserAndVisits()
         {
             return _logService.GetUserAndVisits();
+        }
 
+        [HttpGet("dashboard")]
+        public Task<LogDashboard> GetLogDashboard()
+        {
+            return _serilogService.GetLogDashboard();
         }
     }
 }
diff --git a/src/LinCms.Web/Controllers/Cms/Oauth2Controller.cs b/src/LinCms.Web/Controllers/Cms/Oauth2Controller.cs
index 2a49b650..c58f1d3c 100644
--- a/src/LinCms.Web/Controllers/Cms/Oauth2Controller.cs
+++ b/src/LinCms.Web/Controllers/Cms/Oauth2Controller.cs
@@ -3,49 +3,47 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Linq;
 using System.Security.Claims;
-using System.Text;
 using System.Threading.Tasks;
-using LinCms.Application.Cms.Users;
-using LinCms.Core.Entities;
-using LinCms.Core.Extensions;
-using LinCms.Core.Security;
+using System.Web;
+using Autofac;
+using DotNetCore.Security;
+using LinCms.Cms.Users;
+using LinCms.Data;
+using LinCms.Data.Enums;
+using LinCms.Entities;
+using LinCms.Exceptions;
+using LinCms.Extensions;
+using LinCms.IRepositories;
+using LinCms.Security;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-using Microsoft.IdentityModel.Tokens;
 
-namespace LinCms.Web.Controllers.Cms
+namespace LinCms.Controllers.Cms
 {
+    [ApiExplorerSettings(GroupName = "cms")]
     [Route("cms/oauth2")]
     [ApiController]
     public class Oauth2Controller : ControllerBase
     {
-
-        private readonly IHttpContextAccessor _contextAccessor;
         private const string LoginProviderKey = "LoginProvider";
-        private readonly IConfiguration _configuration;
         private readonly IUserIdentityService _userCommunityService;
         private readonly ILogger<Oauth2Controller> _logger;
-
-        public IFreeSql FreeSql { get; }
-
-        public Oauth2Controller(IHttpContextAccessor contextAccessor,
-                                IConfiguration configuration,
-                                IFreeSql freeSql,
-                                IUserIdentityService userCommunityService,
-                                ILogger<Oauth2Controller> logger)
+        private readonly IUserRepository _userRepository;
+        private readonly IJsonWebTokenService _jsonWebTokenService;
+        private readonly IComponentContext _componentContext;
+        public Oauth2Controller(IUserIdentityService userCommunityService, ILogger<Oauth2Controller> logger, IUserRepository userRepository, IJsonWebTokenService jsonWebTokenService, IComponentContext componentContext)
         {
-            _contextAccessor = contextAccessor;
-            _configuration = configuration;
-            FreeSql = freeSql;
             _userCommunityService = userCommunityService;
             _logger = logger;
+            _userRepository = userRepository;
+            _jsonWebTokenService = jsonWebTokenService;
+            _componentContext = componentContext;
         }
 
-
         /// <summary>
         /// 授权成功后自动回调的地址
         /// </summary>
@@ -53,7 +51,7 @@ public Oauth2Controller(IHttpContextAccessor contextAccessor,
         /// <param name="redirectUrl">授权成功后的跳转地址</param>
         /// <returns></returns>
         [HttpGet("signin-callback")]
-        public async Task<IActionResult> Home(string provider = null, string redirectUrl = "")
+        public async Task<IActionResult> Home(string provider, string redirectUrl = "")
         {
             if (string.IsNullOrWhiteSpace(provider))
             {
@@ -65,56 +63,58 @@ public async Task<IActionResult> Home(string provider = null, string redirectUrl
                 return BadRequest();
             }
 
-            var authenticateResult = await _contextAccessor.HttpContext.AuthenticateAsync(provider);
+            AuthenticateResult authenticateResult = await HttpContext.AuthenticateAsync(provider);
             if (!authenticateResult.Succeeded) return Redirect(redirectUrl);
-            var openIdClaim = authenticateResult.Principal.FindFirst(ClaimTypes.NameIdentifier);
+            var openIdClaim = authenticateResult.Principal?.FindFirst(ClaimTypes.NameIdentifier);
             if (openIdClaim == null || string.IsNullOrWhiteSpace(openIdClaim.Value))
                 return Redirect(redirectUrl);
-            long id = 0;
-            switch (provider)
+
+            List<string> supportProviders = new List<string> { LinUserIdentity.Gitee, LinUserIdentity.GitHub, LinUserIdentity.QQ, };
+
+            if (!supportProviders.Contains(provider))
             {
-                case LinUserIdentity.GitHub:
-                    id = await _userCommunityService.SaveGitHubAsync(authenticateResult.Principal, openIdClaim.Value);
-                    break;
+                _logger.LogError($"未知的privoder:{provider},redirectUrl:{redirectUrl}");
+                throw new LinCmsException($"未知的privoder:{provider}！");
+            }
 
-                case LinUserIdentity.QQ:
+            IOAuth2Service oAuth2Service = _componentContext.ResolveNamed<IOAuth2Service>(provider);
 
-                    break;
-                case LinUserIdentity.WeiXin:
+            long id = await oAuth2Service.SaveUserAsync(authenticateResult.Principal, openIdClaim.Value);
 
-                    break;
-                default:
-                    _logger.LogError($"未知的privoder:{provider},redirectUrl:{redirectUrl}");
-                    break;
-            }
             List<Claim> authClaims = authenticateResult.Principal.Claims.ToList();
 
-            LinUser user = FreeSql.Select<LinUser>().IncludeMany(r => r.LinGroups)
-                .WhereCascade(r => r.IsDeleted == false).Where(r => r.Id == id).First();
+            LinUser user = await _userRepository.Select.IncludeMany(r => r.LinGroups)
+                .WhereCascade(r => r.IsDeleted == false).Where(r => r.Id == id).FirstAsync();
 
+            if (user == null)
+            {
+                throw new LinCmsException("第三方登录失败！");
+            }
             List<Claim> claims = new List<Claim>()
-                {
-                    new Claim(ClaimTypes.NameIdentifier,user.Id.ToString()),
-                    new Claim(ClaimTypes.Email,user.Email??""),
-                    new Claim(ClaimTypes.GivenName,user.Nickname??""),
-                    new Claim(ClaimTypes.Name,user.Username??""),
-                    new Claim(LinCmsClaimTypes.IsAdmin,user.IsAdmin().ToString()),
-                    new Claim(ClaimTypes.Role,user.IsAdmin()?LinGroup.Admin:"")
-                };
-            user.LinGroups?.ForEach(r =>
             {
-                claims.Add(new Claim(LinCmsClaimTypes.Groups, r.Id.ToString()));
-            });
+                new Claim (ClaimTypes.NameIdentifier, user.Id.ToString ()),
+                new Claim (ClaimTypes.Email, user.Email?? ""),
+                new Claim (ClaimTypes.GivenName, user.Nickname?? ""),
+                new Claim (ClaimTypes.Name, user.Username?? ""),
+            };
 
-            claims.AddRange(authClaims);
-            string token = this.CreateToken(claims);
+            user.LinGroups?.ForEach(r =>
+           {
+               claims.Add(new Claim(LinCmsClaimTypes.Groups, r.Id.ToString()));
+           });
 
-            return Redirect($"{redirectUrl}?token={token}");
-        }
+            //claims.AddRange(authClaims);
+            string token = _jsonWebTokenService.Encode(claims);
+
+            // 生成刷新token
+            user.AddRefreshToken();
+            await _userRepository.UpdateAsync(user);
 
+            return Redirect($"{redirectUrl}#login-result?token={token}");
+        }
 
         /// <summary>
-        /// https://localhost:5001/cms/oauth2/signin?provider=GitHub&redirectUrl=http://localhost:8080/#login-result
+        /// https://localhost:5001/cms/oauth2/signin?provider=GitHub&redirectUrl=http://localhost:8080/
         /// </summary>
         /// <param name="provider"></param>
         /// <param name="redirectUrl"></param>
@@ -134,18 +134,119 @@ public async Task<IActionResult> SignIn(string provider, string redirectUrl)
                 return BadRequest();
             }
 
-            var request = _contextAccessor.HttpContext.Request;
-            var url =
-                $"{request.Scheme}://{request.Host}{request.PathBase}{request.Path}-callback?provider={provider}&redirectUrl={redirectUrl}";
+            string url = $"{Request.Scheme}://{Request.Host}{Request.PathBase}{Request.Path}-callback?provider={provider}" + $"&redirectUrl={redirectUrl}";
 
-            _logger.LogInformation($"url:{url}");
+            _logger.LogInformation($"SignIn-url:{url}");
             var properties = new AuthenticationProperties { RedirectUri = url };
             properties.Items[LoginProviderKey] = provider;
             return Challenge(properties, provider);
 
         }
 
-        [HttpGet("signout"), HttpPost("signout")]
+        /// <summary>
+        /// 第三方账号绑定回调
+        /// </summary>
+        /// <param name="provider"></param>
+        /// <param name="redirectUrl"></param>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        [HttpGet("signin-bind-callback")]
+        public async Task<IActionResult> SignInBindCallBack(string provider, string redirectUrl = "", string token = "")
+        {
+            if (string.IsNullOrWhiteSpace(provider))
+            {
+                return BadRequest();
+            }
+
+            if (!await HttpContext.IsProviderSupportedAsync(provider))
+            {
+                return BadRequest();
+            }
+
+            if (token.IsNullOrEmpty() || !token.StartsWith("Bearer "))
+            {
+                return Redirect($"{redirectUrl}#bind-result?code={ErrorCode.Fail}&message={HttpUtility.UrlEncode("请先登录")}");
+            }
+            else
+            {
+                token = token.Remove(0, 7);
+            }
+
+            AuthenticateResult authenticateResult = await HttpContext.AuthenticateAsync(provider);
+            if (!authenticateResult.Succeeded) return Redirect($"{redirectUrl}#bind-result?code=fail&message={authenticateResult.Failure?.Message}");
+            var openIdClaim = authenticateResult.Principal?.FindFirst(ClaimTypes.NameIdentifier);
+            if (openIdClaim == null || string.IsNullOrWhiteSpace(openIdClaim.Value))
+                return Redirect($"{redirectUrl}#bind-result?code={ErrorCode.Fail}&message={HttpUtility.UrlEncode("未能获取openId")}");
+
+            JwtPayload jwtPayload = (JwtPayload)_jsonWebTokenService.Decode(token);
+            string? nameIdentifier = jwtPayload.Claims.FirstOrDefault(r => r.Type == ClaimTypes.NameIdentifier)?.Value;
+            if (nameIdentifier.IsNullOrWhiteSpace())
+            {
+                return Redirect($"{redirectUrl}#bind-result?code={ErrorCode.Fail}&message={HttpUtility.UrlEncode("请先登录")}");
+            }
+            long userId = long.Parse(nameIdentifier);
+            UnifyResponseDto unifyResponseDto;
+
+            List<string> supportProviders = new List<string> { LinUserIdentity.Gitee, LinUserIdentity.GitHub, LinUserIdentity.QQ };
+
+            if (!supportProviders.Contains(provider))
+            {
+                _logger.LogError($"未知的privoder:{provider},redirectUrl:{redirectUrl}");
+                unifyResponseDto = UnifyResponseDto.Error($"未知的privoder:{provider}！");
+            }
+            else
+            {
+                IOAuth2Service oAuth2Service = _componentContext.ResolveNamed<IOAuth2Service>(provider);
+                unifyResponseDto = await oAuth2Service.BindAsync(authenticateResult.Principal, provider, openIdClaim.Value, userId);
+            }
+
+            return Redirect($"{redirectUrl}#bind-result?code={unifyResponseDto.Code.ToString()}&message={HttpUtility.UrlEncode(unifyResponseDto.Message.ToString())}");
+        }
+
+        /// <summary>
+        /// 第三方账号绑定，需要把token值传过来，用于与当前登录人绑定起来
+        /// </summary>
+        /// <param name="provider">GitHub/Gitee/QQ</param>
+        /// <param name="redirectUrl">http://localhost:8081/   http://vvlog.baimocore.cn/</param>
+        /// <param name="token">Bearer {Token}</param>
+        /// <returns></returns>
+
+        [HttpGet("signin-bind")]
+        public async Task<IActionResult> SignInBind(string provider, string redirectUrl, string token)
+        {
+            // Note: the "provider" parameter corresponds to the external
+            // authentication provider choosen by the user agent.
+            if (string.IsNullOrWhiteSpace(provider))
+            {
+                return BadRequest();
+            }
+
+            if (!await HttpContext.IsProviderSupportedAsync(provider))
+            {
+                return BadRequest();
+            }
+
+            string url = $"{Request.Scheme}://{Request.Host}{Request.PathBase}{Request.Path}-callback?provider={provider}"
+                + $"&redirectUrl={redirectUrl}&token={token}";
+
+            _logger.LogInformation($"SignIn-url:{url}");
+            var properties = new AuthenticationProperties { RedirectUri = url };
+            properties.Items[LoginProviderKey] = provider;
+            return Challenge(properties, provider);
+
+        }
+
+        /// <summary>
+        /// 获取第三方登录的提供商
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("external-providers")]
+        public async Task<AuthenticationScheme[]> GetExternalProvidersAsync()
+        {
+            return await HttpContext.GetExternalProvidersAsync();
+        }
+
+        [HttpGet("signout")]
         public IActionResult SignOut()
         {
             // Instruct the cookies middleware to delete the local cookie created
@@ -155,42 +256,53 @@ public IActionResult SignOut()
         }
 
         /// <summary>
-        /// axios得到null，浏览器直接打开能得到github的id 
+        /// 通过axios请求得到null，浏览器直接打开能得到github的id 
         /// </summary>
         /// <param name="provider"></param>
         /// <returns></returns>
         [HttpGet("OpenId")]
-        public async Task<string> OpenId(string provider = null)
+        public async Task<string?> OpenId(string provider)
         {
-            var authenticateResult = await _contextAccessor.HttpContext.AuthenticateAsync(provider);
+            AuthenticateResult authenticateResult = await HttpContext.AuthenticateAsync(provider);
             if (!authenticateResult.Succeeded) return null;
-            var openIdClaim = authenticateResult.Principal.FindFirst(ClaimTypes.NameIdentifier);
+            Claim openIdClaim = authenticateResult.Principal.FindFirst(ClaimTypes.NameIdentifier);
             return openIdClaim?.Value;
 
         }
 
+        /// <summary>
+        /// 通过axios请求，请在header（请求头）携带上文中signin-callback生成的Token值.可以得到openid
+        /// </summary>
+        /// <returns></returns>
         [HttpGet("GetOpenIdByToken")]
-        public string GetOpenIdByToken()
+        public string? GetOpenIdByTokenAsync()
         {
             return User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
         }
 
-        private string CreateToken(IEnumerable<Claim> Claims)
+        /// <summary>
+        /// 得到当前用户绑定的第三方账号，除密码外
+        /// </summary>
+        /// <param name="currentUser"></param>
+        /// <returns></returns>
+        [Authorize]
+        [HttpGet("bindlist")]
+        public async Task<List<UserIdentityDto>> GetListAsync([FromServices] ICurrentUser currentUser)
+        {
+            return (await _userCommunityService.GetListAsync(currentUser.Id ?? 0)).Where(r => r.IdentityType != LinUserIdentity.Password).ToList();
+        }
+
+        /// <summary>
+        /// 解绑用户的第三方账号。当用户没有密码时，无法解绑最后一个账号。只可以解绑自己的账号
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [Authorize]
+        [HttpDelete("unbind/{id}")]
+        public Task UnBind(Guid id)
         {
-            var handler = new JwtSecurityTokenHandler();
-            var key = new SymmetricSecurityKey(
-                Encoding.UTF8.GetBytes(_configuration["Authentication:JwtBearer:SecurityKey"]));
-            var credentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);
-            var token = new JwtSecurityToken(
-                _configuration["Authentication:JwtBearer:Issuer"],
-                _configuration["Authentication:JwtBearer:Audience"],
-                Claims,
-                expires: DateTime.Now.AddMinutes(120),
-                signingCredentials: credentials
-            );
-
-            return handler.WriteToken(token);
+            return _userCommunityService.UnBind(id);
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/LinCms.Web/Controllers/Cms/PermissionController.cs b/src/LinCms.Web/Controllers/Cms/PermissionController.cs
index e914ade0..253bc89c 100644
--- a/src/LinCms.Web/Controllers/Cms/PermissionController.cs
+++ b/src/LinCms.Web/Controllers/Cms/PermissionController.cs
@@ -1,32 +1,42 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using LinCms.Application.Cms.Permissions;
-using LinCms.Application.Contracts.Cms.Permissions;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
-using LinCms.Core.Entities;
-using LinCms.Web.Data;
+using LinCms.Aop.Filter;
+using LinCms.Cms.Permissions;
+using LinCms.Data;
+using LinCms.Utils;
 using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
-namespace LinCms.Web.Controllers.Cms
+namespace LinCms.Controllers.Cms
 {
+    [ApiExplorerSettings(GroupName = "cms")]
     [Route("cms/admin/permission")]
     [ApiController]
-    [LinCmsAuthorize(Roles = LinGroup.Admin)]
     public class PermissionController : ControllerBase
     {
         private readonly IPermissionService _permissionService;
-        public PermissionController( IPermissionService permissionService)
+        public PermissionController(IPermissionService permissionService)
         {
             _permissionService = permissionService;
         }
 
+        /// <summary>
+        /// 查询所有可分配的权限
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [LinCmsAuthorize("查询所有可分配的权限", "管理员")]
+        public IDictionary<string, List<PermissionDto>> GetAllPermissions()
+        {
+            return _permissionService.GetAllStructualPermissions();
+        }
+
         /// <summary>
         /// 删除某个组别的权限
         /// </summary>
         /// <param name="permissionDto"></param>
         /// <returns></returns>
         [HttpPost("remove")]
+        [LinCmsAuthorize("删除多个权限", "管理员")]
         public async Task<UnifyResponseDto> RemovePermissions(RemovePermissionDto permissionDto)
         {
             await _permissionService.DeletePermissionsAsync(permissionDto);
@@ -39,11 +49,18 @@ public async Task<UnifyResponseDto> RemovePermissions(RemovePermissionDto permis
         /// <param name="permissionDto"></param>
         /// <returns></returns>
         [HttpPost("dispatch/batch")]
+        [LinCmsAuthorize("分配多个权限", "管理员")]
         public async Task<UnifyResponseDto> DispatchPermissions(DispatchPermissionsDto permissionDto)
         {
-            List<PermissionDefinition> permissionDefinitions = ReflexHelper.GeAssemblyLinCmsAttributes();
+            List<PermissionDefinition> permissionDefinitions = ReflexHelper.GetAssemblyLinCmsAttributes();
             await _permissionService.DispatchPermissions(permissionDto, permissionDefinitions);
             return UnifyResponseDto.Success("添加权限成功");
         }
+
+        [HttpGet("tree-list")]
+        public Task<List<TreePermissionDto>> GetTreePermissionListAsync()
+        {
+            return _permissionService.GetTreePermissionListAsync();
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/LinCms.Web/Controllers/Cms/SettingController.cs b/src/LinCms.Web/Controllers/Cms/SettingController.cs
index 5c39e654..d0a27168 100644
--- a/src/LinCms.Web/Controllers/Cms/SettingController.cs
+++ b/src/LinCms.Web/Controllers/Cms/SettingController.cs
@@ -1,23 +1,26 @@
-using System;
-using System.Threading.Tasks;
-using LinCms.Application.Cms.Settings;
-using LinCms.Application.Contracts.Cms.Settings;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
-using LinCms.Core.Security;
-using LinCms.Infrastructure.Repositories;
+using LinCms.Aop.Filter;
+using LinCms.Cms.Settings;
+using LinCms.Data;
+using LinCms.IRepositories;
+using LinCms.Security;
 using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
-namespace LinCms.Web.Controllers.Cms
+namespace LinCms.Controllers.Cms
 {
-    [Route("cms/setting")]
+    [ApiExplorerSettings(GroupName = "cms")]
+    [Route("cms/settings")]
     [ApiController]
     public class SettingController : ControllerBase
     {
         private readonly ISettingService _settingService;
         private readonly ICurrentUser _currentUser;
-        private readonly SettingRepository _settingRepository;
-        public SettingController(ISettingService settingService, ICurrentUser currentUser, SettingRepository settingRepository)
+        private readonly ISettingRepository _settingRepository;
+
+        public SettingController(ISettingService settingService, ICurrentUser currentUser,
+            ISettingRepository settingRepository)
         {
             _settingService = settingService;
             _currentUser = currentUser;
@@ -26,9 +29,9 @@ public SettingController(ISettingService settingService, ICurrentUser currentUse
 
         [LinCmsAuthorize("得到所有设置", "设置")]
         [HttpGet]
-        public PagedResultDto<SettingDto> GetPagedListAsync([FromQuery] PageDto pageDto)
+        public async Task<PagedResultDto<SettingDto>> GetPagedListAsync([FromQuery] PageDto pageDto)
         {
-            return _settingService.GetPagedListAsync(pageDto);
+            return await _settingService.GetPagedListAsync(pageDto);
         }
 
         [LinCmsAuthorize("删除设置", "设置")]
@@ -40,16 +43,16 @@ public async Task Delete(Guid id)
 
         [LinCmsAuthorize("新增设置", "设置")]
         [HttpPost]
-        public async Task PostAsync([FromBody]CreateUpdateSettingDto createSetting)
+        public async Task CreateAsync([FromBody] CreateUpdateSettingDto createSetting)
         {
-            await _settingService.PostAsync(createSetting);
+            await _settingService.CreateAsync(createSetting);
         }
 
         [LinCmsAuthorize("修改设置", "设置")]
         [HttpPut("{id}")]
-        public async Task PutAsync(Guid id,[FromBody]CreateUpdateSettingDto updateSettingDto)
+        public async Task UpdateAsync(Guid id, [FromBody] CreateUpdateSettingDto updateSettingDto)
         {
-            await _settingService.PutAsync(id, updateSettingDto);
+            await _settingService.UpdateAsync(id, updateSettingDto);
         }
 
         [HttpGet("{id}")]
@@ -58,29 +61,44 @@ public SettingDto Get(Guid id)
             return _settingService.Get(id);
         }
 
-
-        [HttpPost("editor")]
-        public async Task SetEditorAsync(string value)
+        [HttpPost("set-values")]
+        public async Task SetSettingValues(IDictionary<string, string> settingValues)
         {
-            CreateUpdateSettingDto createSetting = new CreateUpdateSettingDto
+            foreach (var kValue in settingValues)
             {
-                Value = value,
-                ProviderName = "U",
-                ProviderKey = _currentUser.Id.ToString(),
-                Name = "Article.Editor"
-            };
-            await _settingService.SetAsync(createSetting);
+                string key = kValue.Key;
+                CreateUpdateSettingDto createSetting = new CreateUpdateSettingDto
+                {
+                    Value = kValue.Value,
+                    ProviderName = "U",
+                    ProviderKey = _currentUser.Id.ToString(),
+                    Name = key
+                };
+                await _settingService.SetAsync(createSetting);
+            }
         }
 
-        [HttpGet("editor")]
-        public async Task<string> GetOrNullAsync()
+        [HttpGet("key/{key}")]
+        public async Task<string> GetSettingByKey(string key)
         {
-            string name = "Article.Editor";
             string providerName = "U";
-            string providerKey = _currentUser.Id.ToString();
-
-            return await _settingService.GetOrNullAsync(name, providerName, providerKey);
+            string? providerKey = _currentUser.Id.ToString();
+            return await _settingService.GetOrNullAsync(key, providerName, providerKey);
         }
 
+        [HttpGet("keys")]
+        public async Task<IDictionary<string, string>> GetSettingKeys([FromQuery(Name = "keys[]")] List<string> keys)
+        {
+            string providerName = "U";
+            string? providerKey = _currentUser.Id.ToString();
+            IDictionary<string, string> values = new Dictionary<string, string>();
+
+            foreach (var key in keys)
+            {
+                string value = await _settingService.GetOrNullAsync(key, providerName, providerKey);
+                values.Add(key, value);
+            }
+            return values;
+        }
     }
 }
diff --git a/src/LinCms.Web/Controllers/Cms/UserController.cs b/src/LinCms.Web/Controllers/Cms/UserController.cs
index dbd37521..4f88b914 100644
--- a/src/LinCms.Web/Controllers/Cms/UserController.cs
+++ b/src/LinCms.Web/Controllers/Cms/UserController.cs
@@ -1,19 +1,23 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+
 using AutoMapper;
-using LinCms.Application.Cms.Users;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
-using LinCms.Core.Entities;
-using LinCms.Core.Security;
-using LinCms.Application.Contracts.Cms.Users;
-using LinCms.Infrastructure.Repositories;
+
+using LinCms.Aop.Attributes;
+using LinCms.Cms.Groups;
+using LinCms.Cms.Users;
+using LinCms.Data;
+using LinCms.Entities;
+using LinCms.IRepositories;
+using LinCms.Security;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LinCms.Web.Controllers.Cms
+namespace LinCms.Controllers.Cms
 {
+    [ApiExplorerSettings(GroupName = "cms")]
     [ApiController]
     [Route("cms/user")]
     [Authorize]
@@ -23,15 +27,19 @@ public class UserController : ControllerBase
         private readonly IMapper _mapper;
         private readonly IUserService _userSevice;
         private readonly ICurrentUser _currentUser;
-        private readonly UserRepository _userRepository;
+        private readonly IUserRepository _userRepository;
+        private readonly IGroupService _groupService;
+        private readonly IFileRepository _fileRepository;
 
-        public UserController(IFreeSql freeSql, IMapper mapper, IUserService userSevice, ICurrentUser currentUser, UserRepository userRepository)
+        public UserController(IFreeSql freeSql, IMapper mapper, IUserService userSevice, ICurrentUser currentUser, IUserRepository userRepository, IGroupService groupService, IFileRepository fileRepository)
         {
             _freeSql = freeSql;
             _mapper = mapper;
             _userSevice = userSevice;
             _currentUser = currentUser;
             _userRepository = userRepository;
+            _groupService = groupService;
+            _fileRepository = fileRepository;
         }
 
         [HttpGet("get")]
@@ -45,23 +53,22 @@ public JsonResult Get()
         /// 新增用户-不是注册，注册不可能让用户选择gourp_id
         /// </summary>
         /// <param name="userInput"></param>
-        [AuditingLog("管理员新建了一个用户")]
+        [Logger("管理员新建了一个用户")]
         [HttpPost("register")]
-        [LinCmsAuthorize(Roles = LinGroup.Admin)]
-        public UnifyResponseDto Post([FromBody] CreateUserDto userInput)
+        [Authorize(Roles = LinGroup.Admin)]
+        public async Task<UnifyResponseDto> CreateAsync([FromBody] CreateUserDto userInput)
         {
-            _userSevice.Register(_mapper.Map<LinUser>(userInput), userInput.GroupIds);
-
+            await _userSevice.CreateAsync(_mapper.Map<LinUser>(userInput), userInput.GroupIds, userInput.Password);
             return UnifyResponseDto.Success("用户创建成功");
         }
+
         /// <summary>
         /// 得到当前登录人信息
         /// </summary>
         [HttpGet("information")]
-        public async Task<UserInformation> GetInformationAsync()
+        public Task<UserInformation> GetInformationAsync()
         {
-            UserInformation userInformation = await _userSevice.GetInformationAsync(_currentUser.Id ?? 0);
-            return userInformation;
+            return _userSevice.GetInformationAsync(_currentUser.Id ?? 0);
         }
 
         /// <summary>
@@ -74,15 +81,15 @@ public async Task<UserInformation> Permissions()
             UserInformation userInformation = await _userSevice.GetInformationAsync(_currentUser.Id ?? 0);
             var permissions = await _userSevice.GetStructualUserPermissions(_currentUser.Id ?? 0);
             userInformation.Permissions = permissions;
+            userInformation.Admin = _groupService.CheckIsRootByUserId(_currentUser.Id ?? 0);
             return userInformation;
         }
 
-        [AuditingLog("修改了自己的密码")]
+        [Logger("修改了自己的密码")]
         [HttpPut("change_password")]
         public async Task<UnifyResponseDto> ChangePasswordAsync([FromBody] ChangePasswordDto passwordDto)
         {
             await _userSevice.ChangePasswordAsync(passwordDto);
-
             return UnifyResponseDto.Success("密码修改成功");
         }
 
@@ -108,45 +115,50 @@ public UnifyResponseDto SetNickname(UpdateNicknameDto updateNicknameDto)
         }
 
         [HttpPut]
-        public UnifyResponseDto SetProfileInfo(UpdateProfileDto updateProfileDto)
+        public UnifyResponseDto SetProfileInfo(UpdateProfileDto profileDto)
         {
             _freeSql.Update<LinUser>(_currentUser.Id).Set(a => new LinUser()
             {
-                Nickname = updateProfileDto.Nickname,
-                Introduction = updateProfileDto.Introduction
+                Nickname = profileDto.Nickname,
+                BlogAddress = profileDto.BlogAddress,
+                Introduction = profileDto.Introduction
             }).ExecuteAffrows();
             return UnifyResponseDto.Success("更新基本信息成功");
         }
 
         [AllowAnonymous]
         [HttpGet("avatar/{userId}")]
-        public string GetAvatar(long userId)
+        public async Task<string> GetAvatarAsync(long userId)
         {
-            LinUser linUser = _freeSql.Select<LinUser>().WhereCascade(r => r.IsDeleted == false).Where(r => r.Id == userId).First();
-
-            return _currentUser.GetFileUrl(linUser.Avatar);
+            string avatar = await _userRepository.Where(r => r.Id == userId).FirstAsync(r => r.Avatar);
+            return _fileRepository.GetFileUrl(avatar);
 
         }
 
         [AllowAnonymous]
         [HttpGet("{userId}")]
-        public OpenUserDto GetUserByUserId(long userId)
+        public async Task<OpenUserDto?> GetUserByUserId(long userId)
         {
-            LinUser linUser = _freeSql.Select<LinUser>().WhereCascade(r => r.IsDeleted == false).Where(r => r.Id == userId).First();
+            LinUser linUser = await _userRepository.Where(r => r.Id == userId).FirstAsync();
             OpenUserDto openUser = _mapper.Map<LinUser, OpenUserDto>(linUser);
             if (openUser == null) return null;
-            openUser.Avatar = _currentUser.GetFileUrl(openUser.Avatar);
-
+            openUser.Avatar = _fileRepository.GetFileUrl(openUser.Avatar);
             return openUser;
-
         }
 
+        /// <summary>
+        /// 获取最新的12条新手用户数据
+        /// </summary>
+        /// <returns></returns>
         [AllowAnonymous]
+        [Cacheable]
         [HttpGet("novices")]
-        public List<UserNoviceDto> GetNovices()
+        public virtual async Task<List<UserNoviceDto>> GetNovicesAsync()
         {
-            List<UserNoviceDto> userNoviceDtos = _userRepository.Select.OrderByDescending(r => r.CreateTime).Take(12)
-                .ToList(r => new UserNoviceDto()
+            List<UserNoviceDto> userNoviceDtos = (await _userRepository.Select
+                .OrderByDescending(r => r.CreateTime)
+                .Take(12)
+                .ToListAsync(r => new UserNoviceDto()
                 {
                     Id = r.Id,
                     Introduction = r.Introduction,
@@ -155,9 +167,9 @@ public List<UserNoviceDto> GetNovices()
                     Username = r.Username,
                     LastLoginTime = r.LastLoginTime,
                     CreateTime = r.CreateTime,
-                }).Select(r =>
+                })).Select(r =>
                 {
-                    r.Avatar = _currentUser.GetFileUrl(r.Avatar);
+                    r.Avatar = _fileRepository.GetFileUrl(r.Avatar);
                     return r;
                 }).ToList();
 
diff --git a/src/LinCms.Web/Controllers/v1/BookController.cs b/src/LinCms.Web/Controllers/v1/BookController.cs
index e3e6aa37..fb297330 100644
--- a/src/LinCms.Web/Controllers/v1/BookController.cs
+++ b/src/LinCms.Web/Controllers/v1/BookController.cs
@@ -1,92 +1,55 @@
-using AutoMapper;
-using LinCms.Application.Contracts.v1.Books;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
-using LinCms.Core.Entities;
-using LinCms.Core.Exceptions;
-using LinCms.Core.Extensions;
-using LinCms.Infrastructure.Repositories;
-using Microsoft.AspNetCore.Authorization;
+using System.Threading.Tasks;
+using LinCms.Aop.Filter;
+using LinCms.Data;
+using LinCms.v1.Books;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LinCms.Web.Controllers.v1
+namespace LinCms.Controllers.v1
 {
+    [ApiExplorerSettings(GroupName = "v1")]
     [Route("v1/book")]
     [ApiController]
-    [Authorize]
+    // [Authorize]
     public class BookController : ControllerBase
     {
-        private readonly AuditBaseRepository<Book> _bookRepository;
-        private readonly IMapper _mapper;
-        public BookController(AuditBaseRepository<Book> bookRepository, IMapper mapper)
+        private readonly IBookService _bookService;
+        public BookController(IBookService bookService)
         {
-            _bookRepository = bookRepository;
-            _mapper = mapper;
+            _bookService = bookService;
         }
 
         [HttpDelete("{id}")]
         [LinCmsAuthorize("删除图书", "图书")]
-        public UnifyResponseDto DeleteBook(int id)
+        public async Task<UnifyResponseDto> DeleteAsync(int id)
         {
-            _bookRepository.Delete(new Book { Id = id });
+            await _bookService.DeleteAsync(id);
             return UnifyResponseDto.Success();
+
         }
 
         [HttpGet]
-        public PagedResultDto<Book> Get([FromQuery] PageDto pageDto)
+        public async Task<PagedResultDto<BookDto>> GetListAsync([FromQuery] PageDto pageDto)
         {
-            return _bookRepository.Select.OrderByDescending(r => r.Id)
-                .ToPagerList(pageDto, out long count)
-                .ToPagedResultDto(count);
+            return await _bookService.GetListAsync(pageDto);
         }
 
         [HttpGet("{id}")]
-        public BookDto Get(int id)
+        public async Task<BookDto> GetAsync(int id)
         {
-            Book book = _bookRepository.Select.Where(a => a.Id == id).ToOne();
-            return _mapper.Map<BookDto>(book);
+            return await _bookService.GetAsync(id);
         }
 
         [HttpPost]
-        public UnifyResponseDto Post([FromBody] CreateUpdateBookDto createBook)
+        public async Task<UnifyResponseDto> CreateAsync([FromBody] CreateUpdateBookDto createBook)
         {
-            bool exist = _bookRepository.Select.Any(r => r.Title == createBook.Title);
-            if (exist)
-            {
-                throw new LinCmsException("图书已存在");
-            }
-
-            Book book = _mapper.Map<Book>(createBook);
-            _bookRepository.Insert(book);
+            await _bookService.CreateAsync(createBook);
             return UnifyResponseDto.Success("新建图书成功");
         }
 
         [HttpPut("{id}")]
-        public UnifyResponseDto Put(int id, [FromBody] CreateUpdateBookDto updateBook)
+        public async Task<UnifyResponseDto> UpdateAsync(int id, [FromBody] CreateUpdateBookDto updateBook)
         {
-            Book book = _bookRepository.Select.Where(r => r.Id == id).ToOne();
-            if (book==null)
-            {
-                throw new LinCmsException("没有找到相关书籍");
-            }
-
-            bool exist = _bookRepository.Select.Any(r => r.Title == updateBook.Title && r.Id != id);
-            if (exist)
-            {
-                throw new LinCmsException("图书已存在");
-            }
-
-            //book.Image = updateBook.Image;
-            //book.Title = updateBook.Title;
-            //book.Author = updateBook.Author;
-            //book.Summary = updateBook.Summary;
-            //book.Summary = updateBook.Summary;
-
-            //使用AutoMapper方法简化类与类之间的转换过程
-            _mapper.Map(updateBook,book);
-
-            _bookRepository.Update(book);
-
+            await _bookService.UpdateAsync(id, updateBook);
             return UnifyResponseDto.Success("更新图书成功");
         }
     }
diff --git a/src/LinCms.Web/Controllers/v1/MonitorController.cs b/src/LinCms.Web/Controllers/v1/MonitorController.cs
new file mode 100644
index 00000000..88e8bd9a
--- /dev/null
+++ b/src/LinCms.Web/Controllers/v1/MonitorController.cs
@@ -0,0 +1,87 @@
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using LinCms.Aop.Attributes;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
+
+namespace LinCms.Controllers.v1
+{
+    [ApiExplorerSettings(GroupName = "v1")]
+    [Route("v1/monitor")]
+    [ApiController]
+    [AllowAnonymous]
+    public class MonitorController : ControllerBase
+    {
+        private readonly IWebHostEnvironment _env;
+        public MonitorController(IWebHostEnvironment env)
+        {
+            _env = env;
+        }
+
+        /// <summary>
+        /// 服务器配置信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("server-info")]
+        [Cacheable]
+        //[LinCmsAuthorize("服务器配置信息", "监控管理")]
+        public virtual ServerViewModel GetServerInfo()
+        {
+            return new ServerViewModel()
+            {
+                EnvironmentName = _env.EnvironmentName,
+                OSArchitecture = RuntimeInformation.OSArchitecture.ToString(),
+                ContentRootPath = _env.ContentRootPath,
+                WebRootPath = _env.WebRootPath,
+                FrameworkDescription = RuntimeInformation.FrameworkDescription,
+                MemoryFootprint = (Process.GetCurrentProcess().WorkingSet64 / 1048576).ToString("N2") + " MB",
+                WorkingTime = TimeSubTract(DateTime.Now, Process.GetCurrentProcess().StartTime)
+            };
+        }
+
+        private string TimeSubTract(DateTime time1, DateTime time2)
+        {
+            TimeSpan subTract = time1.Subtract(time2);
+            return $"{subTract.Days} 天 {subTract.Hours} 时 {subTract.Minutes} 分 ";
+        }
+    }
+
+    /// <summary>
+    /// 服务器VM
+    /// </summary>
+    public class ServerViewModel
+    {
+        /// <summary>
+        /// 环境变量
+        /// </summary>
+        public string EnvironmentName { get; set; } = null!;
+        /// <summary>
+        /// 系统架构
+        /// </summary>
+        public string OSArchitecture { get; set; } = null!;
+        /// <summary>
+        /// ContentRootPath
+        /// </summary>
+        public string ContentRootPath { get; set; } = null!;
+        /// <summary>
+        /// WebRootPath
+        /// </summary>
+        public string WebRootPath { get; set; } = null!;
+        /// <summary>
+        /// .NET Core版本
+        /// </summary>
+        public string FrameworkDescription { get; set; } = null!;
+        /// <summary>
+        /// 内存占用
+        /// </summary>
+        public string MemoryFootprint { get; set; } = null!;
+        /// <summary>
+        /// 启动时间
+        /// </summary>
+        public string WorkingTime { get; set; } = null!;
+
+
+    }
+}
diff --git a/src/LinCms.Web/Controllers/v1/QiniuController.cs b/src/LinCms.Web/Controllers/v1/QiniuController.cs
index 5aa9c1af..c9511733 100644
--- a/src/LinCms.Web/Controllers/v1/QiniuController.cs
+++ b/src/LinCms.Web/Controllers/v1/QiniuController.cs
@@ -1,80 +1,113 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
-using LinCms.Application.Contracts.Cms.Files;
-using LinCms.Core.Common;
-using LinCms.Core.Exceptions;
+using System.Net;
+using System.Threading.Tasks;
+using LinCms.Blog.Tags;
+using LinCms.Cms.Files;
+using LinCms.Data;
+using LinCms.Entities.Blog;
+using LinCms.IRepositories;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Net.Http.Headers;
-using Qiniu.Http;
-using Qiniu.Storage;
-using Qiniu.Util;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
-namespace LinCms.Web.Controllers.v1
+namespace LinCms.Controllers.v1
 {
     /// <summary>
     /// 七牛云上传服务
     /// </summary>
+    [ApiExplorerSettings(GroupName = "v1")]
     [Route("v1/qiniu")]
     [ApiController]
     public class QiniuController : ControllerBase
     {
-        private readonly IConfiguration _configuration;
-        private readonly IFreeSql _freeSql;
-
-        public QiniuController(IFreeSql freeSql, IConfiguration configuration)
+        private readonly IFileService _fileService;
+        private readonly IWebHostEnvironment _hostingEnv;
+        private readonly ITagService _tagService;
+        private readonly IAuditBaseRepository<Tag> _tagAuditBaseRepository;
+        public QiniuController(IWebHostEnvironment hostingEnv, IFileService fileService, ITagService tagService, IAuditBaseRepository<Tag> tagAuditBaseRepository)
         {
-            _configuration = configuration;
-            _freeSql = freeSql;
+            _hostingEnv = hostingEnv;
+            _fileService = fileService;
+            _tagService = tagService;
+            _tagAuditBaseRepository = tagAuditBaseRepository;
         }
 
         /// <summary>
-        /// 根据后台配置项，得到请求七牛云的token值，前台也可根据此token值上传至七牛云服务
+        /// 将掘金中的取所有标签存到七牛云上，基本信息存入数据库
+        /// 从百度云下载后，放到wwwwroot中，swagger上执行下此方法，需要等很久，提取其中的tags，将Icon上传到七牛云上，tag信息存到数据库中。
+        /// 链接: https://pan.baidu.com/s/1f7DSCC3uNOyiu3st9F1OAQ 提取码: paqf 
         /// </summary>
         /// <returns></returns>
-        [HttpGet("access_token")]
-        public string GetAccessToken()
+        [HttpPost("tag")]
+        public async Task<UnifyResponseDto> UploadTagByJson()
         {
-            Mac mac = new Mac(_configuration["Qiniu:AK"], _configuration["Qiniu:SK"]);
-            PutPolicy putPolicy = new PutPolicy { Scope = _configuration["Qiniu:Bucket"] };
-            return Auth.CreateUploadToken(mac, putPolicy.ToJsonString());
-        }
+            string tagPath = Path.Combine(_hostingEnv.WebRootPath, "json-tag.json");
+            string text = System.IO.File.ReadAllText(tagPath);
 
-        /// <summary>
-        /// 上传文件至七牛云
-        /// </summary>
-        /// <param name="file">单个文件</param>
-        /// <returns></returns>
-        [HttpPost("upload")]
-        public FileDto Upload(IFormFile file)
-        {
-            if (file.Length == 0)
-            {
-                throw new LinCmsException("文件为空");
-            }
+            JObject json = JsonConvert.DeserializeObject<JObject>(text);
 
-            FormUploader upload = new FormUploader(new Config()
+            foreach (var tag in json["d"]["tags"])
             {
-                Zone = Zone.ZONE_CN_South, //华南 
-                UseHttps = _configuration[LinConsts.Qiniu.UseHttps].ToBoolean()
-            });
 
-            string fileName = ContentDispositionHeaderValue
-                .Parse(file.ContentDisposition)
-                .FileName.Trim().ToString();
+                string tagName = tag["title"].ToString();
+                bool valid = await _tagAuditBaseRepository.Where(r => r.TagName == tagName).AnyAsync();
+
+                if (valid)
+                {
+                    Console.WriteLine($"{tagName}已存在，不需要生成");
+                    continue;
+                }
+
+                FileDto fileDto = await this.UploadToQiniu(tag["icon"].ToString());
+
+                var tagEntity = new CreateUpdateTagDto()
+                {
+                    TagName = tagName,
+                    Alias = tag["alias"].ToString(),
+                    Status = true,
+                    Thumbnail = fileDto.Path
+                };
+                await _tagService.CreateAsync(tagEntity);
 
-            string qiniuName = _configuration["Qiniu:PrefixPath"] + "/" + DateTime.Now.ToString("yyyyMMddHHmmssffffff") + Path.GetExtension(fileName);
-            Stream stream = file.OpenReadStream();
-            HttpResult result = upload.UploadStream(stream, qiniuName, GetAccessToken(), null);
+            }
+
+            return UnifyResponseDto.Success();
+        }
+
+        private async Task<FileDto> UploadToQiniu(string remoteImagePath)
+        {
+            IFormFile file = GetUrlFormFile(remoteImagePath);
+            return await _fileService.UploadAsync(file);
+        }
 
-            if (result.Code != (int)HttpCode.OK) throw new LinCmsException("上传失败");
 
-            return new FileDto
+        /// <summary>
+        /// 获取远程服务器内容，并转换成流
+        /// </summary>
+        /// <param name="path">https://lc-gold-cdn.xitu.io/bac28828a49181c34110.png</param>
+        /// <returns></returns>
+        private IFormFile GetUrlFormFile(string path)
+        {
+            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(path);
+            HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+            Stream responseStream = response.GetResponseStream();
+            List<byte> btlst = new List<byte>();
+            int b = responseStream.ReadByte();
+            while (b > -1)
             {
-                Path = qiniuName,
-                Url = _configuration["Qiniu:Host"] + qiniuName
-            };
+                btlst.Add((byte)b);
+                b = responseStream.ReadByte();
+            }
+            byte[] bts = btlst.ToArray();
+            var ms = new MemoryStream();
+            ms.Seek(0, SeekOrigin.Begin);
+            ms.Write(bts);
+            string fileName = path.Substring(path.LastIndexOf("/") + 1, path.Length - path.LastIndexOf("/") - 1);
+            return new FormFile(ms, 0, bts.Length, "file", fileName);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/LinCms.Web/Controllers/v1/TestController.cs b/src/LinCms.Web/Controllers/v1/TestController.cs
index a4841628..5a259272 100644
--- a/src/LinCms.Web/Controllers/v1/TestController.cs
+++ b/src/LinCms.Web/Controllers/v1/TestController.cs
@@ -2,31 +2,35 @@
 using System.Collections.Generic;
 using DotNetCore.CAP;
 using FreeSql;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
-using LinCms.Core.Data.Enums;
-using LinCms.Core.Entities;
-using LinCms.Core.Exceptions;
+using LinCms.Aop.Attributes;
+using LinCms.Aop.Filter;
+using LinCms.Data;
+using LinCms.Data.Enums;
+using LinCms.Entities;
+using LinCms.Exceptions;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-namespace LinCms.Web.Controllers.v1
+
+namespace LinCms.Controllers.v1
 {
-    [Route("cms/test")]
+    [Route("v1/test")]
+    [ApiExplorerSettings(GroupName = "v1")]
     [ApiController]
     public class TestController : ControllerBase
     {
-        private readonly IUnitOfWork _unitOfWork;
         private readonly IFreeSql _freeSql;
         private readonly ICapPublisher _capBus;
-        public TestController(IUnitOfWork unitOfWork, IFreeSql freeSql, ICapPublisher capBus)
+        private readonly UnitOfWorkManager _unitOfWorkManager;
+        public TestController(IFreeSql freeSql, ICapPublisher capBus, UnitOfWorkManager unitOfWorkManager)
         {
-            _unitOfWork = unitOfWork;
             _freeSql = freeSql;
             _capBus = capBus;
+            _unitOfWorkManager = unitOfWorkManager;
         }
 
         [HttpGet("info")]
         [LinCmsAuthorize("查看lin的信息", "信息")]
+        [Logger(template: "{user.UserName}又皮了一波")]
         public UnifyResponseDto Info()
         {
             return UnifyResponseDto.Success("Lin 是一套基于 Python-Flask 的一整套开箱即用的后台管理系统（CMS）。Lin 遵循简洁、高效的原则，通过核心库加插件的方式来驱动整个系统高效的运行");
@@ -66,10 +70,11 @@ public dynamic Get()
         [HttpGet("getDictionary")]
         public IDictionary<string, string> GetDictionary()
         {
-            IDictionary<string, string> dics = new Dictionary<string, string>();
-
-            dics.Add("Key", "Value");
-            dics.Add("Key_Test", "Value_Test");
+            IDictionary<string, string> dics = new Dictionary<string, string>
+            {
+                { "Key", "Value" },
+                { "Key_Test", "Value_Test" }
+            };
 
             return dics;
         }
@@ -77,7 +82,7 @@ public IDictionary<string, string> GetDictionary()
         [HttpGet("lincms-exception")]
         public UnifyResponseDto TestLinCmsException()
         {
-            throw new LinCmsException("我报异常了-NotFound！", ErrorCode.NotFound,StatusCodes.Status404NotFound);
+            throw new LinCmsException("我报异常了-NotFound！", ErrorCode.NotFound, StatusCodes.Status404NotFound);
 
             //return ResultDto.Success();
         }
@@ -95,18 +100,18 @@ public void TestTime(DateTime dateTime)
             Console.WriteLine(dateTime);
         }
 
-        [HttpGet("~/freesql/transaction")]
-        public DateTime FreeSqlTransaction()
+        [HttpGet("~/freesql/transaction/{id}")]
+        public DateTime FreeSqlTransaction(int id)
         {
             DateTime now = DateTime.Now;
             using (var uow = _freeSql.CreateUnitOfWork())
             {
-                using ICapTransaction trans = uow.BeginTransaction(_capBus, false);
+                ICapTransaction trans = uow.BeginTransaction(_capBus, false);
                 var repo = uow.GetRepository<Book>();
 
                 repo.Insert(new Book()
                 {
-                    Author = "luoyunchong",
+                    Author = "luoyunchong" + (id == 1 ? "luoyunchongluoyunchongluoyunchongluoyunchongluoyunchongluoyunchongluoyunchongluoyunchongluoyunchongluoyunchong" : ""),
                     Summary = "1",
                     Title = "122",
                     IsDeleted = false,
@@ -122,30 +127,118 @@ public DateTime FreeSqlTransaction()
                     CreateTime = DateTime.Now,
                     CreateUserId = 2
                 });
-
+                if (id == 0)
+                {
+                    throw new Exception("异常，事务不正常!!");
+                }
                 repo.Insert(new Book()
                 {
                     Author = "luoyunchong",
-                    Summary = "3",
+                    Summary = "summary",
                     Title = "122",
                     IsDeleted = false,
                     CreateTime = DateTime.Now,
                     CreateUserId = 3
                 });
 
+                _capBus.Publish("freesql.time", now);
+                trans.Commit(uow);
+            }
+
+            return now;
+        }
+
+
+        [HttpGet("~/freesql/unitofwork/{id}")]
+        public DateTime UnitOfWorkManagerTransaction(int id, [FromServices] IBaseRepository<Book> repo)
+        {
+            DateTime now = DateTime.Now;
+            using (IUnitOfWork uow = _unitOfWorkManager.Begin())
+            {
+                ICapTransaction trans = _unitOfWorkManager.Current.BeginTransaction(_capBus, false);
+                repo.Insert(new Book()
+                {
+                    Author = "luoyunchong",
+                    Summary = "2",
+                    Title = "122",
+                    IsDeleted = false,
+                    CreateTime = DateTime.Now,
+                    CreateUserId = 2
+                });
 
                 _capBus.Publish("freesql.time", now);
-                trans.Commit();
+                trans.Commit(uow);
+            }
+            return now;
+        }
+
+        [HttpGet("~/freesql/unitofwork/exception/{id}")]
+        public DateTime FreeSqlUnitOfWorkManagerTransaction(int id, [FromServices] IBaseRepository<Book> repo)
+        {
+            DateTime now = DateTime.Now;
+            using (IUnitOfWork uow = _unitOfWorkManager.Begin())
+            {
+                ICapTransaction trans = _unitOfWorkManager.Current.BeginTransaction(_capBus, false);
+
+                repo.Insert(new Book()
+                {
+                    Author = "luoyunchong" + (id == 1 ? "luoyunchongluoyunchongluoyunchongluoyunchongluoyunchongluoyunchongluoyunchongluoyunchongluoyunchongluoyunchong" : ""),
+                    Summary = "1",
+                    Title = "122",
+                    IsDeleted = false,
+                    CreateTime = DateTime.Now,
+                    CreateUserId = 1
+                });
+                repo.Insert(new Book()
+                {
+                    Author = "luoyunchong",
+                    Summary = "2",
+                    Title = "122",
+                    IsDeleted = false,
+                    CreateTime = DateTime.Now,
+                    CreateUserId = 2
+                });
+                if (id == 0)
+                {
+                    throw new Exception("异常，事务不正常!!");
+                }
+                repo.Insert(new Book()
+                {
+                    Author = "luoyunchong",
+                    Summary = "summary",
+                    Title = "122",
+                    IsDeleted = false,
+                    CreateTime = DateTime.Now,
+                    CreateUserId = 3
+                });
+
+                _capBus.Publish("freesql.time", now);
+                trans.Commit(uow);
             }
 
             return now;
         }
-        
+
         [NonAction]
         [CapSubscribe("freesql.time")]
         public void GetTime(DateTime time)
         {
             Console.WriteLine($"time:{time}");
         }
+
+        [HttpGet("~/send")]
+        public IActionResult SendMessage([FromServices] ICapPublisher capBus)
+        {
+            capBus.Publish("test.show.time", DateTime.Now);
+
+            return Ok();
+        }
+
+        [NonAction]
+        [CapSubscribe("test.show.time")]
+        public void ReceiveMessage(DateTime time)
+        {
+            Console.WriteLine("message time is:" + time);
+        }
     }
 }
diff --git a/src/LinCms.Web/Data/Authorization/PermissionAuthorizationHandler.cs b/src/LinCms.Web/Data/Authorization/PermissionAuthorizationHandler.cs
index cf5d4d90..4a23e787 100644
--- a/src/LinCms.Web/Data/Authorization/PermissionAuthorizationHandler.cs
+++ b/src/LinCms.Web/Data/Authorization/PermissionAuthorizationHandler.cs
@@ -1,13 +1,14 @@
-using System.Security.Claims;
-using System.Threading.Tasks;
-using LinCms.Application.Cms.Permissions;
-using LinCms.Core.Entities;
+using System.Threading.Tasks;
+using LinCms.Cms.Permissions;
+using LinCms.Data.Enums;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Authorization.Infrastructure;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
 
-namespace LinCms.Web.Data.Authorization
+namespace LinCms.Data.Authorization
 {
-    public class PermissionAuthorizationHandler : AuthorizationHandler<OperationAuthorizationRequirement>
+    public class PermissionAuthorizationHandler : AuthorizationHandler<ModuleAuthorizationRequirement>
     {
         private readonly IPermissionService _permissionService;
 
@@ -16,26 +17,29 @@ public PermissionAuthorizationHandler(IPermissionService permissionService)
             _permissionService = permissionService;
         }
 
-        protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, OperationAuthorizationRequirement requirement)
+        protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, ModuleAuthorizationRequirement requirement)
         {
-            if (context.User != null)
+            AuthorizationFilterContext? filterContext = context.Resource as AuthorizationFilterContext;
+
+            if (!context.User.Identity.IsAuthenticated)
+            {
+                HandlerAuthenticationFailed(filterContext, "认证失败，请检查请求头或者重新登陆", ErrorCode.AuthenticationFailed);
+                context.Fail();
+                return;
+            }
+
+            if (await _permissionService.CheckPermissionAsync(requirement.Module, requirement.Name))
             {
-                if (context.User.IsInRole(LinGroup.Admin))
-                {
-                    context.Succeed(requirement);
-                }
-                else
-                {
-                    Claim userIdClaim = context.User.FindFirst(_ => _.Type == ClaimTypes.NameIdentifier);
-                    if (userIdClaim != null)
-                    {
-                        if (await _permissionService.CheckPermissionAsync(requirement.Name))
-                        {
-                            context.Succeed(requirement);
-                        }
-                    }
-                }
+                context.Succeed(requirement);
+                return;
             }
+            HandlerAuthenticationFailed(filterContext, $"您没有权限：{requirement.Module}-{requirement.Name}", ErrorCode.NoPermission);
+        }
+
+        public void HandlerAuthenticationFailed(AuthorizationFilterContext context, string errorMsg, ErrorCode errorCode)
+        {
+            context.HttpContext.Response.StatusCode = StatusCodes.Status401Unauthorized;
+            context.Result = new JsonResult(new UnifyResponseDto(errorCode, errorMsg, context.HttpContext));
         }
     }
 }
diff --git a/src/LinCms.Web/Data/Authorization/ValidJtiHandler.cs b/src/LinCms.Web/Data/Authorization/ValidJtiHandler.cs
new file mode 100644
index 00000000..d0820eb4
--- /dev/null
+++ b/src/LinCms.Web/Data/Authorization/ValidJtiHandler.cs
@@ -0,0 +1,55 @@
+using System.Threading.Tasks;
+using LinCms.Data.Enums;
+using LinCms.Entities;
+using LinCms.IRepositories;
+using LinCms.Security;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace LinCms.Data.Authorization
+{
+    public class ValidJtiHandler : AuthorizationHandler<ValidJtiRequirement>
+    {
+        private readonly IAuditBaseRepository<BlackRecord> _blackRecordRepository;
+        private readonly IHttpContextAccessor _contextAccessor;
+
+        public ValidJtiHandler(IAuditBaseRepository<BlackRecord> blackRecordRepository, IHttpContextAccessor contextAccessor)
+        {
+            _blackRecordRepository = blackRecordRepository;
+            _contextAccessor = contextAccessor;
+        }
+        protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, ValidJtiRequirement requirement)
+        {
+            //检查是否登录
+            AuthorizationFilterContext? filterContext = context.Resource as AuthorizationFilterContext;
+            DefaultHttpContext? defaultHttpContext = context.Resource as DefaultHttpContext;
+            if (!context.User.Identity.IsAuthenticated)
+            {
+                HandlerAuthenticationFailed(filterContext, "认证失败，请检查请求头或者重新登陆", ErrorCode.AuthenticationFailed);
+                context.Fail();
+                return;
+            }
+
+            // 检查 jti 是否在黑名单
+            string? jti = await _contextAccessor.HttpContext.GetTokenAsync("Bearer", "access_token");
+            var tokenExists = _blackRecordRepository.Where(r => r.Jti == jti).Any();
+            if (tokenExists)
+            {
+                HandlerAuthenticationFailed(filterContext, "The token is expired!", ErrorCode.AuthenticationFailed);
+                context.Fail();
+                return;
+            }
+            context.Succeed(requirement);
+        }
+
+        public void HandlerAuthenticationFailed(AuthorizationFilterContext filterContext, string errorMsg, ErrorCode errorCode)
+        {
+            if (filterContext == null) return;
+            filterContext.HttpContext.Response.StatusCode = StatusCodes.Status403Forbidden;
+            filterContext.Result = new JsonResult(new UnifyResponseDto(errorCode, errorMsg, filterContext.HttpContext));
+        }
+    }
+}
diff --git a/src/LinCms.Web/Data/DataSeedContributor.cs b/src/LinCms.Web/Data/DataSeedContributor.cs
deleted file mode 100644
index 4e3f9228..00000000
--- a/src/LinCms.Web/Data/DataSeedContributor.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using LinCms.Core.Data;
-using LinCms.Core.Dependency;
-using LinCms.Core.Entities;
-using LinCms.Infrastructure.Repositories;
-
-namespace LinCms.Web.Data
-{
-    public interface IDataSeedContributor
-    {
-        Task SeedAsync();
-
-    }
-    public class DataSeedContributor : IDataSeedContributor, ITransientDependency
-    {
-        private readonly AuditBaseRepository<LinPermission> _permissionRepository;
-        public DataSeedContributor(AuditBaseRepository<LinPermission> permissionRepository)
-        {
-            this._permissionRepository =permissionRepository;
-        }
-
-        public Task SeedAsync()
-        {
-            List<PermissionDefinition> linCmsAttributes = ReflexHelper.GeAssemblyLinCmsAttributes();
-            linCmsAttributes.ForEach(async r =>
-            {
-                bool exist = await _permissionRepository.Select
-                    .Where(u => u.Module == r.Module && u.Name == r.Permission)
-                    .AnyAsync();
-
-                if (!exist)
-                {
-                    await _permissionRepository.InsertAsync(new LinPermission(r.Permission, r.Module));
-                }
-
-            });
-            _permissionRepository.UnitOfWork.Commit();
-
-            return Task.CompletedTask;
-        }
-    }
-}
diff --git a/src/LinCms.Web/Data/MigrationStartupTask.cs b/src/LinCms.Web/Data/MigrationStartupTask.cs
index 54edcc82..e6bf299d 100644
--- a/src/LinCms.Web/Data/MigrationStartupTask.cs
+++ b/src/LinCms.Web/Data/MigrationStartupTask.cs
@@ -1,33 +1,39 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using LinCms.FreeSql;
+using LinCms.Utils;
 using Microsoft.Extensions.DependencyInjection;
-using NetEscapades.AspNetCore.StartupTasks;
+using Microsoft.Extensions.Logging;
 
-namespace LinCms.Web.Data
+namespace LinCms.Data
 {
-    public class MigrationStartupTask : IStartupTask
+    public class MigrationStartupTask
     {
         private readonly IServiceProvider _serviceProvider;
-
-        public MigrationStartupTask(IServiceProvider serviceProvider)
+        private readonly ILogger<MigrationStartupTask> _logger;
+        public MigrationStartupTask(IServiceProvider serviceProvider, ILogger<MigrationStartupTask> logger)
         {
             _serviceProvider = serviceProvider;
+            _logger = logger;
         }
 
         public async Task StartAsync(CancellationToken cancellationToken = default)
         {
-            using (var scope = _serviceProvider.CreateScope())
+            try
             {
+                using var scope = _serviceProvider.CreateScope();
                 IDataSeedContributor dataSeedContributor = scope.ServiceProvider.GetRequiredService<IDataSeedContributor>();
 
-                await dataSeedContributor.SeedAsync();
+                var permissions = ReflexHelper.GetAssemblyLinCmsAttributes();
+                await dataSeedContributor.SeedPermissionAsync(permissions, cancellationToken);
+                await dataSeedContributor.InitAdminPermission();
             }
+            catch (Exception ex)
+            {
+                _logger.LogError($"初始化数据失败！！！{ex.Message}{ex.StackTrace}{ex.InnerException}");
+            };
         }
 
-        public Task ShutdownAsync(CancellationToken cancellationToken = default)
-        {
-            return Task.CompletedTask;
-        }
     }
 }
diff --git a/src/LinCms.Web/Dockerfile b/src/LinCms.Web/Dockerfile
index 084b3f0e..3321d4bd 100644
--- a/src/LinCms.Web/Dockerfile
+++ b/src/LinCms.Web/Dockerfile
@@ -1,12 +1,13 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS base
+FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
 WORKDIR /src
+COPY ["framework/src/IGeekFan.Localization.FreeSql/IGeekFan.Localization.FreeSql.csproj", "framework/src/IGeekFan.Localization.FreeSql/"]
 COPY ["src/LinCms.Web/LinCms.Web.csproj", "src/LinCms.Web/"]
 COPY ["src/LinCms.Plugins/LinCms.Plugins.csproj", "src/LinCms.Plugins/"]
 COPY ["src/LinCms.Infrastructure/LinCms.Infrastructure.csproj", "src/LinCms.Infrastructure/"]
diff --git a/src/LinCms.Web/Extensions.cs b/src/LinCms.Web/Extensions.cs
deleted file mode 100644
index b9f3c008..00000000
--- a/src/LinCms.Web/Extensions.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Reflection;
-using CSRedis;
-using FreeSql;
-using FreeSql.Internal;
-using LinCms.Application;
-using LinCms.Core.Dependency;
-using LinCms.Core.Entities;
-using LinCms.Infrastructure.Repositories;
-using LinCms.Web.Data.Authorization;
-using LinCms.Web.Utils;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Caching.Distributed;
-using Microsoft.Extensions.Caching.Redis;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Scrutor;
-using ToolGood.Words;
-
-namespace LinCms.Web
-{
-    public static class Extensions
-    {
-        #region FreeSql
-        /// <summary>
-        /// FreeSql
-        /// </summary>
-        /// <param name="services"></param>
-        public static void AddContext(this IServiceCollection services)
-        {
-            var configuration = services.BuildServiceProvider().GetRequiredService<IConfiguration>();
-            IConfigurationSection configurationSection = configuration.GetSection("ConnectionStrings:MySql");
-            IFreeSql fsql = new FreeSqlBuilder()
-                   .UseConnectionString(DataType.MySql, configurationSection.Value)
-                   .UseEntityPropertyNameConvert(StringConvertType.PascalCaseToUnderscoreWithLower)//全局转换实体属性名方法 https://github.com/2881099/FreeSql/pull/60
-                   .UseAutoSyncStructure(true) //自动迁移实体的结构到数据库
-                   .UseMonitorCommand(cmd =>
-                       {
-                           Trace.WriteLine(cmd.CommandText+";");
-                       }
-                   )
-                   .UseSyncStructureToLower(true) // 转小写同步结构
-                   .Build();
-
-            fsql.Aop.CurdBefore += (s, e) =>
-            {
-
-            };
-
-            fsql.Aop.CurdAfter += (s, e) =>
-            {
-                if (e.ElapsedMilliseconds > 200)
-                {
-                    //记录日志
-                    //发送短信给负责人
-                }
-            };
-
-            //敏感词处理
-            if (configuration["AuditValue:Enable"].ToBoolean())
-            {
-                IllegalWordsSearch illegalWords = ToolGoodUtils.GetIllegalWordsSearch();
-
-                fsql.Aop.AuditValue += (s, e) =>
-                {
-                    if (e.Column.CsType == typeof(string) && e.Value != null)
-                    {
-                        string oldVal = (string)e.Value;
-                        string newVal = illegalWords.Replace(oldVal);
-                        //第二种处理敏感词的方式
-                        //string newVal = oldVal.ReplaceStopWords();
-                        if (newVal != oldVal)
-                        {
-                            e.Value = newVal;
-                        }
-                    }
-                };
-            }
-            services.AddSingleton(fsql);
-            services.AddScoped<IUnitOfWork>(sp => sp.GetService<IFreeSql>().CreateUnitOfWork());
-
-            services.AddFreeRepository(filter =>
-            {
-                filter.Apply<IDeleteAduitEntity>("IsDeleted", a => a.IsDeleted == false);
-            }, typeof(AuditBaseRepository<>).Assembly);
-        }
-        #endregion
-
-        public static void AddCsRedisCore(this IServiceCollection services)
-        {
-            var configuration = services.BuildServiceProvider().GetRequiredService<IConfiguration>();
-            #region 初始化 Redis配置
-            IConfigurationSection csRediSection = configuration.GetSection("ConnectionStrings:CsRedis");
-            CSRedisClient csredis = new CSRedisClient(csRediSection.Value);
-            //初始化 RedisHelper
-            RedisHelper.Initialization(csredis);
-            //注册mvc分布式缓存
-            services.AddSingleton<IDistributedCache>(new CSRedisCache(RedisHelper.Instance));
-            #endregion
-        }
-
-        public static void AddServices(this IServiceCollection services)
-        {
-            services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
-
-            #region Scrutor 批量注册 
-
-            Assembly[] currentAssemblies = AppDomain.CurrentDomain.GetAssemblies().Where(r => r.FullName.Contains("LinCms.")).ToArray();
-            services.Scan(scan => scan
-                //加载IAppService这个类所在的程序集
-                .FromAssemblyOf<IAppService>()
-                // 表示要注册那些类，上面的代码还做了过滤，只留下了以 Service 结尾的类
-                .AddClasses(classes => classes.Where(t => t.Name != "IFileService" && t.Name.EndsWith("Service", StringComparison.OrdinalIgnoreCase)))
-                .UsingRegistrationStrategy(RegistrationStrategy.Skip)
-                //表示将类型注册为提供其所有公共接口作为服务
-                .AsImplementedInterfaces()
-                //表示注册的生命周期为 Scope
-                .WithScopedLifetime()
-                //扫描当前以LinCms.开头类库 并且继承ITransientDependency的接口以“瞬时”注入到容器中
-                .FromAssemblies(currentAssemblies)
-                .AddClasses(classes => classes.AssignableTo<ITransientDependency>())
-                .AsImplementedInterfaces()
-                .WithTransientLifetime()
-                //继承IScopeDependency的接口注入到容器中以“范围（单次请求获取的是一个实例）注入到容器中
-                .FromAssemblies(currentAssemblies)
-                .AddClasses(classes => classes.AssignableTo<IScopedDependency>())
-                .AsImplementedInterfaces()
-                .WithScopedLifetime()
-
-                //继承ISingletonDependency的接口以“单例”生命周期注入到容器中
-                .FromAssemblies(currentAssemblies)
-                .AddClasses(classes => classes.AssignableTo<ISingletonDependency>())
-                .AsImplementedInterfaces()
-                .WithSingletonLifetime()
-            );
-
-            #endregion
-
-            //将Handler注册到DI系统中
-            services.AddScoped<IAuthorizationHandler, PermissionAuthorizationHandler>();
-        }
-    }
-}
diff --git a/src/LinCms.Web/LinCms.Web.csproj b/src/LinCms.Web/LinCms.Web.csproj
index c0dc654e..183fa60c 100644
--- a/src/LinCms.Web/LinCms.Web.csproj
+++ b/src/LinCms.Web/LinCms.Web.csproj
@@ -1,109 +1,113 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-    <UserSecretsId>66adcf16-3db7-442d-b40c-4fef570b8e19</UserSecretsId>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <TypeScriptToolsVersion>3.4</TypeScriptToolsVersion>
-    <DockerfileContext>..\..</DockerfileContext>
-    <DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
+		<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+		<UserSecretsId>66adcf16-3db7-442d-b40c-4fef570b8e19</UserSecretsId>
+		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+		<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
+		<DockerfileContext>..\..</DockerfileContext>
+		<DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
+		<RootNamespace>LinCms</RootNamespace>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>LinCms.Web.xml</DocumentationFile>
-    <OutputPath>bin\Debug\</OutputPath>
-    <NoWarn>1701;1702;1705;1591</NoWarn>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <WarningLevel>3</WarningLevel>
-  </PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DocumentationFile>LinCms.Web.xml</DocumentationFile>
+		<OutputPath>bin\Debug\</OutputPath>
+		<NoWarn>1701;1702;1705;1591</NoWarn>
+		<PlatformTarget>AnyCPU</PlatformTarget>
+		<WarningLevel>3</WarningLevel>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="bin\**" />
-    <Content Remove="bin\**" />
-    <EmbeddedResource Remove="bin\**" />
-    <None Remove="bin\**" />
-  </ItemGroup>
+	<ItemGroup>
+		<Compile Remove="bin\**" />
+		<Compile Remove="Logs\**" />
+		<None Remove="bin\**" />
+		<None Remove="Logs\**" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <None Remove="LinCms.Web.xml" />
-    <None Remove="tempkey.rsa" />
-    <None Remove="wwwroot\_Illegal\IllegalBit.iws" />
-  </ItemGroup>
+	<ItemGroup>
+		<None Remove="lincms.db" />
+		<None Remove="LinCms.Web.xml" />
+		<None Remove="tempkey.rsa" />
+		<None Remove="wwwroot\_Illegal\IllegalBit.iws" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Content Include="LinCms.Web.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
+	<ItemGroup>
+		<Content Include="LinCms.Web.xml">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="3.0.2" />
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Caching.CSRedis" Version="3.4.5" />
-    <PackageReference Include="CSRedisCore" Version="3.4.5" />
-    <PackageReference Include="DotNetCore.CAP.Dashboard" Version="3.0.2" />
-    <PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="3.0.2" />
-    <PackageReference Include="FreeSql" Version="1.3.0-preview4" />
-    <PackageReference Include="FreeSql.Provider.MySqlConnector" Version="1.3.0-preview4" />
-    <PackageReference Include="IdentityServer4" Version="3.1.2" />
-    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.2" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.10" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.1" />
-    <PackageReference Include="NetEscapades.AspNetCore.StartupTasks" Version="0.1.1" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
-    <PackageReference Include="Scrutor" Version="3.2.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0" />
-    <PackageReference Include="ToolGood.Words" Version="2.3.4.2" />
-  </ItemGroup>  
+	<ItemGroup>
+		<PackageReference Include="AspNetCoreRateLimit" Version="4.0.1" />
+		<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
+		<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.0" />
+		<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
+		<PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.0.21-alpha" />
+		<PackageReference Include="DotNetCore.CAP.Dashboard" Version="5.1.1" />
+		<PackageReference Include="DotNetCore.CAP.InMemoryStorage" Version="5.1.1" />
+		<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="5.1.1" />
+		<PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.8" />
+		<PackageReference Include="IGeekFan.AspNetCore.RapiDoc" Version="0.0.3" />
+		<PackageReference Include="JetBrains.Annotations" Version="2021.1.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.8" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
+		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
+		<PackageReference Include="Owl.reCAPTCHA" Version="0.4.0" />
+		<PackageReference Include="Savorboard.CAP.InMemoryMessageQueue" Version="5.1.1" />
+		<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
+		<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="5.6.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.4" />
+		<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.1.4" />
+		<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.1.4" />
+		<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.1.4" />
+		<PackageReference Include="ToolGood.Words" Version="3.0.2.6" />
+		<PackageReference Include="IGeekFan.Sinks.MariaDB" Version="0.0.1" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\framework\src\VoVo.CAP.MySql\VoVo.CAP.MySql.csproj" />
-    <ProjectReference Include="..\LinCms.Application.Contracts\LinCms.Application.Contracts.csproj" />
-    <ProjectReference Include="..\LinCms.Application\LinCms.Application.csproj" />
-    <ProjectReference Include="..\LinCms.Infrastructure\LinCms.Infrastructure.csproj" />
-    <ProjectReference Include="..\LinCms.Plugins\LinCms.Plugins.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<!--<ProjectReference Include="..\..\..\IGeekFan.AspNetCore.Knife4jUI\src\IGeekFan.AspNetCore.Knife4jUI\IGeekFan.AspNetCore.Knife4jUI.csproj" />
+		<ProjectReference Include="..\..\..\IGeekFan.AspNetCore.RapiDoc\src\IGeekFan.AspNetCore.RapiDoc\IGeekFan.AspNetCore.RapiDoc.csproj" />-->
+		<ProjectReference Include="..\LinCms.Application.Contracts\LinCms.Application.Contracts.csproj" />
+		<ProjectReference Include="..\LinCms.Application\LinCms.Application.csproj" />
+		<ProjectReference Include="..\LinCms.Infrastructure\LinCms.Infrastructure.csproj" />
+		<ProjectReference Include="..\LinCms.Plugins\LinCms.Plugins.csproj" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Content Update="appsettings.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="nlog.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
+	<ItemGroup>
+		<Content Update="appsettings.json">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\PublishProfiles\" />
-    <Folder Include="wwwroot\assets\2019\10\22\" />
-    <Folder Include="wwwroot\assets\2019\11\08\" />
-    <Folder Include="wwwroot\assets\2019\11\09\" />
-    <Folder Include="wwwroot\assets\2019\11\14\" />
-    <Folder Include="wwwroot\assets\2019\12\04\" />
-    <Folder Include="wwwroot\assets\2019\12\09\" />
-    <Folder Include="wwwroot\assets\2019\12\12\" />
-    <Folder Include="wwwroot\assets\2019\12\13\" />
-    <Folder Include="wwwroot\assets\2019\12\14\" />
-  </ItemGroup>
+	<ItemGroup>
+		<Folder Include="Properties\PublishProfiles\" />
+		<Folder Include="wwwroot\assets\" />
+	</ItemGroup>
 
-  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" appsettings_1development_1json__JsonSchema="http://json.schemastore.org/appsettings" /></VisualStudio></ProjectExtensions>
+	<ProjectExtensions>
+		<VisualStudio>
+			<UserProperties properties_4launchsettings_1json__JsonSchema="" />
+		</VisualStudio>
+	</ProjectExtensions>
 
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <TypeScriptTarget>ES5</TypeScriptTarget>
-    <TypeScriptJSXEmit>React</TypeScriptJSXEmit>
-    <TypeScriptModuleKind />
-    <TypeScriptCompileOnSaveEnabled>True</TypeScriptCompileOnSaveEnabled>
-    <TypeScriptNoImplicitAny>False</TypeScriptNoImplicitAny>
-    <TypeScriptRemoveComments>False</TypeScriptRemoveComments>
-    <TypeScriptOutFile />
-    <TypeScriptOutDir />
-    <TypeScriptGeneratesDeclarations>False</TypeScriptGeneratesDeclarations>
-    <TypeScriptNoEmitOnError>True</TypeScriptNoEmitOnError>
-    <TypeScriptSourceMap>True</TypeScriptSourceMap>
-    <TypeScriptMapRoot />
-    <TypeScriptSourceRoot />
-  </PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+		<TypeScriptTarget>ES5</TypeScriptTarget>
+		<TypeScriptJSXEmit>React</TypeScriptJSXEmit>
+		<TypeScriptModuleKind />
+		<TypeScriptCompileOnSaveEnabled>True</TypeScriptCompileOnSaveEnabled>
+		<TypeScriptNoImplicitAny>False</TypeScriptNoImplicitAny>
+		<TypeScriptRemoveComments>False</TypeScriptRemoveComments>
+		<TypeScriptOutFile />
+		<TypeScriptOutDir />
+		<TypeScriptGeneratesDeclarations>False</TypeScriptGeneratesDeclarations>
+		<TypeScriptNoEmitOnError>True</TypeScriptNoEmitOnError>
+		<TypeScriptSourceMap>True</TypeScriptSourceMap>
+		<TypeScriptMapRoot />
+		<TypeScriptSourceRoot />
+	</PropertyGroup>
 
 </Project>
diff --git a/src/LinCms.Web/LinCms.Web.xml b/src/LinCms.Web/LinCms.Web.xml
index 63da0514..02de4668 100644
--- a/src/LinCms.Web/LinCms.Web.xml
+++ b/src/LinCms.Web/LinCms.Web.xml
@@ -4,49 +4,49 @@
         <name>LinCms.Web</name>
     </assembly>
     <members>
-        <member name="M:LinCms.Web.Controllers.Blog.ArticleController.DeleteMyArticle(System.Guid)">
+        <member name="M:LinCms.Controllers.Blog.ArticleController.DeleteMyArticleAsync(System.Guid)">
             <summary>
             删除自己的随笔
             </summary>
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.ArticleController.Delete(System.Guid)">
+        <member name="M:LinCms.Controllers.Blog.ArticleController.Delete(System.Guid)">
             <summary>
             管理员删除违规随笔
             </summary>
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.ArticleController.Get(LinCms.Application.Contracts.Blog.Articles.ArticleSearchDto)">
+        <member name="M:LinCms.Controllers.Blog.ArticleController.Get(LinCms.Blog.Articles.ArticleSearchDto)">
             <summary>
             我所有的随笔
             </summary>
             <param name="searchDto"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.ArticleController.GetArticleAsync(LinCms.Application.Contracts.Blog.Articles.ArticleSearchDto)">
+        <member name="M:LinCms.Controllers.Blog.ArticleController.GetArticleAsync(LinCms.Blog.Articles.ArticleSearchDto)">
             <summary>
             得到所有已审核过的随笔,最新的随笔/三天、七天、月榜、全部
             </summary>
             <param name="searchDto"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.ArticleController.GetAllArticles(LinCms.Application.Contracts.Blog.Articles.ArticleSearchDto)">
+        <member name="M:LinCms.Controllers.Blog.ArticleController.GetAllArticles(LinCms.Blog.Articles.ArticleSearchDto)">
             <summary>
-            得到所有已审核过的随笔
+            得到所有的随笔
             </summary>
             <param name="searchDto"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.ArticleController.GetAsync(System.Guid)">
+        <member name="M:LinCms.Controllers.Blog.ArticleController.GetAsync(System.Guid)">
             <summary>
             随笔详情
             </summary>
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.ArticleController.AuditAsync(System.Guid,System.Boolean)">
+        <member name="M:LinCms.Controllers.Blog.ArticleController.AuditAsync(System.Guid,System.Boolean)">
             <summary>
             审核随笔-拉黑/取消拉黑
             </summary>
@@ -54,59 +54,79 @@
             <param name="isAudit"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.ArticleController.GetSubscribeArticle(LinCms.Core.Data.PageDto)">
+        <member name="M:LinCms.Controllers.Blog.ArticleController.GetSubscribeArticleAsync(LinCms.Data.PageDto)">
             <summary>
             得到我关注的人发布的随笔
             </summary>
             <param name="pageDto"></param>
             <returns></returns>
         </member>
-        <member name="T:LinCms.Web.Controllers.Blog.ChannelController">
+        <member name="M:LinCms.Controllers.Blog.ArticleController.UpdateCommentable(System.Guid,System.Boolean)">
+            <summary>
+            修改随笔是否验证评论
+            </summary>
+            <param name="id">随笔主键</param>
+            <param name="commetable">true:允许评论;false:不允许评论</param>
+            <returns></returns>
+        </member>
+        <member name="T:LinCms.Controllers.Blog.ArticleDraftController">
+            <summary>
+            文章草稿箱，自动保存文章
+            </summary>
+        </member>
+        <member name="M:LinCms.Controllers.Blog.ArticleDraftController.GetAsync(System.Guid)">
+            <summary>
+            用户的随笔草稿详情
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
+        <member name="T:LinCms.Controllers.Blog.ChannelController">
             <summary>
             技术频道
             </summary>
         </member>
-        <member name="T:LinCms.Web.Controllers.Blog.CommentController">
+        <member name="T:LinCms.Controllers.Blog.CommentController">
             <summary>
             随笔评论
             </summary>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.CommentController.Get(LinCms.Application.Contracts.Blog.Comments.CommentSearchDto)">
+        <member name="M:LinCms.Controllers.Blog.CommentController.GetListByArticleAsync(LinCms.Blog.Comments.CommentSearchDto)">
             <summary>
             评论分页列表页,当随笔Id有值时，查询出此随笔的评论
             </summary>
             <param name="commentSearchDto"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.CommentController.GetAll(LinCms.Application.Contracts.Blog.Comments.CommentSearchDto)">
+        <member name="M:LinCms.Controllers.Blog.CommentController.GetListAsync(LinCms.Blog.Comments.CommentSearchDto)">
             <summary>
-            查询出此随笔的评论
+            后台权限-评论列表页
             </summary>
             <param name="commentSearchDto"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.CommentController.Delete(System.Guid)">
+        <member name="M:LinCms.Controllers.Blog.CommentController.DeleteAsync(System.Guid)">
             <summary>
-            删除评论
+            后台权限-删除评论
             </summary>
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.CommentController.DeleteMyComment(System.Guid)">
+        <member name="M:LinCms.Controllers.Blog.CommentController.DeleteMyComment(System.Guid)">
             <summary>
             用户仅可删除自己的评论
             </summary>
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.CommentController.Post(LinCms.Application.Contracts.Blog.Comments.CreateCommentDto)">
+        <member name="M:LinCms.Controllers.Blog.CommentController.CreateAsync(LinCms.Blog.Comments.CreateCommentDto)">
             <summary>
             用户评论
             </summary>
             <param name="createCommentDto"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.CommentController.Put(System.Guid,System.Boolean)">
+        <member name="M:LinCms.Controllers.Blog.CommentController.UpdateAsync(System.Guid,System.Boolean)">
             <summary>
             审核评论-拉黑/取消拉黑
             </summary>
@@ -114,7 +134,7 @@
             <param name="isAudit"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.CommentController.CorrectedComment(System.Guid,System.Int32)">
+        <member name="M:LinCms.Controllers.Blog.CommentController.CorrectedComment(System.Guid,System.Int32)">
             <summary>
             评论-校正评论量,subjectType(1：文章)
             </summary>
@@ -122,138 +142,142 @@
             <param name="subjectType"></param>
             <returns></returns>
         </member>
-        <member name="T:LinCms.Web.Controllers.Blog.MessageBoardController">
-            <summary>
-            留言板
-            </summary>
-        </member>
-        <member name="M:LinCms.Web.Controllers.Blog.MessageBoardController.Get(LinCms.Core.Data.PageDto)">
-            <summary>
-            留言板倒序
-            </summary>
-            <param name="pageDto"></param>
-            <returns></returns>
-        </member>
-        <member name="M:LinCms.Web.Controllers.Blog.MessageBoardController.Post(LinCms.Application.Contracts.Blog.MessageBoards.CreateMessageBoardDto)">
-            <summary>
-            用户留言，无须登录
-            </summary>
-            <param name="createMessageBoardDto"></param>
-            <returns></returns>
-        </member>
-        <member name="M:LinCms.Web.Controllers.Blog.MessageBoardController.Put(System.Guid,System.Boolean)">
-            <summary>
-            审核评论-拉黑/取消拉黑
-            </summary>
-            <param name="id">审论Id</param>
-            <param name="isAudit"></param>
-            <returns></returns>
-        </member>
-        <member name="M:LinCms.Web.Controllers.Blog.TagController.CorrectedTagCountAsync(System.Guid)">
+        <member name="M:LinCms.Controllers.Blog.TagController.CorrectedTagCountAsync(System.Guid)">
             <summary>
             标签-校正标签对应文章数量
             </summary>
             <param name="tagId"></param>
             <returns></returns>
         </member>
-        <member name="T:LinCms.Web.Controllers.Blog.UserLikeController">
+        <member name="T:LinCms.Controllers.Blog.UserLikeController">
             <summary>
              用户点赞随笔
             </summary>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.UserLikeController.Create(LinCms.Application.Contracts.Blog.UserLikes.CreateUpdateUserLikeDto)">
+        <member name="M:LinCms.Controllers.Blog.UserLikeController.CreateOrCancelAsync(LinCms.Blog.UserLikes.CreateUpdateUserLikeDto)">
             <summary>
             用户点赞/取消点赞文章、评论 
             </summary>
             <param name="createUpdateUserLike"></param>
             <returns></returns>
         </member>
-        <member name="T:LinCms.Web.Controllers.Blog.UserSubscribeController">
+        <member name="M:LinCms.Controllers.Blog.UserLikeController.PublishUserLikeNotification(LinCms.Blog.UserLikes.CreateUpdateUserLikeDto,System.Boolean)">
+            <summary>
+            根据用户点赞类型：文章、评论，得到消息的NotificationRespUserId的值
+            </summary>
+            <param name="createUpdateUserLike"></param>
+            <param name="isCancel"></param>
+            <returns></returns>
+        </member>
+        <member name="T:LinCms.Controllers.Blog.UserSubscribeController">
             <summary>
             用户订阅
             </summary>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.UserSubscribeController.Get(System.Int64)">
+        <member name="M:LinCms.Controllers.Blog.UserSubscribeController.Get(System.Int64)">
             <summary>
             判断当前登录的用户是否关注了beSubscribeUserId
             </summary>
             <param name="subscribeUserId"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.UserSubscribeController.Delete(System.Int64)">
+        <member name="M:LinCms.Controllers.Blog.UserSubscribeController.DeleteAsync(System.Int64)">
             <summary>
             取消关注用户
             </summary>
             <param name="subscribeUserId"></param>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.UserSubscribeController.Post(System.Int64)">
+        <member name="M:LinCms.Controllers.Blog.UserSubscribeController.CreateAsync(System.Int64)">
             <summary>
             关注用户
             </summary>
             <param name="subscribeUserId"></param>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.UserSubscribeController.GetUserSubscribeeeList(LinCms.Application.Contracts.Blog.UserSubscribes.UserSubscribeSearchDto)">
+        <member name="M:LinCms.Controllers.Blog.UserSubscribeController.GetUserSubscribeeeList(LinCms.Blog.UserSubscribes.UserSubscribeSearchDto)">
             <summary>
             得到某个用户的关注
             </summary>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.UserSubscribeController.GetUserFansList(LinCms.Application.Contracts.Blog.UserSubscribes.UserSubscribeSearchDto)">
+        <member name="M:LinCms.Controllers.Blog.UserSubscribeController.GetUserFansList(LinCms.Blog.UserSubscribes.UserSubscribeSearchDto)">
             <summary>
             得到某个用户的粉丝
             </summary>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.UserSubscribeController.GetUserSubscribeInfo(System.Int64)">
+        <member name="M:LinCms.Controllers.Blog.UserSubscribeController.GetUserSubscribeInfo(System.Int64,LinCms.IRepositories.IAuditBaseRepository{LinCms.Entities.Blog.UserTag})">
             <summary>
             得到某个用户的关注了、关注者、标签总数
             </summary>
             <param name="userId"></param>
+            <param name="_userTagRepository"></param>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.UserTagController.Post(System.Guid)">
+        <member name="M:LinCms.Controllers.Blog.UserTagController.CreateUserTagAsync(System.Guid)">
             <summary>
             用户关注标签
             </summary>
             <param name="tagId"></param>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.UserTagController.Delete(System.Guid)">
+        <member name="M:LinCms.Controllers.Blog.UserTagController.DeleteUserTagAsync(System.Guid)">
             <summary>
             取消关注标签
             </summary>
             <param name="tagId"></param>
         </member>
-        <member name="M:LinCms.Web.Controllers.Blog.UserTagController.GetUserTagList(LinCms.Application.Contracts.Blog.UserSubscribes.UserSubscribeSearchDto)">
+        <member name="M:LinCms.Controllers.Blog.UserTagController.GetUserTagList(LinCms.Blog.UserSubscribes.UserSubscribeSearchDto)">
             <summary>
             得到某个用户关注的标签
             </summary>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Cms.AccountController.Login(LinCms.Application.Contracts.Cms.Account.LoginInputDto)">
+        <member name="M:LinCms.Controllers.Cms.AccountController.Login(LinCms.Cms.Account.LoginInputDto)">
             <summary>
             登录接口
             </summary>
             <param name="loginInputDto">用户名/密码：admin/123qwe</param>
         </member>
-        <member name="M:LinCms.Web.Controllers.Cms.AccountController.GetRefreshToken">
+        <member name="M:LinCms.Controllers.Cms.AccountController.GetRefreshTokenAsync">
             <summary>
             刷新用户的token
             </summary>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Cms.AccountController.Post(LinCms.Application.Contracts.Cms.Account.RegisterDto)">
+        <member name="M:LinCms.Controllers.Cms.AccountController.LogoutAsync">
+            <summary>
+            TODO
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Controllers.Cms.AccountController.Register(LinCms.Cms.Account.RegisterDto,AutoMapper.IMapper,LinCms.Cms.Users.IUserService)">
             <summary>
             注册
             </summary>
             <param name="registerDto"></param>
+            <param name="_mapper"></param>
+            <param name="_userSevice"></param>
+        </member>
+        <member name="M:LinCms.Controllers.Cms.AccountController.SendPasswordResetCode(LinCms.Cms.Account.SendEmailCodeInput)">
+            <summary>
+            发送邮件：重置密码的验证码
+            </summary>
+            <param name="sendEmailCode"></param>
+            <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Cms.AdminController.GetUserListByGroupId(LinCms.Application.Contracts.Cms.Admins.UserSearchDto)">
+        <member name="M:LinCms.Controllers.Cms.AccountController.ResetPassword(LinCms.Cms.Account.ResetEmailPasswordDto)">
+            <summary>
+            修改密码
+            </summary>
+            <param name="resetPassword"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Controllers.Cms.AdminController.GetUserListByGroupId(LinCms.Cms.Admins.UserSearchDto)">
             <summary>
             用户信息分页列表项
             </summary>
             <param name="searchDto"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Cms.AdminController.Put(System.Int64,LinCms.Application.Contracts.Cms.Admins.UpdateUserDto)">
+        <member name="M:LinCms.Controllers.Cms.AdminController.UpdateAsync(System.Int64,LinCms.Cms.Admins.UpdateUserDto)">
             <summary>
             修改用户信息
             </summary>
@@ -261,14 +285,14 @@
             <param name="updateUserDto"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Cms.AdminController.DeleteAsync(System.Int64)">
+        <member name="M:LinCms.Controllers.Cms.AdminController.DeleteAsync(System.Int64)">
             <summary>
             删除用户
             </summary>
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Cms.AdminController.ResetPasswordAsync(System.Int64,LinCms.Application.Contracts.Cms.Admins.ResetPasswordDto)">
+        <member name="M:LinCms.Controllers.Cms.AdminController.ResetPasswordAsync(System.Int64,LinCms.Cms.Admins.ResetPasswordDto)">
             <summary>
             重置密码
             </summary>
@@ -276,19 +300,13 @@
             <param name="resetPasswordDto"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Cms.AdminController.GetAllPermissions">
+        <member name="M:LinCms.Controllers.Cms.FileController.UploadFiles">
             <summary>
-            查询所有可分配的权限
+            多文件上传
             </summary>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Cms.FileController.UploadFiles">
-            <summary>
-            上传多文件至本地或七牛云，swagger无法正常生成
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:LinCms.Web.Controllers.Cms.FileController.Upload(Microsoft.AspNetCore.Http.IFormFile,System.Int32)">
+        <member name="M:LinCms.Controllers.Cms.FileController.UploadAsync(Microsoft.AspNetCore.Http.IFormFile,System.Int32)">
             <summary>
             单文件上传，键为file
             </summary>
@@ -296,26 +314,33 @@
             <param name="key"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Cms.LogController.GetUsers(LinCms.Core.Data.PageDto)">
+        <member name="M:LinCms.Controllers.Cms.LogController.GetUsers(LinCms.Data.PageDto)">
             <summary>
             查询日志记录的用户
             </summary>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Cms.LogController.GetLogs(LinCms.Application.Contracts.Cms.Logs.LogSearchDto)">
+        <member name="M:LinCms.Controllers.Cms.LogController.GetLogs(LinCms.Cms.Logs.LogSearchDto)">
             <summary>
             日志浏览（人员，时间），分页展示
             </summary>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Cms.LogController.GetUserLogs(LinCms.Application.Contracts.Cms.Logs.LogSearchDto)">
+        <member name="M:LinCms.Controllers.Cms.LogController.GetUserLogs(LinCms.Cms.Logs.LogSearchDto)">
             <summary>
             日志搜素（人员，时间）（内容）， 分页展示
             </summary>
             <param name="searchDto"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Cms.Oauth2Controller.Home(System.String,System.String)">
+        <member name="M:LinCms.Controllers.Cms.LogController.GetSerilogListAsync(LinCms.Cms.Logs.SerilogSearchDto)">
+            <summary>
+            Serilog日志
+            </summary>
+            <param name="searchDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Controllers.Cms.Oauth2Controller.Home(System.String,System.String)">
             <summary>
             授权成功后自动回调的地址
             </summary>
@@ -323,87 +348,249 @@
             <param name="redirectUrl">授权成功后的跳转地址</param>
             <returns></returns>
         </member>
-        <!-- Badly formed XML comment ignored for member "M:LinCms.Web.Controllers.Cms.Oauth2Controller.SignIn(System.String,System.String)" -->
-        <member name="M:LinCms.Web.Controllers.Cms.Oauth2Controller.OpenId(System.String)">
+        <!-- Badly formed XML comment ignored for member "M:LinCms.Controllers.Cms.Oauth2Controller.SignIn(System.String,System.String)" -->
+        <member name="M:LinCms.Controllers.Cms.Oauth2Controller.SignInBindCallBack(System.String,System.String,System.String)">
             <summary>
-            axios得到null，浏览器直接打开能得到github的id 
+            第三方账号绑定回调
             </summary>
             <param name="provider"></param>
+            <param name="redirectUrl"></param>
+            <param name="token"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Controllers.Cms.Oauth2Controller.SignInBind(System.String,System.String,System.String)">
+            <summary>
+            第三方账号绑定，需要把token值传过来，用于与当前登录人绑定起来
+            </summary>
+            <param name="provider">GitHub/Gitee/QQ</param>
+            <param name="redirectUrl">http://localhost:8081/   http://vvlog.baimocore.cn/</param>
+            <param name="token">Bearer {Token}</param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Controllers.Cms.Oauth2Controller.GetExternalProvidersAsync">
+            <summary>
+            获取第三方登录的提供商
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Controllers.Cms.Oauth2Controller.OpenId(System.String)">
+            <summary>
+            通过axios请求得到null，浏览器直接打开能得到github的id 
+            </summary>
+            <param name="provider"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Controllers.Cms.Oauth2Controller.GetOpenIdByTokenAsync">
+            <summary>
+            通过axios请求，请在header（请求头）携带上文中signin-callback生成的Token值.可以得到openid
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Controllers.Cms.Oauth2Controller.GetListAsync(LinCms.Security.ICurrentUser)">
+            <summary>
+            得到当前用户绑定的第三方账号，除密码外
+            </summary>
+            <param name="currentUser"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Controllers.Cms.Oauth2Controller.UnBind(System.Guid)">
+            <summary>
+            解绑用户的第三方账号。当用户没有密码时，无法解绑最后一个账号。只可以解绑自己的账号
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Controllers.Cms.PermissionController.GetAllPermissions">
+            <summary>
+            查询所有可分配的权限
+            </summary>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Cms.PermissionController.RemovePermissions(LinCms.Application.Contracts.Cms.Permissions.RemovePermissionDto)">
+        <member name="M:LinCms.Controllers.Cms.PermissionController.RemovePermissions(LinCms.Cms.Permissions.RemovePermissionDto)">
             <summary>
             删除某个组别的权限
             </summary>
             <param name="permissionDto"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Cms.PermissionController.DispatchPermissions(LinCms.Application.Contracts.Cms.Permissions.DispatchPermissionsDto)">
+        <member name="M:LinCms.Controllers.Cms.PermissionController.DispatchPermissions(LinCms.Cms.Permissions.DispatchPermissionsDto)">
             <summary>
             分配多个权限
             </summary>
             <param name="permissionDto"></param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.Cms.UserController.Post(LinCms.Application.Contracts.Cms.Users.CreateUserDto)">
+        <member name="M:LinCms.Controllers.Cms.UserController.CreateAsync(LinCms.Cms.Users.CreateUserDto)">
             <summary>
             新增用户-不是注册，注册不可能让用户选择gourp_id
             </summary>
             <param name="userInput"></param>
         </member>
-        <member name="M:LinCms.Web.Controllers.Cms.UserController.GetInformationAsync">
+        <member name="M:LinCms.Controllers.Cms.UserController.GetInformationAsync">
             <summary>
             得到当前登录人信息
             </summary>
         </member>
-        <member name="M:LinCms.Web.Controllers.Cms.UserController.Permissions">
+        <member name="M:LinCms.Controllers.Cms.UserController.Permissions">
             <summary>
             查询自己拥有的权限
             </summary>
             <returns></returns>
         </member>
-        <member name="T:LinCms.Web.Controllers.v1.QiniuController">
+        <member name="M:LinCms.Controllers.Cms.UserController.GetNovicesAsync">
+            <summary>
+            获取最新的12条新手用户数据
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:LinCms.Controllers.v1.MonitorController.GetServerInfo">
+            <summary>
+            服务器配置信息
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="T:LinCms.Controllers.v1.ServerViewModel">
+            <summary>
+            服务器VM
+            </summary>
+        </member>
+        <member name="P:LinCms.Controllers.v1.ServerViewModel.EnvironmentName">
+            <summary>
+            环境变量
+            </summary>
+        </member>
+        <member name="P:LinCms.Controllers.v1.ServerViewModel.OSArchitecture">
+            <summary>
+            系统架构
+            </summary>
+        </member>
+        <member name="P:LinCms.Controllers.v1.ServerViewModel.ContentRootPath">
+            <summary>
+            ContentRootPath
+            </summary>
+        </member>
+        <member name="P:LinCms.Controllers.v1.ServerViewModel.WebRootPath">
+            <summary>
+            WebRootPath
+            </summary>
+        </member>
+        <member name="P:LinCms.Controllers.v1.ServerViewModel.FrameworkDescription">
+            <summary>
+            .NET Core版本
+            </summary>
+        </member>
+        <member name="P:LinCms.Controllers.v1.ServerViewModel.MemoryFootprint">
+            <summary>
+            内存占用
+            </summary>
+        </member>
+        <member name="P:LinCms.Controllers.v1.ServerViewModel.WorkingTime">
+            <summary>
+            启动时间
+            </summary>
+        </member>
+        <member name="T:LinCms.Controllers.v1.QiniuController">
             <summary>
             七牛云上传服务
             </summary>
         </member>
-        <member name="M:LinCms.Web.Controllers.v1.QiniuController.GetAccessToken">
+        <member name="M:LinCms.Controllers.v1.QiniuController.UploadTagByJson">
             <summary>
-            根据后台配置项，得到请求七牛云的token值，前台也可根据此token值上传至七牛云服务
+            将掘金中的取所有标签存到七牛云上，基本信息存入数据库
+            从百度云下载后，放到wwwwroot中，swagger上执行下此方法，需要等很久，提取其中的tags，将Icon上传到七牛云上，tag信息存到数据库中。
+            链接: https://pan.baidu.com/s/1f7DSCC3uNOyiu3st9F1OAQ 提取码: paqf 
             </summary>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.v1.QiniuController.Upload(Microsoft.AspNetCore.Http.IFormFile)">
+        <member name="M:LinCms.Controllers.v1.QiniuController.GetUrlFormFile(System.String)">
             <summary>
-            上传文件至七牛云
+            获取远程服务器内容，并转换成流
             </summary>
-            <param name="file">单个文件</param>
+            <param name="path">https://lc-gold-cdn.xitu.io/bac28828a49181c34110.png</param>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.v1.TestController.Get">
+        <member name="M:LinCms.Controllers.v1.TestController.Get">
             <summary>
             下划线，首字母会小写
             </summary>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Controllers.v1.TestController.GetDictionary">
+        <member name="M:LinCms.Controllers.v1.TestController.GetDictionary">
             <summary>
             这种方式不会变小写，怀疑人生，是不是他的key不是键？ https://github.com/JamesNK/Newtonsoft.Json/issues/2088
             </summary>
             <returns></returns>
         </member>
-        <member name="T:LinCms.Web.Data.ReflexHelper">
+        <member name="T:LinCms.Middleware.AopCacheIntercept">
+            <summary>
+            Aop
+            </summary>
+        </member>
+        <member name="T:LinCms.Middleware.RecaptchaVerifyActionFilter">
+            <summary>
+            验证码过滤器，可配置某个方法是否需要Google人机验证
+            </summary>
+        </member>
+        <member name="M:LinCms.Middleware.UnitOfWorkAsyncInterceptor.InterceptSynchronous(Castle.DynamicProxy.IInvocation)">
+            <summary>
+            拦截同步执行的方法
+            </summary>
+            <param name="invocation"></param>
+        </member>
+        <member name="M:LinCms.Middleware.UnitOfWorkAsyncInterceptor.InterceptAsynchronous(Castle.DynamicProxy.IInvocation)">
+            <summary>
+            拦截返回结果为Task的方法
+            </summary>
+            <param name="invocation"></param>
+        </member>
+        <!-- Badly formed XML comment ignored for member "M:LinCms.Middleware.UnitOfWorkAsyncInterceptor.InterceptAsynchronous``1(Castle.DynamicProxy.IInvocation)" -->
+        <member name="T:LinCms.SnakeCaseQuery.SnakeCaseQueryValueProvider">
+            <summary>
+            下划线写法（SnakeCase）
+            </summary>
+        </member>
+        <member name="T:LinCms.Startup.Configuration.DependencyModule">
+            <summary>
+            接口注入
+            </summary>
+        </member>
+        <member name="T:LinCms.Startup.Configuration.RepositoryModule">
+            <summary>
+            注入仓储接口
+            </summary>
+        </member>
+        <member name="T:LinCms.Startup.Configuration.ServiceModule">
+            <summary>
+            注入Application层中的Service
+            </summary>
+        </member>
+        <member name="M:LinCms.Startup.DependencyInjectionExtensions.AddFreeSql(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfiguration)">
+            <summary>
+            FreeSql
+            </summary>
+            <param name="services"></param>
+            <param name="configuration"></param>
+        </member>
+        <member name="M:LinCms.Startup.DependencyInjectionExtensions.AddIpRateLimiting(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfiguration)">
+            <summary>
+            配置限流依赖的服务
+            </summary>
+            <param name="services"></param>
+            <param name="configuration"></param>
+            <returns></returns>
+        </member>
+        <member name="T:LinCms.Utils.ReflexHelper">
             <summary>
             反射帮助类
             </summary>
         </member>
-        <member name="M:LinCms.Web.Data.ReflexHelper.GeAssemblyLinCmsAttributes">
+        <member name="M:LinCms.Utils.ReflexHelper.GetAssemblyLinCmsAttributes">
             <summary>
             通过反射得到LinCmsAttrbutes所有权限结构，为树型权限生成做准备
             </summary>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Data.ReflexHelper.AuthorizationConvertToTree(System.Collections.Generic.List{LinCms.Core.Data.PermissionDefinition})">
+        <member name="M:LinCms.Utils.ReflexHelper.AuthorizationConvertToTree(System.Collections.Generic.List{LinCms.Data.PermissionDefinition})">
                          {
                                 "信息":{
                                     "查看lin的信息":[
@@ -432,51 +619,25 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:LinCms.Web.Extensions.AddContext(Microsoft.Extensions.DependencyInjection.IServiceCollection)">
-            <summary>
-            FreeSql
-            </summary>
-            <param name="services"></param>
-        </member>
-        <member name="T:LinCms.Web.Middleware.CustomExceptionMiddleWare">
-            <summary>
-            如果使用中间件处理异常，当异常处理后，之后 会再去执行LogActionFilterAttriute中的OnActionExecuted方法
-            </summary>
-        </member>
-        <member name="F:LinCms.Web.Middleware.CustomExceptionMiddleWare._next">
+        <member name="M:LinCms.Utils.ReflexHelper.GetTypesByTableAttribute">
             <summary>
-            管道请求委托
-            </summary>
-        </member>
-        <member name="M:LinCms.Web.Middleware.CustomExceptionMiddleWare.JsonHandle(Microsoft.AspNetCore.Http.HttpContext,System.String,LinCms.Core.Data.Enums.ErrorCode,System.Int32)">
-            <summary>
-            处理方式：返回Json格式
+            扫描 IEntity类所在程序集，反射得到类上有特性标签为TableAttribute 的所有类
             </summary>
             <returns></returns>
         </member>
-        <member name="T:LinCms.Web.Middleware.RequestMvcMiddleWare">
-            <summary>
-            处理FreeSql中同一个请求处于一个事务，并一同提交
-            </summary>
-        </member>
-        <member name="T:LinCms.Web.Middleware.SnakeCaseQueryValueProvider">
-            <summary>
-            下划线写法（SnakeCase）
-            </summary>
-        </member>
-        <member name="M:LinCms.Web.Utils.StopWords.ReplaceStopWords(System.String)">
+        <member name="M:LinCms.Utils.StopWords.ReplaceStopWords(System.String)">
             <summary>
             替换所有敏感词为 *
             </summary>
             <param name="that"></param>
             <returns></returns>
         </member>
-        <member name="T:LinCms.Web.Utils.ToolGoodUtils">
+        <member name="T:LinCms.Utils.ToolGoodUtils">
             <summary>
             ToolGood.Words类库配合敏感库
             </summary>
         </member>
-        <member name="M:LinCms.Web.Utils.ToolGoodUtils.GetIllegalWordsSearch">
+        <member name="M:LinCms.Utils.ToolGoodUtils.GetIllegalWordsSearch">
             <summary>
             本地敏感库,文件修改后，重新创建缓存Bit
             </summary>
diff --git a/src/LinCms.Web/Middleware/AopCacheIntercept.cs b/src/LinCms.Web/Middleware/AopCacheIntercept.cs
new file mode 100644
index 00000000..be9670a0
--- /dev/null
+++ b/src/LinCms.Web/Middleware/AopCacheIntercept.cs
@@ -0,0 +1,136 @@
+using Castle.DynamicProxy;
+using LinCms.Aop.Attributes;
+using LinCms.Common;
+using Microsoft.Extensions.Configuration;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+
+namespace LinCms.Middleware
+{
+
+    /// <summary>
+    /// Aop
+    /// </summary>
+    public class AopCacheIntercept : IInterceptor
+    {
+        private readonly IConfiguration _configuration;
+
+        public AopCacheIntercept(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+
+        public void Intercept(IInvocation invocation)
+        {
+            try
+            {
+                bool isEnable = bool.Parse(_configuration["Cache:Enable"]);
+                Type returnType = invocation.Method.ReturnType;
+
+                if (isEnable == false || returnType == typeof(void))
+                {
+                    invocation.Proceed();
+                    return;
+                }
+
+                MethodInfo method = invocation.MethodInvocationTarget ?? invocation.Method;
+
+                //对当前方法的特性验证
+                var cacheAttrObj = method.GetCustomAttributes(typeof(CacheableAttribute), false).FirstOrDefault();
+
+                if (cacheAttrObj is CacheableAttribute cacheAttr)
+                {
+                    //获取自定义缓存键
+                    string cacheKey = GenerateCacheKey(cacheAttr.CacheKey, invocation);
+
+                    string cacheValue = RedisHelper.Get(cacheKey);
+                    if (cacheValue != null)
+                    {
+                        //将当前获取到的缓存值，赋值给当前执行方法
+                        Type[] resultTypes = returnType.GenericTypeArguments;
+
+                        if (returnType == typeof(Task))
+                        {
+                            invocation.ReturnValue = InterceptAsync(cacheKey, (Task)invocation.ReturnValue);
+                        }
+                        else if (returnType.IsGenericType && returnType.GetGenericTypeDefinition() == typeof(Task<>))
+                        {
+                            dynamic d = JsonConvert.DeserializeObject(cacheValue, resultTypes.FirstOrDefault());
+                            invocation.ReturnValue = Task.FromResult(d);
+                        }
+                        else
+                        {
+                            invocation.ReturnValue = JsonConvert.DeserializeObject(cacheValue, returnType);
+                        }
+
+                        return;
+                    }
+
+                    invocation.Proceed();
+
+                    if (returnType == typeof(Task))
+                    {
+                        invocation.ReturnValue = InterceptAsync(cacheKey, (Task)invocation.ReturnValue);
+                    }
+                    else if (returnType.IsGenericType && returnType.GetGenericTypeDefinition() == typeof(Task<>))
+                    {
+                        invocation.ReturnValue = InterceptAsync(cacheKey, (dynamic)invocation.ReturnValue);
+                    }
+                    else
+                    {
+                        int ExpireSeconds = int.Parse(_configuration["Cache:ExpireSeconds"].ToString());
+
+                        RedisHelper.Set(cacheKey, JsonConvert.SerializeObject(invocation.ReturnValue), ExpireSeconds);
+                    }
+                    return;
+                }
+
+                invocation.Proceed();
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+        }
+
+        // do the continuation work for Task...
+        private async Task InterceptAsync(string cacheKey, Task task)
+        {
+            await task.ConfigureAwait(false);
+        }
+
+        // do the continuation work for Task<T>...
+        private async Task<T> InterceptAsync<T>(string cacheKey, Task<T> task)
+        {
+            T result = await task.ConfigureAwait(false);
+            int ExpireSeconds = int.Parse(_configuration["Cache:ExpireSeconds"].ToString());
+            await RedisHelper.SetAsync(cacheKey, JsonConvert.SerializeObject(result), ExpireSeconds);
+            return result;
+        }
+
+        private string GenerateCacheKey(string cacheKey, IInvocation invocation)
+        {
+            string className = invocation.TargetType.Name;
+            string methodName = invocation.Method.Name;
+            List<object> methodArguments = invocation.Arguments.ToList();
+            string param = string.Empty;
+            if (methodArguments.Count > 0)
+            {
+                string serializeString = JsonConvert.SerializeObject(methodArguments, Formatting.Indented, new JsonSerializerSettings
+                {
+                    DefaultValueHandling = DefaultValueHandling.Ignore
+                });
+                param = ":" + EncryptUtil.Encrypt(serializeString);
+            }
+            return string.Concat(cacheKey ?? $"{className}:{methodName}", param);
+        }
+
+    }
+
+
+}
diff --git a/src/LinCms.Web/Middleware/CustomExceptionMiddleWare.cs b/src/LinCms.Web/Middleware/CustomExceptionMiddleWare.cs
deleted file mode 100644
index 75e03ea6..00000000
--- a/src/LinCms.Web/Middleware/CustomExceptionMiddleWare.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Text;
-using System.Threading.Tasks;
-using LinCms.Core.Common;
-using LinCms.Core.Data;
-using LinCms.Core.Data.Enums;
-using LinCms.Core.Exceptions;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-
-namespace LinCms.Web.Middleware
-{
-    /// <summary>
-    /// 如果使用中间件处理异常，当异常处理后，之后 会再去执行LogActionFilterAttriute中的OnActionExecuted方法
-    /// </summary>
-    public class CustomExceptionMiddleWare
-    {
-        /// <summary>
-        /// 管道请求委托
-        /// </summary>
-        private readonly RequestDelegate _next;
-
-        private readonly ILogger<CustomExceptionMiddleWare> _logger;
-
-        private readonly IWebHostEnvironment _environment;
-        public CustomExceptionMiddleWare(RequestDelegate next, ILogger<CustomExceptionMiddleWare> logger, IWebHostEnvironment environment)
-        {
-            _next = next;
-            _logger = logger;
-            _environment = environment;
-        }
-
-        public async Task InvokeAsync(HttpContext context)
-        {
-            try
-            {
-                await _next(context); //调用管道执行下一个中间件
-            }
-            catch (Exception ex)
-            {
-                if (ex is LinCmsException cmsException) //自定义业务异常
-                {
-                    await JsonHandle(context, cmsException.Message, cmsException.GetErrorCode(),
-                        cmsException.GetCode());
-                }
-                else
-                {
-                    string errorMsg = $"异常信息:{(ex.InnerException != null ? ex.InnerException.Message : ex.Message)}";
-
-                    _logger.LogError(errorMsg);
-
-                    await JsonHandle(context, _environment.IsDevelopment() ? errorMsg : "服务器正忙，请稍后再试!",
-                        ErrorCode.UnknownError, 500);
-
-                }
-            }
-        }
-
-        /// <summary>
-        /// 处理方式：返回Json格式
-        /// </summary>
-        /// <returns></returns>
-        private async Task JsonHandle(HttpContext context, string errorMsg, ErrorCode errorCode, int statusCode)
-        {
-            UnifyResponseDto apiResponse = new UnifyResponseDto()
-            {
-                Message = errorMsg,
-                Code = errorCode,
-                Request = LinCmsUtils.GetRequest(context)
-            }; ;
-
-            context.Response.ContentType = "application/json";
-            context.Response.StatusCode = statusCode;
-            await context.Response.WriteAsync(apiResponse.ToString(), Encoding.UTF8); ;
-        }
-
-    }
-}
diff --git a/src/LinCms.Web/Middleware/IpLimitMiddleware.cs b/src/LinCms.Web/Middleware/IpLimitMiddleware.cs
new file mode 100644
index 00000000..183cee3a
--- /dev/null
+++ b/src/LinCms.Web/Middleware/IpLimitMiddleware.cs
@@ -0,0 +1,22 @@
+using System.Threading.Tasks;
+using AspNetCoreRateLimit;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace LinCms.Middleware
+{
+    public class IpLimitMiddleware : IpRateLimitMiddleware
+    {
+        public IpLimitMiddleware(RequestDelegate next, IProcessingStrategy processingStrategy, IOptions<IpRateLimitOptions> options, IRateLimitCounterStore counterStore, IIpPolicyStore policyStore, IRateLimitConfiguration config, ILogger<IpRateLimitMiddleware> logger)
+            : base(next, processingStrategy, options, counterStore, policyStore, config, logger)
+        {
+        }
+
+        public override Task ReturnQuotaExceededResponse(HttpContext httpContext, RateLimitRule rule, string retryAfter)
+        {
+            httpContext.Response.Headers.Append("Access-Control-Allow-Origin", "*");
+            return base.ReturnQuotaExceededResponse(httpContext, rule, retryAfter);
+        }
+    }
+}
diff --git a/src/LinCms.Web/Middleware/RecaptchaVerifyActionFilter.cs b/src/LinCms.Web/Middleware/RecaptchaVerifyActionFilter.cs
new file mode 100644
index 00000000..1114e1c5
--- /dev/null
+++ b/src/LinCms.Web/Middleware/RecaptchaVerifyActionFilter.cs
@@ -0,0 +1,79 @@
+using LinCms.Exceptions;
+using LinCms.Models.Options;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Owl.reCAPTCHA;
+using Owl.reCAPTCHA.v3;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.NetworkInformation;
+using System.Threading.Tasks;
+
+namespace LinCms.Middleware
+{
+    /// <summary>
+    /// 验证码过滤器，可配置某个方法是否需要Google人机验证
+    /// </summary>
+    public class RecaptchaVerifyActionFilter : ActionFilterAttribute
+    {
+        private readonly GooglereCAPTCHAOptions _options;
+        private readonly IreCAPTCHASiteVerifyV3 _siteVerify;
+        private readonly ILogger<RecaptchaVerifyActionFilter> _logger;
+        public RecaptchaVerifyActionFilter(ILogger<RecaptchaVerifyActionFilter> logger, 
+            IServiceProvider serviceProvider, 
+            IOptionsMonitor<GooglereCAPTCHAOptions> options,
+            IreCAPTCHASiteVerifyV3 siteVerify
+            )
+        {
+            _options = options.CurrentValue;
+            _siteVerify = siteVerify;
+            _logger = logger;
+        }
+
+        public override async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+        {
+            if (!_options.Enabled)
+            {
+                await next();
+                return;
+            }
+
+            if (context.HttpContext.Request.Headers.ContainsKey(_options.HeaderKey))
+            {
+                string googleRecaptchaToken = context.HttpContext.Request.Headers[_options.HeaderKey].ToString();
+
+                if (googleRecaptchaToken.IsNullOrEmpty())
+                {
+                    throw new LinCmsException("验证参数不存在，人机验证失败！");
+                }
+
+                try
+                {
+                    reCAPTCHASiteVerifyV3Response response = await _siteVerify.Verify(new reCAPTCHASiteVerifyRequest
+                    {
+                        Response = googleRecaptchaToken,
+                        RemoteIp = context.HttpContext.Connection.RemoteIpAddress?.ToString()
+                    });
+
+                    if (!response.Success || response.Score != 0 && response.Score <_options.MinimumScore)
+                    {
+                        throw new LinCmsException("人机验证失败！");
+                    }
+                }
+                catch (NetworkInformationException ex)
+                {
+                    _logger.LogError($"Google人机验证网络请求失败：{ex.Message}{ex.StackTrace}");
+                }
+
+                await next();
+                return;
+            }
+
+            throw new LinCmsException("人机验证失败，请检查参数！");
+        }
+    }
+}
diff --git a/src/LinCms.Web/Middleware/RequestMvcMiddleWare.cs b/src/LinCms.Web/Middleware/RequestMvcMiddleWare.cs
deleted file mode 100644
index 98a5a78d..00000000
--- a/src/LinCms.Web/Middleware/RequestMvcMiddleWare.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using FreeSql;
-using Microsoft.AspNetCore.Http;
-
-namespace LinCms.Web.Middleware
-{
-    /// <summary>
-    /// 处理FreeSql中同一个请求处于一个事务，并一同提交
-    /// </summary>
-    public class RequestMvcMiddleWare
-    {
-        private readonly RequestDelegate _next;
-
-        public RequestMvcMiddleWare(RequestDelegate next)
-        {
-            _next = next;
-        }
-
-        public async Task InvokeAsync(HttpContext httpContext, IUnitOfWork unitOfWork)
-        {
-            try
-            {
-                unitOfWork.Open();
-                await _next.Invoke(httpContext);
-                unitOfWork.Commit();
-
-            }
-            catch (Exception ex)
-            {
-                unitOfWork?.Rollback();
-                throw ex;
-            }
-            finally
-            {
-                unitOfWork?.Dispose();
-            }
-        }
-    }
-}
diff --git a/src/LinCms.Web/Middleware/SnakeCaseQueryValueProviderFactory.cs b/src/LinCms.Web/Middleware/SnakeCaseQueryValueProviderFactory.cs
deleted file mode 100644
index 30700a37..00000000
--- a/src/LinCms.Web/Middleware/SnakeCaseQueryValueProviderFactory.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using System.Globalization;
-using System.Threading.Tasks;
-using LinCms.Core.Extensions;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-
-namespace LinCms.Web.Middleware
-{
-    /// <summary>
-    /// 下划线写法（SnakeCase）
-    /// </summary>
-    public class SnakeCaseQueryValueProvider : QueryStringValueProvider
-    {
-        public SnakeCaseQueryValueProvider(
-            BindingSource bindingSource,
-            IQueryCollection values,
-            CultureInfo culture)
-            : base(bindingSource, values, culture)
-        {
-        }
-
-        public override bool ContainsPrefix(string prefix)
-        {
-            return base.ContainsPrefix(prefix.ToSnakeCase());
-        }
-
-        public override ValueProviderResult GetValue(string key)
-        {
-            return base.GetValue(key.ToSnakeCase());
-        }
-    }
-    public class SnakeCaseQueryValueProviderFactory : IValueProviderFactory
-    {
-        public Task CreateValueProviderAsync(ValueProviderFactoryContext context)
-        {
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
-
-            var valueProvider = new SnakeCaseQueryValueProvider(
-                BindingSource.Query,
-                context.ActionContext.HttpContext.Request.Query,
-                CultureInfo.CurrentCulture);
-
-            context.ValueProviders.Add(valueProvider);
-
-            return Task.CompletedTask;
-        }
-    }
-}
diff --git a/src/LinCms.Web/Middleware/UnitOfWorkAsyncInterceptor.cs b/src/LinCms.Web/Middleware/UnitOfWorkAsyncInterceptor.cs
new file mode 100644
index 00000000..4db6ffc8
--- /dev/null
+++ b/src/LinCms.Web/Middleware/UnitOfWorkAsyncInterceptor.cs
@@ -0,0 +1,166 @@
+using Castle.DynamicProxy;
+using FreeSql;
+using LinCms.Aop.Attributes;
+using Microsoft.Extensions.Logging;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace LinCms.Middleware
+{
+    public class UnitOfWorkAsyncInterceptor : IAsyncInterceptor
+    {
+        private readonly UnitOfWorkManager _unitOfWorkManager;
+        private readonly ILogger<UnitOfWorkAsyncInterceptor> _logger;
+        IUnitOfWork _unitOfWork;
+
+        public UnitOfWorkAsyncInterceptor(UnitOfWorkManager unitOfWorkManager, ILogger<UnitOfWorkAsyncInterceptor> logger)
+        {
+            _unitOfWorkManager = unitOfWorkManager;
+            _logger = logger;
+        }
+
+        private bool TryBegin(IInvocation invocation)
+        {
+            //_unitOfWork = _unitOfWorkManager.Begin(Propagation.Requierd);
+            //return true;
+            var method = invocation.MethodInvocationTarget ?? invocation.Method;
+            var attribute = method.GetCustomAttributes(typeof(TransactionalAttribute), false).FirstOrDefault();
+            if (attribute is TransactionalAttribute transaction)
+            {
+                _unitOfWork = _unitOfWorkManager.Begin(transaction.Propagation, transaction.IsolationLevel);
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// 拦截同步执行的方法
+        /// </summary>
+        /// <param name="invocation"></param>
+        public void InterceptSynchronous(IInvocation invocation)
+        {
+            if (TryBegin(invocation))
+            {
+                int? hashCode = _unitOfWork.GetHashCode();
+                try
+                {
+                    invocation.Proceed();
+                    _logger.LogInformation($"----- 拦截同步执行的方法-事务 {hashCode} 提交前----- ");
+                    _unitOfWork.Commit();
+                    _logger.LogInformation($"----- 拦截同步执行的方法-事务 {hashCode} 提交成功----- ");
+                }
+                catch
+                {
+                    _logger.LogError($"----- 拦截同步执行的方法-事务 {hashCode} 提交失败----- ");
+                    _unitOfWork.Rollback();
+                    throw;
+                }
+                finally
+                {
+                    _unitOfWork.Dispose();
+                }
+            }
+            else
+            {
+                invocation.Proceed();
+            }
+        }
+
+        /// <summary>
+        /// 拦截返回结果为Task的方法
+        /// </summary>
+        /// <param name="invocation"></param>
+        public void InterceptAsynchronous(IInvocation invocation)
+        {
+            if (TryBegin(invocation))
+            {
+                invocation.ReturnValue = InternalInterceptAsynchronous(invocation);
+            }
+            else
+            {
+                invocation.Proceed();
+            }
+        }
+
+        private async Task InternalInterceptAsynchronous(IInvocation invocation)
+        {
+            string methodName = $"{invocation.MethodInvocationTarget.DeclaringType?.FullName}.{invocation.Method.Name}()";
+            int? hashCode = _unitOfWork.GetHashCode();
+
+            using (_logger.BeginScope("_unitOfWork:{hashCode}", hashCode))
+            {
+                _logger.LogInformation($"----- async Task 开始事务{hashCode} {methodName}----- ");
+
+                invocation.Proceed();
+                try
+                {
+                    //处理Task返回一个null值的情况会导致空指针
+                    if (invocation.ReturnValue != null)
+                    {
+                        await (Task)invocation.ReturnValue;
+                    }
+                    _unitOfWork.Commit();
+                    _logger.LogInformation($"----- async Task 事务 {hashCode} Commit----- ");
+                }
+                catch (System.Exception)
+                {
+                    _unitOfWork.Rollback();
+                    _logger.LogError($"----- async Task 事务 {hashCode} Rollback----- ");
+                    throw;
+                }
+                finally
+                {
+                    _unitOfWork.Dispose();
+                }
+            }
+
+        }
+
+
+        /// <summary>
+        /// 拦截返回结果为Task<TResult>的方法
+        /// </summary>
+        /// <param name="invocation"></param>
+        /// <typeparam name="TResult"></typeparam>
+        public void InterceptAsynchronous<TResult>(IInvocation invocation)
+        {
+            invocation.ReturnValue = InternalInterceptAsynchronous<TResult>(invocation);
+        }
+
+        private async Task<TResult> InternalInterceptAsynchronous<TResult>(IInvocation invocation)
+        {
+            TResult result;
+            if (TryBegin(invocation))
+            {
+                string methodName = $"{invocation.MethodInvocationTarget.DeclaringType?.FullName}.{invocation.Method.Name}()";
+                int hashCode = _unitOfWork.GetHashCode();
+                _logger.LogInformation($"----- async Task<TResult> 开始事务{hashCode} {methodName}----- ");
+
+                try
+                {
+                    invocation.Proceed();
+                    result = await (Task<TResult>)invocation.ReturnValue;
+                    _unitOfWork.Commit();
+                    _logger.LogInformation($"----- async Task<TResult> Commit事务{hashCode}----- ");
+                }
+                catch (System.Exception)
+                {
+                    _unitOfWork.Rollback();
+                    _logger.LogError($"----- async Task<TResult> Rollback事务{hashCode}----- ");
+                    throw;
+                }
+                finally
+                {
+                    _unitOfWork.Dispose();
+                }
+            }
+            else
+            {
+                invocation.Proceed();
+                result = await (Task<TResult>)invocation.ReturnValue;
+            }
+            return result;
+        }
+    }
+}
diff --git a/src/LinCms.Web/Middleware/UnitOfWorkInterceptor.cs b/src/LinCms.Web/Middleware/UnitOfWorkInterceptor.cs
new file mode 100644
index 00000000..d89df084
--- /dev/null
+++ b/src/LinCms.Web/Middleware/UnitOfWorkInterceptor.cs
@@ -0,0 +1,19 @@
+using Castle.DynamicProxy;
+
+namespace LinCms.Middleware
+{
+    public class UnitOfWorkInterceptor : IInterceptor
+    {
+        private readonly UnitOfWorkAsyncInterceptor asyncInterceptor;
+
+        public UnitOfWorkInterceptor(UnitOfWorkAsyncInterceptor interceptor)
+        {
+            asyncInterceptor = interceptor;
+        }
+
+        public void Intercept(IInvocation invocation)
+        {
+            asyncInterceptor.ToInterceptor().Intercept(invocation);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Web/Models/Options/GooglereCAPTCHAOptions.cs b/src/LinCms.Web/Models/Options/GooglereCAPTCHAOptions.cs
new file mode 100644
index 00000000..04c02714
--- /dev/null
+++ b/src/LinCms.Web/Models/Options/GooglereCAPTCHAOptions.cs
@@ -0,0 +1,18 @@
+using Owl.reCAPTCHA;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace LinCms.Models.Options
+{
+    public class GooglereCAPTCHAOptions : reCAPTCHAOptions
+    {
+        public static string RecaptchaSettings = "RecaptchaSettings";
+
+        public string HeaderKey { get; set; } = "Google-RecaptchaToken";
+        public bool Enabled { get; set; } = false;
+        public string Version { get; set; } = reCAPTCHAConsts.V3;
+        public float MinimumScore { get; set; } = 0.9F;
+    }
+}
diff --git a/src/LinCms.Web/Program.cs b/src/LinCms.Web/Program.cs
deleted file mode 100644
index 7893d226..00000000
--- a/src/LinCms.Web/Program.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Logging;
-using NLog.Web;
-
-namespace LinCms.Web
-{
-    public class Program
-    {
-        public static async Task Main(string[] args)
-        {
-            var logger = NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();
-            try
-            {
-                logger.Debug("init main");
-                await CreateWebHostBuilder(args).Build().RunAsync();
-            }
-            catch (Exception exception)
-            {
-                logger.Error(exception, "Stopped program because of exception");
-                throw;
-            }
-            finally
-            {
-                NLog.LogManager.Shutdown();
-            }
-        }
-
-        private static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                .ConfigureLogging(logging =>
-                {
-                    logging.ClearProviders();
-                    logging.SetMinimumLevel(LogLevel.Trace);
-                })
-                .UseNLog();
-    }
-}
diff --git a/src/LinCms.Web/Properties/launchSettings.json b/src/LinCms.Web/Properties/launchSettings.json
index 50342373..628e77b6 100644
--- a/src/LinCms.Web/Properties/launchSettings.json
+++ b/src/LinCms.Web/Properties/launchSettings.json
@@ -1,19 +1,19 @@
-{
+{
   "$schema": "http://json.schemastore.org/launchsettings.json",
   "profiles": {
     "LinCms.Web": {
       "commandName": "Project",
       "launchBrowser": true,
-      "launchUrl": "swagger/index.html",
+      "launchUrl": "index.html",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Development" //Staging  Development
       },
-      "applicationUrl": "https://localhost:5001;http://localhost:5000"
+      "applicationUrl": "https://localhost:5001;http://localhost:5000" //
     },
     "Docker": {
       "commandName": "Docker",
       "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger/index.html",
+      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/index.html",
       "environmentVariables": {
         "ASPNETCORE_URLS": "https://+:443;http://+:80",
         "ASPNETCORE_HTTPS_PORT": "44391"
@@ -23,4 +23,4 @@
       "sslPort": 44391
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/LinCms.Web/RateLimitConfig.json b/src/LinCms.Web/RateLimitConfig.json
new file mode 100644
index 00000000..f3b4f14e
--- /dev/null
+++ b/src/LinCms.Web/RateLimitConfig.json
@@ -0,0 +1,41 @@
+{
+  "IpRateLimiting": {
+    //false则全局将应用限制，并且仅应用具有作为端点的规则* 。 true则限制将应用于每个端点，如{HTTP_Verb}{PATH}
+    "EnableEndpointRateLimiting": true,
+    //false则拒绝的API调用不会添加到调用次数计数器上
+    "StackBlockedRequests": false,
+    "RealIpHeader": "X-Real-IP",
+    "ClientIdHeader": "X-ClientId",
+    "HttpStatusCode": 200,
+    "QuotaExceededResponse": {
+      "Content": "{{\"code\":10140,\"message\":\"访问过于频繁，请稍后重试\",\"data\":null}}",
+      "ContentType": "application/json",
+      "StatusCode": 429
+    },
+    "IpWhitelist": [],
+    "EndpointWhitelist": [],
+    "ClientWhitelist": [],
+    "GeneralRules": [
+      {
+        "Endpoint": "*",
+       // "Endpoint": "*:/cms/test",
+        "Period": "1s",
+        "Limit": 10
+      }
+    ]
+  },
+  "IpRateLimitPolicies": {
+    "IpRules": [
+        {
+          "Ip": "192.168.2.136",
+          "Rules": [
+            {
+              "Endpoint": "*",
+              "Period": "1s",
+              "Limit": 10
+            }
+          ]
+        }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/LinCms.Web/Middleware/SnakeCaseQueryParametersApiDescriptionProvider.cs b/src/LinCms.Web/SnakeCaseQuery/ApiDescriptionProvider.cs
similarity index 71%
rename from src/LinCms.Web/Middleware/SnakeCaseQueryParametersApiDescriptionProvider.cs
rename to src/LinCms.Web/SnakeCaseQuery/ApiDescriptionProvider.cs
index 17f5f364..25d89a2e 100644
--- a/src/LinCms.Web/Middleware/SnakeCaseQueryParametersApiDescriptionProvider.cs
+++ b/src/LinCms.Web/SnakeCaseQuery/ApiDescriptionProvider.cs
@@ -1,10 +1,10 @@
 using System.Linq;
-using LinCms.Core.Extensions;
+using LinCms.Extensions;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 
-namespace LinCms.Web.Middleware
+namespace LinCms.SnakeCaseQuery
 {
-    public class SnakeCaseQueryParametersApiDescriptionProvider : IApiDescriptionProvider
+    public class ApiDescriptionProvider : IApiDescriptionProvider
     {
         public int Order => 1;
 
@@ -14,7 +14,7 @@ public void OnProvidersExecuted(ApiDescriptionProviderContext context)
 
         public void OnProvidersExecuting(ApiDescriptionProviderContext context)
         {
-            foreach (ApiParameterDescription parameter in context.Results.SelectMany(x => x.ParameterDescriptions).Where(x => x.Source.Id == "Query" || x.Source.Id == "ModelBinding"))
+            foreach (ApiParameterDescription parameter in context.Results.SelectMany(x => x.ParameterDescriptions).Where(x => x.Source.Id == "Query" || x.Source.Id == "ModelBinding" ))
             {
                 parameter.Name = parameter.Name.ToSnakeCase();
             }
diff --git a/src/LinCms.Web/SnakeCaseQuery/SnakeCaseQueryValueProvider.cs b/src/LinCms.Web/SnakeCaseQuery/SnakeCaseQueryValueProvider.cs
new file mode 100644
index 00000000..cf9a6e09
--- /dev/null
+++ b/src/LinCms.Web/SnakeCaseQuery/SnakeCaseQueryValueProvider.cs
@@ -0,0 +1,31 @@
+using System.Globalization;
+using LinCms.Extensions;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace LinCms.SnakeCaseQuery
+{
+    /// <summary>
+    /// 下划线写法（SnakeCase）
+    /// </summary>
+    public class SnakeCaseQueryValueProvider : QueryStringValueProvider
+    {
+        public SnakeCaseQueryValueProvider(
+            BindingSource bindingSource,
+            IQueryCollection values,
+            CultureInfo culture)
+            : base(bindingSource, values, culture)
+        {
+        }
+
+        public override bool ContainsPrefix(string prefix)
+        {
+            return base.ContainsPrefix(prefix.ToSnakeCase());
+        }
+
+        public override ValueProviderResult GetValue(string key)
+        {
+            return base.GetValue(key.ToSnakeCase());
+        }
+    }
+}
diff --git a/src/LinCms.Web/SnakeCaseQuery/ValueProviderFactory.cs b/src/LinCms.Web/SnakeCaseQuery/ValueProviderFactory.cs
new file mode 100644
index 00000000..18ca7a05
--- /dev/null
+++ b/src/LinCms.Web/SnakeCaseQuery/ValueProviderFactory.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Globalization;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace LinCms.SnakeCaseQuery
+{
+
+    public class ValueProviderFactory : IValueProviderFactory
+    {
+        public Task CreateValueProviderAsync(ValueProviderFactoryContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var valueProvider = new SnakeCaseQueryValueProvider(
+                BindingSource.Query,
+                context.ActionContext.HttpContext.Request.Query,
+                CultureInfo.CurrentCulture);
+
+            context.ValueProviders.Add(valueProvider);
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/LinCms.Web/Startup.cs b/src/LinCms.Web/Startup.cs
deleted file mode 100644
index b750614b..00000000
--- a/src/LinCms.Web/Startup.cs
+++ /dev/null
@@ -1,369 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-using AutoMapper;
-using DotNetCore.CAP.Messages;
-using HealthChecks.UI.Client;
-using LinCms.Application.AutoMapper.Cms;
-using LinCms.Application.Cms.Files;
-using LinCms.Core.Aop;
-using LinCms.Core.Common;
-using LinCms.Core.Data;
-using LinCms.Core.Data.Enums;
-using LinCms.Core.Entities;
-using LinCms.Core.Extensions;
-using LinCms.Plugins.Poem.AutoMapper;
-using LinCms.Web.Data;
-using LinCms.Web.Middleware;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Diagnostics.HealthChecks;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.ApiExplorer;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using Microsoft.IdentityModel.Tokens;
-using Microsoft.OpenApi.Models;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
-
-namespace LinCms.Web
-{
-    public class Startup
-    {
-        public IConfiguration Configuration { get; }
-
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddContext();
-            #region IdentityServer4
-
-            #region AddAuthentication\AddIdentityServerAuthentication 
-            //AddAuthentication()是把验证服务注册到DI, 并配置了Bearer作为默认模式.
-
-            //AddIdentityServerAuthentication()是在DI注册了token验证的处理者.
-            //由于是本地运行, 所以就不使用https了, RequireHttpsMetadata = false.如果是生产环境, 一定要使用https.
-            //Authority指定Authorization Server的地址.
-            //ApiName要和Authorization Server里面配置ApiResource的name一样.
-            //和  AddJwtBearer不能同时使用，目前还不理解区别。
-            //services
-            //    .AddAuthentication(IdentityServerAuthenticationDefaults.AuthenticationScheme)
-            //    .AddIdentityServerAuthentication(IdentityServerAuthenticationDefaults.AuthenticationScheme, options =>
-            //    {
-            //        options.RequireHttpsMetadata = false; // for dev env
-            //        options.Authority = $"{Configuration["Identity:Protocol"]}://{Configuration["Identity:IP"]}:{Configuration["Identity:Port"]}"; ;
-            //        options.ApiName = Configuration["Service:Name"]; // match with configuration in IdentityServer
-
-            //        //options.JwtValidationClockSkew = TimeSpan.FromSeconds(60 * 5);
-
-            //    });
-            #endregion
-
-            #region AddJwtBearer
-            services.AddAuthentication(opts =>
-                {
-                    opts.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme;
-                    opts.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-                    opts.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-                })
-                .AddCookie(options =>
-                {
-                    options.LoginPath = "/cms/oauth2/signin";
-                    options.LogoutPath = "/cms/oauth2/signout";
-                })
-                .AddJwtBearer(JwtBearerDefaults.AuthenticationScheme, options =>
-                {
-                    //identityserver4 地址 也就是本项目地址
-                    options.Authority = $"{Configuration["Identity:Protocol"]}://{Configuration["Identity:IP"]}:{Configuration["Identity:Port"]}";
-                    options.RequireHttpsMetadata = false;
-                    options.Audience = Configuration["Service:Name"];
-
-                    options.TokenValidationParameters = new TokenValidationParameters
-                    {
-                        // The signing key must match!
-                        ValidateIssuerSigningKey = true,
-                        IssuerSigningKey = new SymmetricSecurityKey(
-                            Encoding.ASCII.GetBytes(Configuration["Authentication:JwtBearer:SecurityKey"])),
-
-                        // Validate the JWT Issuer (iss) claim
-                        ValidateIssuer = true,
-                        ValidIssuer = Configuration["Authentication:JwtBearer:Issuer"],
-
-                        // Validate the JWT Audience (aud) claim
-                        ValidateAudience = true,
-                        ValidAudience = Configuration["Authentication:JwtBearer:Audience"],
-
-                        // Validate the token expiry
-                        ValidateLifetime = true,
-
-                        // If you want to allow a certain amount of clock drift, set that here
-                        //ClockSkew = TimeSpan.Zero
-                    };
-
-                    //options.TokenValidationParameters = new TokenValidationParameters()
-                    //{
-                    //    ClockSkew = TimeSpan.Zero   //偏移设置为了0s,用于测试过期策略,完全按照access_token的过期时间策略，默认原本为5分钟
-                    //};
-
-
-                    //使用Authorize设置为需要登录时，返回json格式数据。
-                    options.Events = new JwtBearerEvents()
-                    {
-                        OnAuthenticationFailed = context =>
-                        {
-                            //Token expired
-                            if (context.Exception.GetType() == typeof(SecurityTokenExpiredException))
-                            {
-                                context.Response.Headers.Add("Token-Expired", "true");
-                            }
-                            return Task.CompletedTask;
-                        },
-                        OnChallenge = context =>
-                        {
-                            //此处代码为终止.Net Core默认的返回类型和数据结果，这个很重要哦
-                            context.HandleResponse();
-
-                            string message;
-                            ErrorCode errorCode;
-                            int statusCode = StatusCodes.Status401Unauthorized;
-
-                            if (context.Error == "invalid_token" &&
-                               context.ErrorDescription == "The token is expired")
-                            {
-                                message = "令牌过期";
-                                errorCode = ErrorCode.TokenExpired;
-                                statusCode = StatusCodes.Status422UnprocessableEntity;
-                            }
-                            else if (context.Error == "invalid_token" && context.ErrorDescription.IsNullOrEmpty())
-                            {
-                                message = "令牌失效";
-                                errorCode = ErrorCode.TokenInvalidation;
-                            }
-
-                            else
-                            {
-                                message = "请先登录";//""认证失败，请检查请求头或者重新登录";
-                                errorCode = ErrorCode.AuthenticationFailed;
-                            }
-
-                            context.Response.ContentType = "application/json";
-                            context.Response.StatusCode = statusCode;
-                            context.Response.WriteAsync(new UnifyResponseDto(errorCode, message, context.HttpContext).ToString());
-
-                            return Task.FromResult(0);
-                        }
-                    };
-                })
-                .AddGitHub(options =>
-                {
-                    options.ClientId = Configuration["Authentication:GitHub:ClientId"];
-                    options.ClientSecret = Configuration["Authentication:GitHub:ClientSecret"];
-                    options.Scope.Add("user:email");
-                    //authenticateResult.Principal.FindFirst(ClaimTypes.Uri)?.Value;  得到GitHub头像
-                    options.ClaimActions.MapJsonKey(LinConsts.Claims.AvatarUrl, "avatar_url");
-                    options.ClaimActions.MapJsonKey(LinConsts.Claims.BIO, "bio");
-                    options.ClaimActions.MapJsonKey(LinConsts.Claims.BlogAddress, "blog");
-                });
-            #endregion
-
-            #endregion
-
-            services.AddCsRedisCore();
-
-            services.AddAutoMapper(typeof(UserProfile).Assembly, typeof(PoemProfile).Assembly);
-
-            services.AddCors();
-
-            #region Mvc
-            services.AddControllers(options =>
-             {
-                 options.ValueProviderFactories.Add(new SnakeCaseQueryValueProviderFactory());//设置SnakeCase形式的QueryString参数
-                 //options.Filters.Add<LinCmsExceptionFilter>();
-                 options.Filters.Add<LogActionFilterAttribute>(); // 添加请求方法时的日志记录过滤器
-             })
-             .AddNewtonsoftJson(opt =>
-             {
-                 //opt.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:MM:ss";
-                 //设置时间戳格式
-                 opt.SerializerSettings.Converters = new List<JsonConverter>()
-                 {
-                        new LinCmsTimeConverter()
-                 };
-                 // 设置下划线方式，首字母是小写
-                 opt.SerializerSettings.ContractResolver = new DefaultContractResolver()
-                 {
-                     NamingStrategy = new SnakeCaseNamingStrategy()
-                     {
-                         ProcessDictionaryKeys = true
-                     }
-                 };
-             })
-             .ConfigureApiBehaviorOptions(options =>
-             {
-                 options.SuppressConsumesConstraintForFormFileParameters = true;//SuppressUseValidationProblemDetailsForInvalidModelStateResponses;
-                 //自定义 BadRequest 响应
-                 options.InvalidModelStateResponseFactory = context =>
-                 {
-                     var problemDetails = new ValidationProblemDetails(context.ModelState);
-
-                     var resultDto = new UnifyResponseDto(ErrorCode.ParameterError, problemDetails.Errors, context.HttpContext);
-
-                     return new BadRequestObjectResult(resultDto)
-                     {
-                         ContentTypes = { "application/json" }
-                     };
-                 };
-             });
-            #endregion
-
-            services.AddServices();
-
-            string serviceName = Configuration.GetSection("FILE:SERVICE").Value;
-
-            if (serviceName == LinFile.LocalFileService)
-            {
-                services.AddTransient<IFileService, LocalFileService>();
-            }
-            else
-            {
-                services.AddTransient<IFileService, QiniuService>();
-            }
-
-            #region Swagger
-            //Swagger重写PascalCase，改成SnakeCase模式
-            services.TryAddEnumerable(ServiceDescriptor
-                .Transient<IApiDescriptionProvider, SnakeCaseQueryParametersApiDescriptionProvider>());
-
-            //Register the Swagger generator, defining 1 or more Swagger documents
-            services.AddSwaggerGen(options =>
-            {
-                options.SwaggerDoc("v1", new OpenApiInfo() { Title = "LinCms", Version = "v1" });
-                var security = new OpenApiSecurityRequirement()
-                {
-                    { new OpenApiSecurityScheme
-                    {
-                        Reference = new OpenApiReference()
-                        {
-                            Id = "Bearer",
-                            Type = ReferenceType.SecurityScheme
-                        }
-                    }, Array.Empty<string>() }
-                };
-                options.AddSecurityRequirement(security);//添加一个必须的全局安全信息，和AddSecurityDefinition方法指定的方案名称要一致，这里是Bearer。
-                options.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
-                {
-                    Description = "JWT授权(数据将在请求头中进行传输) 参数结构: \"Authorization: Bearer {token}\"",
-                    Name = "Authorization",//jwt默认的参数名称
-                    In = ParameterLocation.Header,//jwt默认存放Authorization信息的位置(请求头中)
-                    Type = SecuritySchemeType.ApiKey
-                });
-
-                string xmlPath = Path.Combine(AppContext.BaseDirectory, $"{typeof(Startup).Assembly.GetName().Name}.xml");
-                options.IncludeXmlComments(xmlPath);
-
-            });
-            #endregion
-
-
-            services.Configure<FormOptions>(options =>
-            {
-                options.MultipartBodyLengthLimit = 1024 * 1024 * 2;
-                options.MultipartHeadersCountLimit = 10;
-            });
-
-            IConfigurationSection configurationSection = Configuration.GetSection("ConnectionStrings:MySql");
-            services.AddCap(x =>
-            {
-                x.UseMySql(configurationSection.Value);
-
-                x.UseRabbitMQ(options =>
-                {
-                    options.HostName = Configuration["RabbitMQ:HostName"];
-                    options.UserName = Configuration["RabbitMQ:UserName"];
-                    options.Password = Configuration["RabbitMQ:Password"];
-                    options.VirtualHost = Configuration["RabbitMQ:VirtualHost"];
-                });
-
-                x.UseDashboard();
-                x.FailedRetryCount = 5;
-                x.FailedThresholdCallback = (type, message) =>
-                {
-                    Console.WriteLine(
-                        $@"A message of type {type} failed after executing {x.FailedRetryCount} several times, requiring manual troubleshooting. Message name: {message.GetName()}");
-                };
-            });
-            services.AddStartupTask<MigrationStartupTask>();
-            services.AddHealthChecks();
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
-        {
-            if (env.IsDevelopment())
-            {
-                //app.UseDeveloperExceptionPage();
-            }
-            else
-            {
-                app.UseHsts();
-            }
-            app.UseHsts();
-            app.UseStaticFiles();
-            //异常中间件应放在MVC执行事务的中件间的前面，否则异常时RequestMvcMiddleWare无法catch异常
-            app.UseMiddleware(typeof(CustomExceptionMiddleWare));
-            app.UseMiddleware(typeof(RequestMvcMiddleWare));
-
-            // Enable middleware to serve generated Swagger as a JSON endpoint.
-            app.UseSwagger();
-
-            //// Enable middleware to serve swagger-ui (HTML, JS, CSS, etc.),
-            //// specifying the Swagger JSON endpoint.
-            app.UseSwaggerUI(c =>
-            {
-                c.SwaggerEndpoint("/swagger/v1/swagger.json", "LinCms");
-                //c.RoutePrefix = string.Empty;
-                //c.OAuthClientId(Configuration["Service:ClientId"]);//客服端名称
-                //c.OAuthAppName(Configuration["Service:Name"]); // 描述
-            });
-
-            app.UseCors(builder =>
-            {
-                string[] withOrigins = Configuration.GetSection("WithOrigins").Get<string[]>();
-
-                builder.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(withOrigins);
-            });
-
-            app.UseAuthentication();
-            app.UseHttpsRedirection();
-
-            app.UseRouting()
-               .UseAuthorization()
-               .UseEndpoints(endpoints =>
-           {
-               endpoints.MapControllers();
-               endpoints.MapHealthChecks("/health", new HealthCheckOptions
-               {
-                   Predicate = _ => true,
-                   ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse
-               });
-           });
-        }
-
-    }
-}
diff --git a/src/LinCms.Web/Startup/Configuration/AutofacModule.cs b/src/LinCms.Web/Startup/Configuration/AutofacModule.cs
new file mode 100644
index 00000000..0ed247ad
--- /dev/null
+++ b/src/LinCms.Web/Startup/Configuration/AutofacModule.cs
@@ -0,0 +1,30 @@
+using Autofac;
+using LinCms.Data;
+using LinCms.Data.Authorization;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
+
+namespace LinCms.Startup.Configuration
+{
+    public class AutofacModule : Module
+    {
+        private readonly IConfiguration _configuration;
+        public AutofacModule(IConfiguration configuration)
+        {
+            this._configuration = configuration;
+        }
+
+        protected override void Load(ContainerBuilder builder)
+        {
+            builder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>().SingleInstance();
+            builder.RegisterType<PermissionAuthorizationHandler>().As<IAuthorizationHandler>().InstancePerLifetimeScope();
+            builder.RegisterType<ValidJtiHandler>().As<IAuthorizationHandler>().InstancePerLifetimeScope();
+
+            builder.RegisterType<MigrationStartupTask>().SingleInstance();
+            builder.RegisterBuildCallback(async (c) => await c.Resolve<MigrationStartupTask>().StartAsync());
+
+        }
+    }
+
+}
diff --git a/src/LinCms.Web/Startup/Configuration/DependencyModule.cs b/src/LinCms.Web/Startup/Configuration/DependencyModule.cs
new file mode 100644
index 00000000..832c3ac6
--- /dev/null
+++ b/src/LinCms.Web/Startup/Configuration/DependencyModule.cs
@@ -0,0 +1,38 @@
+ using Autofac;
+using LinCms.Dependency;
+using System;
+using System.Linq;
+using System.Reflection;
+
+namespace LinCms.Startup.Configuration
+{
+    /// <summary>
+    /// 接口注入
+    /// </summary>
+    public class DependencyModule : Autofac.Module
+    {
+        protected override void Load(ContainerBuilder builder)
+        {
+            Assembly[] currentAssemblies = AppDomain.CurrentDomain.GetAssemblies().Where(r => r.FullName.Contains("LinCms.")).ToArray();
+
+            //每次调用，都会重新实例化对象；每次请求都创建一个新的对象；
+            Type transientDependency = typeof(ITransientDependency);
+            builder.RegisterAssemblyTypes(currentAssemblies)
+                .Where(t => transientDependency.GetTypeInfo().IsAssignableFrom(t) && t.IsClass && !t.IsAbstract && !t.IsGenericType)
+                .AsImplementedInterfaces().InstancePerDependency();
+
+            //同一个Lifetime生成的对象是同一个实例
+            Type scopeDependency = typeof(IScopedDependency);
+            builder.RegisterAssemblyTypes(currentAssemblies)
+                .Where(t => scopeDependency.GetTypeInfo().IsAssignableFrom(t) && t.IsClass && !t.IsAbstract && !t.IsGenericType)
+                .AsImplementedInterfaces().InstancePerLifetimeScope();
+
+            //单例模式，每次调用，都会使用同一个实例化的对象；每次都用同一个对象；
+            Type singletonDependency = typeof(ISingletonDependency);
+            builder.RegisterAssemblyTypes(currentAssemblies)
+                .Where(t => singletonDependency.GetTypeInfo().IsAssignableFrom(t) && t.IsClass && !t.IsAbstract &&!t.IsGenericType)
+                .AsImplementedInterfaces().SingleInstance();
+
+        }
+    }
+}
diff --git a/src/LinCms.Web/Startup/Configuration/FreeSqlModule.cs b/src/LinCms.Web/Startup/Configuration/FreeSqlModule.cs
new file mode 100644
index 00000000..cc2fb0b8
--- /dev/null
+++ b/src/LinCms.Web/Startup/Configuration/FreeSqlModule.cs
@@ -0,0 +1,109 @@
+using Autofac;
+using FreeSql;
+using FreeSql.Internal;
+using LinCms.Entities;
+using LinCms.FreeSql;
+using LinCms.Utils;
+using Microsoft.Extensions.Configuration;
+using Serilog;
+using System;
+using System.Diagnostics;
+using System.Threading;
+using ToolGood.Words;
+
+namespace LinCms.Startup.Configuration
+{
+    public class FreeSqlModule : Module
+    {
+        private readonly IConfiguration _configuration;
+
+        public FreeSqlModule(IConfiguration configuration)
+        {
+            this._configuration = configuration;
+        }
+
+        protected override void Load(ContainerBuilder builder)
+        {
+
+            IFreeSql fsql = new FreeSqlBuilder()
+                .UseConnectionString(_configuration)
+                .UseNameConvert(NameConvertType.PascalCaseToUnderscoreWithLower)
+                .UseAutoSyncStructure(true)
+                .UseNoneCommandParameter(true)
+                .UseMonitorCommand(cmd =>
+                    {
+                        Trace.WriteLine(cmd.CommandText + ";");
+                    }
+                )
+                .CreateDatabaseIfNotExists()
+                .Build()
+                .SetDbContextOptions(opt => opt.EnableAddOrUpdateNavigateList = true)//联级保存功能开启（默认为关闭）
+                ;
+
+
+            fsql.Aop.CurdAfter += (s, e) =>
+            {
+                Log.Debug($"ManagedThreadId:{Thread.CurrentThread.ManagedThreadId}: FullName:{e.EntityType.FullName}" +
+                          $" ElapsedMilliseconds:{e.ElapsedMilliseconds}ms, {e.Sql}");
+
+
+                if (e.ElapsedMilliseconds > 200)
+                {
+                    //记录日志
+                    //发送短信给负责人
+                }
+            };
+
+            //敏感词处理
+            if (_configuration["AuditValue:Enable"].ToBoolean())
+            {
+                IllegalWordsSearch illegalWords = ToolGoodUtils.GetIllegalWordsSearch();
+
+                fsql.Aop.AuditValue += (s, e) =>
+                {
+                    if (e.Column.CsType == typeof(string) && e.Value != null)
+                    {
+                        string oldVal = (string)e.Value;
+                        string newVal = illegalWords.Replace(oldVal);
+                        //第二种处理敏感词的方式
+                        //string newVal = oldVal.ReplaceStopWords();
+                        if (newVal != oldVal)
+                        {
+                            e.Value = newVal;
+                        }
+                    }
+                };
+            }
+
+            builder.RegisterInstance(fsql).SingleInstance();
+            //services.AddFreeRepository();
+
+
+            builder.RegisterType(typeof(UnitOfWorkManager)).InstancePerLifetimeScope();
+
+
+            fsql.GlobalFilter.Apply<IDeleteAduitEntity>("IsDeleted", a => a.IsDeleted == false);
+            try
+            {
+                using var objPool = fsql.Ado.MasterPool.Get();
+            }
+            catch (Exception e)
+            {
+                Log.Logger.Error(e + e.StackTrace + e.Message + e.InnerException);
+                return;
+            }
+            //在运行时直接生成表结构
+            try
+            {
+                fsql.CodeFirst
+                    .SeedData()
+                    .SyncStructure(ReflexHelper.GetTypesByTableAttribute());
+            }
+            catch (Exception e)
+            {
+                Log.Logger.Error(e + e.StackTrace + e.Message + e.InnerException);
+            }
+
+        }
+    }
+}
diff --git a/src/LinCms.Web/Startup/Configuration/RepositoryModule.cs b/src/LinCms.Web/Startup/Configuration/RepositoryModule.cs
new file mode 100644
index 00000000..b4d266c8
--- /dev/null
+++ b/src/LinCms.Web/Startup/Configuration/RepositoryModule.cs
@@ -0,0 +1,28 @@
+using Autofac;
+using LinCms.IRepositories;
+using LinCms.Repositories;
+using System.Linq;
+using System.Reflection;
+
+namespace LinCms.Startup.Configuration
+{
+
+    /// <summary>
+    /// 注入仓储接口
+    /// </summary>
+    public class RepositoryModule : Autofac.Module
+    {
+        protected override void Load(ContainerBuilder builder)
+        {
+            Assembly assemblysRepository = Assembly.Load("LinCms.Infrastructure");
+            builder.RegisterAssemblyTypes(assemblysRepository)
+                    .Where(a => a.Name.EndsWith("Repository"))
+                    .AsImplementedInterfaces()
+                    .InstancePerLifetimeScope();
+
+            builder.RegisterGeneric(typeof(AuditBaseRepository<>)).As(typeof(IAuditBaseRepository<>)).InstancePerLifetimeScope();
+            builder.RegisterGeneric(typeof(AuditBaseRepository<,>)).As(typeof(IAuditBaseRepository<,>)).InstancePerLifetimeScope();
+
+        }
+    }
+}
diff --git a/src/LinCms.Web/Startup/Configuration/ServiceModule.cs b/src/LinCms.Web/Startup/Configuration/ServiceModule.cs
new file mode 100644
index 00000000..18ddcc9f
--- /dev/null
+++ b/src/LinCms.Web/Startup/Configuration/ServiceModule.cs
@@ -0,0 +1,78 @@
+using Autofac;
+using Autofac.Extras.DynamicProxy;
+using LinCms.Cms.Account;
+using LinCms.Cms.Files;
+using LinCms.Cms.Users;
+using LinCms.Entities;
+using LinCms.Middleware;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace LinCms.Startup.Configuration
+{
+    /// <summary>
+    /// 注入Application层中的Service
+    /// </summary>
+    public class ServiceModule : Autofac.Module
+    {
+        protected override void Load(ContainerBuilder builder)
+        {
+            builder.RegisterType<UnitOfWorkInterceptor>();
+            builder.RegisterType<UnitOfWorkAsyncInterceptor>();
+
+            builder.RegisterType<AopCacheIntercept>();
+
+            List<Type> interceptorServiceTypes = new List<Type>()
+            {
+                typeof(UnitOfWorkInterceptor),
+                typeof(AopCacheIntercept),
+            };
+
+            string[] notIncludes = new string[]
+            {
+                typeof(QiniuService).Name,
+                typeof(LocalFileService).Name,
+                typeof(IdentityServer4Service).Name,
+                typeof(JwtTokenService).Name,
+                typeof(GithubOAuth2Serivice).Name,
+                typeof(GiteeOAuth2Service).Name,
+                typeof(QQOAuth2Service).Name
+            };
+
+            Assembly servicesDllFile = Assembly.Load("LinCms.Application");
+            builder.RegisterAssemblyTypes(servicesDllFile)
+                .Where(a => a.Name.EndsWith("Service") && !notIncludes.Where(r => r == a.Name).Any() && !a.IsAbstract && !a.IsInterface && a.IsPublic)
+                .AsImplementedInterfaces()
+                .InstancePerLifetimeScope()
+                .PropertiesAutowired()// 属性注入
+                .InterceptedBy(interceptorServiceTypes.ToArray())
+                .EnableInterfaceInterceptors();
+
+            //太慢了。
+            //Assembly webDllFile = Assembly.Load("LinCms.Web");
+            //builder.RegisterAssemblyTypes(webDllFile)
+            //    .Where(a => a.Name.EndsWith("Controller") && !a.IsAbstract && !a.IsInterface && a.IsPublic)
+            //    .InstancePerLifetimeScope()
+            //    .AsSelf()
+            //    .PropertiesAutowired()// 属性注入
+            //    .InterceptedBy(interceptorServiceTypes.ToArray())
+            //    .EnableClassInterceptors();
+
+
+
+            //一个接口多个实现，使用Named，区分
+            builder.RegisterType<LocalFileService>().Named<IFileService>(LinFile.LocalFileService).InstancePerLifetimeScope();
+            builder.RegisterType<QiniuService>().Named<IFileService>(LinFile.QiniuService).InstancePerLifetimeScope();
+
+            builder.RegisterType<IdentityServer4Service>().Named<ITokenService>(typeof(IdentityServer4Service).Name).InstancePerLifetimeScope();
+            builder.RegisterType<JwtTokenService>().Named<ITokenService>(typeof(JwtTokenService).Name).InstancePerLifetimeScope();
+
+            builder.RegisterType<GithubOAuth2Serivice>().Named<IOAuth2Service>(LinUserIdentity.GitHub).InstancePerLifetimeScope();
+            builder.RegisterType<GiteeOAuth2Service>().Named<IOAuth2Service>(LinUserIdentity.Gitee).InstancePerLifetimeScope();
+            builder.RegisterType<QQOAuth2Service>().Named<IOAuth2Service>(LinUserIdentity.QQ).InstancePerLifetimeScope();
+
+        }
+    }
+}
diff --git a/src/LinCms.Web/Startup/DependencyInjectionExtensions.cs b/src/LinCms.Web/Startup/DependencyInjectionExtensions.cs
new file mode 100644
index 00000000..b8915e8e
--- /dev/null
+++ b/src/LinCms.Web/Startup/DependencyInjectionExtensions.cs
@@ -0,0 +1,259 @@
+using System;
+using System.Diagnostics;
+using System.Threading;
+using AspNetCoreRateLimit;
+using CSRedis;
+using DotNetCore.CAP;
+using DotNetCore.CAP.Messages;
+using FreeSql;
+using FreeSql.Internal;
+using LinCms.Data.Enums;
+using LinCms.Data.Options;
+using LinCms.Email;
+using LinCms.Entities;
+using LinCms.FreeSql;
+using LinCms.Utils;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Redis;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Savorboard.CAP.InMemoryMessageQueue;
+using Serilog;
+using ToolGood.Words;
+
+namespace LinCms.Startup
+{
+    public static class DependencyInjectionExtensions
+    {
+
+        #region FreeSql 已换成AutoFac注入方式 Configuration/FreeSqlModule
+        /// <summary>
+        /// FreeSql
+        /// </summary>
+        /// <param name="services"></param>
+        /// <param name="configuration"></param>
+        public static void AddFreeSql(this IServiceCollection services, IConfiguration configuration)
+        {
+            IFreeSql fsql = new FreeSqlBuilder()
+                   .UseConnectionString(configuration)
+                   .UseNameConvert(NameConvertType.PascalCaseToUnderscoreWithLower)
+                   .UseAutoSyncStructure(true)
+                   .UseNoneCommandParameter(true)
+                   .UseMonitorCommand(cmd =>
+                   {
+                       Trace.WriteLine(cmd.CommandText + ";");
+                   }
+                   )
+                   .Build()
+                   .SetDbContextOptions(opt => opt.EnableAddOrUpdateNavigateList = true);//联级保存功能开启（默认为关闭）
+
+            fsql.Aop.CurdAfter += (s, e) =>
+            {
+                Log.Debug($"ManagedThreadId:{Thread.CurrentThread.ManagedThreadId}: FullName:{e.EntityType.FullName}" +
+                          $" ElapsedMilliseconds:{e.ElapsedMilliseconds}ms, {e.Sql}");
+
+                if (e.ElapsedMilliseconds > 200)
+                {
+                    //记录日志
+                    //发送短信给负责人
+                }
+            };
+
+            //敏感词处理
+            if (configuration["AuditValue:Enable"].ToBoolean())
+            {
+                IllegalWordsSearch illegalWords = ToolGoodUtils.GetIllegalWordsSearch();
+
+                fsql.Aop.AuditValue += (s, e) =>
+                {
+                    if (e.Column.CsType == typeof(string) && e.Value != null)
+                    {
+                        string oldVal = (string)e.Value;
+                        string newVal = illegalWords.Replace(oldVal);
+                        //第二种处理敏感词的方式
+                        //string newVal = oldVal.ReplaceStopWords();
+                        if (newVal != oldVal)
+                        {
+                            e.Value = newVal;
+                        }
+                    }
+                };
+            }
+
+            services.AddSingleton(fsql);
+            services.AddFreeRepository();
+            services.AddScoped<UnitOfWorkManager>();
+            fsql.GlobalFilter.Apply<IDeleteAduitEntity>("IsDeleted", a => a.IsDeleted == false);
+            try
+            {
+                using var objPool = fsql.Ado.MasterPool.Get();
+            }
+            catch (Exception e)
+            {
+                Log.Logger.Error(e + e.StackTrace + e.Message + e.InnerException);
+                return;
+            }
+            //在运行时直接生成表结构
+            try
+            {
+                fsql.CodeFirst
+                    .SeedData()
+                    .SyncStructure(ReflexHelper.GetTypesByTableAttribute());
+            }
+            catch (Exception e)
+            {
+                Log.Logger.Error(e + e.StackTrace + e.Message + e.InnerException);
+            }
+        }
+        #endregion
+
+        #region 初始化 Redis配置
+        public static void AddCsRedisCore(this IServiceCollection services, IConfiguration configuration)
+        {
+
+            IConfigurationSection csRediSection = configuration.GetSection("ConnectionStrings:CsRedis");
+            CSRedisClient csRedisClient = new CSRedisClient(csRediSection.Value);
+            //初始化 RedisHelper
+            RedisHelper.Initialization(csRedisClient);
+            //注册mvc分布式缓存
+            services.AddSingleton<IDistributedCache>(new CSRedisCache(RedisHelper.Instance));
+        }
+        #endregion
+
+
+        public static void AddDIServices(this IServiceCollection services, IConfiguration configuration)
+        {
+            //services.AddTransient<CustomExceptionMiddleWare>();
+
+            services.AddFreeRepository();
+            services.AddHttpClient("IdentityServer4");
+            services.Configure<MailKitOptions>(configuration.GetSection("MailKitOptions"));
+            services.Configure<FileStorageOption>(configuration.GetSection("FileStorage"));
+            services.Configure<SiteOption>(configuration.GetSection("Site"));
+        }
+
+        /// <summary>
+        /// 配置限流依赖的服务
+        /// </summary>
+        /// <param name="services"></param>
+        /// <param name="configuration"></param>
+        /// <returns></returns>
+        public static IServiceCollection AddIpRateLimiting(this IServiceCollection services, IConfiguration configuration)
+        {
+            //加载配置
+            services.AddOptions();
+            //从IpRateLimiting.json获取相应配置
+            services.Configure<IpRateLimitOptions>(configuration.GetSection("IpRateLimiting"));
+            services.Configure<IpRateLimitPolicies>(configuration.GetSection("IpRateLimitPolicies"));
+            services.AddDistributedRateLimiting();
+            //配置（计数器密钥生成器）
+            services.AddSingleton<IRateLimitConfiguration, RateLimitConfiguration>();
+
+            return services;
+        }
+
+
+        #region 分布式事务一致性CAP
+
+        public static CapOptions UseCapOptions(this CapOptions @this, IConfiguration Configuration)
+        {
+            IConfigurationSection defaultStorage = Configuration.GetSection("CAP:DefaultStorage");
+            IConfigurationSection defaultMessageQueue = Configuration.GetSection("CAP:DefaultMessageQueue");
+            if (Enum.TryParse(defaultStorage.Value, out CapStorageType capStorageType))
+            {
+                if (!Enum.IsDefined(typeof(CapStorageType), capStorageType))
+                {
+                    Log.Error($"CAP配置CAP:DefaultStorage:{defaultStorage.Value}无效");
+                }
+
+                switch (capStorageType)
+                {
+                    case CapStorageType.InMemoryStorage:
+                        @this.UseInMemoryStorage();
+                        break;
+                    case CapStorageType.Mysql:
+                        IConfigurationSection mySql = Configuration.GetSection($"ConnectionStrings:MySql");
+                        @this.UseMySql(mySql.Value);
+                        break;
+                    //case CapStorageType.SqlServer:
+                    //    IConfigurationSection sqlServer = Configuration.GetSection($"ConnectionStrings:SqlServer");
+                    //    @this.UseSqlServer(opt =>
+                    //    {
+                    //        opt.ConnectionString = sqlServer.Value;
+                    // //使用SQL SERVER2008才需要打开他
+                    //        opt.UseSqlServer2008();
+                    //    });
+                    //    break;
+                    default:
+                        break;
+                }
+
+            }
+            else
+            {
+                Log.Error($"CAP:DefaultStorage:{capStorageType}配置无效，仅支持InMemoryStorage，Mysql，SqlServer！更多请增加引用，修改配置项代码");
+            }
+
+            if (Enum.TryParse(defaultMessageQueue.Value, out CapMessageQueueType capMessageQueueType))
+            {
+                if (!Enum.IsDefined(typeof(CapMessageQueueType), capMessageQueueType))
+                {
+                    Log.Error($"CAP配置CAP:DefaultMessageQueue:{defaultMessageQueue.Value}无效");
+                }
+                IConfigurationSection configurationSection = Configuration.GetSection($"ConnectionStrings:{capMessageQueueType}");
+
+                switch (capMessageQueueType)
+                {
+                    case CapMessageQueueType.InMemoryQueue:
+                        @this.UseInMemoryMessageQueue();
+                        break;
+                    case CapMessageQueueType.RabbitMQ:
+                        @this.UseRabbitMQ(options =>
+                        {
+                            options.HostName = Configuration["CAP:RabbitMQ:HostName"];
+                            options.UserName = Configuration["CAP:RabbitMQ:UserName"];
+                            options.Password = Configuration["CAP:RabbitMQ:Password"];
+                            options.VirtualHost = Configuration["CAP:RabbitMQ:VirtualHost"];
+                        });
+                        break;
+                    default:
+                        break;
+                }
+            }
+            else
+            {
+                Log.Error($"CAP配置CAP:DefaultMessageQueue:{defaultMessageQueue.Value}无效");
+            }
+
+            return @this;
+        }
+
+        public static IServiceCollection AddCap(this IServiceCollection services, IConfiguration Configuration)
+        {
+
+            services.AddCap(x =>
+            {
+                try
+                {
+                    x.UseCapOptions(Configuration);
+                }
+                catch (Exception ex)
+                {
+                    Log.Error(ex.Message);
+                    throw;
+                }
+                x.UseDashboard();
+                x.FailedRetryCount = 5;
+                x.FailedThresholdCallback = (type) =>
+                {
+                    Log.Error($@"A message of type {type} failed after executing {x.FailedRetryCount} several times, requiring manual troubleshooting. Message name: {type.Message.GetName()}");
+                };
+            });
+
+            return services;
+        }
+
+        #endregion
+
+    }
+}
diff --git a/src/LinCms.Web/Startup/JwtExtensions.cs b/src/LinCms.Web/Startup/JwtExtensions.cs
new file mode 100644
index 00000000..0615df27
--- /dev/null
+++ b/src/LinCms.Web/Startup/JwtExtensions.cs
@@ -0,0 +1,186 @@
+using System;
+using System.Threading.Tasks;
+using AspNet.Security.OAuth.Gitee;
+using DotNetCore.Security;
+using LinCms.Common;
+using LinCms.Data;
+using LinCms.Data.Authorization;
+using LinCms.Data.Enums;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.IdentityModel.Tokens;
+
+namespace LinCms.Startup
+{
+    public static class JwtExtensions
+    {
+        public static JsonWebTokenSettings AddSecurity(this IServiceCollection services, IConfiguration configuration)
+        {
+            JsonWebTokenSettings jsonWebTokenSettings = new JsonWebTokenSettings(
+                           configuration["Authentication:JwtBearer:SecurityKey"],
+                           new TimeSpan(1, 0, 0, 0),
+                           configuration["Authentication:JwtBearer:Audience"],
+                           configuration["Authentication:JwtBearer:Issuer"]
+                       );
+            services.AddHashService();
+            services.AddICryptographyService("lin-cms-dotnetcore-cryptography");
+            services.AddJsonWebTokenService(jsonWebTokenSettings);
+            return jsonWebTokenSettings;
+        }
+
+        public static void AddJwtBearer(this IServiceCollection services, IConfiguration Configuration)
+        {
+            JsonWebTokenSettings jsonWebTokenSettings = services.AddSecurity(Configuration);
+
+            //基于策略 处理 退出登录 黑名单策略 授权
+            services.AddAuthorization(options =>
+            {
+                var defaultPolicy = new AuthorizationPolicyBuilder()
+                    .AddAuthenticationSchemes(JwtBearerDefaults.AuthenticationScheme)
+                    .RequireAuthenticatedUser()
+                    .AddRequirements(new ValidJtiRequirement())
+                    .Build();
+                options.AddPolicy("Bearer", defaultPolicy);
+                // If no policy specified, use this
+                options.DefaultPolicy = defaultPolicy;
+            });
+
+            //认证
+            services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
+               .AddCookie(options =>
+               {
+                   options.Cookie.SameSite = SameSiteMode.None;
+                   options.Cookie.SecurePolicy = CookieSecurePolicy.Always;
+                   options.Cookie.IsEssential = true;
+               })//使用指定的方案启用 JWT 持有者身份验证。
+               .AddJwtBearer(options =>
+               {
+                   bool isIds4 = Configuration["Service:IdentityServer4"].ToBoolean();
+
+                   if (isIds4)
+                   {
+                       //identityserver4 地址 也就是本项目地址
+                       options.Authority = Configuration["Service:Authority"];
+                   }
+                   options.RequireHttpsMetadata = Configuration["Service:UseHttps"].ToBoolean();
+                   options.Audience = Configuration["Service:Name"];
+
+                   options.TokenValidationParameters = new TokenValidationParameters
+                   {
+                       // The signing key must match!
+                       ValidateIssuerSigningKey = true,
+                       IssuerSigningKey = jsonWebTokenSettings.SecurityKey,
+
+                       // Validate the JWT Issuer (iss) claim
+                       ValidateIssuer = true,
+                       ValidIssuer = jsonWebTokenSettings.Issuer,
+
+                       // Validate the JWT Audience (aud) claim
+                       ValidateAudience = true,
+                       ValidAudience = jsonWebTokenSettings.Audience,
+
+                       // Validate the token expiry
+                       ValidateLifetime = true,
+
+                       // If you want to allow a certain amount of clock drift, set thatValidIssuer  here
+                       //ClockSkew = TimeSpan.Zero
+                   };
+
+                   //options.TokenValidationParameters = new TokenValidationParameters()
+                   //{
+                   //    ClockSkew = TimeSpan.Zero   //偏移设置为了0s,用于测试过期策略,完全按照access_token的过期时间策略，默认原本为5分钟
+                   //};
+
+
+                   //使用Authorize设置为需要登录时，返回json格式数据。
+                   options.Events = new JwtBearerEvents()
+                   {
+                       OnAuthenticationFailed = context =>
+                       {
+                           //Token expired
+                           if (context.Exception.GetType() == typeof(SecurityTokenExpiredException))
+                           {
+                               context.Response.Headers.Add("Token-Expired", "true");
+                           }
+
+                           return Task.CompletedTask;
+                       },
+                       OnChallenge = async context =>
+                       {
+                           //此处代码为终止.Net Core默认的返回类型和数据结果，这个很重要哦
+                           context.HandleResponse();
+
+                           string message;
+                           ErrorCode errorCode;
+                           int statusCode = StatusCodes.Status401Unauthorized;
+
+                           if (context.Error == "invalid_token" &&
+                               context.ErrorDescription == "The token is expired")
+                           {
+                               message = "令牌过期";
+                               errorCode = ErrorCode.TokenExpired;
+                               statusCode = StatusCodes.Status422UnprocessableEntity;
+                           }
+                           else if (context.Error == "invalid_token" && context.ErrorDescription.IsNullOrEmpty())
+                           {
+                               message = "令牌失效";
+                               errorCode = ErrorCode.TokenInvalidation;
+                           }
+                           else
+                           {
+                               message = "请先登录 " + context.ErrorDescription; //""认证失败，请检查请求头或者重新登录";
+                               errorCode = ErrorCode.AuthenticationFailed;
+                           }
+
+                           context.Response.ContentType = "application/json";
+                           context.Response.StatusCode = statusCode;
+                           await context.Response.WriteAsync(new UnifyResponseDto(errorCode, message, context.HttpContext).ToString());
+
+                       }
+                   };
+               })
+               .AddGitHub(options =>
+               {
+                   options.ClientId = Configuration["Authentication:GitHub:ClientId"];
+                   options.ClientSecret = Configuration["Authentication:GitHub:ClientSecret"];
+                   options.Scope.Add("user:email");
+                   options.ClaimActions.MapJsonKey(LinConsts.Claims.AvatarUrl, "avatar_url");
+                   options.ClaimActions.MapJsonKey(LinConsts.Claims.HtmlUrl, "html_url");
+                   //登录成功后可通过  authenticateResult.Principal.FindFirst(ClaimTypes.Uri)?.Value;  得到GitHub头像
+                   options.ClaimActions.MapJsonKey(LinConsts.Claims.BIO, "bio");
+                   options.ClaimActions.MapJsonKey(LinConsts.Claims.BlogAddress, "blog");
+               })
+               .AddQQ(options =>
+               {
+                   options.ClientId = Configuration["Authentication:QQ:ClientId"];
+                   options.ClientSecret = Configuration["Authentication:QQ:ClientSecret"];
+               })
+               .AddGitee(GiteeAuthenticationDefaults.AuthenticationScheme, "码云", options =>
+               {
+                   options.ClientId = Configuration["Authentication:Gitee:ClientId"];
+                   options.ClientSecret = Configuration["Authentication:Gitee:ClientSecret"];
+
+                   options.ClaimActions.MapJsonKey("urn:gitee:avatar_url", "avatar_url");
+                   options.ClaimActions.MapJsonKey("urn:gitee:blog", "blog");
+                   options.ClaimActions.MapJsonKey("urn:gitee:bio", "bio");
+                   options.ClaimActions.MapJsonKey("urn:gitee:html_url", "html_url");
+                   //options.Scope.Add("projects");
+                   //options.Scope.Add("pull_requests");
+                   //options.Scope.Add("issues");
+                   //options.Scope.Add("notes");
+                   //options.Scope.Add("keys");
+                   //options.Scope.Add("hook");
+                   //options.Scope.Add("groups");
+                   //options.Scope.Add("gists");
+                   //options.Scope.Add("enterprises");
+
+                   options.SaveTokens = true;
+               });
+
+        }
+    }
+}
diff --git a/src/LinCms.Web/Startup/Program.cs b/src/LinCms.Web/Startup/Program.cs
new file mode 100644
index 00000000..0e6fc0d0
--- /dev/null
+++ b/src/LinCms.Web/Startup/Program.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Threading.Tasks;
+using AspNetCoreRateLimit;
+using Autofac.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Serilog;
+
+namespace LinCms.Startup
+{
+    public class Program
+    {
+        public static IConfiguration Configuration { get; } = new ConfigurationBuilder()
+            .SetBasePath(Directory.GetCurrentDirectory())
+            .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+            .AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"}.json", optional: true)
+            .AddEnvironmentVariables()
+            .Build();
+
+        public static async Task Main(string[] args)
+        {
+#if DEBUG
+            Serilog.Debugging.SelfLog.Enable(msg =>
+            Debug.WriteLine(msg)
+            );
+#endif
+
+            Log.Logger = new LoggerConfiguration().ReadFrom.Configuration(Configuration)
+                .Enrich.FromLogContext()
+                .CreateLogger();
+
+            try
+            {
+                Log.Information("init main");
+                IHost webHost = CreateWebHostBuilder(args).Build();
+                try
+                {
+                    using var scope = webHost.Services.CreateScope();
+                    // get the ClientPolicyStore instance
+                    var clientPolicyStore = scope.ServiceProvider.GetRequiredService<IClientPolicyStore>();
+
+                    // seed Client data from appsettings
+                    await clientPolicyStore.SeedAsync();
+
+                    // get the IpPolicyStore instance
+                    var ipPolicyStore = scope.ServiceProvider.GetRequiredService<IIpPolicyStore>();
+
+                    // seed IP data from appsettings
+                    await ipPolicyStore.SeedAsync();
+                }
+                catch (Exception ex)
+                {
+                    Log.Fatal(ex, "IIpPolicyStore RUN Error");
+                }
+                await webHost.RunAsync();
+            }
+            catch (Exception ex)
+            {
+                Log.Fatal(ex, "Host terminated unexpectedly");
+            }
+            finally
+            {
+                Log.CloseAndFlush();
+            }
+        }
+
+        private static IHostBuilder CreateWebHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .UseServiceProviderFactory(new AutofacServiceProviderFactory())
+                .ConfigureWebHostDefaults(webBuilder =>
+                {
+                    webBuilder.ConfigureKestrel((context, options) =>
+                    {
+                        //设置应用服务器Kestrel请求体最大为50MB，默认为28.6MB
+                        options.Limits.MaxRequestBodySize = 1024 * 1024 * 50;
+                    });
+                    webBuilder.UseStartup<Startup>().ConfigureAppConfiguration((host, config) =>
+                    {
+                        config.AddJsonFile($"RateLimitConfig.json", optional: true, reloadOnChange: true);
+                    });
+                })
+                .UseSerilog();
+    }
+}
diff --git a/src/LinCms.Web/Startup/Startup.cs b/src/LinCms.Web/Startup/Startup.cs
new file mode 100644
index 00000000..83c63631
--- /dev/null
+++ b/src/LinCms.Web/Startup/Startup.cs
@@ -0,0 +1,240 @@
+using System.Collections.Generic;
+using Autofac;
+using IGeekFan.AspNetCore.Knife4jUI;
+using IGeekFan.AspNetCore.RapiDoc;
+using LinCms.Aop.Filter;
+using LinCms.Cms.Users;
+using LinCms.Data;
+using LinCms.Data.Enums;
+using LinCms.Extensions;
+using LinCms.Middleware;
+using LinCms.Models.Options;
+using LinCms.Plugins.Poem.Services;
+using LinCms.SnakeCaseQuery;
+using LinCms.Startup.Configuration;
+using LinCms.Utils;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.HttpOverrides;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using Owl.reCAPTCHA;
+using Serilog;
+using Serilog.Events;
+
+namespace LinCms.Startup
+{
+    public class Startup
+    {
+        public IConfiguration Configuration { get; }
+
+        public Startup(IConfiguration configuration)
+        {
+            Configuration = configuration;
+        }
+
+        public void ConfigureServices(IServiceCollection services)
+        {
+            //services.AddFreeSql(Configuration);
+
+            services.AddCsRedisCore(Configuration);
+
+            services.AddJwtBearer(Configuration);
+
+            services.AddAutoMapper(typeof(UserProfile).Assembly, typeof(PoemProfile).Assembly);
+
+            services.AddCors();
+
+            #region Mvc
+            services.AddMvc(options =>
+                {
+                    options.ValueProviderFactories.Add(new ValueProviderFactory()); //设置SnakeCase形式的QueryString参数
+                    //options.Filters.Add<LogActionFilterAttribute>(); // 添加请求方法时的日志记录过滤器
+                    options.Filters.Add<LinCmsExceptionFilter>(); // 
+                })
+                .AddNewtonsoftJson(opt =>
+                {
+                    opt.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:MM:ss";
+                    // 设置自定义时间戳格式
+                    opt.SerializerSettings.Converters = new List<JsonConverter>()
+                    {
+                        new LinCmsTimeConverter()
+                    };
+                    // 设置下划线方式，首字母是小写
+                    opt.SerializerSettings.ContractResolver = new DefaultContractResolver()
+                    {
+                        NamingStrategy = new SnakeCaseNamingStrategy()
+                        {
+                            //ProcessDictionaryKeys = true
+                        },
+                    };
+                })
+                .ConfigureApiBehaviorOptions(options =>
+                {
+                    //options.SuppressConsumesConstraintForFormFileParameters = true; //SuppressUseValidationProblemDetailsForInvalidModelStateResponses;
+                    //自定义 BadRequest 响应
+                    options.InvalidModelStateResponseFactory = context =>
+                    {
+                        var problemDetails = new ValidationProblemDetails(context.ModelState);
+                        var resultDto = new UnifyResponseDto(ErrorCode.ParameterError, problemDetails.Errors, context.HttpContext);
+
+                        return new BadRequestObjectResult(resultDto)
+                        {
+                            ContentTypes = { "application/json" }
+                        };
+                    };
+                });
+            #endregion
+
+            #region 配置Google验证码
+            services.AddScoped<RecaptchaVerifyActionFilter>();
+            services.Configure<GooglereCAPTCHAOptions>(Configuration.GetSection(GooglereCAPTCHAOptions.RecaptchaSettings));
+            GooglereCAPTCHAOptions googlereCAPTCHAOptions = new GooglereCAPTCHAOptions();
+            Configuration.GetSection(GooglereCAPTCHAOptions.RecaptchaSettings).Bind(googlereCAPTCHAOptions);
+            services.AddreCAPTCHAV3(x =>
+            {
+                x.VerifyBaseUrl = googlereCAPTCHAOptions.VerifyBaseUrl;
+                x.SiteKey = googlereCAPTCHAOptions.SiteKey;
+                x.SiteSecret = googlereCAPTCHAOptions.SiteSecret;
+            });
+            #endregion
+
+            services.AddDIServices(Configuration);
+
+            //Swagger 扩展方法配置Swagger
+            services.AddSwaggerGen();
+
+            //应用程序级别设置
+            services.Configure<FormOptions>(options =>
+            {
+                //单个文件上传的大小限制为8 MB      默认134217728 应该是128MB
+                options.MultipartBodyLengthLimit = 1024 * 1024 * 8; //8MB
+            });
+
+            // 分布式事务一致性CAP
+            services.AddCap(Configuration);
+
+            services.Configure<ForwardedHeadersOptions>(options =>
+            {
+                options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
+            });
+
+            //之前请注入AddCsRedisCore，内部实现IDistributedCache接口
+            services.AddIpRateLimiting(Configuration);
+
+            services.AddHealthChecks();
+        }
+
+        public void ConfigureContainer(ContainerBuilder builder)
+        {
+            builder.RegisterModule(new RepositoryModule());
+            builder.RegisterModule(new ServiceModule());
+            builder.RegisterModule(new AutofacModule(Configuration));
+            builder.RegisterModule(new DependencyModule());
+            builder.RegisterModule(new FreeSqlModule(Configuration));
+        }
+
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
+        {
+            app.UseForwardedHeaders();
+
+            if (env.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
+            else
+            {
+                app.UseHsts();
+            }
+
+            app.UseHttpsRedirection();
+
+            app.UseStaticFiles();
+
+            app.UseSerilogRequestLogging(opts =>
+            {
+                opts.EnrichDiagnosticContext = LogHelper.EnrichFromRequest;
+                opts.GetLevel = (ctx, _, ex) =>
+                {
+                    var path = ctx.Request.Path;
+                    switch (path)
+                    {
+                        case "/health":
+                        case "/cms/log/serilog":
+                            return LogEventLevel.Debug;
+                    }
+                    return ex != null || ctx.Response.StatusCode > 499 ? LogEventLevel.Error : LogEventLevel.Information;
+                };
+            });
+
+            //异常中间件应放在MVC执行事务的中件间的前面，否则异常时UnitOfWorkMiddleware无法catch异常
+            //app.UseMiddleware(typeof(CustomExceptionMiddleWare));
+
+            #region 三种Swagger
+            app.UseSwagger();
+
+            app.UseSwaggerUI(c =>
+            {
+                //http://localhost:5000/swagger/index.html
+                c.SwaggerEndpoint("/swagger/v1/swagger.json", "v1");
+                c.SwaggerEndpoint("/swagger/cms/swagger.json", "cms");
+
+                c.OAuthClientId(Configuration["Service:ClientId"]);
+                c.OAuthClientSecret(Configuration["Service:ClientSecret"]);
+                c.OAuthAppName(Configuration["Service:Name"]);
+
+                c.ConfigObject.DisplayOperationId = true;
+
+            });
+
+            app.UseKnife4UI(c =>
+            {
+                c.DocumentTitle = "LinCms博客模块";
+                c.RoutePrefix = "";//http://localhost:5000/index.html
+                                   //c.InjectStylesheet("");
+                c.SwaggerEndpoint("/swagger/v1/swagger.json", "v1");
+                c.SwaggerEndpoint("/swagger/cms/swagger.json", "cms");
+                c.OAuthClientSecret(Configuration["Service:ClientSecret"]);
+                c.OAuthClientId(Configuration["Service:ClientId"]);
+                c.OAuthAppName(Configuration["Service:Name"]);
+            });
+
+            app.UseRapiDocUI(c =>
+            {
+                c.RoutePrefix = "RapiDoc"; //http://localhost:5000/RapiDoc/index.html
+                c.SwaggerEndpoint("/swagger/v1/swagger.json", "v1");
+                c.SwaggerEndpoint("/swagger/cms/swagger.json", "cms");
+            });
+
+            #endregion
+
+            app.UseCors(builder =>
+            {
+                string[] withOrigins = Configuration.GetSection("WithOrigins").Get<string[]>();
+                builder.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(withOrigins);
+            });
+
+            //认证中间件
+            app.UseAuthentication();
+
+            //IP 限流 RateLimitConfig.json
+            app.UseMiddleware<IpLimitMiddleware>();
+
+            app.UseRouting()
+                .UseAuthorization()
+                .UseEndpoints(endpoints =>
+                {
+                    endpoints.MapControllers();
+                    endpoints.MapHealthChecks("/health");
+                });
+        }
+    }
+
+}
diff --git a/src/LinCms.Web/Startup/SwaggerExtensions.cs b/src/LinCms.Web/Startup/SwaggerExtensions.cs
new file mode 100644
index 00000000..bff8421b
--- /dev/null
+++ b/src/LinCms.Web/Startup/SwaggerExtensions.cs
@@ -0,0 +1,168 @@
+using LinCms.Data.Options;
+using LinCms.Entities;
+using LinCms.Exceptions;
+using LinCms.SnakeCaseQuery;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
+using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Interfaces;
+using Microsoft.OpenApi.Models;
+using Serilog;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.InteropServices;
+
+namespace LinCms.Startup
+{
+    public static class SwaggerExtensions
+    {
+        public static IServiceCollection AddSwaggerGen(this IServiceCollection services)
+        {
+            //解决  https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/1349#issuecomment-572537295
+            services.AddSwaggerGenNewtonsoftSupport();
+
+            SiteOption? siteOption = services.BuildServiceProvider().GetService<IOptionsSnapshot<SiteOption>>()?.Value;
+            if (siteOption == null)
+            {
+                throw new LinCmsException("you should add  `services.Configure<SiteOption>(configuration.GetSection(\"Site\"));` before get this options value ");
+            }
+
+            //Swagger重写PascalCase，改成SnakeCase模式
+            services.TryAddEnumerable(ServiceDescriptor.Transient<IApiDescriptionProvider, ApiDescriptionProvider>());
+
+            //Register the Swagger generator, defining 1 or more Swagger documents
+            services.AddSwaggerGen(options =>
+            {
+                string ApiName = "LinCms.Web";
+                options.SwaggerDoc("v1", new OpenApiInfo()
+                {
+                    Title = ApiName + RuntimeInformation.FrameworkDescription,
+                    Version = "v1",
+                    Contact = new OpenApiContact
+                    {
+                        Name = ApiName,
+                        Email = siteOption.Email,
+                        Url = new Uri(siteOption.BlogUrl)
+                    },
+                    License = new OpenApiLicense
+                    {
+                        Name = ApiName + " 官方文档",
+                        Url = new Uri(siteOption.DocUrl)
+                    }
+                });
+
+                options.SwaggerDoc("cms", new OpenApiInfo() { Title = ApiName + RuntimeInformation.FrameworkDescription, Version = "cms" });
+
+                //添加一个必须的全局安全信息，和AddSecurityDefinition方法指定的方案名称要一致，这里是Bearer。
+                options.AddSecurityRequirement(new OpenApiSecurityRequirement()
+                {
+                    {
+                        new OpenApiSecurityScheme
+                        {
+                            Reference = new OpenApiReference()
+                            {
+                                Id =  "Bearer",
+                                Type = ReferenceType.SecurityScheme
+                            }
+                        },
+                        Array.Empty<string>()
+                    }
+                });
+                options.AddSecurityDefinition(JwtBearerDefaults.AuthenticationScheme, new OpenApiSecurityScheme
+                {
+                    Description = "JWT授权(数据将在请求头中进行传输) 参数结构: \"Authorization: Bearer {token}\"",
+                    Name = "Authorization", //jwt默认的参数名称
+                    In = ParameterLocation.Header, //jwt默认存放Authorization信息的位置(请求头中)
+                    Type = SecuritySchemeType.ApiKey
+                });
+
+                options.AddSecurityRequirement(new OpenApiSecurityRequirement()
+                {
+                    {
+                        new OpenApiSecurityScheme
+                        {
+                            Reference = new OpenApiReference()
+                            {
+                                Id =  "oauth2",
+                                Type = ReferenceType.SecurityScheme
+                            }
+                        },
+                        Array.Empty<string>()
+                    }
+                });
+                // Define the OAuth2.0 scheme that's in use (i.e. Implicit Flow)
+                options.AddSecurityDefinition("oauth2", new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.OAuth2,
+                    Flows = new OpenApiOAuthFlows
+                    {
+                        AuthorizationCode = new OpenApiOAuthFlow
+                        {
+                            AuthorizationUrl = new Uri(siteOption.IdentityServer4Domain + "/connect/authorize", UriKind.Absolute),
+                            TokenUrl = new Uri(siteOption.IdentityServer4Domain + "/connect/token", UriKind.Absolute),
+                            Scopes = new Dictionary<string, string>
+                            {
+                                { "LinCms.Web", "Access read/write LinCms.Web" }
+                            }
+                        },
+                        Password = new OpenApiOAuthFlow()
+                        {
+                            AuthorizationUrl = new Uri(siteOption.IdentityServer4Domain + "/connect/authorize", UriKind.Absolute),
+                            TokenUrl = new Uri(siteOption.IdentityServer4Domain + "/connect/token", UriKind.Absolute),
+                            Scopes = new Dictionary<string, string>
+                            {
+                                { "openid", "Access read openid" },
+                                { "offline_access", "Access read offline_access" },
+                                { "LinCms.Web", "Access read/write LinCms.Web" }
+                            }
+                        }
+                    },
+                    Extensions = new Dictionary<string, IOpenApiExtension>()
+                    {
+                       {"x-client-id", new OpenApiString("lin-cms-dotnetcore-client-id")},
+                       {"x-client-secret", new OpenApiString("lin-cms-dotnetcore-client-secrets")},
+                    }
+                });
+
+                try
+                {
+                    string xmlPath = Path.Combine(AppContext.BaseDirectory, $"{typeof(Startup).Assembly.GetName().Name}.xml");
+                    options.IncludeXmlComments(xmlPath, true);
+                    //实体层的xml文件名
+                    string xmlEntityPath = Path.Combine(AppContext.BaseDirectory, $"{typeof(IEntity).Assembly.GetName().Name}.xml");
+                    options.IncludeXmlComments(xmlEntityPath);
+                    //Dto所在类库
+                    string applicationPath = Path.Combine(AppContext.BaseDirectory, $"{typeof(IApplicationService).Assembly.GetName().Name}.xml");
+                    options.IncludeXmlComments(applicationPath);
+                }
+                catch (Exception ex)
+                {
+                    Log.Logger.Warning(ex.Message);
+                }
+
+                //options.AddServer(new OpenApiServer()
+                //{
+                //    Url = "https://localhost:5001/",
+                //    Description = "本地"
+                //}); ;
+                //options.AddServer(new OpenApiServer()
+                //{
+                //    Url = "https://api.igeekfan.cn/",
+                //    Description = "服务端"
+                //});
+
+                options.CustomOperationIds(apiDesc =>
+                {
+                    var controllerAction = apiDesc.ActionDescriptor as ControllerActionDescriptor;
+                    return $"{controllerAction.ControllerName}-{controllerAction.ActionName}-{ controllerAction.GetHashCode()}";
+                });
+            });
+            return services;
+        }
+    }
+}
diff --git a/src/LinCms.Web/Utils/LogHelper.cs b/src/LinCms.Web/Utils/LogHelper.cs
new file mode 100644
index 00000000..eae637f5
--- /dev/null
+++ b/src/LinCms.Web/Utils/LogHelper.cs
@@ -0,0 +1,40 @@
+using LinCms.Security;
+using Microsoft.AspNetCore.Http;
+using Serilog;
+
+namespace LinCms.Utils
+{
+    public class LogHelper
+    {
+        public static void EnrichFromRequest(IDiagnosticContext diagnosticContext, HttpContext httpContext)
+        {
+            var request = httpContext.Request;
+            ICurrentUser? currentUser = httpContext.RequestServices.GetService(typeof(ICurrentUser)) as ICurrentUser;
+            if (currentUser != null)
+            {
+                diagnosticContext.Set("UserName", currentUser.UserName);
+                diagnosticContext.Set("UserId", currentUser.Id);
+            }
+            // et all the common properties available for every request
+            diagnosticContext.Set("Host", request.Host);
+            diagnosticContext.Set("Protocol", request.Protocol);
+            diagnosticContext.Set("Scheme", request.Scheme);
+
+            // Only set it if available. You're not sending sensitive data in a querystring right?!
+            if (request.QueryString.HasValue)
+            {
+                diagnosticContext.Set("QueryString", request.QueryString.Value);
+            }
+
+            // Set the content-type of the Response at this point
+            diagnosticContext.Set("ContentType", httpContext.Response.ContentType);
+
+            // Retrieve the IEndpointFeature selected for the request
+            var endpoint = httpContext.GetEndpoint();
+            if (endpoint != null)
+            {
+                diagnosticContext.Set("EndpointName", endpoint.DisplayName);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Web/Utils/MultipartRequestHelper.cs b/src/LinCms.Web/Utils/MultipartRequestHelper.cs
new file mode 100644
index 00000000..b3ad9e43
--- /dev/null
+++ b/src/LinCms.Web/Utils/MultipartRequestHelper.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace LinCms.Utils
+{
+    public class MultipartRequestHelper
+    {
+        public static bool IsMultipartContentType(string contentType)
+        {
+            return !string.IsNullOrEmpty(contentType)
+                   && contentType.IndexOf("multipart/", StringComparison.OrdinalIgnoreCase) >= 0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/LinCms.Web/Data/ReflexHelper.cs b/src/LinCms.Web/Utils/ReflexHelper.cs
similarity index 56%
rename from src/LinCms.Web/Data/ReflexHelper.cs
rename to src/LinCms.Web/Utils/ReflexHelper.cs
index 6448bb95..380b8cf7 100644
--- a/src/LinCms.Web/Data/ReflexHelper.cs
+++ b/src/LinCms.Web/Utils/ReflexHelper.cs
@@ -1,25 +1,26 @@
 using System;
 using System.Collections.Generic;
-using System.Dynamic;
 using System.Linq;
 using System.Reflection;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
-using LinCms.Core.Entities;
-using LinCms.Core.Extensions;
+using FreeSql.DataAnnotations;
+using LinCms.Aop.Filter;
+using LinCms.Data;
+using LinCms.Entities;
+using LinCms.Startup;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Routing;
 
-namespace LinCms.Web.Data
+namespace LinCms.Utils
 {
     /// <summary>
     /// 反射帮助类
     /// </summary>
     public class ReflexHelper
     {
-        public static List<T> GetAssembly<T>() where T : Attribute
+        public static List<T> GetAssemblies<T>() where T : Attribute
         {
             List<T> listT = new List<T>();
-            List<Type> assembly = typeof(Startup).Assembly.GetTypes().AsEnumerable()
+            List<Type> assembly = typeof(Program).Assembly.GetTypes().AsEnumerable()
                 .Where(type => typeof(ControllerBase).IsAssignableFrom(type)).ToList();
 
             assembly.ForEach(d =>
@@ -32,20 +33,20 @@ public static List<T> GetAssembly<T>() where T : Attribute
 
 
         //得到这样的结果
-        //LinCms.Zero.Data.PermissionDto Permission:查询日志记录的用户、Module:日志、Router:cms.log+get_users
-        //LinCms.Zero.Data.PermissionDto Permission:查询所有日志、Module:日志、Router:cms.log+get_logs
-        //LinCms.Zero.Data.PermissionDto Permission:搜索日志、Module:日志、Router:cms.log+get_user_logs
-        //LinCms.Zero.Data.PermissionDto Permission:查看lin的信息、Module:信息、Router:cms.test+info
-        //LinCms.Zero.Data.PermissionDto Permission:删除图书、Module:图书、Router:v1.book+delete_book
+        //LinCms.Zero.Data.PermissionDto Permission:查询日志记录的用户、Module:日志、Router:cms.log.get_users
+        //LinCms.Zero.Data.PermissionDto Permission:查询所有日志、Module:日志、Router:cms.log.get_logs
+        //LinCms.Zero.Data.PermissionDto Permission:搜索日志、Module:日志、Router:cms.log.get_user_logs
+        //LinCms.Zero.Data.PermissionDto Permission:查看lin的信息、Module:信息、Router:cms.test.info
+        //LinCms.Zero.Data.PermissionDto Permission:删除图书、Module:图书、Router:v1.book.delete_book
         /// <summary>
         /// 通过反射得到LinCmsAttrbutes所有权限结构，为树型权限生成做准备
         /// </summary>
         /// <returns></returns>
-        public static List<PermissionDefinition> GeAssemblyLinCmsAttributes()
+        public static List<PermissionDefinition> GetAssemblyLinCmsAttributes()
         {
             List<PermissionDefinition> linAuths = new List<PermissionDefinition>();
 
-            List<Type> assembly = typeof(Startup).Assembly.GetTypes().AsEnumerable()
+            List<Type> assembly = typeof(Program).Assembly.GetTypes().AsEnumerable()
                 .Where(type => typeof(ControllerBase).IsAssignableFrom(type)).ToList();
             //通过反射得到控制器上的权限特性标签
             assembly.ForEach(d =>
@@ -54,7 +55,7 @@ public static List<PermissionDefinition> GeAssemblyLinCmsAttributes()
                 RouteAttribute routerAttribute = d.GetCustomAttribute<RouteAttribute>();
                 if (linCmsAuthorize?.Permission != null && routerAttribute?.Template != null)
                 {
-                    linAuths.Add(new PermissionDefinition(linCmsAuthorize.Permission, linCmsAuthorize.Module, routerAttribute.Template.Replace("/", ".")));
+                    linAuths.Add(new PermissionDefinition(linCmsAuthorize.Permission, linCmsAuthorize.Module, routerAttribute.Template));
                 }
             });
 
@@ -66,24 +67,51 @@ public static List<PermissionDefinition> GeAssemblyLinCmsAttributes()
                 {
                     foreach (MethodInfo methodInfo in r.GetMethods())
                     {
+                        HttpMethodAttribute methodAttribute = GetMethodAttribute(methodInfo);
+
                         foreach (Attribute attribute in methodInfo.GetCustomAttributes())
                         {
-                            if (attribute is LinCmsAuthorizeAttribute linCmsAuthorize && linCmsAuthorize.Permission.IsNotNullOrEmpty() && linCmsAuthorize.Module.IsNotNullOrEmpty())
+                            if (attribute is LinCmsAuthorizeAttribute linAttribute && linAttribute.Permission.IsNotNullOrEmpty() && linAttribute.Module.IsNotNullOrEmpty())
                             {
+                                string actionTemplate = methodAttribute.Template != null ? "/" + methodAttribute.Template + " " : " ";
+                                string router = $"{routerAttribute.Template}{actionTemplate}{methodAttribute.HttpMethods.FirstOrDefault()}";
                                 linAuths.Add(
                                         new PermissionDefinition(
-                                                linCmsAuthorize.Permission,
-                                                linCmsAuthorize.Module,
-                                                $"{routerAttribute.Template.Replace("/", ".")}+{methodInfo.Name.ToSnakeCase()}"
-                                                )
+                                                linAttribute.Permission,
+                                                linAttribute.Module,
+                                                router
+                                            )
                                     );
+                                //methodInfo.Name.ToSnakeCase()
                             }
                         }
                     }
                 }
             });
 
-            return linAuths;
+            return linAuths.Distinct().ToList();
+        }
+
+        private static HttpMethodAttribute GetMethodAttribute(MethodInfo methodInfo)
+        {
+            HttpMethodAttribute methodAttribute = methodInfo.GetCustomAttribute<HttpGetAttribute>();
+            if (methodAttribute != null)
+            {
+                return methodAttribute;
+            }
+            methodAttribute = methodInfo.GetCustomAttribute<HttpDeleteAttribute>();
+            if (methodAttribute != null)
+            {
+                return methodAttribute;
+            }
+            methodAttribute = methodInfo.GetCustomAttribute<HttpPutAttribute>();
+            if (methodAttribute != null)
+            {
+                return methodAttribute;
+            }
+            methodAttribute = methodInfo.GetCustomAttribute<HttpPostAttribute>();
+
+            return methodAttribute;
         }
 
         /**
@@ -128,10 +156,10 @@ public static dynamic AuthorizationConvertToTree(List<PermissionDefinition> list
                 }).ToList()
             }).ToList();
 
-            IDictionary<string, object> expandoObject = new ExpandoObject();
+            IDictionary<string, object> expandoObject = new Dictionary<string, object>();
             foreach (var permission in permissionTree)
             {
-                IDictionary<string, object> perExpandObject = new ExpandoObject();
+                IDictionary<string, object> perExpandObject = new Dictionary<string, object>();
 
                 foreach (var children in permission.Children)
                 {
@@ -152,15 +180,15 @@ public static List<IDictionary<string, object>> AuthsConvertToTree(List<LinPermi
                 Children = r.Select(u => u.Name).ToList()
             }).ToList();
 
-            List<IDictionary<string, object>> list=new List<IDictionary<string, object>>();
+            List<IDictionary<string, object>> list = new List<IDictionary<string, object>>();
 
             foreach (var groupAuth in groupAuths)
             {
-                IDictionary<string, object> moduleExpandoObject = new ExpandoObject();
+                IDictionary<string, object> moduleExpandoObject = new Dictionary<string, object>();
                 List<IDictionary<string, object>> perExpandList = new List<IDictionary<string, object>>();
                 groupAuth.Children.ForEach(permission =>
                 {
-                    IDictionary<string, object> perExpandObject = new ExpandoObject();
+                    IDictionary<string, object> perExpandObject = new Dictionary<string, object>();
                     perExpandObject["module"] = groupAuth.Key;
                     perExpandObject["permission"] = permission;
                     perExpandList.Add(perExpandObject);
@@ -172,5 +200,54 @@ public static List<IDictionary<string, object>> AuthsConvertToTree(List<LinPermi
 
             return list;
         }
+
+        /// <summary>
+        /// 扫描 IEntity类所在程序集，反射得到类上有特性标签为TableAttribute 的所有类
+        /// </summary>
+        /// <returns></returns>
+        public static Type[] GetTypesByTableAttribute()
+        {
+            List<Type> tableAssembies = new List<Type>();
+            foreach (Type type in Assembly.GetAssembly(typeof(IEntity)).GetExportedTypes())
+            {
+                foreach (Attribute attribute in type.GetCustomAttributes())
+                {
+                    if (attribute is TableAttribute tableAttribute)
+                    {
+                        if (tableAttribute.DisableSyncStructure == false)
+                        {
+                            tableAssembies.Add(type);
+                        }
+                    }
+                }
+            };
+            return tableAssembies.ToArray();
+        }
+
+        public static Type[] GetTypesByNameSpace()
+        {
+            List<Type> tableAssembies = new List<Type>();
+            List<string> entitiesFullName = new List<string>()
+            {
+                "LinCms.Entities.Settings",
+                "LinCms.Entities.Blog",
+                "LinCms.Entities.Base",
+                "LinCms.Entities.Lin",
+                "LinCms.Entities.Book",
+            };
+
+            foreach (Type type in Assembly.GetAssembly(typeof(IEntity)).GetExportedTypes())
+            {
+                foreach (var fullname in entitiesFullName)
+                {
+                    if (type.FullName.StartsWith(fullname) && type.IsClass)
+                    {
+                        tableAssembies.Add(type);
+                    }
+                }
+
+            }
+            return tableAssembies.ToArray();
+        }
     }
 }
diff --git a/src/LinCms.Web/Utils/StopWords.cs b/src/LinCms.Web/Utils/StopWords.cs
index d59759b6..f5b073b2 100644
--- a/src/LinCms.Web/Utils/StopWords.cs
+++ b/src/LinCms.Web/Utils/StopWords.cs
@@ -3,7 +3,7 @@
 using System.IO;
 using System.Text;
 
-namespace LinCms.Web.Utils
+namespace LinCms.Utils
 {
     public static class StopWords
     {
diff --git a/src/LinCms.Web/Utils/ToolGoodUtils.cs b/src/LinCms.Web/Utils/ToolGoodUtils.cs
index 32d10dfe..dd08897c 100644
--- a/src/LinCms.Web/Utils/ToolGoodUtils.cs
+++ b/src/LinCms.Web/Utils/ToolGoodUtils.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using ToolGood.Words;
 
-namespace LinCms.Web.Utils
+namespace LinCms.Utils
 {
     /// <summary>
     /// ToolGood.Words类库配合敏感库
@@ -20,12 +20,14 @@ public class ToolGoodUtils
 
         private const string InfoPath = "wwwroot/_Illegal/IllegalInfo.txt";
         private const string BitPath = "wwwroot/_Illegal/IllegalBit.iws";
+        [System.Obsolete]
+        private static IllegalWordsSearch? _search;
 
-        private static IllegalWordsSearch _search;
         /// <summary>
         /// 本地敏感库,文件修改后，重新创建缓存Bit
         /// </summary>
         /// <returns></returns>
+        [System.Obsolete]
         public static IllegalWordsSearch GetIllegalWordsSearch()
         {
             if (!File.Exists(UrlsPath)||!File.Exists(KeywordsPath))
@@ -62,6 +64,7 @@ public static IllegalWordsSearch GetIllegalWordsSearch()
             return _search;
         }
 
+        [System.Obsolete]
         private static IllegalWordsSearch CreateIllegalWordsSearch()
         {
             string[] words1 = File.ReadAllLines(Path.GetFullPath(KeywordsPath), Encoding.UTF8);
diff --git a/src/LinCms.Web/appsettings.Development.json b/src/LinCms.Web/appsettings.Development.json
new file mode 100644
index 00000000..3046c2ad
--- /dev/null
+++ b/src/LinCms.Web/appsettings.Development.json
@@ -0,0 +1,10 @@
+{
+
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "System": "Information",
+      "Microsoft": "Information"
+    }
+  }
+}
diff --git a/src/LinCms.Web/appsettings.Production.json b/src/LinCms.Web/appsettings.Production.json
new file mode 100644
index 00000000..5f7bba27
--- /dev/null
+++ b/src/LinCms.Web/appsettings.Production.json
@@ -0,0 +1,170 @@
+{
+  "ConnectionStrings": {
+    "DefaultDB": "{ConnectionStrings.DefaultDB}",
+    "DataType": {
+      "MySql": 0,
+      "SqlServer": 1,
+      "PostgreSQL": 2,
+      "Oracle": 3,
+      "Sqlite": 4
+    },
+    "MySql": "{ConnectionStrings.MySql}",
+    "SqlServer": "{ConnectionStrings.SqlServer}",
+    "Sqlite": "{ConnectionStrings.Sqlite}",
+    "CsRedis": "{ConnectionStrings.CsRedis}"
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Warning",
+      "Microsoft": "Warning"
+    }
+  },
+  "FileStorage": {
+    "MaxFileSize": 83886080,
+    "NumLimit": 10,
+    "Include": "",
+    "Exclude": ".exe,.dll",
+    "ServiceName": "LocalFileService",
+    "LocalFile": {
+      "PrefixPath": "assets",
+      "Host": "https://images.igeekfan.cn/"
+    },
+    "Qiniu": {
+      "AK": "{FileStorage.Qiniu.AK}",
+      "SK": "{FileStorage.Qiniu.SK}",
+      "Bucket": "vvv",
+      "PrefixPath": "assets",
+      "Host": "https://images.igeekfan.cn/",
+      "UseHttps": false
+    }
+  },
+  "Site": {
+    "VVLogDomain": "https://vvlog.baimocore.cn/",
+    "CMSDomain": "https://cms.baimocore.cn/",
+    "ApiDomain": "https://api.igeekfan.cn/",
+    "IdentityServer4Domain": "https://ids4.igeekfan.cn/",
+    "Email": "luoyunchong@foxmail.com",
+    "BlogUrl": "https://www.cnblogs.com/igeekfan/",
+    "DocUrl": "https://luoyunchong.github.io/vovo-docs/dotnetcore/lin-cms/dotnetcore-start.html"
+  },
+  "WithOrigins": [
+    "http://localhost:8080/",
+    "https://localhost:5001/",
+    "https://cms.baimocore.cn/",
+    "https://www.baimocore.cn/",
+    "https://vvlog.baimocore.cn/"
+  ],
+  "Service": {
+    "IdentityServer4": true,
+    "Name": "LinCms.Web",
+    "GrantType": "password",
+    "ClientId": "lin-cms-dotnetcore-client-id",
+    "ClientSecret": "lin-cms-dotnetcore-client-secrets",
+    "Authority": "https://ids4.igeekfan.cn/",
+    "UseHttps": true
+  },
+  "Authentication": {
+    "JwtBearer": {
+      "SecurityKey": "lin-cms-dotnetcore-SecurityKey",
+      "Issuer": "lin-cms-dotnetcore-Issuer",
+      "Audience": "LinCms.Web"
+    },
+    "GitHub": {
+      "ClientId": "{Authentication.GitHub.ClientId}",
+      "ClientSecret": "{Authentication.GitHub.ClientSecret}"
+    },
+    "QQ": {
+      "ClientId": "{Authentication.QQ.ClientId}",
+      "ClientSecret": "{Authentication.QQ.ClientSecret}"
+    },
+    "Gitee": {
+      "ClientId": "{Authentication.Gitee.ClientId}",
+      "ClientSecret": "{Authentication.Gitee.ClientSecret}"
+    }
+  },
+  "MailKitOptions": {
+    "Host": "{MailKitOptions.Host}",
+    "Port": "{MailKitOptions.Port}",
+    "EnableSsl": true,
+    "UserName": "{MailKitOptions.UserName}",
+    "Password": "{MailKitOptions.Password}",
+    "Domain": ""
+  },
+  "AuditValue": {
+    "Enable": false
+  },
+  "CAP": {
+    "DefaultStorage": "1",
+    "DefaultMessageQueue": "1",
+    "Storage": {
+      "InMemoryStorage": 0,
+      "MySql": 1
+    },
+    "MessageQueue": {
+      "InMemoryQueue": 0,
+      "RabbitMQ": 1
+    },
+    "RabbitMQ": {
+      "HostName": "{CAP.RabbitMQ.HostName}",
+      "UserName": "{CAP.RabbitMQ.UserName}",
+      "Password": "{CAP.RabbitMQ.Password}",
+      "Port": 5672,
+      "VirtualHost": "{CAP.RabbitMQ.VirtualHost}"
+    }
+  },
+  "Serilog": {
+    "Using": [
+      "Serilog.Sinks.Console",
+      "Serilog.Sinks.MariaDB"
+    ],
+    "MinimumLevel": {
+      "Default": "Information",
+      "Override": {
+        "Microsoft": "Information",
+        "System": "Warning"
+      }
+    },
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "path": "Logs/log.txt",
+          "rollingInterval": "Day"
+        }
+      },
+      {
+        "Name": "Console",
+        "Args": {
+          "theme": "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Code, Serilog.Sinks.Console",
+          "outputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} <s:{SourceContext}>{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "MariaDB",
+        "Args": {
+          "connectionString": "{ConnectionStrings.MySql}",
+          "autoCreateTable": true,
+          "tableName": "app_serilog",
+          "restrictedToMinimumLevel": "Information",
+          "batchPostingLimit": 1000,
+          "period": "0.00:00:30",
+          "options": {
+            "PropertiesToColumnsMapping": {
+              "Exception": "exception",
+              "Level": "level",
+              "Message": "message",
+              "MessageTemplate": "message_template",
+              "Properties": "properties",
+              "Timestamp": "timestamp"
+            },
+            "TimestampInUtc": false,
+            "ExcludePropertiesWithDedicatedColumn": true,
+            "EnumsAsInts": true,
+            "LogRecordsCleanupFrequency": "0.02:00:00",
+            "LogRecordsExpiration": "31.00:00:00"
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/src/LinCms.Web/appsettings.json b/src/LinCms.Web/appsettings.json
new file mode 100644
index 00000000..116b8a6c
--- /dev/null
+++ b/src/LinCms.Web/appsettings.json
@@ -0,0 +1,275 @@
+{
+  "ConnectionStrings": {
+    "DefaultDB": "0",
+    "DataType": {
+      "MySql": 0,
+      "SqlServer": 1,
+      "PostgreSQL": 2,
+      "Oracle": 3,
+      "Sqlite": 4
+    },
+    //"MySql": "Data Source=localhost;Port=3306;User ID=root;Password=root;Initial Catalog=lincms;Charset=utf8mb4;SslMode=none;Max pool size=1;Connection LifeTime=20",
+    //"MySql": "Data Source=localhost;Port=3306;User ID=root;Password=root;Initial Catalog=lincms;Charset=utf8mb4;SslMode=none;Max pool size=1;Connection LifeTime=20",
+    "MySql": "Data Source=localhost;Port=3308;User ID=root;Password=root;Initial Catalog=lincms2;Charset=utf8mb4;SslMode=none;Max pool size=1;Connection LifeTime=20",
+    "SqlServer": "Data Source=.;User ID=sa;Password=123456;Integrated Security=True;Initial Catalog=LinCMS;Pooling=true;Min Pool Size=1",
+    "PostgreSQL": "Host=localhost;Port=5432;Username=postgres;Password=123456; Database=lincms;Pooling=true;Minimum Pool Size=1",
+    "Oracle": null,
+    "Sqlite": "Data Source=|DataDirectory|\\lincms2.db; Attachs=lincms.db; Pooling=true;Min Pool Size=1",
+    "CsRedis": "127.0.0.1:6379,password=,defaultDatabase=0"
+  },
+  "Cache": { //对应用中带CacheableAttribute标签的数据进行缓存,缓存查询上性能有良好提升,控制器需要将方法设置成virtual 才能拦截到，，service 层 需要有接口才行
+    "Enable": true,
+    "ExpireSeconds": "300" //默认过期时间（s秒)
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Trace",
+      "Microsoft": "Information"
+    }
+  },
+  "AllowedHosts": "*",
+  "FileStorage": {
+    "MaxFileSize": 83886080,
+    "NumLimit": 3,
+    "Include": "",
+    "Exclude": ".exe,.dll,.jar",
+    "ServiceName": "LocalFileService", //LocalFileService、QiniuService
+    "LocalFile": {
+      "PrefixPath": "assets",
+      "Host": "https://localhost:5001/"
+    },
+    "Qiniu": {
+      "AK": "eUH1O-ft66S4XM2GIK7FGmj7czuYkcAyNGDAc-wq",
+      "SK": "4dOi1daSr2-YgofhAfWb8JaLrbgozCmgD6AUmmM9",
+      "Bucket": "vvv",
+      "PrefixPath": "assets",
+      "Host": "https://images.igeekfan.cn/",
+      "UseHttps": false
+    }
+  },
+  "Site": {
+    "VVLogDomain": "http://localhost:8081/",
+    "CMSDomain": "http://localhost:8080/",
+    "ApiDomain": "http://localhost:5001/",
+    "IdentityServer4Domain": "https://localhost:5003/",
+    "Email": "luoyunchong@foxmail.com",
+    "BlogUrl": "https://www.cnblogs.com/igeekfan/",
+    "DocUrl": "https://luoyunchong.github.io/vovo-docs/dotnetcore/lin-cms/dotnetcore-start.html"
+  },
+  "WithOrigins": [ "http://localhost:8081/", "http://localhost:8080/", "http://127.0.0.1:8081/", "http://127.0.0.1:8080/", "http://192.168.3.39:8081/", "http://192.168.3.39:8080/" ],
+  "Service": {
+    "IdentityServer4": false,
+    "Name": "LinCms.Web",
+    "GrantType": "password",
+    "ClientId": "lin-cms-dotnetcore-client-id",
+    "ClientSecret": "lin-cms-dotnetcore-client-secrets",
+    "Authority": "https://localhost:5003/",
+    "UseHttps": true
+  },
+  "Authentication": {
+    "JwtBearer": {
+      "SecurityKey": "lin-cms-dotnetcore-SecurityKey",
+      "Issuer": "lin-cms-dotnetcore-Issuer",
+      "Audience": "LinCms.Web"
+    },
+    "GitHub": {
+      "ClientId": "0be6b05fc717bfc4fb67",
+      "ClientSecret": "dcaced9f176afba64e89d88b9b06ffc4a887a609"
+    },
+    "QQ": {
+      "ClientId": "101867513",
+      "ClientSecret": "713095932626dd2f5e60489654b6ed52"
+    },
+    "Gitee": {
+      "ClientId": "173c165116e081ef9ff7681283f0e6b717d6e41ffa4873a5c8efda623587f91f",
+      "ClientSecret": "7f43f16b4e039f5698e319ba9aaf09c519f1872d4af44e5a41a1ca25ffb6f160"
+    }
+  },
+  "MailKitOptions": {
+    "Host": "smtp.163.com",
+    "Port": "25",
+    "EnableSsl": true,
+    "UserName": "igeekfan@163.com",
+    "Password": "",
+    "Domain": ""
+  },
+  "AuditValue": {
+    "Enable": false
+  },
+  "CAP": {
+    "DefaultStorage": "1",
+    "DefaultMessageQueue": "0",
+    "Storage": {
+      "InMemoryStorage": 0,
+      "MySql": 1,
+      "SqlServer": 2
+    },
+    "MessageQueue": {
+      "InMemoryQueue": 0,
+      "RabbitMQ": 1
+    },
+    "RabbitMQ": {
+      "HostName": "localhost",
+      "UserName": "admin",
+      "Password": "123456",
+      "Port": 5672,
+      "VirtualHost": "/admin"
+    }
+  },
+  "RecaptchaSettings": {
+    "Enabled": false,
+    "Version": "reCAPTCHA_V3",
+    "HeaderKey": "Google-RecaptchaToken",
+    "MinimumScore": 0.6, //0<x<1
+    "SiteKey": "6Le2mr4ZAAAAAP-83AhlTnJ3jaU9hiwniQ80nI7d",
+    "SiteSecret": "6Le2mr4ZAAAAAGHRZ2INwf1fOtUNwjF8jsHUti2C",
+    "VerifyBaseUrl": "https://www.recaptcha.net/"
+  },
+  "Serilog": {
+    "Using": [
+      "Serilog.Sinks.Console",
+      "Serilog.Sinks.File",
+      "Serilog.Sinks.MariaDB"
+      // "Serilog.Sinks.MSSqlServer"
+    ],
+    "MinimumLevel": {
+      "Default": "Information",
+      "Override": {
+        "Microsoft": "Information",
+        "System": "Warning"
+      }
+    },
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "path": "Logs/log.txt",
+          "rollingInterval": "Day"
+        }
+      },
+      {
+        "Name": "Console",
+        "Args": {
+          "theme": "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Code, Serilog.Sinks.Console",
+          "outputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} <s:{SourceContext}>{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "MariaDB",
+        "Args": {
+          "connectionString": "Data Source=localhost;Port=3308;User ID=root;Password=root;Initial Catalog=lincms;Charset=utf8mb4;SslMode=none;Max pool size=1;Connection LifeTime=20",
+          "autoCreateTable": true,
+          "tableName": "app_serilog",
+          "restrictedToMinimumLevel": "Information",
+          "batchPostingLimit": 4, //1000
+          "period": "0.00:00:03",
+          "options": {
+            "PropertiesToColumnsMapping": {
+              "Exception": "exception",
+              "Level": "level",
+              "Message": "message",
+              "MessageTemplate": "message_template",
+              "Properties": "properties",
+              "Timestamp": "timestamp"
+            },
+            "TimestampInUtc": false,
+            "ExcludePropertiesWithDedicatedColumn": true,
+            "EnumsAsInts": true,
+            "LogRecordsCleanupFrequency": "0.02:00:00",
+            "LogRecordsExpiration": "31.00:00:00"
+          }
+        }
+      }
+      //{
+      //  "Name": "MSSqlServer",
+      //  "Args": {
+      //    "connectionString": "Data Source=.;User ID=sa;Password=123456;Integrated Security=True;Initial Catalog=LinCMS;Pooling=true;Min Pool Size=1",
+      //    "restrictedToMinimumLevel": "Information",
+      //    "sinkOptionsSection": {
+      //      "tableName": "app_serilog",
+      //      "schemaName": "dbo",
+      //      "autoCreateSqlTable": true,
+      //      "batchPostingLimit": 1000,
+      //      "period": "0.00:00:15"
+      //    },
+      //    "columnOptionsSection": {
+      //      "disableTriggers": true,
+      //      "clusteredColumnstoreIndex": false,
+      //      "primaryKeyColumnName": "id",
+      //      "addStandardColumns": [ "LogEvent" ],
+      //      "removeStandardColumns": [ "Properties" ],
+      //      "additionalColumns": [
+      //        {
+      //          "ColumnName": "event_type",
+      //          "DataType": "int",
+      //          "AllowNull": true
+      //        },
+      //        {
+      //          "ColumnName": "release",
+      //          "DataType": "varchar",
+      //          "DataLength": 32
+      //        },
+      //        {
+      //          "ColumnName": "environment_user_name",
+      //          "PropertyName": "UserName",
+      //          "DataType": "varchar",
+      //          "DataLength": 50
+      //        },
+      //        {
+      //          "ColumnName": "all_sqlcolumn_defaults",
+      //          "DataType": "varchar",
+      //          "AllowNull": true,
+      //          "DataLength": -1,
+      //          "NonClusteredIndex": false
+      //        }
+      //      ],
+      //      "id": {
+      //        "columnName": "id",
+      //        "nonClusteredIndex": true
+      //      },
+      //      "level": {
+      //        "columnName": "level",
+      //        "storeAsEnum": true
+      //      },
+      //      //"Properties": {
+      //      //  "columnName": "properties",
+      //      //  "excludeAdditionalProperties": true,
+      //      //  "dictionaryElementName": "dict",
+      //      //  "itemElementName": "item",
+      //      //  "omitDictionaryContainerElement": false,
+      //      //  "omitSequenceContainerElement": false,
+      //      //  "omitStructureContainerElement": false,
+      //      //  "omitElementIfEmpty": true,
+      //      //  "propertyElementName": "prop",
+      //      //  "rootElementName": "root",
+      //      //  "sequenceElementName": "seq",
+      //      //  "structureElementName": "struct",
+      //      //  "usePropertyKeyAsElementName": false
+      //      //},
+      //      "TimeStamp": {
+      //        "columnName": "timestamp",
+      //        "convertToUtc": true,
+      //        "DataType": "tinyint"
+      //      },
+      //      "MessageTemplate": {
+      //        "columnName": "message_template",
+      //        "convertToUtc": true
+      //      },
+      //      "Timestamp": "timestamp",
+      //      "Exception": {
+      //        "columnName": "exception"
+      //      },
+      //      "Message": {
+      //        "columnName": "message"
+      //      },
+      //      "logEvent": {
+      //        "columnName": "properties",
+      //        "excludeAdditionalProperties": true,
+      //        "excludeStandardColumns": true
+      //      }
+      //    }
+      //  }
+      //}
+    ]
+  }
+}
diff --git a/src/LinCms.Web/nlog.config b/src/LinCms.Web/nlog.config
deleted file mode 100644
index c2536ea1..00000000
--- a/src/LinCms.Web/nlog.config
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autoReload="true">
-
-  <targets>
-    <target name="defaultlog" xsi:type="File" keepFileOpen="false" encoding="utf-8"
-            fileName="${basedir}/Logs/${level}/${shortdate}.log"
-            layout="${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}" />
-    <!-- write logs to file  -->
-    <target xsi:type="File" name="allfile" fileName="${basedir}/Logs/nlog-all-${shortdate}.log"
-            layout="${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}" />
-  </targets>
-
-  <rules>
-    <!--All logs, including from Microsoft-->
-    <logger name="*" minlevel="Trace" writeTo="allfile" />
-    <!--Skip non-critical Microsoft logs and so log only own logs-->
-    <logger name="Microsoft.*" maxlevel="Info" final="true" />
-    <logger name="*" minlevel="trace" writeTo="defaultlog" />
-  </rules>
-
-</nlog>
\ No newline at end of file
diff --git a/test/LinCms.Test/BaseLinCmsTest.cs b/test/LinCms.Test/BaseLinCmsTest.cs
index 749d3083..fd019dc7 100644
--- a/test/LinCms.Test/BaseLinCmsTest.cs
+++ b/test/LinCms.Test/BaseLinCmsTest.cs
@@ -1,49 +1,76 @@
 using System;
-using AutoMapper;
-using FreeSql;
-using Microsoft.AspNetCore;
+using System.IO;
+using System.Net.Http;
+using Autofac.Extensions.DependencyInjection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using NLog.Web;
+using Serilog;
 
 namespace LinCms.Test
 {
-    public abstract class BaseLinCmsTest : IDisposable
+    public abstract class BaseLinCmsTest
     {
-        protected readonly IServiceProvider ServiceProvider;
-        protected readonly IWebHostEnvironment HostingEnv;
-        protected readonly IMapper Mapper;
-        protected readonly IFreeSql FreeSql;
-        protected readonly IUnitOfWork UnitOfWork;
+        protected TestServer Server { get; }
+        protected HttpClient Client { get; }
+        protected IServiceProvider ServiceProvider { get; }
+        public static Microsoft.Extensions.Configuration.IConfiguration Configuration { get; } = new ConfigurationBuilder()
+            .SetBasePath(Directory.GetCurrentDirectory())
+            .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+            .AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"}.json", optional: true)
+            .AddEnvironmentVariables()
+            .Build();
+
         protected BaseLinCmsTest()
         {
-            var server = new TestServer(WebHost.CreateDefaultBuilder()
-                .UseEnvironment("Development")
-                .UseStartup<TestStartup>()
-                .ConfigureLogging(logging =>
-                {
-                    logging.ClearProviders();
-                    logging.SetMinimumLevel(LogLevel.Trace);
-                    logging.AddConsole();
-                }).UseNLog()
-            ); ;
-            ServiceProvider = server.Host.Services.CreateScope().ServiceProvider;
-
-            HostingEnv = ServiceProvider.GetService<IWebHostEnvironment>();
-
-            Mapper = ServiceProvider.GetService<IMapper>();
-            FreeSql = ServiceProvider.GetService<IFreeSql>();
-            UnitOfWork = ServiceProvider.GetService<IUnitOfWork>();
+            var builder = CreateHostBuilder();
+            var host = builder.Build();
+            host.Start();
+
+            Server = host.GetTestServer();
+            Client = host.GetTestClient();
+            ServiceProvider = Server.Services;
+
+        }
+
+        private IHostBuilder CreateHostBuilder()
+        {
+
+            Log.Logger = new LoggerConfiguration().ReadFrom.Configuration(Configuration)
+                .Enrich.FromLogContext()
+                .CreateLogger();
 
+            return Host.CreateDefaultBuilder()
+                  .UseServiceProviderFactory(new AutofacServiceProviderFactory())
+                  .ConfigureWebHostDefaults(webBuilder =>
+                  {
+                      webBuilder.UseStartup<Startup.Startup>().UseEnvironment("Development");
+                      webBuilder.UseTestServer();
+                  })
+                  .ConfigureLogging(logging =>
+                  {
+                      logging.ClearProviders();
+                      logging.SetMinimumLevel(LogLevel.Trace);
+                  })
+                  .ConfigureServices(ConfigureServices).UseSerilog();
         }
 
+        protected virtual void ConfigureServices(HostBuilderContext context, IServiceCollection services)
+        {
+
+        }
+
+        public T GetService<T>()
+        {
+            return this.ServiceProvider.GetService<T>();
+        }
 
-        public void Dispose()
+        public  T GetRequiredService<T>()
         {
-            FreeSql?.Dispose();
-            UnitOfWork?.Dispose();
+            return this.ServiceProvider.GetRequiredService<T>();
         }
 
     }
diff --git a/test/LinCms.Test/Common/FileTest.cs b/test/LinCms.Test/Common/FileTest.cs
deleted file mode 100644
index c2c51ae6..00000000
--- a/test/LinCms.Test/Common/FileTest.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.IO;
-using Xunit;
-
-namespace LinCms.Test.Common
-{
-    public class FileTest
-    {
-        [Fact]
-        public void test()
-        {
-            string url = "https://gitee.com/kongren/funNLP/raw/master/data/%E6%95%8F%E6%84%9F%E8%AF%8D%E5%BA%93/%E6%95%8F%E6%84%9F%E8%AF%8D.txt";
-            string lastWriteTime = new FileInfo(url).LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss");
-        }
-    }
-}
diff --git a/test/LinCms.Test/Common/LinCmsUtilsTest.cs b/test/LinCms.Test/Common/LinCmsUtilsTest.cs
deleted file mode 100644
index 76bd8f15..00000000
--- a/test/LinCms.Test/Common/LinCmsUtilsTest.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using LinCms.Core.Common;
-using Xunit;
-
-namespace LinCms.Test.Common
-{
-   public class LinCmsUtilsTest
-    {
-        [Fact]
-        public void test()
-        {
-            var d= LinCmsUtils.IpQueryCity("117.83.181.123");
-        }
-    }
-}
diff --git a/test/LinCms.Test/Controller/BaseControllerTests.cs b/test/LinCms.Test/Controller/BaseControllerTests.cs
index 2b95346b..5f4951b7 100644
--- a/test/LinCms.Test/Controller/BaseControllerTests.cs
+++ b/test/LinCms.Test/Controller/BaseControllerTests.cs
@@ -1,56 +1,66 @@
 using System;
+using System.ComponentModel;
+using System.Net;
 using System.Net.Http;
+using System.Text;
 using System.Threading.Tasks;
 using IdentityModel.Client;
 using IdentityServer4.Models;
-using LinCms.Core.Exceptions;
+using LinCms.Exceptions;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
-using Microsoft.Extensions.Logging;
-using NLog.Web;
+using Microsoft.Extensions.Configuration;
 using Xunit;
 
 namespace LinCms.Test.Controller
 {
-    public abstract class BaseControllerTests
+    public abstract class BaseControllerTests : BaseLinCmsTest
     {
-        protected HttpClient Client { get; }
-        protected readonly IServiceProvider serviceProvider;
-
-        protected BaseControllerTests()
+        private readonly IConfiguration _configuration;
+        protected TestServer IdentityServer { get; }
+        protected HttpClient IdentityClient { get; }
+        protected BaseControllerTests() : base()
         {
-            var server = new TestServer(WebHost.CreateDefaultBuilder()
-                .UseEnvironment("Development")
-                .UseStartup<TestStartup>()
-                .ConfigureLogging(logging =>
-                {
-                    logging.ClearProviders();
-                    logging.SetMinimumLevel(LogLevel.Trace);
-                    logging.AddConsole();
-                }).UseNLog()); ;
-
-            Client = server.CreateClient();
+            _configuration = GetService<IConfiguration>();
 
+            var builder = this.CreateHostBuilder(); ;
+            IdentityServer = new TestServer(builder)
+            {
+                BaseAddress = new Uri("https://localhost:5003/")
+            };
+            IdentityClient = IdentityServer.CreateClient();
+        }
 
-            serviceProvider = server.Host.Services; 
-
+        private IWebHostBuilder CreateHostBuilder()
+        {
+            return WebHost.CreateDefaultBuilder()
+                            .UseEnvironment("Development")
+                            .UseUrls("https://*:5003/")
+                            .UseStartup<IdentityServer4.Startup>();
         }
+
         public async Task HttpClientResourePassword()
         {
-            TokenResponse response = await Client.RequestTokenAsync(new TokenRequest
+            var disco = await Client.GetDiscoveryDocumentAsync(_configuration["Service:Authority"]);
+            if (disco.IsError)
             {
-                Address = "http://localhost:5000/connect/token",
-                GrantType = GrantType.ResourceOwnerPassword,
-
-                ClientId = "lin-cms-dotnetcore-client-id",
-                ClientSecret = "lin-cms-dotnetcore-client-secrets",
+                Console.WriteLine(disco.Error);
+                throw new Exception(disco.Error);
+            }
 
+            TokenResponse response = await Client.RequestTokenAsync(new PasswordTokenRequest
+            {
+                Address = disco.TokenEndpoint,
+                GrantType = GrantType.ResourceOwnerPassword,
+                ClientId = _configuration["Service:ClientId"],
+                ClientSecret = _configuration["Service:ClientSecret"],
                 Parameters =
                 {
                     { "UserName","admin"},
                     { "Password","123qwe"}
-                }
+                },
+                Scope = _configuration["Service:Scope"]
             });
             Assert.False(response.IsError);
             Assert.NotNull(response.AccessToken);
@@ -61,5 +71,21 @@ public async Task HttpClientResourePassword()
             }
             Client.SetBearerToken(response.AccessToken);
         }
+
+        public string ToParams(object source)
+        {
+            var buff = new StringBuilder(string.Empty);
+            if (source == null)
+                throw new ArgumentNullException("source", "Unable to convert object to a dictionary. The source object is null.");
+            foreach (PropertyDescriptor property in TypeDescriptor.GetProperties(source))
+            {
+                object value = property.GetValue(source);
+                if (value != null)
+                {
+                    buff.Append(WebUtility.UrlEncode(property.Name) + "=" + WebUtility.UrlEncode(value + "") + "&");
+                }
+            }
+            return buff.ToString().Trim('&');
+        }
     }
 }
diff --git a/test/LinCms.Test/Controller/Blog/UserLikeControllerTest.cs b/test/LinCms.Test/Controller/Blog/UserLikeControllerTest.cs
index c4fbd64e..49e9c87b 100644
--- a/test/LinCms.Test/Controller/Blog/UserLikeControllerTest.cs
+++ b/test/LinCms.Test/Controller/Blog/UserLikeControllerTest.cs
@@ -1,30 +1,15 @@
 using System;
-using System.Threading.Tasks;
-using AutoMapper;
-using LinCms.Application.Contracts.Blog.Articles;
-using LinCms.Application.Contracts.Blog.UserLikes;
-using LinCms.Core.Entities.Blog;
-using LinCms.Web.Controllers.Blog;
-using Microsoft.Extensions.DependencyInjection;
+using LinCms.Blog.UserLikes;
+using LinCms.Entities.Blog;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace LinCms.Test.Controller.Blog
 {
     public class UserLikeControllerTest : BaseControllerTests
     {
-        private readonly IMapper _mapper;
-        private readonly IFreeSql _freeSql;
-        private readonly UserLikeController _userLikeController;
-        private readonly ITestOutputHelper _testOutputHelper;
 
-        public UserLikeControllerTest(ITestOutputHelper testOutputHelper) : base()
+        public UserLikeControllerTest() : base()
         {
-            _userLikeController = serviceProvider.GetService<UserLikeController>(); ;
-
-            _mapper = serviceProvider.GetService<IMapper>();
-            _freeSql = serviceProvider.GetService<IFreeSql>();
-            _testOutputHelper = testOutputHelper;
         }
 
 
@@ -37,7 +22,6 @@ public void Create()
                 SubjectId = new Guid("5e63dcd7-6e39-36e0-0001-059272461091"),
                 SubjectType = UserLikeSubjectType.UserLikeComment
             };
-            _userLikeController.Create(createUpdateUserLike);
         }
 
 
diff --git a/test/LinCms.Test/Controller/Cms/FileControllerTests.cs b/test/LinCms.Test/Controller/Cms/FileControllerTests.cs
index ab4658f5..e2d6697b 100644
--- a/test/LinCms.Test/Controller/Cms/FileControllerTests.cs
+++ b/test/LinCms.Test/Controller/Cms/FileControllerTests.cs
@@ -12,7 +12,7 @@ public class FileControllerTests : BaseControllerTests
 
         public FileControllerTests() : base()
         {
-            _hostingEnv = serviceProvider.GetService<IWebHostEnvironment>();
+            _hostingEnv = ServiceProvider.GetRequiredService<IWebHostEnvironment>();
         }
 
         [Fact]
diff --git a/test/LinCms.Test/Controller/Cms/GroupControllerTests.cs b/test/LinCms.Test/Controller/Cms/GroupControllerTests.cs
index 9619c810..8d5266b6 100644
--- a/test/LinCms.Test/Controller/Cms/GroupControllerTests.cs
+++ b/test/LinCms.Test/Controller/Cms/GroupControllerTests.cs
@@ -1,8 +1,7 @@
 using System;
 using AutoMapper;
-using LinCms.Application.Contracts.Cms.Groups;
-using LinCms.Core.Entities;
-using LinCms.Web;
+using LinCms.Cms.Groups;
+using LinCms.Entities;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 
@@ -15,7 +14,7 @@ public class GroupControllerTests
         public GroupControllerTests() 
         {
             IServiceCollection services = new ServiceCollection();
-            services.AddAutoMapper((typeof(Startup).Assembly));
+            services.AddAutoMapper((typeof(ApplicationService).Assembly));
 
             IServiceProvider serviceProvider = services.BuildServiceProvider();
 
diff --git a/test/LinCms.Test/Controller/Cms/TestControllerTests.cs b/test/LinCms.Test/Controller/Cms/TestControllerTests.cs
index bd1aa8f5..98db360b 100644
--- a/test/LinCms.Test/Controller/Cms/TestControllerTests.cs
+++ b/test/LinCms.Test/Controller/Cms/TestControllerTests.cs
@@ -2,15 +2,17 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace LinCms.Test.Controller.Cms
 {
     public class TestControllerTests : BaseControllerTests
     {
+        private readonly ITestOutputHelper _outputHelper;
 
-        public TestControllerTests() : base()
+        public TestControllerTests(ITestOutputHelper outputHelper) : base()
         {
-
+            _outputHelper = outputHelper;
         }
 
         [Fact]
@@ -24,12 +26,17 @@ public async Task Test_Info()
             // Assert
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         }
+
         [Fact]
         public async Task Test_Get()
         {
             // Act
             HttpResponseMessage response = await Client.GetAsync($"/cms/test/get");
 
+            // Output
+            var responseTest = await response.Content.ReadAsStringAsync();
+            _outputHelper.WriteLine(responseTest);
+
             // Assert
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         }
diff --git a/test/LinCms.Test/Controller/Cms/UserControllerTests.cs b/test/LinCms.Test/Controller/Cms/UserControllerTests.cs
index 0e5f0a08..c057d4a7 100644
--- a/test/LinCms.Test/Controller/Cms/UserControllerTests.cs
+++ b/test/LinCms.Test/Controller/Cms/UserControllerTests.cs
@@ -1,9 +1,4 @@
-using System;
-using LinCms.Core.Entities;
-using Microsoft.Extensions.DependencyInjection;
-using Xunit;
-
-namespace LinCms.Test.Controller.Cms
+namespace LinCms.Test.Controller.Cms
 {
     public class UserControllerTests : BaseControllerTests
     {
diff --git a/test/LinCms.Test/Controller/v1/ArticleControllerTest.cs b/test/LinCms.Test/Controller/v1/ArticleControllerTest.cs
index a97a25e1..fc4c7845 100644
--- a/test/LinCms.Test/Controller/v1/ArticleControllerTest.cs
+++ b/test/LinCms.Test/Controller/v1/ArticleControllerTest.cs
@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
 using AutoMapper;
-using LinCms.Application.Contracts.Blog.Articles;
-using LinCms.Web.Controllers.Blog;
+using LinCms.Blog.Articles;
+using LinCms.Controllers.Blog;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace LinCms.Test.Controller.v1
 {
@@ -13,15 +12,13 @@ public class ArticleControllerTest : BaseControllerTests
         private readonly IMapper _mapper;
         private readonly IFreeSql _freeSql;
         private readonly ArticleController _articleController;
-        private readonly ITestOutputHelper _testOutputHelper;
 
-        public ArticleControllerTest(ITestOutputHelper testOutputHelper) : base()
+        public ArticleControllerTest() : base()
         {
-            _articleController = serviceProvider.GetService<ArticleController>(); ;
+            _articleController = ServiceProvider.GetService<ArticleController>(); ;
 
-            _mapper = serviceProvider.GetService<IMapper>();
-            _freeSql = serviceProvider.GetService<IFreeSql>();
-            _testOutputHelper = testOutputHelper;
+            _mapper = ServiceProvider.GetService<IMapper>();
+            _freeSql = ServiceProvider.GetService<IFreeSql>();
         }
 
 
diff --git a/test/LinCms.Test/Controller/v1/BaseTypeControllerTest.cs b/test/LinCms.Test/Controller/v1/BaseTypeControllerTest.cs
index 235bea81..53be6db8 100644
--- a/test/LinCms.Test/Controller/v1/BaseTypeControllerTest.cs
+++ b/test/LinCms.Test/Controller/v1/BaseTypeControllerTest.cs
@@ -9,7 +9,7 @@ public class BaseTypeControllerTest:BaseControllerTests
 
         public BaseTypeControllerTest() : base()
         {
-            _hostingEnv = serviceProvider.GetService<IWebHostEnvironment>();
+            _hostingEnv = ServiceProvider.GetService<IWebHostEnvironment>();
         }
 
 
diff --git a/test/LinCms.Test/Controller/v1/BookControllerTest.cs b/test/LinCms.Test/Controller/v1/BookControllerTest.cs
new file mode 100644
index 00000000..de2c0292
--- /dev/null
+++ b/test/LinCms.Test/Controller/v1/BookControllerTest.cs
@@ -0,0 +1,80 @@
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using LinCms.Data;
+using LinCms.v1.Books;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace LinCms.Test.Controller.v1
+{
+    public class BookControllerTest : BaseControllerTests
+    {
+        public BookControllerTest() : base()
+        {
+        
+        }
+        [Fact]
+
+        public async Task HttpClientResourePasswordTest()
+        {
+            await HttpClientResourePassword();
+        }
+        
+        [Fact]
+        public async Task CreateAsync()
+        {
+            await HttpClientResourePassword();
+            // Act
+            CreateUpdateBookDto createUpdateBookDto = new CreateUpdateBookDto()
+            {
+                Author="luo",
+                Summary = "lin-cms-dotnetcore从零到1是一本介绍一个SB开发的一个小系统",
+                Title="lin-cms-dotnetcore从零到1",
+                Image = "123"
+            }; 
+            
+            HttpContent httpContent = new StringContent(JsonConvert.SerializeObject(createUpdateBookDto));
+            
+            var response = await Client.PostAsync($"/v1/book",httpContent);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task PutAsync()
+        {
+            // Act
+            CreateUpdateBookDto createUpdateBookDto = new CreateUpdateBookDto()
+            {
+                Author="luo",
+                Summary = "lin-cms-dotnetcore从零到1是一本介绍一个SB开发的一个小系统",
+                Title="lin-cms-dotnetcore从零到1"
+            }; 
+            
+            HttpContent httpContent = new StringContent( JsonConvert.SerializeObject(createUpdateBookDto));
+            
+            var response = await Client.PostAsync($"/v1/book",httpContent);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task GetListAsync( )
+        {
+            // 1、Arrange
+            PageDto pageDto = new PageDto();
+
+            // Act
+            var response = await Client.GetAsync($"/v1/book?{ToParams(pageDto)}");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        }
+
+   
+
+    }
+}
diff --git a/test/LinCms.Test/Controller/v1/CommentControllerTest.cs b/test/LinCms.Test/Controller/v1/CommentControllerTest.cs
index 3fab6a88..84aed99f 100644
--- a/test/LinCms.Test/Controller/v1/CommentControllerTest.cs
+++ b/test/LinCms.Test/Controller/v1/CommentControllerTest.cs
@@ -1,6 +1,4 @@
 using AutoMapper;
-using FreeSql;
-using LinCms.Core.Entities.Blog;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -11,15 +9,13 @@ public class CommentControllerTest : BaseControllerTests
         private readonly IWebHostEnvironment _hostingEnv;
         private readonly IMapper _mapper;
         private readonly IFreeSql _freeSql;
-        private readonly BaseRepository<Comment> _baseRepository;
 
         public CommentControllerTest() : base()
         {
-            _hostingEnv = serviceProvider.GetService<IWebHostEnvironment>();
+            _hostingEnv = ServiceProvider.GetService<IWebHostEnvironment>();
 
-            _mapper = serviceProvider.GetService<IMapper>();
-            _baseRepository = serviceProvider.GetService<BaseRepository<Comment>>();
-            _freeSql = serviceProvider.GetService<IFreeSql>();
+            _mapper = ServiceProvider.GetService<IMapper>();
+            _freeSql = ServiceProvider.GetService<IFreeSql>();
         }
 
 
diff --git a/test/LinCms.Test/Controller/v1/TagControllerTest.cs b/test/LinCms.Test/Controller/v1/TagControllerTest.cs
index 06d43957..3605e7f5 100644
--- a/test/LinCms.Test/Controller/v1/TagControllerTest.cs
+++ b/test/LinCms.Test/Controller/v1/TagControllerTest.cs
@@ -2,9 +2,9 @@
 using Microsoft.AspNetCore.Hosting;
 using System;
 using System.Threading.Tasks;
-using LinCms.Core.Entities.Blog;
-using LinCms.Infrastructure.Repositories;
-using LinCms.Web.Controllers.Blog;
+using LinCms.Controllers.Blog;
+using LinCms.Entities.Blog;
+using LinCms.IRepositories;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 
@@ -15,17 +15,16 @@ public class TagControllerTest : BaseControllerTests
         private readonly IWebHostEnvironment _hostingEnv;
         private readonly IMapper _mapper;
         private readonly IFreeSql _freeSql;
-        private readonly AuditBaseRepository<Tag> _tagRepository;
+        private readonly IAuditBaseRepository<Tag> _tagRepository;
         private readonly TagController _tagController;
 
         public TagControllerTest() : base()
         {
-            _hostingEnv = serviceProvider.GetService<IWebHostEnvironment>();
-            _tagController = serviceProvider.GetService<TagController>(); ;
-
-            _mapper = serviceProvider.GetService<IMapper>();
-            _tagRepository = serviceProvider.GetService<AuditBaseRepository<Tag>>();
-            _freeSql = serviceProvider.GetService<IFreeSql>();
+            _hostingEnv = ServiceProvider.GetService<IWebHostEnvironment>();
+            _tagController = ServiceProvider.GetService<TagController>(); ;
+            _mapper = ServiceProvider.GetService<IMapper>();
+            _tagRepository = ServiceProvider.GetService<IAuditBaseRepository<Tag>>();
+            _freeSql = ServiceProvider.GetService<IFreeSql>();
         }
 
         [Fact]
diff --git a/test/LinCms.Test/Core/EmailSenderTest.cs b/test/LinCms.Test/Core/EmailSenderTest.cs
new file mode 100644
index 00000000..1b8cfc0f
--- /dev/null
+++ b/test/LinCms.Test/Core/EmailSenderTest.cs
@@ -0,0 +1,47 @@
+using DotNetCore.Security;
+using LinCms.Email;
+using MimeKit;
+using System.Collections.Generic;
+using System.IdentityModel.Tokens.Jwt;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+
+
+namespace LinCms.Test.Core
+{
+    public class EmailSenderTest : BaseLinCmsTest
+    {
+        private readonly ITestOutputHelper testOutputHelper;
+        private readonly IEmailSender _emailSender;
+        public EmailSenderTest(ITestOutputHelper testOut)
+        {
+            testOutputHelper = testOut;
+            _emailSender = GetService<IEmailSender>();
+        }
+
+        [Fact]
+        public async Task OutputTest()
+        {
+            var message = new MimeMessage();
+            message.From.Add(new MailboxAddress("igeekfan", "igeekfan@163.com"));
+            message.To.Add(new MailboxAddress("Mrs. luoyunchong", "luoyunchong@foxmail.com"));
+            message.Subject = "How you doin'?";
+
+            message.Body = new TextPart("plain")
+            {
+                Text = @"Hey Chandler,
+
+I just wanted to let you know that Monica and I were going to go play some paintball, you in?
+
+-- Joey"
+
+            };
+            await _emailSender.SendAsync(message);
+
+            await Task.CompletedTask;
+        }
+    }
+}
diff --git a/test/LinCms.Test/EnumTest.cs b/test/LinCms.Test/EnumTest.cs
index bbdef381..e13aea8d 100644
--- a/test/LinCms.Test/EnumTest.cs
+++ b/test/LinCms.Test/EnumTest.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using LinCms.Core.Data.Enums;
+using LinCms.Data.Enums;
 using Xunit;
 
 namespace LinCms.Test
@@ -16,5 +16,16 @@ public void ErrorCodeTest()
                 .ToDictionary(t => (int)t, t => t.ToString());
            
         }
+
+        [Fact]
+        public void Test()
+        {
+            string path = "https://lc-gold-cdn.xitu.io/bac28828a49181c34110.png";
+
+            string name = path.Substring(path.LastIndexOf("/") + 1, path.Length - path.LastIndexOf("/") - 1);
+
+            Assert.Equal("bac28828a49181c34110.png", name);
+        }
+
     }
 }
diff --git a/test/LinCms.Test/LinCms.Test.csproj b/test/LinCms.Test/LinCms.Test.csproj
index f508a6ce..11b60ab8 100644
--- a/test/LinCms.Test/LinCms.Test.csproj
+++ b/test/LinCms.Test/LinCms.Test.csproj
@@ -1,29 +1,35 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>8</LangVersion>
-    <OutputType>Library</OutputType>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
+		<LangVersion>8</LangVersion>
+		<OutputType>Library</OutputType>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="ToolGood.Words" Version="2.3.4.2" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<PlatformTarget>AnyCPU</PlatformTarget>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\LinCms.Application.Contracts\LinCms.Application.Contracts.csproj" />
-    <ProjectReference Include="..\..\src\LinCms.Application\LinCms.Application.csproj" />
-    <ProjectReference Include="..\..\src\LinCms.Core\LinCms.Core.csproj" />
-    <ProjectReference Include="..\..\src\LinCms.Infrastructure\LinCms.Infrastructure.csproj" />
-    <ProjectReference Include="..\..\src\LinCms.Plugins\LinCms.Plugins.csproj" />
-    <ProjectReference Include="..\..\src\LinCms.Web\LinCms.Web.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.8" />
+		<PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+		<PackageReference Include="xunit" Version="2.4.1" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\src\LinCms.Application.Contracts\LinCms.Application.Contracts.csproj" />
+		<ProjectReference Include="..\..\src\LinCms.Application\LinCms.Application.csproj" />
+		<ProjectReference Include="..\..\src\LinCms.Core\LinCms.Core.csproj" />
+		<ProjectReference Include="..\..\src\LinCms.Infrastructure\LinCms.Infrastructure.csproj" />
+		<ProjectReference Include="..\..\src\LinCms.Plugins\LinCms.Plugins.csproj" />
+		<ProjectReference Include="..\..\src\LinCms.Web\LinCms.Web.csproj" />
+		<ProjectReference Include="..\..\identityserver4\LinCms.IdentityServer4\LinCms.IdentityServer4.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/test/LinCms.Test/LinCmsTest.cs b/test/LinCms.Test/LinCmsTest.cs
new file mode 100644
index 00000000..421f2a73
--- /dev/null
+++ b/test/LinCms.Test/LinCmsTest.cs
@@ -0,0 +1,137 @@
+using DotNetCore.Security;
+using FreeSql;
+using LinCms.Entities.Base;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IdentityModel.Tokens.Jwt;
+using System.Linq;
+using System.Security.Claims;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace LinCms.Test
+{
+    public class LinCmsTest : BaseLinCmsTest
+    {
+        private readonly ITestOutputHelper _testOutputHelper;
+        private readonly IFreeSql freeSql;
+        private readonly IJsonWebTokenService jsonWebTokenService;
+        private readonly ICryptographyService _cryptographyService;
+        public LinCmsTest(ITestOutputHelper testOut)
+        {
+            _testOutputHelper = testOut;
+            freeSql = GetService<IFreeSql>();
+            jsonWebTokenService = GetService<IJsonWebTokenService>();
+            _cryptographyService = GetService<ICryptographyService>();
+        }
+
+        [Fact]
+        public void OutputTest()
+        {
+            _testOutputHelper.WriteLine("BaseLinCmsTest ConfigureServices");
+        }
+
+
+        //guid:9fd248c8-e9da-412f-bad9-aa5f7f1d7b80,passowrd:IWxIlqMAE3SU3JTogdDAJw==
+        [Fact]
+        public void CryptographyServiceEncrypt()
+        {
+            string guid = Guid.NewGuid().ToString();
+            string encrptypassword = _cryptographyService.Encrypt("123qwe", guid);
+
+            _testOutputHelper.WriteLine($"guid:{guid},passowrd:{encrptypassword}");
+        }
+
+
+        /// <summary>
+        /// 主要负责工作单元的创建
+        /// </summary>
+        [Fact]
+        public void CreateUnitOfWorkTest()
+        {
+            using IUnitOfWork uow = freeSql.CreateUnitOfWork();
+            uow.GetOrBeginTransaction();
+
+            using (IUnitOfWork uow2 = freeSql.CreateUnitOfWork())
+            {
+                uow2.GetOrBeginTransaction();
+
+                uow2.Commit();
+            }
+            uow.Commit();
+        }
+
+        [Theory]
+        [InlineData("F")]
+        [InlineData("Bearer")]
+        [InlineData("Bearer eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1laWRlbnRpZmllciI6WyI3MyIsIjE4NjEzMjY2Il0sImh0dHA6Ly9zY2hlbWFzLnhtbHNvYXAub3JnL3dzLzIwMDUvMDUvaWRlbnRpdHkvY2xhaW1zL2VtYWlsYWRkcmVzcyI6WyJsdW95dW5jaG9uZ0Bmb3htYWlsLmNvbSIsImx1b3l1bmNob25nQGZveG1haWwuY29tIl0sImh0dHA6Ly9zY2hlbWFzLnhtbHNvYXAub3JnL3dzLzIwMDUvMDUvaWRlbnRpdHkvY2xhaW1zL2dpdmVubmFtZSI6IklHZWVrRmFuIiwiaHR0cDovL3NjaGVtYXMueG1sc29hcC5vcmcvd3MvMjAwNS8wNS9pZGVudGl0eS9jbGFpbXMvbmFtZSI6WyIiLCJsdW95dW5jaG9uZyJdLCJMaW5DbXNDbGFpbVR5cGVzLkdyb3VwcyI6IjMiLCJ1cm46Z2l0aHViOm5hbWUiOiJJR2Vla0ZhbiIsInVybjpnaXRodWI6dXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS91c2Vycy9sdW95dW5jaG9uZyIsInVybjpnaXRodWI6YXZhdGFyX3VybCI6Imh0dHBzOi8vYXZhdGFyczEuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTg2MTMyNjY_dj00IiwidXJuOmdpdGh1YjpiaW8iOiLkuobkuI3otbfnmoTnm5bojKjmr5QiLCJ1cm46Z2l0aHViOmJsb2ciOiJodHRwczovL2Jsb2cuaWdlZWtmYW4uY24vIiwibmJmIjoxNTk0NTY4ODQ3LCJleHAiOjE1OTcxNjA4NDcsImlzcyI6Imxpbi1jbXMtZG90bmV0Y29yZS1Jc3N1ZXIiLCJhdWQiOiJMaW5DbXMuV2ViIn0._WbTaOaftqCXHE95RoNTYm8c2Yq1tlOqJDALaqEQjgRIA7EtJKqgI72a2g6furX7B3SLjzA9Bwr5OHOfdV3qlw")]
+        public void Jwt(string token)
+        {
+
+            if (token != "" && token.StartsWith("Bearer "))
+            {
+                token = token.Remove(0, 7);
+                Dictionary<string, object> dict = jsonWebTokenService.Decode(token);
+                JwtPayload JwtPayload = new JwtSecurityTokenHandler().ReadJwtToken(token).Payload;
+                object nameobj = JwtPayload[ClaimTypes.NameIdentifier];
+
+                string[] names = JsonConvert.DeserializeObject<string[]>(nameobj.ToString());
+
+                object c2 = JwtPayload[ClaimTypes.Name];
+                object GivenName = JwtPayload[ClaimTypes.GivenName];
+
+                string id = JwtPayload.Claims.FirstOrDefault(r => r.Type == ClaimTypes.NameIdentifier)?.Value;
+            }
+
+
+        }
+
+        [Fact]
+        public void FormatQueryString()
+        {
+
+            var result = new
+            {
+                code = "success",
+                message = "绑定成功"
+            };
+
+            string msg = GetQueryString(result);
+
+            Assert.Equal("code=message&message=绑定成功", msg);
+
+        }
+
+        private static string GetQueryString(object obj)
+        {
+            //HttpUtility
+            var properties = from p in obj.GetType().GetProperties()
+                             where p.GetValue(obj, null) != null
+                             select p.Name + "=" + p.GetValue(obj, null).ToString();
+            return string.Join("&", properties.ToArray());
+        }
+
+        [Fact]
+        public void string1()
+        {
+
+            var date = DateTime.Now;
+            var s = $"{date:yyyyMMdd}";
+
+            var sql = freeSql.Insert(new BaseItem()).AsTable(old => $"{old}_{date:yyyyMMdd}").ToSql();
+
+            _testOutputHelper.WriteLine(sql);
+
+        }
+
+        [Fact]
+        public void f()
+        {
+            int _min = 100000;
+            int _max = 999999;
+            Random _rdm = new Random();
+            int f = _rdm.Next(_min, _max);
+        }
+    }
+}
diff --git a/test/LinCms.Test/Md5CommonTest.cs b/test/LinCms.Test/Md5CommonTest.cs
index 48a0fa3f..9b39574c 100644
--- a/test/LinCms.Test/Md5CommonTest.cs
+++ b/test/LinCms.Test/Md5CommonTest.cs
@@ -1,4 +1,4 @@
-using LinCms.Core.Common;
+using LinCms.Common;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/test/LinCms.Test/ReflexTest.cs b/test/LinCms.Test/ReflexTest.cs
index 43aa5f12..c89aa794 100644
--- a/test/LinCms.Test/ReflexTest.cs
+++ b/test/LinCms.Test/ReflexTest.cs
@@ -1,15 +1,16 @@
-using System;
+using FreeSql;
+using LinCms.Aop.Filter;
+using LinCms.Controllers.Cms;
+using LinCms.Data;
+using LinCms.FreeSql;
+using LinCms.Utils;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using LinCms.Core.Aop;
-using LinCms.Core.Data;
-using LinCms.Web;
-using LinCms.Web.Controllers.Cms;
-using LinCms.Web.Data;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -43,8 +44,6 @@ public void TestOutputHelpler()
         {
             _testOutputHelper.WriteLine("console test output helper");
         }
-
-
         //"LinCms.Zero.Authorization.LinCmsAuthorizeAttribute","查询日志记录的用户","日志"
         //"LinCms.Zero.Authorization.LinCmsAuthorizeAttribute","查询所有日志","日志"
         //"LinCms.Zero.Authorization.LinCmsAuthorizeAttribute","搜索日志","日志"
@@ -93,7 +92,7 @@ public void GetLinCmsAttribute()
         [Fact]
         public void GetAssemblyMethodsAttributes()
         {
-            List<Type> assembly = typeof(Startup).Assembly.GetTypes().AsEnumerable()
+            List<Type> assembly = typeof(Startup.Startup).Assembly.GetTypes().AsEnumerable()
                 .Where(type => typeof(ControllerBase).IsAssignableFrom(type)).ToList();
 
             assembly.ForEach(r =>
@@ -119,7 +118,7 @@ public void GetAssemblyMethodsAttributes()
         [Fact]
         public void GetControllerAttributes()
         {
-            List<Type> assembly = typeof(Startup).Assembly.GetTypes().AsEnumerable()
+            List<Type> assembly = typeof(Startup.Startup).Assembly.GetTypes().AsEnumerable()
                 .Where(type => typeof(ControllerBase).IsAssignableFrom(type)).ToList();
 
             assembly.ForEach(d =>
@@ -139,7 +138,7 @@ public void GetControllerAttributes()
         [Fact]
         public void ReflexHelperTest()
         {
-            List<PermissionDefinition> attributes = ReflexHelper.GeAssemblyLinCmsAttributes();
+            List<PermissionDefinition> attributes = ReflexHelper.GetAssemblyLinCmsAttributes();
             foreach (PermissionDefinition attribute in attributes)
             {
                 _testOutputHelper.WriteLine(attribute.ToString());
@@ -153,11 +152,11 @@ public void ReflexHelperTest()
         [Fact]
         public void ConvertToTree()
         {
-            List<PermissionDefinition> linCmsAttributes = ReflexHelper.GeAssemblyLinCmsAttributes();
+            List<PermissionDefinition> linCmsAttributes = ReflexHelper.GetAssemblyLinCmsAttributes();
 
             dynamic obj = ReflexHelper.AuthorizationConvertToTree(linCmsAttributes);
 
-            string jsonSerializeObject =JsonConvert.SerializeObject(obj);
+            string jsonSerializeObject = JsonConvert.SerializeObject(obj);
 
         }
 
@@ -165,7 +164,82 @@ public void ConvertToTree()
         [Fact]
         public void Test()
         {
-            var assem = AppDomain.CurrentDomain.GetAssemblies().Where(r=>r.FullName.Contains("LinCms.")).ToList();
+            List<Assembly> assem = AppDomain.CurrentDomain.GetAssemblies().Where(r => r.FullName.Contains("LinCms.")).ToList();
+        }
+
+        [Fact]
+        public void RelfexGetCustomAttributes()
+        {
+            var entityTypes = ReflexHelper.GetTypesByTableAttribute();
+            Assert.True(entityTypes.Length > 0);
+        }
+
+        [Fact]
+        public void GetTypes()
+        {
+            var entityTypes = ReflexHelper.GetTypesByNameSpace();
+            Assert.True(entityTypes.Length > 0);
+        }
+
+        [Fact]
+        public void FreeSqlBuilderTest()
+        {
+            FreeSqlBuilder fsql = new FreeSqlBuilder()
+                .UseConnectionString(DataType.MySql, "Data Source=localhost;Port=3306;User ID=root;Password=root;Initial Catalog=lincms2;Charset=utf8mb4;SslMode=none;Max pool size=1;Connection LifeTime=20")
+                .UseAutoSyncStructure(true)
+                .UseNoneCommandParameter(true);
+
+
+            Type type = fsql.GetType();
+            FieldInfo fieldInfo = type.GetField("_masterConnectionString", BindingFlags.NonPublic | BindingFlags.Instance);
+            string value = (string)fieldInfo.GetValue(fsql);
+
+            FieldInfo _dataTypeFieldInfo = type.GetField("_dataType", BindingFlags.NonPublic | BindingFlags.Instance);
+            DataType dataType = (DataType)_dataTypeFieldInfo.GetValue(fsql);
+
+
+        }
+
+
+        [Fact]
+        public void OdbcFreeSqlBuilderTest()
+        {
+
+            //using OdbcConnection cnn = new OdbcConnection("Driver={SQL Server};Server=.;Initial Catalog=master;Uid=sa;Pwd=123456");
+            //cnn.Open();
+
+            FreeSqlBuilder fsqlBuilder = new FreeSqlBuilder()
+                .UseConnectionString(DataType.OdbcSqlServer, "Driver={SQL Server};AttachDBFilename=d:\\db\\File\\AdventureWorks.mdf;Server=.;Initial Catalog=AdventureWorks;Uid=sa;Pwd=123456")
+                .UseAutoSyncStructure(true)
+                .UseNoneCommandParameter(true);
+
+
+            fsqlBuilder.CreateDatabaseIfNotExists_ODBCSqlServer();
+
+        }
+
+        [Fact]
+        public void OdbcFreeSqlBuilderTest2()
+        {
+
+            FreeSqlBuilder fsqlBuilder2 = new FreeSqlBuilder()
+               .UseConnectionString(DataType.OdbcSqlServer, "Driver={SQL Server};AttachDBFilename=|DataDirectory|\\AdventureWorks2.mdf;Server=.;Initial Catalog=AdventureWorks2;Uid=sa;Pwd=123456");
+
+            fsqlBuilder2.CreateDatabaseIfNotExists_ODBCSqlServer();
+        }
+
+
+        /// <summary>
+        ///  Message:  System.Data.Odbc.OdbcException : ERROR[IM002][Microsoft][ODBC Driver Manager] Data source name not found and no default driver specified
+        /// </summary>
+        [Fact]
+        public void CreateDatabaseIfNotExists_ODBCMySql_Test()
+        {
+            FreeSqlBuilder fsqlBuilder2 = new FreeSqlBuilder()
+               .UseConnectionString(DataType.OdbcMySql, "Driver={MySQL ODBC 8.0 Unicode Driver}; Server=127.0.0.1;Port=3308;Persist Security Info=False; Trusted_Connection=Yes;UID=root;PWD=123456; DATABASE=cccddd_odbc;Charset=utf8; SslMode=none;Min Pool Size=1");
+
+            fsqlBuilder2.CreateDatabaseIfNotExists_ODBCMySql();
+
         }
     }
 }
diff --git a/test/LinCms.Test/Repositories/AuditBaseRepositoryTests.cs b/test/LinCms.Test/Repositories/AuditBaseRepositoryTests.cs
deleted file mode 100644
index 235d0626..00000000
--- a/test/LinCms.Test/Repositories/AuditBaseRepositoryTests.cs
+++ /dev/null
@@ -1,239 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using LinCms.Application.Contracts.v1.Books;
-using LinCms.Core.Entities;
-using LinCms.Core.Entities.Blog;
-using LinCms.Infrastructure.Repositories;
-using Microsoft.Extensions.DependencyInjection;
-using Xunit;
-
-namespace LinCms.Test.Repositories
-{
-    public class AuditBaseRepositoryTests : BaseLinCmsTest
-    {
-        private readonly AuditBaseRepository<Book> _bookRepository;
-
-        public AuditBaseRepositoryTests()
-        {
-            _bookRepository = ServiceProvider.GetService<AuditBaseRepository<Book>>();
-        }
-
-        private Book GetBook()
-        {
-            CreateUpdateBookDto createBook = new CreateUpdateBookDto()
-            {
-                Title = Guid.NewGuid().ToString(),
-                Author = Guid.NewGuid().ToString().Substring(0, 10),
-                Image = Guid.NewGuid().ToString(),
-                Summary = Guid.NewGuid().ToString(),
-            };
-            Book book = Mapper.Map<Book>(createBook);
-
-            return book;
-        }
-
-        [Fact]
-        public void Insert()
-        {
-            Book book = GetBook();
-            Book backBook = _bookRepository.Insert(book);
-
-            Assert.Equal(book.Author, backBook.Author);
-        }
-
-        [Fact]
-        public async Task Insert2()
-        {
-
-            Book book = GetBook();
-            Book backBook = await _bookRepository.InsertAsync(book);
-
-            Assert.Equal(book.Author, backBook.Author);
-        }
-
-        [Fact]
-        public void InsertList()
-        {
-
-            List<Book> listBook = new List<Book>()
-            {
-                GetBook(),
-                GetBook(),
-                GetBook(),
-                GetBook(),
-                GetBook(),
-                GetBook(),
-                GetBook(),
-            };
-            List<Book> backBooks = _bookRepository.Insert(listBook);
-
-            Assert.Equal(backBooks[0].Author, backBooks[0].Author);
-        }
-
-        [Fact]
-        public async Task InsertAsyncListAsync()
-        {
-
-            List<Book> listBook = new List<Book>()
-            {
-                GetBook(),
-                GetBook(),
-                GetBook(),
-                GetBook(),
-                GetBook(),
-                GetBook(),
-                GetBook(),
-            };
-            List<Book> backBooks = await _bookRepository.InsertAsync(listBook);
-
-            Assert.Equal(backBooks[0].Author, backBooks[0].Author);
-        }
-
-        [Fact]
-        public void Update()
-        {
-            Book book = GetBook();
-            book.Id = 5;
-            book.Title = "112122123";
-            int len = _bookRepository.Update(book);
-
-            Assert.Equal(1, len);
-        }
-
-
-        [Fact]
-        public async Task UpdateAsync()
-        {
-            Book book = GetBook();
-            book.Id = 7;
-            _bookRepository.Attach(book);
-            book.Title = "123";
-            int len = await _bookRepository.UpdateAsync(book);
-
-            Assert.Equal(1, len);
-        }
-
-        [Fact]
-        public void UpdateList()
-        {
-            Book b1 = GetBook();
-            Book b2 = GetBook();
-
-            b1.Id = 8;
-            b2.Id = 9;
-
-            List<Book> books = new List<Book>()
-            {
-                b1,b2
-            };
-            int len = _bookRepository.Update(books);
-
-            Assert.Equal(2, len);
-        }
-        [Fact]
-        public async Task UpdateListAsync()
-        {
-            Book b1 = GetBook();
-            Book b2 = GetBook();
-            Book b3 = GetBook();
-            Book b4 = GetBook();
-
-            b1.Id = 8;
-            b2.Id = 9;
-            b3.Id = 10;
-            b4.Id = 11;
-
-            b1.Title = "123";
-
-            List<Book> books = new List<Book>()
-            {
-                b1,b2,b3,b4
-            };
-
-            _bookRepository.Attach(books);
-            int len = await _bookRepository.UpdateAsync(books);
-
-            Assert.Equal(4, len);
-        }
-
-        [Fact]
-        public void Delete()
-        {
-            _bookRepository.Delete(new Book() { Id = 6 });
-        }
-
-        [Fact]
-        public async Task DeleteAsync()
-        {
-            await _bookRepository.DeleteAsync(new Book() { Id = 7 });
-        }
-
-        [Fact]
-        public void DeleteList()
-        {
-            List<Book> books = new List<Book>()
-            {
-                new Book(){Id=10},
-                new Book(){Id=8} ,
-                new Book(){Id=9}
-                };
-            _bookRepository.Delete(books);
-        }
-
-        [Fact]
-        public async Task DeleteAsyncList()
-        {
-            List<Book> books = new List<Book>()
-            {
-                new Book(){Id=11},
-                new Book(){Id=12} ,
-                new Book(){Id=13}
-            };
-            await _bookRepository.DeleteAsync(books);
-        }
-
-        [Fact]
-        public void DeleteWhere()
-        {
-            _bookRepository.Delete(r => r.Id > 13 && r.Id < 15);
-        }
-
-        [Fact]
-        public async Task DeleteAsyncWhere()
-        {
-            await _bookRepository.DeleteAsync(r => r.Id >= 15 && r.Id < 18);
-        }
-
-        [Fact]
-        public void f()
-        {
-            Type f = typeof(Book);
-            Type f2 = typeof(IDeleteAduitEntity);
-            bool f3 = typeof(Book).IsSubclassOf(typeof(IDeleteAduitEntity));
-            bool f4 = typeof(IDeleteAduitEntity).IsAssignableFrom(typeof(Book));
-
-        }
-
-        [Fact]
-        public void TestUnitOfWork()
-        {
-            Guid id = new Guid();
-            using (var uow=FreeSql.CreateUnitOfWork())
-            {
-                var articleBaseRepository = uow.GetRepository<Article>();
-                var tagArticleRepository = uow.GetRepository<TagArticle>();
-                var commentBaseRepository = uow.GetRepository<Comment>();
-                var userLikeRepository = uow.GetRepository<UserLike>();
-
-                articleBaseRepository.Delete(new Article { Id = id });
-                tagArticleRepository.Delete(r => r.ArticleId == id);
-                commentBaseRepository.Delete(r => r.SubjectId == id);
-                userLikeRepository.Delete(r => r.SubjectId == id);
-
-            }
-
-
-        }
-    }
-}
diff --git a/test/LinCms.Test/Repositories/v1/ArticleRepositoryTest.cs b/test/LinCms.Test/Repositories/Blog/ArticleRepositoryTest.cs
similarity index 67%
rename from test/LinCms.Test/Repositories/v1/ArticleRepositoryTest.cs
rename to test/LinCms.Test/Repositories/Blog/ArticleRepositoryTest.cs
index 8bbe2498..9bff8548 100644
--- a/test/LinCms.Test/Repositories/v1/ArticleRepositoryTest.cs
+++ b/test/LinCms.Test/Repositories/Blog/ArticleRepositoryTest.cs
@@ -5,29 +5,25 @@
 using System.Linq;
 using System;
 using System.Threading.Tasks;
-using LinCms.Application.Contracts.Blog.Articles;
-using LinCms.Core.Entities.Blog;
-using LinCms.Infrastructure.Repositories;
+using AutoMapper;
+using LinCms.Blog.Articles;
+using LinCms.Entities.Blog;
+using LinCms.IRepositories;
 
-namespace LinCms.Test.Repositories.v1
+namespace LinCms.Test.Repositories.Blog
 {
     public class ArticleRepositoryTest : BaseLinCmsTest
     {
-        private readonly AuditBaseRepository<Article> _articleRepository;
-        private readonly AuditBaseRepository<TagArticle> _tagArticleRepository;
-        private readonly AuditBaseRepository<Tag> _tagRepository;
+        private readonly IAuditBaseRepository<Article> _articleRepository;
+        private readonly IMapper _mapper;
         private readonly ITestOutputHelper _testOutputHelper;
-
-        public ArticleRepositoryTest(ITestOutputHelper testOutputHelper) : base()
+        public ArticleRepositoryTest(ITestOutputHelper _testOutputHelper) : base()
         {
-            _articleRepository = ServiceProvider.GetService<AuditBaseRepository<Article>>();
-            _tagRepository = ServiceProvider.GetService<AuditBaseRepository<Tag>>();
-            _tagArticleRepository = ServiceProvider.GetService<AuditBaseRepository<TagArticle>>();
-            _testOutputHelper = testOutputHelper;
+            _articleRepository = ServiceProvider.GetRequiredService<IAuditBaseRepository<Article>>();
+            _mapper = ServiceProvider.GetRequiredService<IMapper>();
+            this._testOutputHelper = _testOutputHelper;
         }
 
-
-
         /// <summary>
         /// 使用BaseItem某一类别作为文件分类专栏时，使用From来join出分类专栏的名称。
         /// </summary>
@@ -46,18 +42,10 @@ public void Gets()
                 })
                 .Select(r =>
                 {
-                    ArticleDto articleDto = Mapper.Map<ArticleDto>(r.Article);
+                    ArticleDto articleDto = _mapper.Map<ArticleDto>(r.Article);
                     return articleDto;
                 }).ToList();
 
-            //使用SQL直接获取文章及其分类名称
-            List<ArticleDto> t9 = FreeSql.Ado.Query<ArticleDto>($@"
-                            SELECT a.*,b.item_name as classifyName 
-                            FROM blog_article a 
-                            LEFT JOIN base_item b 
-                            on a.classify_id=b.id where a.is_deleted=0"
-            );
-
             //属性Classify为null
             List<Article> articles1 = _articleRepository
                 .Select
@@ -78,7 +66,7 @@ LEFT JOIN base_item b
                     Article = r
                 }).Select(r =>
                 {
-                    ArticleDto articleDto = Mapper.Map<ArticleDto>(r.Article);
+                    ArticleDto articleDto = _mapper.Map<ArticleDto>(r.Article);
                     return articleDto;
                 }).ToList();
 
@@ -88,7 +76,7 @@ LEFT JOIN base_item b
                 .Include(r => r.Classify)
                 .ToList().Select(r =>
                 {
-                    ArticleDto articleDto = Mapper.Map<ArticleDto>(r);
+                    ArticleDto articleDto = _mapper.Map<ArticleDto>(r);
                     return articleDto;
                 }).ToList();
 
@@ -135,23 +123,16 @@ public void TestInCludeMany()
 
         }
 
-        [Fact]
-        public void Test()
-        {
-            Guid guid = new Guid("5dc93286-5e44-c190-008e-3fc74d4fcee0");
-            var error = _articleRepository.Select.IncludeMany(r => r.Tags)
-                .Where(r => r.Id == guid)
-                .ToList(); ;
-        }
 
         [Fact]
         public void Test2()
         {
-            //blog_article 找不到列 Tags”
-            Guid guid = new Guid("5dc93286-5e44-c190-008e-3fc74d4fcee0");
             var error = _articleRepository.Select
-                .Where(r => r.Id == guid)
-                .ToList(r => r.Tags);
+                .ToList(r => new
+                {
+                    r.Title,
+                    count = r.Tags.AsSelect().Count()
+                });
         }
 
 
@@ -185,10 +166,16 @@ public void TestWhereOneToMany()
                 .Select
                 .IncludeMany(r => r.Tags.Where(u => u.Id == r.Id)).ToList();
 
-            //System.Exception:“表达式错误，它不是连续的 MemberAccess 类型：value(LinCms.Test.Controller.v1.ArticleControllerTest+<>c__DisplayClass9_0).searchDto”
+
             var data = _articleRepository
                 .Select
-                .IncludeMany(r => r.Tags.Where(u => u.Id == searchDto.TagId)).ToList();
+                .IncludeMany(r => r.Tags, r => r.Where(u => u.Id == searchDto.TagId)).ToList();
+
+            //System.Exception:“表达式错误，它不是连续的 MemberAccess 类型：value(LinCms.Test.Controller.v1.ArticleControllerTest+<>c__DisplayClass9_0).searchDto”
+            //var data = _articleRepository
+            //    .Select
+            //    .IncludeMany(r => r.Tags.Where(u => u.Id == searchDto.TagId)).ToList();
+
 
         }
 
@@ -197,10 +184,10 @@ public void TestInCludeManySql()
         {
             //这里就不会生成UserInfo表的IsDeleted=0的判断
             var sql = _articleRepository
-                .Select
-                .Include(r => r.UserInfo)
-                .WhereCascade(r => r.IsAudit == true && r.IsDeleted == false)
-                .ToSql();
+                  .Select
+                  .Include(r => r.UserInfo)
+                  .WhereCascade(r => r.IsAudit == true && r.IsDeleted == false)
+                  .ToSql();
 
             _testOutputHelper.WriteLine(sql);
 
@@ -227,21 +214,18 @@ public void TestIncludeManyList()
         [Fact]
         public async Task CreateArticleAsyncTest()
         {
-            Article article=new Article()
+            Article article = new Article()
             {
-                Id = new Guid("5dccaf53-b8ff-0750-00bf-8e9549e111a6"),
-            };
-            await _articleRepository.UpdateAsync(article);
-            List<TagArticle> tagArticles = new List<TagArticle>()
-            {
-                new TagArticle()
+                Tags = new List<Tag>()
                 {
-                    TagId = Guid.NewGuid(),
-                    ArticleId = Guid.NewGuid()
+                    new Tag()
+                    {
+                        Id = Guid.NewGuid(),
+                    }
                 }
             };
-            await _tagArticleRepository.InsertAsync(tagArticles);
-            UnitOfWork.Commit();
+
+            await _articleRepository.InsertAsync(article);
         }
     }
 }
diff --git a/test/LinCms.Test/Repositories/v1/CommentRepositoryTest.cs b/test/LinCms.Test/Repositories/Blog/CommentRepositoryTest.cs
similarity index 87%
rename from test/LinCms.Test/Repositories/v1/CommentRepositoryTest.cs
rename to test/LinCms.Test/Repositories/Blog/CommentRepositoryTest.cs
index e2682e15..150a7c3b 100644
--- a/test/LinCms.Test/Repositories/v1/CommentRepositoryTest.cs
+++ b/test/LinCms.Test/Repositories/Blog/CommentRepositoryTest.cs
@@ -3,20 +3,26 @@
 using System.Collections.Generic;
 using System.Linq;
 using System;
-using FreeSql;
-using LinCms.Application.Contracts.Blog.Comments;
-using LinCms.Core.Entities.Blog;
-using LinCms.Core.Extensions;
+using AutoMapper;
+using LinCms.Blog.Comments;
+using LinCms.Entities.Blog;
+using LinCms.Extensions;
+using LinCms.IRepositories;
 
-namespace LinCms.Test.Repositories.v1
+namespace LinCms.Test.Repositories.Blog
 {
     public class CommentRepositoryTest : BaseLinCmsTest
     {
-        private readonly BaseRepository<Comment> _baseRepository;
+        private readonly IAuditBaseRepository<Comment> _baseRepository;
+        
+        private readonly IMapper Mapper;
+        private readonly IFreeSql FreeSql;
 
         public CommentRepositoryTest() : base()
         {
-            _baseRepository = ServiceProvider.GetService<BaseRepository<Comment>>();
+            _baseRepository = ServiceProvider.GetRequiredService<IAuditBaseRepository<Comment>>();
+            Mapper = ServiceProvider.GetRequiredService<IMapper>();
+            FreeSql = ServiceProvider.GetRequiredService<IFreeSql>();
         }
 
 
diff --git a/test/LinCms.Test/Repositories/v1/TagRepositoryTest.cs b/test/LinCms.Test/Repositories/Blog/TagRepositoryTest.cs
similarity index 66%
rename from test/LinCms.Test/Repositories/v1/TagRepositoryTest.cs
rename to test/LinCms.Test/Repositories/Blog/TagRepositoryTest.cs
index 84b59c55..f9a061cf 100644
--- a/test/LinCms.Test/Repositories/v1/TagRepositoryTest.cs
+++ b/test/LinCms.Test/Repositories/Blog/TagRepositoryTest.cs
@@ -1,24 +1,21 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using LinCms.Application.Contracts.Blog.Tags;
-using LinCms.Core.Entities.Blog;
-using LinCms.Infrastructure.Repositories;
+using LinCms.Blog.Tags;
+using LinCms.Entities.Blog;
+using LinCms.IRepositories;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 
-namespace LinCms.Test.Repositories.v1
+namespace LinCms.Test.Repositories.Blog
 {
     public class TagRepositoryTest : BaseLinCmsTest
     {
 
-        private readonly AuditBaseRepository<Tag> _tagRepository;
-        private readonly AuditBaseRepository<TagArticle> _tagArticleRepository;
+        private readonly IAuditBaseRepository<Tag> _tagRepository;
+        private readonly IAuditBaseRepository<TagArticle> _tagArticleRepository;
 
         public TagRepositoryTest()
         {
-            _tagRepository = ServiceProvider.GetService<AuditBaseRepository<Tag>>();
-            _tagArticleRepository = ServiceProvider.GetService<AuditBaseRepository<TagArticle>>();
+            _tagRepository = ServiceProvider.GetService<IAuditBaseRepository<Tag>>();
+            _tagArticleRepository = ServiceProvider.GetService<IAuditBaseRepository<TagArticle>>();
         }
 
         [Fact]
diff --git a/test/LinCms.Test/Repositories/v1/UserSubscribeRepositoryTest.cs b/test/LinCms.Test/Repositories/Blog/UserSubscribeRepositoryTest.cs
similarity index 80%
rename from test/LinCms.Test/Repositories/v1/UserSubscribeRepositoryTest.cs
rename to test/LinCms.Test/Repositories/Blog/UserSubscribeRepositoryTest.cs
index c3b7b824..690636ec 100644
--- a/test/LinCms.Test/Repositories/v1/UserSubscribeRepositoryTest.cs
+++ b/test/LinCms.Test/Repositories/Blog/UserSubscribeRepositoryTest.cs
@@ -1,18 +1,18 @@
-using LinCms.Application.Contracts.Blog.UserSubscribes;
-using LinCms.Core.Entities.Blog;
-using LinCms.Infrastructure.Repositories;
-using LinCms.Application.Contracts.Cms.Users;
-using Xunit;
+using Xunit;
 using Microsoft.Extensions.DependencyInjection;
+using LinCms.Blog.UserSubscribes;
+using LinCms.Cms.Users;
+using LinCms.Entities.Blog;
+using LinCms.IRepositories;
 
-namespace LinCms.Test.Repositories.v1
+namespace LinCms.Test.Repositories.Blog
 {
     public class UserSubscribeRepositoryTest : BaseLinCmsTest
     {
-        private readonly AuditBaseRepository<UserSubscribe> _userSubscribeRepository;
+        private readonly IAuditBaseRepository<UserSubscribe> _userSubscribeRepository;
         public UserSubscribeRepositoryTest() : base()
         {
-            _userSubscribeRepository = ServiceProvider.GetService<AuditBaseRepository<UserSubscribe>>();
+            _userSubscribeRepository = ServiceProvider.GetService<IAuditBaseRepository<UserSubscribe>>();
         }
 
         [Fact]
@@ -30,8 +30,7 @@ public void GetUserSubscribeeeList()
                     CreateUserId = r.CreateUserId,
                     BeSubscribeUserId = r.SubscribeUserId,
                     Subscribeer = r.SubscribeUser,
-                    IsSubscribeed = _userSubscribeRepository.Select.Any(u =>
-                        u.CreateUserId == 7 && u.SubscribeUserId == r.SubscribeUserId)
+                    IsSubscribeed = _userSubscribeRepository.Select.Any(u =>u.CreateUserId == 7 && u.SubscribeUserId == r.SubscribeUserId)
                 });
 
             var userSubscribe2 = _userSubscribeRepository.Select
diff --git a/test/LinCms.Test/Repositories/BookRepositoryTests.cs b/test/LinCms.Test/Repositories/BookRepositoryTests.cs
new file mode 100644
index 00000000..9df3ec1c
--- /dev/null
+++ b/test/LinCms.Test/Repositories/BookRepositoryTests.cs
@@ -0,0 +1,139 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using AutoMapper;
+using LinCms.Entities;
+using LinCms.IRepositories;
+using LinCms.v1.Books;
+using Xunit;
+
+namespace LinCms.Test.Repositories
+{
+    public class BookRepositoryTests : BaseLinCmsTest
+    {
+        private readonly IBookRepository _bookRepository;
+        private readonly IMapper _mapper;
+
+        public BookRepositoryTests() : base()
+        {
+            _bookRepository = GetRequiredService<IBookRepository>();
+            _mapper = GetRequiredService<IMapper>();
+        }
+
+        private Book GetBook()
+        {
+            CreateUpdateBookDto createBook = new CreateUpdateBookDto()
+            {
+                Title = Guid.NewGuid().ToString(),
+                Author = Guid.NewGuid().ToString().Substring(0, 10),
+                Image = Guid.NewGuid().ToString(),
+                Summary = Guid.NewGuid().ToString(),
+            };
+            Book book = _mapper.Map<Book>(createBook);
+
+            return book;
+        }
+
+        [Fact]
+        public void Insert()
+        {
+            Book book = GetBook();
+            Book backBook = _bookRepository.Insert(book);
+            Assert.Equal(book.Author, backBook.Author);
+        }
+
+        [Fact]
+        public async Task Insert2()
+        {
+
+            Book book = GetBook();
+            Book backBook = await _bookRepository.InsertAsync(book);
+            Assert.Equal(book.Author, backBook.Author);
+        }
+
+        [Fact]
+        public void InsertList()
+        {
+
+            List<Book> listBook = new List<Book>()
+            {
+                GetBook(),
+                GetBook(),
+                GetBook(),
+                GetBook(),
+                GetBook(),
+                GetBook(),
+                GetBook(),
+            };
+            List<Book> backBooks = _bookRepository.Insert(listBook);
+            Assert.Equal(listBook[0].Author, backBooks[0].Author);
+        }
+
+        [Fact]
+        public async Task InsertAsyncListAsync()
+        {
+            List<Book> listBook = new List<Book>()
+            {
+                GetBook(),
+                GetBook(),
+                GetBook(),
+                GetBook(),
+                GetBook(),
+                GetBook(),
+                GetBook(),
+            };
+            List<Book> backBooks = await _bookRepository.InsertAsync(listBook);
+            Assert.Equal(listBook[0].Author, backBooks[0].Author);
+
+        }
+
+        [Fact]
+        public void Update()
+        {
+            Book book = _bookRepository.Select.First();
+            book.Title = "112122123";
+            int len = _bookRepository.Update(book);
+            Assert.Equal(1, len);
+        }
+
+
+        [Fact]
+        public async Task UpdateAsync()
+        {
+            Book book = await _bookRepository.Select.FirstAsync();
+            book.Title = "123";
+            int len = await _bookRepository.UpdateAsync(book);
+            Assert.Equal(1, len);
+        }
+
+
+
+
+        [Fact]
+        public void Delete()
+        {
+            Book book = _bookRepository.Select.First();
+            _bookRepository.Delete(book);
+        }
+
+        [Fact]
+        public async Task DeleteAsync()
+        {
+            Book book = await _bookRepository.Select.FirstAsync();
+            await _bookRepository.DeleteAsync(book);
+        }
+
+
+
+        [Fact]
+        public void IsAssignableFromTest()
+        {
+            Type f1 = typeof(Book);
+            Type f2 = typeof(IDeleteAduitEntity);
+            bool f3 = typeof(Book).IsSubclassOf(typeof(IDeleteAduitEntity));
+            bool f4 = typeof(IDeleteAduitEntity).IsAssignableFrom(typeof(Book));
+
+        }
+
+    }
+}
diff --git a/test/LinCms.Test/Service/Base/BaseTypeServiceTest.cs b/test/LinCms.Test/Service/Base/BaseTypeServiceTest.cs
new file mode 100644
index 00000000..9643f1de
--- /dev/null
+++ b/test/LinCms.Test/Service/Base/BaseTypeServiceTest.cs
@@ -0,0 +1,67 @@
+using FreeSql;
+using LinCms.Entities.Base;
+using LinCms.IRepositories;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Xunit;
+
+namespace LinCms.Test.Service.Base
+{
+    public class BaseTypeServiceTest : BaseLinCmsTest
+    {
+        private readonly IAuditBaseRepository<BaseType> baseRepository;
+        private readonly UnitOfWorkManager _unitOfWorkManager;
+        private readonly IFreeSql freeSql;
+
+        public BaseTypeServiceTest() : base()
+        {
+            baseRepository = GetService<IAuditBaseRepository<BaseType>>();
+            _unitOfWorkManager = GetService<UnitOfWorkManager>();
+            freeSql = GetService<IFreeSql>();
+        }
+
+        /*
+        SELECT
+            a.*
+        FROM
+            `base_type` a
+            LEFT JOIN `base_item` b ON b.`id` = (
+        SELECT
+            b2.`id` 
+        FROM
+            `base_item` b2
+        WHERE
+             a.`id` = b2.`base_type_id`  
+            LIMIT 1 
+        )*/
+        [Fact]
+        public void LeftJoinOne()
+        {
+            var d = freeSql.Select<BaseType, BaseItem>()    
+                .LeftJoin((a, b) => b.Id == (freeSql.Select<BaseItem>().As("b2").Where(b2 => b2.BaseTypeId == a.Id).First(b2 => b2.Id)))
+                .ToSql((a, b) => new { a, b });
+        }
+
+
+
+        [Fact]
+        public void TestInclude()
+        {
+            var result = freeSql.Select<BaseType>()
+                 .IncludeMany(r => r.BaseItems.Take(1)).ToList();
+
+        }
+
+        [Fact]
+        public void LeftJoin()
+        {
+            var result = freeSql.Select<BaseType>()
+                 .IncludeMany(r => r.BaseItems.Take(1)).ToList();
+
+        }
+
+
+    }
+}
diff --git a/test/LinCms.Test/Service/Blog/ArticleServiceTest.cs b/test/LinCms.Test/Service/Blog/ArticleServiceTest.cs
new file mode 100644
index 00000000..2ae4345a
--- /dev/null
+++ b/test/LinCms.Test/Service/Blog/ArticleServiceTest.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Threading.Tasks;
+using Xunit;
+using FreeSql;
+using LinCms.Blog.Articles;
+using LinCms.Data;
+
+namespace LinCms.Test.Service.Blog
+{
+    public class ArticleServiceTest : BaseLinCmsTest
+    {
+        private readonly IArticleService _articleService;
+        private readonly UnitOfWorkManager _unitOfWorkManager;
+
+        public ArticleServiceTest() : base()
+        {
+            _articleService = GetService<IArticleService>();
+            _unitOfWorkManager = GetService<UnitOfWorkManager>();
+         }
+
+        [Fact]
+        public async Task DeleteAsync()
+        {
+            await _articleService.DeleteAsync(new Guid("5dc93286-5e44-c190-008e-3fc74d4fcee0"));
+        }
+
+        [Fact]
+        public async Task GetAsync()
+        {
+            await _articleService.GetAsync(new Guid("5deea988-b280-dff8-003c-85247943caf7"));
+
+        }
+
+        [Fact]
+        public async Task GetSubscribeArticleAsyncTest()
+        {
+            await _articleService.GetSubscribeArticleAsync(new PageDto());
+        }
+
+        [Fact]
+        public async Task GetArticleAsync()
+        {
+            await _articleService.GetArticleAsync(new ArticleSearchDto() { TagId = Guid.NewGuid() });
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/LinCms.Test/Service/Cms/LogServiceTest.cs b/test/LinCms.Test/Service/Cms/LogServiceTest.cs
index 1b740550..25b9d10e 100644
--- a/test/LinCms.Test/Service/Cms/LogServiceTest.cs
+++ b/test/LinCms.Test/Service/Cms/LogServiceTest.cs
@@ -1,26 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using LinCms.Application.Blog.Articles;
-using LinCms.Application.Cms.Logs;
-using LinCms.Application.Contracts.Blog.Articles;
-using LinCms.Core.Data;
+using System.Collections.Generic;
+using LinCms.Cms.Logs;
 using Xunit;
-using Xunit.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
 namespace LinCms.Test.Service.Cms
 {
 
     public class LogServiceTest : BaseLinCmsTest
     {
-        private readonly ITestOutputHelper _testOutputHelper;
         private readonly ILogService _logService;
 
-        public LogServiceTest(ITestOutputHelper testOutputHelper) : base()
+        public LogServiceTest() : base()
         {
             _logService = ServiceProvider.GetService<ILogService>();
-            _testOutputHelper = testOutputHelper;
         }
 
         [Fact]
diff --git a/test/LinCms.Test/Service/Cms/UserServiceTest.cs b/test/LinCms.Test/Service/Cms/UserServiceTest.cs
new file mode 100644
index 00000000..2d67b10f
--- /dev/null
+++ b/test/LinCms.Test/Service/Cms/UserServiceTest.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using AutoMapper;
+using LinCms.Cms.Groups;
+using LinCms.Cms.Users;
+using LinCms.Data;
+using LinCms.Entities;
+using LinCms.Extensions;
+using LinCms.IRepositories;
+using Xunit;
+
+namespace LinCms.Test.Service.Cms
+{
+    public class UserServiceTest : BaseLinCmsTest
+    {
+        private readonly IUserService _userService;
+        private readonly IUserRepository userRepository;
+        private readonly IMapper _mapper;
+
+        public UserServiceTest() : base()
+        {
+            userRepository = GetService<IUserRepository>();
+            _userService = GetService<IUserService>();
+            _mapper = GetService<IMapper>();
+        }
+
+        [Fact]
+        public async Task ChangePasswordAsync()
+        {
+            await _userService.ChangePasswordAsync(new ChangePasswordDto()
+            {
+                ConfirmPassword = "123qwe",
+                NewPassword = "123qwe",
+                OldPassword = "123qwe"
+            });
+        }
+
+        [Fact]
+        public async Task Delete()
+        {
+            await _userService.DeleteAsync(14);
+        }
+
+
+        [Fact]
+        public void GetUserListByGroupId()
+        {
+            List<UserDto> linUsers = userRepository.Select
+                .IncludeMany(r => r.LinGroups)
+                .OrderByDescending(r => r.Id).ToPagerList(new PageDto(), out long totalCount)
+                .Select(r =>
+                {
+                    UserDto userDto = _mapper.Map<UserDto>(r);
+                    userDto.Groups = _mapper.Map<List<GroupDto>>(r.LinGroups);
+                    return userDto;
+                }).ToList();
+
+        }
+
+
+        [Fact]
+        public async Task GetToList()
+        {
+            var linUsers = await userRepository.Select
+                .IncludeMany(r => r.LinGroups.Select(u => new LinGroup { Id = u.Id, Name = u.Name }))
+                .OrderByDescending(r => r.Id)
+                .ToListAsync();
+        }
+
+        [Fact]
+        public async Task GetSelectToList()
+        {
+            var linUsers = await userRepository.Select
+                .IncludeMany(r => r.LinGroups.Select(u => new LinGroup { Id = u.Id, Name = u.Name }))
+                .OrderByDescending(r => r.Id)
+                .ToListAsync(r => new
+                {
+                    r.Username,
+                    r.Email,
+                    r.LinGroups
+                });
+        }
+
+        [Fact]
+        public async Task GetSelectDtoToList()
+        {
+            var linUsers = await userRepository.Select
+                .IncludeMany(r => r.LinGroups.Select(u => new LinGroup { Id = u.Id, Name = u.Name }))
+                .OrderByDescending(r => r.Id)
+                .ToListAsync(r => new UserDto
+                {
+                    Username = r.Username,
+                    Email = r.Email,
+                    //Groups = r.LinGroups
+                });
+        }
+
+    }
+}
diff --git a/test/LinCms.Test/Service/v1/ArticleServiceTest.cs b/test/LinCms.Test/Service/v1/ArticleServiceTest.cs
deleted file mode 100644
index e314f51d..00000000
--- a/test/LinCms.Test/Service/v1/ArticleServiceTest.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using LinCms.Application.Blog.Articles;
-using LinCms.Application.Contracts.Blog.Articles;
-using LinCms.Core.Data;
-using Xunit.Abstractions;
-using Microsoft.Extensions.DependencyInjection;
-using Xunit;
-
-namespace LinCms.Test.Service.v1
-{
-    public class ArticleServiceTest : BaseLinCmsTest
-    {
-        private readonly ITestOutputHelper _testOutputHelper;
-        private readonly IArticleService _articleService;
-
-        public ArticleServiceTest(ITestOutputHelper testOutputHelper) : base()
-        {
-            _articleService = ServiceProvider.GetService<IArticleService>();
-            _testOutputHelper = testOutputHelper;
-        }
-
-        [Fact]
-        public void Delete()
-        {
-            _articleService.Delete(new Guid("5dc93286-5e44-c190-008e-3fc74d4fcee0"));
-        }
-
-        [Fact]
-        public async Task GetAsync()
-        {
-            string redisKey = "article:query:TestGetArticleAsync";
-            var d =await RedisHelper.CacheShellAsync(redisKey, 3600, async () =>
-                    {
-                        return await _articleService.GetAsync(new Guid("5deea988-b280-dff8-003c-85247943caf7"));
-                    }
-               );
-
-        }
-
-        [Fact]
-        public void GetSubscribeArticle()
-        {
-            string redisKey = "article:query:GetSubscribeArticle";
-            var subscribute = RedisHelper.CacheShell(redisKey, 3600, () =>
-                {
-                    return _articleService.GetSubscribeArticle(new PageDto());
-                }
-            );
-
-        }
-
-        [Fact]
-        public async Task GetArticleAsync()
-        {
-            string redisKey = "article:query:GetArticleAsync";
-            var subscribute =await RedisHelper.CacheShellAsync(redisKey, 3600, async () =>
-                {
-                    return await _articleService.GetArticleAsync(new ArticleSearchDto());
-                }
-            );
-
-        }
-    }
-}
diff --git a/test/LinCms.Test/Service/v1/BookServiceTest.cs b/test/LinCms.Test/Service/v1/BookServiceTest.cs
new file mode 100644
index 00000000..86786027
--- /dev/null
+++ b/test/LinCms.Test/Service/v1/BookServiceTest.cs
@@ -0,0 +1,25 @@
+using System.Threading.Tasks;
+using LinCms.Data;
+using LinCms.v1.Books;
+using Xunit;
+
+namespace LinCms.Test.Service.v1
+{
+    public class BookServiceTest : BaseLinCmsTest
+    {
+        private readonly IBookService _bookService;
+
+        public BookServiceTest() : base()
+        {
+            _bookService = GetRequiredService<IBookService>();
+        }
+
+        [Fact]
+        public async Task GetListAsyncTest()
+        {
+            PagedResultDto<BookDto> books = await _bookService.GetListAsync(new PageDto { });
+
+            Assert.True(books.Items.Count > 0);
+        }
+    }
+}
diff --git a/test/LinCms.Test/TestStartup.cs b/test/LinCms.Test/TestStartup.cs
index 12c4a198..d21baaff 100644
--- a/test/LinCms.Test/TestStartup.cs
+++ b/test/LinCms.Test/TestStartup.cs
@@ -1,18 +1,19 @@
-using LinCms.Web;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace LinCms.Test
 {
-    public class TestStartup : Startup
+    public class TestStartup 
     {
-        public TestStartup(IConfiguration configuration) : base(configuration)
+        public IConfiguration Configuration { get; }
+
+        public TestStartup(IConfiguration configuration)
         {
         }
 
         public void ConfigureTestServices(IServiceCollection services)
         {
-            // TODO:为测试环境配置服务
+
         }
     }
 }
diff --git a/test/LinCms.Test/Startups/ToolWordTest.cs b/test/LinCms.Test/Utils/ToolWordTest.cs
similarity index 90%
rename from test/LinCms.Test/Startups/ToolWordTest.cs
rename to test/LinCms.Test/Utils/ToolWordTest.cs
index 5c8ffb32..1f3902b6 100644
--- a/test/LinCms.Test/Startups/ToolWordTest.cs
+++ b/test/LinCms.Test/Utils/ToolWordTest.cs
@@ -1,11 +1,12 @@
 using ToolGood.Words;
 using Xunit;
 
-namespace LinCms.Test.Startups
+namespace LinCms.Test.Utils
 {
     public class ToolWordTest
     {
         [Fact]
+        [System.Obsolete]
         public void IssuesTest_17()
         {
             var illegalWordsSearch = new IllegalWordsSearch();