diff --git a/Util.sln b/Util.sln
index 50df5592..62972bbe 100644
--- a/Util.sln
+++ b/Util.sln
@@ -74,6 +74,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "02-Util.Ui.Angular.AntDesig
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "04-Util.Ui.Angular.Material", "src\Util.Ui.Angular.Material\04-Util.Ui.Angular.Material.csproj", "{9A38AC58-8559-4895-A09E-2A924FD9763A}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "01-Presentation", "01-Presentation", "{3FAAA4DC-3245-4270-8BAF-C6333C79D516}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "02-Service", "02-Service", "{BA4E4760-AE72-4091-8E25-6B300CC27EEE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "03-Domain", "03-Domain", "{4B71322A-458F-448D-844A-62A15F4323BC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "04-Infrastructure", "04-Infrastructure", "{11ED0240-9469-44ED-B92B-007633238CC6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Util.Samples.Service", "sample\Util.Samples.Service\Util.Samples.Service.csproj", "{9C3643A9-2C53-4578-A373-CCF5626E7346}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Util.Samples.Domain", "sample\Util.Samples.Domain\Util.Samples.Domain.csproj", "{02E7316A-0B88-47D3-B859-3B2E90307F7F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Util.Samples.Data", "sample\Util.Samples.Data\Util.Samples.Data.csproj", "{8F374F37-9A07-427E-9BA3-0E3A69AB094D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -184,6 +198,18 @@ Global
 		{9A38AC58-8559-4895-A09E-2A924FD9763A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9A38AC58-8559-4895-A09E-2A924FD9763A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9A38AC58-8559-4895-A09E-2A924FD9763A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C3643A9-2C53-4578-A373-CCF5626E7346}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C3643A9-2C53-4578-A373-CCF5626E7346}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C3643A9-2C53-4578-A373-CCF5626E7346}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C3643A9-2C53-4578-A373-CCF5626E7346}.Release|Any CPU.Build.0 = Release|Any CPU
+		{02E7316A-0B88-47D3-B859-3B2E90307F7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02E7316A-0B88-47D3-B859-3B2E90307F7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02E7316A-0B88-47D3-B859-3B2E90307F7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{02E7316A-0B88-47D3-B859-3B2E90307F7F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F374F37-9A07-427E-9BA3-0E3A69AB094D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F374F37-9A07-427E-9BA3-0E3A69AB094D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F374F37-9A07-427E-9BA3-0E3A69AB094D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F374F37-9A07-427E-9BA3-0E3A69AB094D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -215,13 +241,20 @@ Global
 		{D1083FEB-81A7-4BBF-ADDB-C03D143BC4AB} = {DE1DF0B9-0403-4888-8B24-8208348E9AFA}
 		{F680DA14-282E-471E-8E1C-F4D2067B718E} = {D1083FEB-81A7-4BBF-ADDB-C03D143BC4AB}
 		{E220692E-909A-4855-A67F-64C3A9590BA6} = {3746073A-1C5C-40A7-9D50-CB2A94CA888A}
-		{18A2D4FE-27BB-4A69-8C07-29169B9006B3} = {F1B4AAEF-9162-4DFA-8B62-4069FC914839}
+		{18A2D4FE-27BB-4A69-8C07-29169B9006B3} = {3FAAA4DC-3245-4270-8BAF-C6333C79D516}
 		{26F6273A-567A-4AA4-8304-AEC57FC40DC9} = {3746073A-1C5C-40A7-9D50-CB2A94CA888A}
-		{41F2DA18-8295-4003-99D3-4237B90D7BAE} = {F1B4AAEF-9162-4DFA-8B62-4069FC914839}
-		{E4C15F45-CBB9-4240-B0CD-45E6A2A34629} = {F1B4AAEF-9162-4DFA-8B62-4069FC914839}
+		{41F2DA18-8295-4003-99D3-4237B90D7BAE} = {3FAAA4DC-3245-4270-8BAF-C6333C79D516}
+		{E4C15F45-CBB9-4240-B0CD-45E6A2A34629} = {3FAAA4DC-3245-4270-8BAF-C6333C79D516}
 		{5D30B981-7319-4181-9E0A-DDE1ECCC691D} = {78CC88DA-0B25-45BC-86A8-FFE9628B34A6}
 		{4939123A-D223-4F20-9911-6C30F2EECF2B} = {0629A068-957D-4920-9290-0B9288341E0D}
 		{9A38AC58-8559-4895-A09E-2A924FD9763A} = {78CC88DA-0B25-45BC-86A8-FFE9628B34A6}
+		{3FAAA4DC-3245-4270-8BAF-C6333C79D516} = {F1B4AAEF-9162-4DFA-8B62-4069FC914839}
+		{BA4E4760-AE72-4091-8E25-6B300CC27EEE} = {F1B4AAEF-9162-4DFA-8B62-4069FC914839}
+		{4B71322A-458F-448D-844A-62A15F4323BC} = {F1B4AAEF-9162-4DFA-8B62-4069FC914839}
+		{11ED0240-9469-44ED-B92B-007633238CC6} = {F1B4AAEF-9162-4DFA-8B62-4069FC914839}
+		{9C3643A9-2C53-4578-A373-CCF5626E7346} = {BA4E4760-AE72-4091-8E25-6B300CC27EEE}
+		{02E7316A-0B88-47D3-B859-3B2E90307F7F} = {4B71322A-458F-448D-844A-62A15F4323BC}
+		{8F374F37-9A07-427E-9BA3-0E3A69AB094D} = {11ED0240-9469-44ED-B92B-007633238CC6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {AA6E8E23-8AB6-4AB6-9B31-494CB7CE5E63}
diff --git a/build/version.props b/build/version.props
index a2b250ee..013eeb46 100644
--- a/build/version.props
+++ b/build/version.props
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<VersionMajor>1</VersionMajor>
 		<VersionMinor>3</VersionMinor>
-		<VersionPatch>5</VersionPatch>
+		<VersionPatch>6</VersionPatch>
 		<VersionQuality></VersionQuality>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
diff --git a/sample/Util.Samples.Angular.Material/Apis/Systems/ApplicationController.cs b/sample/Util.Samples.Angular.Material/Apis/Systems/ApplicationController.cs
index 839b23d5..30e18717 100644
--- a/sample/Util.Samples.Angular.Material/Apis/Systems/ApplicationController.cs
+++ b/sample/Util.Samples.Angular.Material/Apis/Systems/ApplicationController.cs
@@ -1,6 +1,6 @@
-using Util.Samples.Services.Abstractions.Systems;
-using Util.Samples.Services.Dtos.Systems;
-using Util.Samples.Services.Queries.Systems;
+using Util.Samples.Service.Abstractions.Systems;
+using Util.Samples.Service.Dtos.Systems;
+using Util.Samples.Service.Queries.Systems;
 using Util.Webs.Controllers;
 
 namespace Util.Samples.Apis.Systems {
diff --git a/sample/Util.Samples.Angular.Material/Apis/Systems/RoleController.cs b/sample/Util.Samples.Angular.Material/Apis/Systems/RoleController.cs
index 75c6bb0f..b17c4abf 100644
--- a/sample/Util.Samples.Angular.Material/Apis/Systems/RoleController.cs
+++ b/sample/Util.Samples.Angular.Material/Apis/Systems/RoleController.cs
@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using Util.Samples.Services.Abstractions.Systems;
-using Util.Samples.Services.Dtos.Systems;
-using Util.Samples.Services.Queries.Systems;
+using Util.Samples.Service.Abstractions.Systems;
+using Util.Samples.Service.Dtos.Systems;
+using Util.Samples.Service.Queries.Systems;
 using Util.Ui.Controllers;
 
 namespace Util.Samples.Apis.Systems {
diff --git a/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Application/Detail.cshtml b/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Application/Detail.cshtml
index 672702e8..ac6977fe 100644
--- a/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Application/Detail.cshtml
+++ b/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Application/Detail.cshtml
@@ -1,4 +1,4 @@
-@model Util.Samples.Services.Dtos.Systems.ApplicationDto
+@model ApplicationDto
 <style>
     .mat-expansion-panel {
         margin-bottom: 10px;
diff --git a/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Application/Edit.cshtml b/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Application/Edit.cshtml
index 4b746331..364b25aa 100644
--- a/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Application/Edit.cshtml
+++ b/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Application/Edit.cshtml
@@ -1,4 +1,4 @@
-@model Util.Samples.Services.Dtos.Systems.ApplicationDto
+@model ApplicationDto
 
 <util-form id="form" on-submit="submit(form,btnSubmit)">
     <util-card>
@@ -31,7 +31,7 @@
             </util-layout>
             <util-layout class="mt30">
                 <util-layout-item flex="50%" offset="5%">
-                    <util-editor for="Comment" upload-url="/api/upload"></util-editor>
+                    <util-editor for="Comment"></util-editor>
                 </util-layout-item>
             </util-layout>
         </util-card-content>
diff --git a/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Application/Index.cshtml b/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Application/Index.cshtml
index 90294939..4652a472 100644
--- a/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Application/Index.cshtml
+++ b/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Application/Index.cshtml
@@ -1,4 +1,4 @@
-@model Util.Samples.Services.Dtos.Systems.ApplicationDto
+@model ApplicationDto
 
 <style>
     .mat-column-code {
diff --git a/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Role/Detail.cshtml b/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Role/Detail.cshtml
index 9587456c..9898e53f 100644
--- a/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Role/Detail.cshtml
+++ b/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Role/Detail.cshtml
@@ -1,4 +1,4 @@
-@model Util.Samples.Services.Dtos.Systems.RoleDto
+@model RoleDto
 <util-layout flex="70%" x-align="Center">
     <util-card>
         <util-card-header>
diff --git a/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Role/Edit.cshtml b/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Role/Edit.cshtml
index f7a37562..62b99da0 100644
--- a/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Role/Edit.cshtml
+++ b/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Role/Edit.cshtml
@@ -1,4 +1,4 @@
-@model Util.Samples.Services.Dtos.Systems.CreateRoleRequest
+@model CreateRoleRequest
 
 <util-form id="form" on-submit="submit(form,btnSubmit)">
     <util-card>
diff --git a/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Role/Index.cshtml b/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Role/Index.cshtml
index 2727b8f3..d2d88914 100644
--- a/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Role/Index.cshtml
+++ b/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Role/Index.cshtml
@@ -1,4 +1,4 @@
-@model Util.Samples.Services.Dtos.Systems.RoleDto
+@model RoleDto
 
 <util-toolbar>
     <util-layout>
diff --git a/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Role/SelectRoleDialog.cshtml b/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Role/SelectRoleDialog.cshtml
index d39071c1..41dc6777 100644
--- a/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Role/SelectRoleDialog.cshtml
+++ b/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Role/SelectRoleDialog.cshtml
@@ -1,4 +1,4 @@
-@model Util.Samples.Services.Dtos.Systems.RoleDto
+@model RoleDto
 
 <util-dialog-title>
     选择父角色
diff --git a/sample/Util.Samples.Angular.Material/Areas/Systems/Views/_ViewImports.cshtml b/sample/Util.Samples.Angular.Material/Areas/Systems/Views/_ViewImports.cshtml
index 775d6087..58869c67 100644
--- a/sample/Util.Samples.Angular.Material/Areas/Systems/Views/_ViewImports.cshtml
+++ b/sample/Util.Samples.Angular.Material/Areas/Systems/Views/_ViewImports.cshtml
@@ -4,5 +4,7 @@
 @using Util.Ui.Material.Extensions
 @using Util.Ui.Material.Enums
 @using Util.Ui.Prime.Extensions
+@using Util.Samples.Service.Dtos.Systems
 @addTagHelper *,Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *,Util.Ui.Angular
 @addTagHelper *,Util.Ui.Angular.Material
\ No newline at end of file
diff --git a/sample/Util.Samples.Angular.Material/Configs/ServiceRegister.cs b/sample/Util.Samples.Angular.Material/Configs/ServiceRegister.cs
deleted file mode 100644
index 2dcc7ec1..00000000
--- a/sample/Util.Samples.Angular.Material/Configs/ServiceRegister.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.DependencyInjection;
-using Util.Dependency;
-using Util.Files;
-using Util.Files.Paths;
-using Util.Randoms;
-using Util.Samples.Data.Repositories.Systems;
-using Util.Samples.Domains.Models;
-using Util.Security.Identity.Describers;
-
-namespace Util.Samples.Configs {
-    /// <summary>
-    /// 服务注册
-    /// </summary>
-    public class ServiceRegister : IDependencyRegistrar {
-        /// <summary>
-        /// 注册依赖
-        /// </summary>
-        public void Register( IServiceCollection services ) {
-            services.AddIdentity<IdentityUser, Role>()
-                .AddRoleStore<RoleRepository>();
-            services.AddScoped<IdentityErrorDescriber, IdentityErrorChineseDescriber>();
-            services.AddScoped<IFileStore, DefaultFileStore>();
-            services.AddScoped<IPathGenerator, DefaultPathGenerator>();
-            services.AddSingleton<IBasePath>(new DefaultBasePath( "/upload" ));
-            services.AddScoped<IRandomGenerator, GuidRandomGenerator>();
-        }
-    }
-}
diff --git a/sample/Util.Samples.Angular.Material/Domains/Models/Role.cs b/sample/Util.Samples.Angular.Material/Domains/Models/Role.cs
deleted file mode 100644
index c4896c51..00000000
--- a/sample/Util.Samples.Angular.Material/Domains/Models/Role.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using Util.Security.Identity.Models;
-
-namespace Util.Samples.Domains.Models {
-    /// <summary>
-    /// 角色
-    /// </summary>
-    public class Role : Role<Role,Guid,Guid?> {
-        /// <summary>
-        /// 初始化角色
-        /// </summary>
-        public Role()
-            : this( Guid.Empty, "", 0 ) {
-        }
-
-        /// <summary>
-        /// 初始化角色
-        /// </summary>
-        /// <param name="id">角色标识</param>
-        /// <param name="path">路径</param>
-        /// <param name="level">级数</param>
-        public Role( Guid id, string path, int level )
-            : base( id, path, level ) {
-        }
-    }
-}
\ No newline at end of file
diff --git a/sample/Util.Samples.Angular.Material/Domains/Repositories/IRoleRepository.cs b/sample/Util.Samples.Angular.Material/Domains/Repositories/IRoleRepository.cs
deleted file mode 100644
index f1429112..00000000
--- a/sample/Util.Samples.Angular.Material/Domains/Repositories/IRoleRepository.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using Util.Samples.Domains.Models;
-using Util.Security.Identity.Repositories;
-
-namespace Util.Samples.Domains.Repositories {
-    /// <summary>
-    /// 角色仓储
-    /// </summary>
-    public interface IRoleRepository : IRoleRepository<Role,Guid,Guid?> {
-    }
-}
\ No newline at end of file
diff --git a/sample/Util.Samples.Angular.Material/Domains/Services/Abstractions/IRoleManager.cs b/sample/Util.Samples.Angular.Material/Domains/Services/Abstractions/IRoleManager.cs
deleted file mode 100644
index 6344cc0c..00000000
--- a/sample/Util.Samples.Angular.Material/Domains/Services/Abstractions/IRoleManager.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using Util.Samples.Domains.Models;
-using Util.Security.Identity.Services.Abstractions;
-
-namespace Util.Samples.Domains.Services.Abstractions {
-    /// <summary>
-    /// 角色服务
-    /// </summary>
-    public interface IRoleManager : IRoleManager<Role, Guid, Guid?> {
-    }
-}
diff --git a/sample/Util.Samples.Angular.Material/Domains/Services/Implements/RoleManager.cs b/sample/Util.Samples.Angular.Material/Domains/Services/Implements/RoleManager.cs
deleted file mode 100644
index 0c03bb36..00000000
--- a/sample/Util.Samples.Angular.Material/Domains/Services/Implements/RoleManager.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using Microsoft.AspNetCore.Identity;
-using Util.Samples.Domains.Models;
-using Util.Samples.Domains.Repositories;
-using Util.Samples.Domains.Services.Abstractions;
-using Util.Security.Identity.Services.Implements;
-
-namespace Util.Samples.Domains.Services.Implements {
-    /// <summary>
-    /// 初始化角色服务
-    /// </summary>
-    public class RoleManager : RoleManager<Role, Guid, Guid?>, IRoleManager {
-        /// <summary>
-        /// 初始化角色服务
-        /// </summary>
-        /// <param name="roleManager">Identity角色服务</param>
-        /// <param name="roleRepository">角色仓储</param>
-        public RoleManager( RoleManager<Role> roleManager, IRoleRepository roleRepository ) : base( roleManager, roleRepository ) {
-            Manager = roleManager;
-            RoleRepository = roleRepository;
-        }
-
-        /// <summary>
-        /// Identity角色服务
-        /// </summary>
-        protected RoleManager<Role> Manager { get; set; }
-        /// <summary>
-        /// 角色仓储
-        /// </summary>
-        public IRoleRepository RoleRepository { get; set; }
-    }
-}
diff --git a/sample/Util.Samples.Angular.Material/Startup.cs b/sample/Util.Samples.Angular.Material/Startup.cs
index fb283247..f622e884 100644
--- a/sample/Util.Samples.Angular.Material/Startup.cs
+++ b/sample/Util.Samples.Angular.Material/Startup.cs
@@ -1,21 +1,15 @@
 using System;
 using System.IO;
-using System.Linq;
-using EasyCaching.InMemory;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.ApplicationModels;
 using Microsoft.AspNetCore.SpaServices.Webpack;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Swashbuckle.AspNetCore.Swagger;
-using Util.Caches.EasyCaching;
 using Util.Datas.Ef;
-using Util.Events.Default;
-using Util.Locks.Default;
 using Util.Logs.Extensions;
 using Util.Samples.Data;
-using Util.Samples.Data.SqlServer;
+using Util.Samples.Data.UnitOfWorks.SqlServer;
 using Util.Webs.Extensions;
 
 namespace Util.Samples {
@@ -48,15 +42,6 @@ namespace Util.Samples {
             //添加NLog日志操作
             services.AddNLog();
 
-            //添加EasyCaching缓存
-            services.AddCache( options => options.UseInMemory() );
-
-            //添加业务锁
-            services.AddLock();
-
-            //注册XSRF令牌服务
-            services.AddXsrfToken();
-
             //添加EF工作单元
             //====== 支持Sql Server 2012+ ==========
             services.AddUnitOfWork<ISampleUnitOfWork, SampleUnitOfWork>( Configuration.GetConnectionString( "DefaultConnection" ) );
@@ -72,24 +57,9 @@ namespace Util.Samples {
             //添加Swagger
             services.AddSwaggerGen( options => {
                 options.SwaggerDoc( "v1", new Info { Title = "Util Api Demo", Version = "v1" } );
-                options.IncludeXmlComments( Path.Combine( AppContext.BaseDirectory, "Util.xml" ) );
-                options.IncludeXmlComments( Path.Combine( AppContext.BaseDirectory, "Util.Webs.xml" ) );
                 options.IncludeXmlComments( Path.Combine( AppContext.BaseDirectory, "Util.Samples.xml" ) );
             } );
 
-            // 添加Razor静态Html生成器
-            services.AddRazorHtml();
-
-            //添加事件总线
-            services.AddEventBus();
-
-            //添加Cap事件总线
-            //services.AddEventBus( options => {
-            //    options.UseDashboard();
-            //    options.UseSqlServer( Configuration.GetConnectionString( "DefaultConnection" ) );
-            //    options.UseRabbitMQ( "192.168.244.138" );
-            //} );
-
             //添加Util基础设施服务
             return services.AddUtil();
         }
@@ -123,7 +93,6 @@ namespace Util.Samples {
             app.UseErrorLog();
             app.UseStaticFiles();
             app.UseAuthentication();
-            app.UseXsrfToken();
             ConfigRoute( app );
         }
 
diff --git a/sample/Util.Samples.Angular.Material/Util.Samples.Angular.Material.csproj b/sample/Util.Samples.Angular.Material/Util.Samples.Angular.Material.csproj
index 053b9177..02b36db1 100644
--- a/sample/Util.Samples.Angular.Material/Util.Samples.Angular.Material.csproj
+++ b/sample/Util.Samples.Angular.Material/Util.Samples.Angular.Material.csproj
@@ -27,6 +27,7 @@
   <ItemGroup>
     <PackageReference Include="Exceptionless.AspNetCore" Version="4.3.2022" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.2.2" />
+    <PackageReference Include="Util.Ui.Angular.Material" Version="1.3.6" />
   </ItemGroup>
 
   <ItemGroup>
@@ -36,18 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Util.Applications\08-Util.Applications.csproj" />
-    <ProjectReference Include="..\..\src\Util.Biz.Payments\02-Util.Biz.Payments.csproj" />
-    <ProjectReference Include="..\..\src\Util.Biz\01-Util.Biz.csproj" />
-    <ProjectReference Include="..\..\src\Util.Caches\04-Util.Caches.csproj" />
-    <ProjectReference Include="..\..\src\Util.Datas\07-Util.Datas.csproj" />
-    <ProjectReference Include="..\..\src\Util.Events\05-Util.Events.csproj" />
-    <ProjectReference Include="..\..\src\Util.Logs\03-Util.Logs.csproj" />
-    <ProjectReference Include="..\..\src\Util.Security\02-Util.Security.csproj" />
-    <ProjectReference Include="..\..\src\Util.Tools.QrCode\01-Util.Tools.QrCode.csproj" />
-    <ProjectReference Include="..\..\src\Util.Ui.Angular.Material\04-Util.Ui.Angular.Material.csproj" />
-    <ProjectReference Include="..\..\src\Util.Webs\09-Util.Webs.csproj" />
-    <ProjectReference Include="..\..\src\Util\01-Util.csproj" />
+    <ProjectReference Include="..\Util.Samples.Service\Util.Samples.Service.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/sample/Util.Samples.Angular.Material/DbScripts/MySql/Sample.sql b/sample/Util.Samples.Data/DbScripts/MySql/Sample.sql
similarity index 100%
rename from sample/Util.Samples.Angular.Material/DbScripts/MySql/Sample.sql
rename to sample/Util.Samples.Data/DbScripts/MySql/Sample.sql
diff --git a/sample/Util.Samples.Angular.Material/DbScripts/PgSql/Sample.sql b/sample/Util.Samples.Data/DbScripts/PgSql/Sample.sql
similarity index 100%
rename from sample/Util.Samples.Angular.Material/DbScripts/PgSql/Sample.sql
rename to sample/Util.Samples.Data/DbScripts/PgSql/Sample.sql
diff --git a/sample/Util.Samples.Angular.Material/DbScripts/SqlServer/Sample.sql b/sample/Util.Samples.Data/DbScripts/SqlServer/Sample.sql
similarity index 100%
rename from sample/Util.Samples.Angular.Material/DbScripts/SqlServer/Sample.sql
rename to sample/Util.Samples.Data/DbScripts/SqlServer/Sample.sql
diff --git a/sample/Util.Samples.Angular.Material/Data/ISampleUnitOfWork.cs b/sample/Util.Samples.Data/ISampleUnitOfWork.cs
similarity index 100%
rename from sample/Util.Samples.Angular.Material/Data/ISampleUnitOfWork.cs
rename to sample/Util.Samples.Data/ISampleUnitOfWork.cs
diff --git a/sample/Util.Samples.Angular.Material/Data/MySql/Mappings/ApplicationMap.cs b/sample/Util.Samples.Data/Mappings/Systems/MySql/ApplicationMap.cs
similarity index 90%
rename from sample/Util.Samples.Angular.Material/Data/MySql/Mappings/ApplicationMap.cs
rename to sample/Util.Samples.Data/Mappings/Systems/MySql/ApplicationMap.cs
index 41bbdf0b..7075e1a1 100644
--- a/sample/Util.Samples.Angular.Material/Data/MySql/Mappings/ApplicationMap.cs
+++ b/sample/Util.Samples.Data/Mappings/Systems/MySql/ApplicationMap.cs
@@ -1,8 +1,8 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Util.Samples.Domains.Models;
+using Util.Samples.Domain.Models;
 
-namespace Util.Samples.Data.MySql.Mappings {
+namespace Util.Samples.Data.Mappings.Systems.MySql {
     /// <summary>
     /// 应用程序映射配置
     /// </summary>
diff --git a/sample/Util.Samples.Angular.Material/Data/MySql/Mappings/RoleMap.cs b/sample/Util.Samples.Data/Mappings/Systems/MySql/RoleMap.cs
similarity index 91%
rename from sample/Util.Samples.Angular.Material/Data/MySql/Mappings/RoleMap.cs
rename to sample/Util.Samples.Data/Mappings/Systems/MySql/RoleMap.cs
index 59ef9ea0..2953f29a 100644
--- a/sample/Util.Samples.Angular.Material/Data/MySql/Mappings/RoleMap.cs
+++ b/sample/Util.Samples.Data/Mappings/Systems/MySql/RoleMap.cs
@@ -1,8 +1,8 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Util.Samples.Domains.Models;
+using Util.Samples.Domain.Models;
 
-namespace Util.Samples.Data.MySql.Mappings {
+namespace Util.Samples.Data.Mappings.Systems.MySql {
     /// <summary>
     /// 角色映射配置
     /// </summary>
diff --git a/sample/Util.Samples.Angular.Material/Data/PgSql/Mappings/ApplicationMap.cs b/sample/Util.Samples.Data/Mappings/Systems/PgSql/ApplicationMap.cs
similarity index 90%
rename from sample/Util.Samples.Angular.Material/Data/PgSql/Mappings/ApplicationMap.cs
rename to sample/Util.Samples.Data/Mappings/Systems/PgSql/ApplicationMap.cs
index 07141c2d..55d53c3c 100644
--- a/sample/Util.Samples.Angular.Material/Data/PgSql/Mappings/ApplicationMap.cs
+++ b/sample/Util.Samples.Data/Mappings/Systems/PgSql/ApplicationMap.cs
@@ -1,8 +1,8 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Util.Samples.Domains.Models;
+using Util.Samples.Domain.Models;
 
-namespace Util.Samples.Data.PgSql.Mappings {
+namespace Util.Samples.Data.Mappings.Systems.PgSql {
     /// <summary>
     /// 应用程序映射配置
     /// </summary>
diff --git a/sample/Util.Samples.Angular.Material/Data/PgSql/Mappings/RoleMap.cs b/sample/Util.Samples.Data/Mappings/Systems/PgSql/RoleMap.cs
similarity index 91%
rename from sample/Util.Samples.Angular.Material/Data/PgSql/Mappings/RoleMap.cs
rename to sample/Util.Samples.Data/Mappings/Systems/PgSql/RoleMap.cs
index 55817a48..4e568c60 100644
--- a/sample/Util.Samples.Angular.Material/Data/PgSql/Mappings/RoleMap.cs
+++ b/sample/Util.Samples.Data/Mappings/Systems/PgSql/RoleMap.cs
@@ -1,8 +1,8 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Util.Samples.Domains.Models;
+using Util.Samples.Domain.Models;
 
-namespace Util.Samples.Data.PgSql.Mappings {
+namespace Util.Samples.Data.Mappings.Systems.PgSql {
     /// <summary>
     /// 角色映射配置
     /// </summary>
diff --git a/sample/Util.Samples.Angular.Material/Data/SqlServer/Mappings/Systems/ApplicationMap.cs b/sample/Util.Samples.Data/Mappings/Systems/SqlServer/ApplicationMap.cs
similarity index 90%
rename from sample/Util.Samples.Angular.Material/Data/SqlServer/Mappings/Systems/ApplicationMap.cs
rename to sample/Util.Samples.Data/Mappings/Systems/SqlServer/ApplicationMap.cs
index 48786205..be0a66bd 100644
--- a/sample/Util.Samples.Angular.Material/Data/SqlServer/Mappings/Systems/ApplicationMap.cs
+++ b/sample/Util.Samples.Data/Mappings/Systems/SqlServer/ApplicationMap.cs
@@ -1,8 +1,8 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Util.Samples.Domains.Models;
+using Util.Samples.Domain.Models;
 
-namespace Util.Samples.Data.SqlServer.Mappings.Systems {
+namespace Util.Samples.Data.Mappings.Systems.SqlServer {
     /// <summary>
     /// 应用程序映射配置
     /// </summary>
diff --git a/sample/Util.Samples.Angular.Material/Data/SqlServer/Mappings/Systems/RoleMap.cs b/sample/Util.Samples.Data/Mappings/Systems/SqlServer/RoleMap.cs
similarity index 91%
rename from sample/Util.Samples.Angular.Material/Data/SqlServer/Mappings/Systems/RoleMap.cs
rename to sample/Util.Samples.Data/Mappings/Systems/SqlServer/RoleMap.cs
index ab63cc2b..9476dc4d 100644
--- a/sample/Util.Samples.Angular.Material/Data/SqlServer/Mappings/Systems/RoleMap.cs
+++ b/sample/Util.Samples.Data/Mappings/Systems/SqlServer/RoleMap.cs
@@ -1,8 +1,8 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Util.Samples.Domains.Models;
+using Util.Samples.Domain.Models;
 
-namespace Util.Samples.Data.SqlServer.Mappings.Systems {
+namespace Util.Samples.Data.Mappings.Systems.SqlServer {
     /// <summary>
     /// 角色映射配置
     /// </summary>
diff --git a/sample/Util.Samples.Angular.Material/Data/Repositories/Systems/ApplicationRepository.cs b/sample/Util.Samples.Data/Repositories/Systems/ApplicationRepository.cs
similarity index 86%
rename from sample/Util.Samples.Angular.Material/Data/Repositories/Systems/ApplicationRepository.cs
rename to sample/Util.Samples.Data/Repositories/Systems/ApplicationRepository.cs
index f07db5b5..449a38cc 100644
--- a/sample/Util.Samples.Angular.Material/Data/Repositories/Systems/ApplicationRepository.cs
+++ b/sample/Util.Samples.Data/Repositories/Systems/ApplicationRepository.cs
@@ -1,6 +1,6 @@
 using Util.Datas.Ef.Core;
-using Util.Samples.Domains.Models;
-using Util.Samples.Domains.Repositories;
+using Util.Samples.Domain.Models;
+using Util.Samples.Domain.Repositories;
 
 namespace Util.Samples.Data.Repositories.Systems {
     /// <summary>
diff --git a/sample/Util.Samples.Angular.Material/Data/Repositories/Systems/RoleRepository.cs b/sample/Util.Samples.Data/Repositories/Systems/RoleRepository.cs
similarity index 98%
rename from sample/Util.Samples.Angular.Material/Data/Repositories/Systems/RoleRepository.cs
rename to sample/Util.Samples.Data/Repositories/Systems/RoleRepository.cs
index a0cb0e08..4317bad6 100644
--- a/sample/Util.Samples.Angular.Material/Data/Repositories/Systems/RoleRepository.cs
+++ b/sample/Util.Samples.Data/Repositories/Systems/RoleRepository.cs
@@ -3,8 +3,8 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 using Util.Datas.Ef.Core;
-using Util.Samples.Domains.Models;
-using Util.Samples.Domains.Repositories;
+using Util.Samples.Domain.Models;
+using Util.Samples.Domain.Repositories;
 
 namespace Util.Samples.Data.Repositories.Systems {
     /// <summary>
diff --git a/sample/Util.Samples.Angular.Material/Data/MySql/SampleUnitOfWork.cs b/sample/Util.Samples.Data/UnitOfWorks/MySql/SampleUnitOfWork.cs
similarity index 92%
rename from sample/Util.Samples.Angular.Material/Data/MySql/SampleUnitOfWork.cs
rename to sample/Util.Samples.Data/UnitOfWorks/MySql/SampleUnitOfWork.cs
index 2741669e..6d09e9c1 100644
--- a/sample/Util.Samples.Angular.Material/Data/MySql/SampleUnitOfWork.cs
+++ b/sample/Util.Samples.Data/UnitOfWorks/MySql/SampleUnitOfWork.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Util.Datas.UnitOfWorks;
 
-namespace Util.Samples.Data.MySql {
+namespace Util.Samples.Data.UnitOfWorks.MySql {
     /// <summary>
     /// 工作单元
     /// </summary>
diff --git a/sample/Util.Samples.Angular.Material/Data/PgSql/SampleUnitOfWork.cs b/sample/Util.Samples.Data/UnitOfWorks/PgSql/SampleUnitOfWork.cs
similarity index 92%
rename from sample/Util.Samples.Angular.Material/Data/PgSql/SampleUnitOfWork.cs
rename to sample/Util.Samples.Data/UnitOfWorks/PgSql/SampleUnitOfWork.cs
index ccd36840..ff3b411b 100644
--- a/sample/Util.Samples.Angular.Material/Data/PgSql/SampleUnitOfWork.cs
+++ b/sample/Util.Samples.Data/UnitOfWorks/PgSql/SampleUnitOfWork.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Util.Datas.UnitOfWorks;
 
-namespace Util.Samples.Data.PgSql {
+namespace Util.Samples.Data.UnitOfWorks.PgSql {
     /// <summary>
     /// 工作单元
     /// </summary>
diff --git a/sample/Util.Samples.Angular.Material/Data/SqlServer/SampleUnitOfWork.cs b/sample/Util.Samples.Data/UnitOfWorks/SqlServer/SampleUnitOfWork.cs
similarity index 91%
rename from sample/Util.Samples.Angular.Material/Data/SqlServer/SampleUnitOfWork.cs
rename to sample/Util.Samples.Data/UnitOfWorks/SqlServer/SampleUnitOfWork.cs
index 92471db3..8fdbc48f 100644
--- a/sample/Util.Samples.Angular.Material/Data/SqlServer/SampleUnitOfWork.cs
+++ b/sample/Util.Samples.Data/UnitOfWorks/SqlServer/SampleUnitOfWork.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Util.Datas.UnitOfWorks;
 
-namespace Util.Samples.Data.SqlServer {
+namespace Util.Samples.Data.UnitOfWorks.SqlServer {
     /// <summary>
     /// 工作单元
     /// </summary>
diff --git a/sample/Util.Samples.Data/Util.Samples.Data.csproj b/sample/Util.Samples.Data/Util.Samples.Data.csproj
new file mode 100644
index 00000000..dcc4c070
--- /dev/null
+++ b/sample/Util.Samples.Data/Util.Samples.Data.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Util.Datas" Version="1.3.6" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Util.Samples.Domain\Util.Samples.Domain.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/sample/Util.Samples.Angular.Material/Domains/Models/Application.cs b/sample/Util.Samples.Domain/Models/Application.cs
similarity index 99%
rename from sample/Util.Samples.Angular.Material/Domains/Models/Application.cs
rename to sample/Util.Samples.Domain/Models/Application.cs
index 512e700f..88b2be71 100644
--- a/sample/Util.Samples.Angular.Material/Domains/Models/Application.cs
+++ b/sample/Util.Samples.Domain/Models/Application.cs
@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using Util.Domains;
 using Util.Domains.Auditing;
 
-namespace Util.Samples.Domains.Models {
+namespace Util.Samples.Domain.Models {
     /// <summary>
     /// 应用程序
     /// </summary>
diff --git a/sample/Util.Samples.Domain/Models/Role.Base.cs b/sample/Util.Samples.Domain/Models/Role.Base.cs
new file mode 100644
index 00000000..1b3c9491
--- /dev/null
+++ b/sample/Util.Samples.Domain/Models/Role.Base.cs
@@ -0,0 +1,143 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using Util.Domains;
+using Util.Domains.Auditing;
+using Util.Domains.Trees;
+
+namespace Util.Samples.Domain.Models {
+    /// <summary>
+    /// 角色
+    /// </summary>
+    [Description( "角色" )]
+    public partial class Role : TreeEntityBase<Role, Guid, Guid?>, IDelete, IAudited {
+        /// <summary>
+        /// 初始化角色
+        /// </summary>
+        public Role()
+            : this( Guid.Empty, "", 0 ) {
+        }
+
+        /// <summary>
+        /// 初始化角色
+        /// </summary>
+        /// <param name="id">角色标识</param>
+        /// <param name="path">路径</param>
+        /// <param name="level">级数</param>
+        public Role( Guid id, string path, int level )
+            : base( id, path, level ) {
+        }
+
+        /// <summary>
+        /// 角色编码
+        /// </summary>
+        [Required( ErrorMessage = "角色编码不能为空" )]
+        [StringLength( 256, ErrorMessage = "角色编码输入过长，不能超过256位" )]
+        public string Code { get; set; }
+        /// <summary>
+        /// 角色名称
+        /// </summary>
+        [Required( ErrorMessage = "角色名称不能为空" )]
+        [StringLength( 256, ErrorMessage = "角色名称输入过长，不能超过256位" )]
+        public string Name { get; set; }
+        /// <summary>
+        /// 标准化角色名称
+        /// </summary>
+        [Required( ErrorMessage = "标准化角色名称不能为空" )]
+        [StringLength( 256, ErrorMessage = "标准化角色名称输入过长，不能超过256位" )]
+        public string NormalizedName { get; set; }
+        /// <summary>
+        /// 角色类型
+        /// </summary>
+        [Required( ErrorMessage = "角色类型不能为空" )]
+        [StringLength( 80, ErrorMessage = "角色类型输入过长，不能超过80位" )]
+        public string Type { get; set; }
+        /// <summary>
+        /// 管理员
+        /// </summary>
+        public bool IsAdmin { get; private set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [StringLength( 500, ErrorMessage = "备注输入过长，不能超过500位" )]
+        public string Comment { get; set; }
+        /// <summary>
+        /// 拼音简码
+        /// </summary>
+        [StringLength( 200, ErrorMessage = "拼音简码输入过长，不能超过200位" )]
+        public string PinYin { get; set; }
+        /// <summary>
+        /// 签名
+        /// </summary>
+        [StringLength( 256, ErrorMessage = "签名输入过长，不能超过256位" )]
+        public string Sign { get; private set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreationTime { get; set; }
+        /// <summary>
+        /// 创建人编号
+        /// </summary>
+        public Guid? CreatorId { get; set; }
+        /// <summary>
+        /// 最后修改时间
+        /// </summary>
+        public DateTime? LastModificationTime { get; set; }
+        /// <summary>
+        /// 最后修改人编号
+        /// </summary>
+        public Guid? LastModifierId { get; set; }
+        /// <summary>
+        /// 是否删除
+        /// </summary>
+        public bool IsDeleted { get; set; }
+
+        /// <summary>
+        /// 添加描述
+        /// </summary>
+        protected override void AddDescriptions() {
+            AddDescription( t => t.Id );
+            AddDescription( t => t.Code );
+            AddDescription( t => t.Name );
+            AddDescription( t => t.NormalizedName );
+            AddDescription( t => t.Type );
+            AddDescription( t => t.IsAdmin );
+            AddDescription( t => t.ParentId );
+            AddDescription( t => t.Path );
+            AddDescription( t => t.Level );
+            AddDescription( t => t.SortId );
+            AddDescription( t => t.Enabled );
+            AddDescription( t => t.Comment );
+            AddDescription( t => t.PinYin );
+            AddDescription( t => t.Sign );
+            AddDescription( t => t.CreationTime );
+            AddDescription( t => t.CreatorId );
+            AddDescription( t => t.LastModificationTime );
+            AddDescription( t => t.LastModifierId );
+        }
+
+        /// <summary>
+        /// 添加变更列表
+        /// </summary>
+        protected override void AddChanges( Role other ) {
+            AddChange( t => t.Id, other.Id );
+            AddChange( t => t.Code, other.Code );
+            AddChange( t => t.Name, other.Name );
+            AddChange( t => t.NormalizedName, other.NormalizedName );
+            AddChange( t => t.Type, other.Type );
+            AddChange( t => t.IsAdmin, other.IsAdmin );
+            AddChange( t => t.ParentId, other.ParentId );
+            AddChange( t => t.Path, other.Path );
+            AddChange( t => t.Level, other.Level );
+            AddChange( t => t.SortId, other.SortId );
+            AddChange( t => t.Enabled, other.Enabled );
+            AddChange( t => t.Comment, other.Comment );
+            AddChange( t => t.PinYin, other.PinYin );
+            AddChange( t => t.Sign, other.Sign );
+            AddChange( t => t.CreationTime, other.CreationTime );
+            AddChange( t => t.CreatorId, other.CreatorId );
+            AddChange( t => t.LastModificationTime, other.LastModificationTime );
+            AddChange( t => t.LastModifierId, other.LastModifierId );
+        }
+    }
+}
\ No newline at end of file
diff --git a/sample/Util.Samples.Domain/Models/Role.cs b/sample/Util.Samples.Domain/Models/Role.cs
new file mode 100644
index 00000000..02ec5a96
--- /dev/null
+++ b/sample/Util.Samples.Domain/Models/Role.cs
@@ -0,0 +1,23 @@
+namespace Util.Samples.Domain.Models {
+    /// <summary>
+    /// 角色
+    /// </summary>
+    public partial class Role {
+        /// <summary>
+        /// 初始化
+        /// </summary>
+        public override void Init() {
+            base.Init();
+            IsAdmin = false;
+            NormalizedName = Name;
+            InitPinYin();
+        }
+
+        /// <summary>
+        /// 初始化拼音简码
+        /// </summary>
+        public void InitPinYin() {
+            PinYin = Util.Helpers.String.PinYin( Name );
+        }
+    }
+}
\ No newline at end of file
diff --git a/sample/Util.Samples.Angular.Material/Domains/Repositories/IApplicationRepository.cs b/sample/Util.Samples.Domain/Repositories/IApplicationRepository.cs
similarity index 69%
rename from sample/Util.Samples.Angular.Material/Domains/Repositories/IApplicationRepository.cs
rename to sample/Util.Samples.Domain/Repositories/IApplicationRepository.cs
index c4172f4a..34f661ac 100644
--- a/sample/Util.Samples.Angular.Material/Domains/Repositories/IApplicationRepository.cs
+++ b/sample/Util.Samples.Domain/Repositories/IApplicationRepository.cs
@@ -1,7 +1,7 @@
 using Util.Domains.Repositories;
-using Util.Samples.Domains.Models;
+using Util.Samples.Domain.Models;
 
-namespace Util.Samples.Domains.Repositories {
+namespace Util.Samples.Domain.Repositories {
     /// <summary>
     /// 应用程序仓储
     /// </summary>
diff --git a/sample/Util.Samples.Domain/Repositories/IRoleRepository.cs b/sample/Util.Samples.Domain/Repositories/IRoleRepository.cs
new file mode 100644
index 00000000..ceaf9f73
--- /dev/null
+++ b/sample/Util.Samples.Domain/Repositories/IRoleRepository.cs
@@ -0,0 +1,11 @@
+using System;
+using Util.Domains.Trees;
+using Util.Samples.Domain.Models;
+
+namespace Util.Samples.Domain.Repositories {
+    /// <summary>
+    /// 角色仓储
+    /// </summary>
+    public interface IRoleRepository : ITreeRepository<Role,Guid,Guid?> {
+    }
+}
\ No newline at end of file
diff --git a/sample/Util.Samples.Domain/Services/IRoleManager.cs b/sample/Util.Samples.Domain/Services/IRoleManager.cs
new file mode 100644
index 00000000..a6c3bb4b
--- /dev/null
+++ b/sample/Util.Samples.Domain/Services/IRoleManager.cs
@@ -0,0 +1,20 @@
+using System.Threading.Tasks;
+using Util.Domains.Services;
+using Util.Samples.Domain.Models;
+
+namespace Util.Samples.Domain.Services {
+    /// <summary>
+    /// 角色服务
+    /// </summary>
+    public interface IRoleManager : IDomainService {
+        /// <summary>
+        /// 创建角色
+        /// </summary>
+        /// <param name="role">角色</param>
+        Task CreateAsync( Role role );
+        /// <summary>
+        /// 修改角色
+        /// </summary>
+        Task UpdateAsync( Role role );
+    }
+}
diff --git a/sample/Util.Samples.Domain/Services/RoleManager.cs b/sample/Util.Samples.Domain/Services/RoleManager.cs
new file mode 100644
index 00000000..c9359e58
--- /dev/null
+++ b/sample/Util.Samples.Domain/Services/RoleManager.cs
@@ -0,0 +1,65 @@
+using System.Threading.Tasks;
+using Util.Domains.Services;
+using Util.Exceptions;
+using Util.Samples.Domain.Models;
+using Util.Samples.Domain.Repositories;
+
+namespace Util.Samples.Domain.Services {
+    /// <summary>
+    /// 初始化角色服务
+    /// </summary>
+    public class RoleManager : DomainServiceBase, IRoleManager {
+        /// <summary>
+        /// 初始化角色服务
+        /// </summary>
+        /// <param name="repository">角色仓储</param>
+        public RoleManager( IRoleRepository repository ) {
+            Repository = repository;
+        }
+
+        /// <summary>
+        /// 角色仓储
+        /// </summary>
+        private IRoleRepository Repository { get; }
+
+        /// <summary>
+        /// 创建角色
+        /// </summary>
+        /// <param name="role">角色</param>
+        public virtual async Task CreateAsync( Role role ) {
+            await ValidateCreate( role );
+            role.Init();
+            var parent = await Repository.FindAsync( role.ParentId );
+            role.InitPath( parent );
+            role.SortId = await Repository.GenerateSortIdAsync( role.ParentId );
+            await Repository.AddAsync( role );
+        }
+
+        /// <summary>
+        /// 创建角色验证
+        /// </summary>
+        /// <param name="role">角色</param>
+        protected virtual async Task ValidateCreate( Role role ) {
+            role.CheckNull( nameof( role ) );
+            if( await Repository.ExistsAsync( t => t.Code == role.Code ) )
+                ThrowDuplicateCodeException( role.Code );
+        }
+
+        /// <summary>
+        /// 抛出编码重复异常
+        /// </summary>
+        protected void ThrowDuplicateCodeException( string code ) {
+            throw new Warning( $"角色编码 {code} 已存在" );
+        }
+
+        /// <summary>
+        /// 修改角色
+        /// </summary>
+        public async Task UpdateAsync( Role role ) {
+            role.CheckNull( nameof( role ) );
+            role.InitPinYin();
+            await Repository.UpdatePathAsync( role );
+            await Repository.UpdateAsync( role );
+        }
+    }
+}
diff --git a/sample/Util.Samples.Domain/Util.Samples.Domain.csproj b/sample/Util.Samples.Domain/Util.Samples.Domain.csproj
new file mode 100644
index 00000000..7aa98a7f
--- /dev/null
+++ b/sample/Util.Samples.Domain/Util.Samples.Domain.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Util.Core" Version="1.3.6" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Models/Role.*.cs">
+      <DependentUpon>Role.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/sample/Util.Samples.Angular.Material/Services/Abstractions/Systems/IApplicationService.cs b/sample/Util.Samples.Service/Abstractions/Systems/IApplicationService.cs
similarity index 57%
rename from sample/Util.Samples.Angular.Material/Services/Abstractions/Systems/IApplicationService.cs
rename to sample/Util.Samples.Service/Abstractions/Systems/IApplicationService.cs
index e88173a7..58b1f71a 100644
--- a/sample/Util.Samples.Angular.Material/Services/Abstractions/Systems/IApplicationService.cs
+++ b/sample/Util.Samples.Service/Abstractions/Systems/IApplicationService.cs
@@ -1,8 +1,8 @@
 using Util.Applications;
-using Util.Samples.Services.Dtos.Systems;
-using Util.Samples.Services.Queries.Systems;
+using Util.Samples.Service.Dtos.Systems;
+using Util.Samples.Service.Queries.Systems;
 
-namespace Util.Samples.Services.Abstractions.Systems {
+namespace Util.Samples.Service.Abstractions.Systems {
     /// <summary>
     /// 应用程序服务
     /// </summary>
diff --git a/sample/Util.Samples.Angular.Material/Services/Abstractions/Systems/IRoleService.cs b/sample/Util.Samples.Service/Abstractions/Systems/IRoleService.cs
similarity index 83%
rename from sample/Util.Samples.Angular.Material/Services/Abstractions/Systems/IRoleService.cs
rename to sample/Util.Samples.Service/Abstractions/Systems/IRoleService.cs
index 4320c284..dc5f0294 100644
--- a/sample/Util.Samples.Angular.Material/Services/Abstractions/Systems/IRoleService.cs
+++ b/sample/Util.Samples.Service/Abstractions/Systems/IRoleService.cs
@@ -2,11 +2,11 @@
 using System.Threading.Tasks;
 using AspectCore.DynamicProxy.Parameters;
 using Util.Applications.Trees;
-using Util.Samples.Services.Dtos.Systems;
-using Util.Samples.Services.Queries.Systems;
+using Util.Samples.Service.Dtos.Systems;
+using Util.Samples.Service.Queries.Systems;
 using Util.Validations.Aspects;
 
-namespace Util.Samples.Services.Abstractions.Systems {
+namespace Util.Samples.Service.Abstractions.Systems {
     /// <summary>
     /// 角色服务
     /// </summary>
diff --git a/sample/Util.Samples.Angular.Material/Services/Dtos/Systems/ApplicationDto.cs b/sample/Util.Samples.Service/Dtos/Systems/ApplicationDto.cs
similarity index 97%
rename from sample/Util.Samples.Angular.Material/Services/Dtos/Systems/ApplicationDto.cs
rename to sample/Util.Samples.Service/Dtos/Systems/ApplicationDto.cs
index 24cbc549..d29676ad 100644
--- a/sample/Util.Samples.Angular.Material/Services/Dtos/Systems/ApplicationDto.cs
+++ b/sample/Util.Samples.Service/Dtos/Systems/ApplicationDto.cs
@@ -4,11 +4,11 @@ using System.Runtime.Serialization;
 using Util.Applications.Dtos;
 using Util.Ui.Attributes;
 
-namespace Util.Samples.Services.Dtos.Systems {
+namespace Util.Samples.Service.Dtos.Systems {
     /// <summary>
     /// 应用程序数据传输对象
     /// </summary>
-    [Model( "model" )]
+    [Model]
     public class ApplicationDto : DtoBase {
         /// <summary>
         /// 应用程序编码
diff --git a/sample/Util.Samples.Angular.Material/Services/Dtos/Systems/CreateRoleRequest.cs b/sample/Util.Samples.Service/Dtos/Systems/CreateRoleRequest.cs
similarity index 96%
rename from sample/Util.Samples.Angular.Material/Services/Dtos/Systems/CreateRoleRequest.cs
rename to sample/Util.Samples.Service/Dtos/Systems/CreateRoleRequest.cs
index 619e91df..c2be4378 100644
--- a/sample/Util.Samples.Angular.Material/Services/Dtos/Systems/CreateRoleRequest.cs
+++ b/sample/Util.Samples.Service/Dtos/Systems/CreateRoleRequest.cs
@@ -4,11 +4,11 @@ using System.Runtime.Serialization;
 using Util.Applications.Dtos;
 using Util.Ui.Attributes;
 
-namespace Util.Samples.Services.Dtos.Systems {
+namespace Util.Samples.Service.Dtos.Systems {
     /// <summary>
     /// 创建角色参数
     /// </summary>
-    [Model("model")]
+    [Model]
     public class CreateRoleRequest : RequestBase {
         /// <summary>
         /// 角色编码
diff --git a/sample/Util.Samples.Angular.Material/Services/Dtos/Systems/RoleDto.cs b/sample/Util.Samples.Service/Dtos/Systems/RoleDto.cs
similarity index 98%
rename from sample/Util.Samples.Angular.Material/Services/Dtos/Systems/RoleDto.cs
rename to sample/Util.Samples.Service/Dtos/Systems/RoleDto.cs
index b822b29d..68c91344 100644
--- a/sample/Util.Samples.Angular.Material/Services/Dtos/Systems/RoleDto.cs
+++ b/sample/Util.Samples.Service/Dtos/Systems/RoleDto.cs
@@ -4,11 +4,11 @@ using System.Runtime.Serialization;
 using Util.Applications.Trees;
 using Util.Ui.Attributes;
 
-namespace Util.Samples.Services.Dtos.Systems {
+namespace Util.Samples.Service.Dtos.Systems {
     /// <summary>
     /// 角色数据传输对象
     /// </summary>
-    [Model( "model" )]
+    [Model]
     public class RoleDto : TreeDtoBase {
         /// <summary>
         /// 角色编码
diff --git a/sample/Util.Samples.Angular.Material/Services/Dtos/Systems/UpdateRoleRequest.cs b/sample/Util.Samples.Service/Dtos/Systems/UpdateRoleRequest.cs
similarity index 96%
rename from sample/Util.Samples.Angular.Material/Services/Dtos/Systems/UpdateRoleRequest.cs
rename to sample/Util.Samples.Service/Dtos/Systems/UpdateRoleRequest.cs
index 3195d74f..cd2241bc 100644
--- a/sample/Util.Samples.Angular.Material/Services/Dtos/Systems/UpdateRoleRequest.cs
+++ b/sample/Util.Samples.Service/Dtos/Systems/UpdateRoleRequest.cs
@@ -4,11 +4,11 @@ using System.Runtime.Serialization;
 using Util.Applications.Dtos;
 using Util.Ui.Attributes;
 
-namespace Util.Samples.Services.Dtos.Systems {
+namespace Util.Samples.Service.Dtos.Systems {
     /// <summary>
     /// 修改角色请求参数
     /// </summary>
-    [Model("model")]
+    [Model]
     public class UpdateRoleRequest : RequestBase {
         /// <summary>
         /// 角色标识
diff --git a/sample/Util.Samples.Angular.Material/Services/Implements/Systems/ApplicationService.cs b/sample/Util.Samples.Service/Implements/Systems/ApplicationService.cs
similarity index 89%
rename from sample/Util.Samples.Angular.Material/Services/Implements/Systems/ApplicationService.cs
rename to sample/Util.Samples.Service/Implements/Systems/ApplicationService.cs
index f5c751f4..c47d4bcf 100644
--- a/sample/Util.Samples.Angular.Material/Services/Implements/Systems/ApplicationService.cs
+++ b/sample/Util.Samples.Service/Implements/Systems/ApplicationService.cs
@@ -2,18 +2,17 @@
 using Util.Applications;
 using Util.Datas.Sql;
 using Util.Domains.Repositories;
-using Util.Events;
 using Util.Exceptions;
 using Util.Maps;
 using Util.Samples.Data;
-using Util.Samples.Domains.Models;
-using Util.Samples.Domains.Repositories;
-using Util.Samples.Services.Abstractions.Systems;
-using Util.Samples.Services.Dtos.Systems;
-using Util.Samples.Services.Queries.Systems;
+using Util.Samples.Domain.Models;
+using Util.Samples.Domain.Repositories;
+using Util.Samples.Service.Abstractions.Systems;
+using Util.Samples.Service.Dtos.Systems;
+using Util.Samples.Service.Queries.Systems;
 using Util.Security.Properties;
 
-namespace Util.Samples.Services.Implements.Systems {
+namespace Util.Samples.Service.Implements.Systems {
     /// <summary>
     /// 应用程序服务
     /// </summary>
@@ -24,12 +23,10 @@ namespace Util.Samples.Services.Implements.Systems {
         /// <param name="unitOfWork">工作单元</param>
         /// <param name="applicationRepository">应用程序仓储</param>
         /// <param name="sqlQuery">Sql查询对象</param>
-        /// <param name="eventBus">事件总线</param>
-        public ApplicationService( ISampleUnitOfWork unitOfWork, IApplicationRepository applicationRepository, ISqlQuery sqlQuery, IEventBus eventBus )
+        public ApplicationService( ISampleUnitOfWork unitOfWork, IApplicationRepository applicationRepository, ISqlQuery sqlQuery )
             : base( unitOfWork, applicationRepository ) {
             ApplicationRepository = applicationRepository;
             SqlQuery = sqlQuery;
-            EventBus = eventBus;
         }
 
         /// <summary>
@@ -40,10 +37,6 @@ namespace Util.Samples.Services.Implements.Systems {
         /// Sql查询对象
         /// </summary>
         public ISqlQuery SqlQuery { get; }
-        /// <summary>
-        /// 事件总线
-        /// </summary>
-        public IEventBus EventBus { get; }
 
         /// <summary>
         /// 转换为数据传输对象
diff --git a/sample/Util.Samples.Angular.Material/Services/Implements/Systems/RoleService.cs b/sample/Util.Samples.Service/Implements/Systems/RoleService.cs
similarity index 89%
rename from sample/Util.Samples.Angular.Material/Services/Implements/Systems/RoleService.cs
rename to sample/Util.Samples.Service/Implements/Systems/RoleService.cs
index 65153be4..7ed874c9 100644
--- a/sample/Util.Samples.Angular.Material/Services/Implements/Systems/RoleService.cs
+++ b/sample/Util.Samples.Service/Implements/Systems/RoleService.cs
@@ -5,14 +5,14 @@ using Util.Datas.Queries;
 using Util.Domains.Repositories;
 using Util.Maps;
 using Util.Samples.Data;
-using Util.Samples.Domains.Models;
-using Util.Samples.Domains.Repositories;
-using Util.Samples.Domains.Services.Abstractions;
-using Util.Samples.Services.Abstractions.Systems;
-using Util.Samples.Services.Dtos.Systems;
-using Util.Samples.Services.Queries.Systems;
+using Util.Samples.Domain.Models;
+using Util.Samples.Domain.Repositories;
+using Util.Samples.Domain.Services;
+using Util.Samples.Service.Abstractions.Systems;
+using Util.Samples.Service.Dtos.Systems;
+using Util.Samples.Service.Queries.Systems;
 
-namespace Util.Samples.Services.Implements.Systems {
+namespace Util.Samples.Service.Implements.Systems {
     /// <summary>
     /// 角色服务
     /// </summary>
diff --git a/sample/Util.Samples.Angular.Material/Services/Queries/Systems/ApplicationQuery.cs b/sample/Util.Samples.Service/Queries/Systems/ApplicationQuery.cs
similarity index 77%
rename from sample/Util.Samples.Angular.Material/Services/Queries/Systems/ApplicationQuery.cs
rename to sample/Util.Samples.Service/Queries/Systems/ApplicationQuery.cs
index 64afbad5..67b976eb 100644
--- a/sample/Util.Samples.Angular.Material/Services/Queries/Systems/ApplicationQuery.cs
+++ b/sample/Util.Samples.Service/Queries/Systems/ApplicationQuery.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using Util.Datas.Queries;
 
-namespace Util.Samples.Services.Queries.Systems {
+namespace Util.Samples.Service.Queries.Systems {
     /// <summary>
     /// 应用程序查询实体
     /// </summary>
@@ -67,20 +67,5 @@ namespace Util.Samples.Services.Queries.Systems {
         /// </summary>
         [Display( Name = "创建人编号" )]
         public Guid? CreatorId { get; set; }
-        /// <summary>
-        /// 起始最后修改时间
-        /// </summary>
-        [Display( Name = "起始最后修改时间" )]
-        public DateTime? BeginLastModificationTime { get; set; }
-        /// <summary>
-        /// 结束最后修改时间
-        /// </summary>
-        [Display( Name = "结束最后修改时间" )]
-        public DateTime? EndLastModificationTime { get; set; }
-        /// <summary>
-        /// 最后修改人编号
-        /// </summary>
-        [Display( Name = "最后修改人编号" )]
-        public Guid? LastModifierId { get; set; }
     }
 }
\ No newline at end of file
diff --git a/sample/Util.Samples.Angular.Material/Services/Queries/Systems/RoleQuery.cs b/sample/Util.Samples.Service/Queries/Systems/RoleQuery.cs
similarity index 98%
rename from sample/Util.Samples.Angular.Material/Services/Queries/Systems/RoleQuery.cs
rename to sample/Util.Samples.Service/Queries/Systems/RoleQuery.cs
index bcbc1437..06a3312f 100644
--- a/sample/Util.Samples.Angular.Material/Services/Queries/Systems/RoleQuery.cs
+++ b/sample/Util.Samples.Service/Queries/Systems/RoleQuery.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using Util.Datas.Queries.Trees;
 
-namespace Util.Samples.Services.Queries.Systems {
+namespace Util.Samples.Service.Queries.Systems {
     /// <summary>
     /// 角色查询参数
     /// </summary>
diff --git a/sample/Util.Samples.Service/Util.Samples.Service.csproj b/sample/Util.Samples.Service/Util.Samples.Service.csproj
new file mode 100644
index 00000000..3a000d1d
--- /dev/null
+++ b/sample/Util.Samples.Service/Util.Samples.Service.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Util.Applications" Version="1.3.6" />
+    <PackageReference Include="Util.Ui.Core" Version="1.3.6" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Util.Samples.Data\Util.Samples.Data.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Util.Applications/Trees/TreeDtoBase.cs b/src/Util.Applications/Trees/TreeDtoBase.cs
index 8f3070d1..d651459c 100644
--- a/src/Util.Applications/Trees/TreeDtoBase.cs
+++ b/src/Util.Applications/Trees/TreeDtoBase.cs
@@ -1,50 +1,41 @@
 using System.ComponentModel.DataAnnotations;
-using System.Runtime.Serialization;
 using Util.Applications.Dtos;
 
 namespace Util.Applications.Trees {
     /// <summary>
     /// 树型数据传输对象
     /// </summary>
-    [DataContract]
     public abstract class TreeDtoBase : DtoBase, ITreeNode {
         /// <summary>
         /// 父标识
         /// </summary>
-        [DataMember]
         public string ParentId { get; set; }
         /// <summary>
         /// 父名称
         /// </summary>
-        [DataMember]
         public string ParentName { get; set; }
         /// <summary>
         /// 路径
         /// </summary>
-        [DataMember]
         public string Path { get; set; }
         /// <summary>
         /// 级数
         /// </summary>
-        [DataMember]
         public int? Level { get; set; }
         /// <summary>
         /// 启用
         /// </summary>
         [Display( Name = "启用" )]
-        [DataMember]
         public bool? Enabled { get; set; }
         /// <summary>
         /// 排序号
         /// </summary>
         [Display( Name = "排序号" )]
-        [DataMember]
         public int? SortId { get; set; }
         /// <summary>
         /// 是否展开
         /// </summary>
         [Display( Name = "是否展开" )]
-        [DataMember]
         public bool? Expanded { get; set; }
     }
 }