diff --git a/.gitignore b/.gitignore index 84f6cfa5..0de3190e 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,15 @@ BenchmarkDotNet.Artifacts/ /sample/Util.Samples.Webs.AntDesign.Angular/package-lock.json *.user *.log +/sample/Util.Samples.Angular.AntDesign/node_modules +/sample/Util.Samples.Angular.AntDesign/wwwroot/dist +/sample/Util.Samples.Angular.AntDesign/yarn.lock +/sample/Util.Samples.Angular.Material/.vs +/sample/Util.Samples.Angular.Material/node_modules +/sample/Util.Samples.Angular.Material/Typings/app/*.html +/sample/Util.Samples.Angular.Material/Typings/app/base/*.html +/sample/Util.Samples.Angular.Material/Typings/app/systems/application/html +/sample/Util.Samples.Angular.Material/Typings/app/systems/role/html +/sample/Util.Samples.Angular.Material/wwwroot/upload +/sample/Util.Samples.Angular.Material/wwwroot/dist +/sample/Util.Samples.Angular.Material/yarn.lock diff --git a/Util.sln b/Util.sln index 2506e6bd..affdf307 100644 --- a/Util.sln +++ b/Util.sln @@ -2,8 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2027 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Util.Samples.Webs", "sample\Util.Samples.Webs\Util.Samples.Webs.csproj", "{323B64B7-5CE0-4222-B9ED-9F418730897C}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "01-src", "01-src", "{ECBD28DE-AFFB-4C9A-8988-6297FA5ADDD5}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "02-test", "02-test", "{DE1DF0B9-0403-4888-8B24-8208348E9AFA}" @@ -66,7 +64,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Util.Samples.Schedulers", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "04-Util.Caches", "src\Util.Caches\04-Util.Caches.csproj", "{26F6273A-567A-4AA4-8304-AEC57FC40DC9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Util.Samples.Webs.AntDesign.Angular", "sample\Util.Samples.Webs.AntDesign.Angular\Util.Samples.Webs.AntDesign.Angular.csproj", "{F5F011EE-ADDC-4F0D-9A70-F254CFB88DD8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Util.Samples.Angular.Material", "sample\Util.Samples.Angular.Material\Util.Samples.Angular.Material.csproj", "{41F2DA18-8295-4003-99D3-4237B90D7BAE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Util.Samples.Angular.AntDesign", "sample\Util.Samples.Angular.AntDesign\Util.Samples.Angular.AntDesign.csproj", "{E4C15F45-CBB9-4240-B0CD-45E6A2A34629}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "04-Util.Ui.Angular.AntDesign", "src\Util.Ui.Angular.AntDesign\04-Util.Ui.Angular.AntDesign.csproj", "{5D30B981-7319-4181-9E0A-DDE1ECCC691D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -74,10 +76,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {323B64B7-5CE0-4222-B9ED-9F418730897C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {323B64B7-5CE0-4222-B9ED-9F418730897C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {323B64B7-5CE0-4222-B9ED-9F418730897C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {323B64B7-5CE0-4222-B9ED-9F418730897C}.Release|Any CPU.Build.0 = Release|Any CPU {4C93DBB6-7840-4277-BAF1-56148B62FB3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4C93DBB6-7840-4277-BAF1-56148B62FB3D}.Debug|Any CPU.Build.0 = Debug|Any CPU {4C93DBB6-7840-4277-BAF1-56148B62FB3D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -162,16 +160,23 @@ Global {26F6273A-567A-4AA4-8304-AEC57FC40DC9}.Debug|Any CPU.Build.0 = Debug|Any CPU {26F6273A-567A-4AA4-8304-AEC57FC40DC9}.Release|Any CPU.ActiveCfg = Release|Any CPU {26F6273A-567A-4AA4-8304-AEC57FC40DC9}.Release|Any CPU.Build.0 = Release|Any CPU - {F5F011EE-ADDC-4F0D-9A70-F254CFB88DD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5F011EE-ADDC-4F0D-9A70-F254CFB88DD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5F011EE-ADDC-4F0D-9A70-F254CFB88DD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5F011EE-ADDC-4F0D-9A70-F254CFB88DD8}.Release|Any CPU.Build.0 = Release|Any CPU + {41F2DA18-8295-4003-99D3-4237B90D7BAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {41F2DA18-8295-4003-99D3-4237B90D7BAE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {41F2DA18-8295-4003-99D3-4237B90D7BAE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {41F2DA18-8295-4003-99D3-4237B90D7BAE}.Release|Any CPU.Build.0 = Release|Any CPU + {E4C15F45-CBB9-4240-B0CD-45E6A2A34629}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E4C15F45-CBB9-4240-B0CD-45E6A2A34629}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E4C15F45-CBB9-4240-B0CD-45E6A2A34629}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E4C15F45-CBB9-4240-B0CD-45E6A2A34629}.Release|Any CPU.Build.0 = Release|Any CPU + {5D30B981-7319-4181-9E0A-DDE1ECCC691D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5D30B981-7319-4181-9E0A-DDE1ECCC691D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5D30B981-7319-4181-9E0A-DDE1ECCC691D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5D30B981-7319-4181-9E0A-DDE1ECCC691D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {323B64B7-5CE0-4222-B9ED-9F418730897C} = {F1B4AAEF-9162-4DFA-8B62-4069FC914839} {3746073A-1C5C-40A7-9D50-CB2A94CA888A} = {ECBD28DE-AFFB-4C9A-8988-6297FA5ADDD5} {4C93DBB6-7840-4277-BAF1-56148B62FB3D} = {6FA93B2E-A5E5-44CA-9851-52FAA2BF5C57} {6FA93B2E-A5E5-44CA-9851-52FAA2BF5C57} = {DE1DF0B9-0403-4888-8B24-8208348E9AFA} @@ -200,7 +205,9 @@ Global {E220692E-909A-4855-A67F-64C3A9590BA6} = {3746073A-1C5C-40A7-9D50-CB2A94CA888A} {18A2D4FE-27BB-4A69-8C07-29169B9006B3} = {F1B4AAEF-9162-4DFA-8B62-4069FC914839} {26F6273A-567A-4AA4-8304-AEC57FC40DC9} = {3746073A-1C5C-40A7-9D50-CB2A94CA888A} - {F5F011EE-ADDC-4F0D-9A70-F254CFB88DD8} = {F1B4AAEF-9162-4DFA-8B62-4069FC914839} + {41F2DA18-8295-4003-99D3-4237B90D7BAE} = {F1B4AAEF-9162-4DFA-8B62-4069FC914839} + {E4C15F45-CBB9-4240-B0CD-45E6A2A34629} = {F1B4AAEF-9162-4DFA-8B62-4069FC914839} + {5D30B981-7319-4181-9E0A-DDE1ECCC691D} = {78CC88DA-0B25-45BC-86A8-FFE9628B34A6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AA6E8E23-8AB6-4AB6-9B31-494CB7CE5E63} diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/Pages/Home/Main.cshtml b/sample/Util.Samples.Angular.AntDesign/Pages/Home/Main.cshtml similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/Pages/Home/Main.cshtml rename to sample/Util.Samples.Angular.AntDesign/Pages/Home/Main.cshtml diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/Pages/Home/NotFound.cshtml b/sample/Util.Samples.Angular.AntDesign/Pages/Home/NotFound.cshtml similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/Pages/Home/NotFound.cshtml rename to sample/Util.Samples.Angular.AntDesign/Pages/Home/NotFound.cshtml diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/Pages/Index.cshtml b/sample/Util.Samples.Angular.AntDesign/Pages/Index.cshtml similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/Pages/Index.cshtml rename to sample/Util.Samples.Angular.AntDesign/Pages/Index.cshtml diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/Pages/_ViewImports.cshtml b/sample/Util.Samples.Angular.AntDesign/Pages/_ViewImports.cshtml similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/Pages/_ViewImports.cshtml rename to sample/Util.Samples.Angular.AntDesign/Pages/_ViewImports.cshtml diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/Program.cs b/sample/Util.Samples.Angular.AntDesign/Program.cs similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/Program.cs rename to sample/Util.Samples.Angular.AntDesign/Program.cs diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/Properties/launchSettings.json b/sample/Util.Samples.Angular.AntDesign/Properties/launchSettings.json similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/Properties/launchSettings.json rename to sample/Util.Samples.Angular.AntDesign/Properties/launchSettings.json diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/Startup.cs b/sample/Util.Samples.Angular.AntDesign/Startup.cs similarity index 91% rename from sample/Util.Samples.Webs.AntDesign.Angular/Startup.cs rename to sample/Util.Samples.Angular.AntDesign/Startup.cs index ddbb1499..d6e38d93 100644 --- a/sample/Util.Samples.Webs.AntDesign.Angular/Startup.cs +++ b/sample/Util.Samples.Angular.AntDesign/Startup.cs @@ -56,22 +56,22 @@ namespace Util.Samples { //添加EF工作单元 //====== 支持Sql Server 2012+ ========== - //services.AddUnitOfWork( Configuration.GetConnectionString( "DefaultConnection" ) ); + //services.AddUnitOfWork( Configuration.GetConnectionString( "DefaultConnection" ) ); //======= 支持Sql Server 2005+ ========== - //services.AddUnitOfWork( builder => { + //services.AddUnitOfWork( builder => { // builder.UseSqlServer( Configuration.GetConnectionString( "DefaultConnection" ), option => option.UseRowNumberForPaging() ); //} ); //======= 支持PgSql ======= - //services.AddUnitOfWork( Configuration.GetConnectionString( "PgSqlConnection" ) ); + //services.AddUnitOfWork( Configuration.GetConnectionString( "PgSqlConnection" ) ); //======= 支持MySql ======= - //services.AddUnitOfWork( Configuration.GetConnectionString( "MySqlConnection" ) ); + //services.AddUnitOfWork( Configuration.GetConnectionString( "MySqlConnection" ) ); //添加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.Webs.AntDesign.Angular.xml" ) ); + options.IncludeXmlComments( Path.Combine( AppContext.BaseDirectory, "Util.Samples.xml" ) ); } ); //添加事件总线 diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/Typings/app/app-routing.module.ts b/sample/Util.Samples.Angular.AntDesign/Typing/app/app-routing.module.ts similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/Typings/app/app-routing.module.ts rename to sample/Util.Samples.Angular.AntDesign/Typing/app/app-routing.module.ts diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/Typings/app/app.component.ts b/sample/Util.Samples.Angular.AntDesign/Typing/app/app.component.ts similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/Typings/app/app.component.ts rename to sample/Util.Samples.Angular.AntDesign/Typing/app/app.component.ts diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/Typings/app/app.module.ts b/sample/Util.Samples.Angular.AntDesign/Typing/app/app.module.ts similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/Typings/app/app.module.ts rename to sample/Util.Samples.Angular.AntDesign/Typing/app/app.module.ts diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/Typings/app/env.ts b/sample/Util.Samples.Angular.AntDesign/Typing/app/env.ts similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/Typings/app/env.ts rename to sample/Util.Samples.Angular.AntDesign/Typing/app/env.ts diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/Typings/app/framework.module.ts b/sample/Util.Samples.Angular.AntDesign/Typing/app/framework.module.ts similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/Typings/app/framework.module.ts rename to sample/Util.Samples.Angular.AntDesign/Typing/app/framework.module.ts diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/Typings/app/home/not-found.component.ts b/sample/Util.Samples.Angular.AntDesign/Typing/app/home/not-found.component.ts similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/Typings/app/home/not-found.component.ts rename to sample/Util.Samples.Angular.AntDesign/Typing/app/home/not-found.component.ts diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/Typings/app/viser/bar/app.module.ts b/sample/Util.Samples.Angular.AntDesign/Typing/app/viser/bar/app.module.ts similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/Typings/app/viser/bar/app.module.ts rename to sample/Util.Samples.Angular.AntDesign/Typing/app/viser/bar/app.module.ts diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/Typings/app/viser/bar/data.ts b/sample/Util.Samples.Angular.AntDesign/Typing/app/viser/bar/data.ts similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/Typings/app/viser/bar/data.ts rename to sample/Util.Samples.Angular.AntDesign/Typing/app/viser/bar/data.ts diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/Typings/main.ts b/sample/Util.Samples.Angular.AntDesign/Typing/main.ts similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/Typings/main.ts rename to sample/Util.Samples.Angular.AntDesign/Typing/main.ts diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/Util.Samples.Webs.AntDesign.Angular.csproj b/sample/Util.Samples.Angular.AntDesign/Util.Samples.Angular.AntDesign.csproj similarity index 89% rename from sample/Util.Samples.Webs.AntDesign.Angular/Util.Samples.Webs.AntDesign.Angular.csproj rename to sample/Util.Samples.Angular.AntDesign/Util.Samples.Angular.AntDesign.csproj index 9fd31719..d2866548 100644 --- a/sample/Util.Samples.Webs.AntDesign.Angular/Util.Samples.Webs.AntDesign.Angular.csproj +++ b/sample/Util.Samples.Angular.AntDesign/Util.Samples.Angular.AntDesign.csproj @@ -11,12 +11,12 @@ bin\Release\ - bin\Release\netcoreapp2.2\Util.Samples.Webs.AntDesign.Angular.xml + bin\Release\netcoreapp2.2\Util.Samples.xml bin\Debug\ - bin\Debug\netcoreapp2.2\Util.Samples.Webs.AntDesign.Angular.xml + bin\Debug\netcoreapp2.2\Util.Samples.xml diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/appsettings.Development.json b/sample/Util.Samples.Angular.AntDesign/appsettings.Development.json similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/appsettings.Development.json rename to sample/Util.Samples.Angular.AntDesign/appsettings.Development.json diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/appsettings.json b/sample/Util.Samples.Angular.AntDesign/appsettings.json similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/appsettings.json rename to sample/Util.Samples.Angular.AntDesign/appsettings.json diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/nlog.config b/sample/Util.Samples.Angular.AntDesign/nlog.config similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/nlog.config rename to sample/Util.Samples.Angular.AntDesign/nlog.config diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/package.json b/sample/Util.Samples.Angular.AntDesign/package.json similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/package.json rename to sample/Util.Samples.Angular.AntDesign/package.json diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/tsconfig.json b/sample/Util.Samples.Angular.AntDesign/tsconfig.json similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/tsconfig.json rename to sample/Util.Samples.Angular.AntDesign/tsconfig.json diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/webpack.config.js b/sample/Util.Samples.Angular.AntDesign/webpack.config.js similarity index 96% rename from sample/Util.Samples.Webs.AntDesign.Angular/webpack.config.js rename to sample/Util.Samples.Angular.AntDesign/webpack.config.js index 0257c341..e1c86523 100644 --- a/sample/Util.Samples.Webs.AntDesign.Angular/webpack.config.js +++ b/sample/Util.Samples.Angular.AntDesign/webpack.config.js @@ -14,7 +14,7 @@ module.exports = (env) => { //打包js let jsConfig = { mode: mode, - entry: { app: getPath("Typings/main.ts") }, + entry: { app: getPath("Typing/main.ts") }, output: { publicPath: 'dist/', path: getPath("wwwroot/dist"), diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/webpack.config.vendor.js b/sample/Util.Samples.Angular.AntDesign/webpack.config.vendor.js similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/webpack.config.vendor.js rename to sample/Util.Samples.Angular.AntDesign/webpack.config.vendor.js diff --git a/sample/Util.Samples.Webs.AntDesign.Angular/wwwroot/favicon.ico b/sample/Util.Samples.Angular.AntDesign/wwwroot/favicon.ico similarity index 100% rename from sample/Util.Samples.Webs.AntDesign.Angular/wwwroot/favicon.ico rename to sample/Util.Samples.Angular.AntDesign/wwwroot/favicon.ico diff --git a/sample/Util.Samples.Webs/Apis/Systems/ApplicationController.cs b/sample/Util.Samples.Angular.Material/Apis/Systems/ApplicationController.cs similarity index 69% rename from sample/Util.Samples.Webs/Apis/Systems/ApplicationController.cs rename to sample/Util.Samples.Angular.Material/Apis/Systems/ApplicationController.cs index 5a9e9def..839b23d5 100644 --- a/sample/Util.Samples.Webs/Apis/Systems/ApplicationController.cs +++ b/sample/Util.Samples.Angular.Material/Apis/Systems/ApplicationController.cs @@ -1,9 +1,9 @@ -using Util.Samples.Webs.Services.Abstractions.Systems; -using Util.Samples.Webs.Services.Dtos.Systems; -using Util.Samples.Webs.Services.Queries.Systems; +using Util.Samples.Services.Abstractions.Systems; +using Util.Samples.Services.Dtos.Systems; +using Util.Samples.Services.Queries.Systems; using Util.Webs.Controllers; -namespace Util.Samples.Webs.Apis.Systems { +namespace Util.Samples.Apis.Systems { /// /// 应用程序控制器 /// diff --git a/sample/Util.Samples.Webs/Apis/Systems/RoleController.cs b/sample/Util.Samples.Angular.Material/Apis/Systems/RoleController.cs similarity index 87% rename from sample/Util.Samples.Webs/Apis/Systems/RoleController.cs rename to sample/Util.Samples.Angular.Material/Apis/Systems/RoleController.cs index c5e2a9f2..75c6bb0f 100644 --- a/sample/Util.Samples.Webs/Apis/Systems/RoleController.cs +++ b/sample/Util.Samples.Angular.Material/Apis/Systems/RoleController.cs @@ -1,11 +1,11 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using Util.Samples.Webs.Services.Abstractions.Systems; -using Util.Samples.Webs.Services.Dtos.Systems; -using Util.Samples.Webs.Services.Queries.Systems; +using Util.Samples.Services.Abstractions.Systems; +using Util.Samples.Services.Dtos.Systems; +using Util.Samples.Services.Queries.Systems; using Util.Ui.Controllers; -namespace Util.Samples.Webs.Apis.Systems { +namespace Util.Samples.Apis.Systems { /// /// 角色控制器 /// diff --git a/sample/Util.Samples.Webs/Apis/Tools/CkEditorController.cs b/sample/Util.Samples.Angular.Material/Apis/Tools/CkEditorController.cs similarity index 95% rename from sample/Util.Samples.Webs/Apis/Tools/CkEditorController.cs rename to sample/Util.Samples.Angular.Material/Apis/Tools/CkEditorController.cs index e136c00c..d778ed59 100644 --- a/sample/Util.Samples.Webs/Apis/Tools/CkEditorController.cs +++ b/sample/Util.Samples.Angular.Material/Apis/Tools/CkEditorController.cs @@ -4,7 +4,7 @@ using Util.Files; using Util.Ui.CkEditor; using Util.Webs.Controllers; -namespace Util.Samples.Webs.Apis.Tools { +namespace Util.Samples.Apis.Tools { /// /// CKEditor控制器 /// diff --git a/sample/Util.Samples.Webs/Apis/Tools/InitRazorController.cs b/sample/Util.Samples.Angular.Material/Apis/Tools/InitRazorController.cs similarity index 53% rename from sample/Util.Samples.Webs/Apis/Tools/InitRazorController.cs rename to sample/Util.Samples.Angular.Material/Apis/Tools/InitRazorController.cs index 1f4be586..e19950bd 100644 --- a/sample/Util.Samples.Webs/Apis/Tools/InitRazorController.cs +++ b/sample/Util.Samples.Angular.Material/Apis/Tools/InitRazorController.cs @@ -1,20 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.Infrastructure; -using Util.Helpers; using Util.Webs.Controllers; using Util.Webs.Razors; -namespace Util.Samples.Webs.Apis.Tools -{ +namespace Util.Samples.Apis.Tools { /// /// 初始化Razor控制器 /// - public class InitRazorController : WebApiControllerBase - { + public class InitRazorController : WebApiControllerBase { /// /// Razor静态Html生成器 /// @@ -23,22 +16,18 @@ namespace Util.Samples.Webs.Apis.Tools /// /// 初始化一个类型的实例 /// - /// - public InitRazorController(IRazorHtmlGenerator razorHtmlGenerator) - { + public InitRazorController( IRazorHtmlGenerator razorHtmlGenerator ) { RazorHtmlGenerator = razorHtmlGenerator; } /// /// 初始化路由 /// - /// - [Route("/api/init")] + [Route( "/api/init" )] [HttpPost] - public async Task Init() - { + public async Task Init() { await RazorHtmlGenerator.Generate(); - return new JsonResult(""); + return new JsonResult( "" ); } } } diff --git a/sample/Util.Samples.Webs/Areas/Systems/Controllers/ApplicationController.cs b/sample/Util.Samples.Angular.Material/Areas/Systems/Controllers/ApplicationController.cs similarity index 92% rename from sample/Util.Samples.Webs/Areas/Systems/Controllers/ApplicationController.cs rename to sample/Util.Samples.Angular.Material/Areas/Systems/Controllers/ApplicationController.cs index 74662919..a8fd47b5 100644 --- a/sample/Util.Samples.Webs/Areas/Systems/Controllers/ApplicationController.cs +++ b/sample/Util.Samples.Angular.Material/Areas/Systems/Controllers/ApplicationController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Util.Ui.Controllers; -namespace Util.Samples.Webs.Areas.Systems.Controllers { +namespace Util.Samples.Areas.Systems.Controllers { /// /// 应用程序控制器 /// diff --git a/sample/Util.Samples.Webs/Areas/Systems/Controllers/RoleController.cs b/sample/Util.Samples.Angular.Material/Areas/Systems/Controllers/RoleController.cs similarity index 93% rename from sample/Util.Samples.Webs/Areas/Systems/Controllers/RoleController.cs rename to sample/Util.Samples.Angular.Material/Areas/Systems/Controllers/RoleController.cs index 41d763f2..95e4e808 100644 --- a/sample/Util.Samples.Webs/Areas/Systems/Controllers/RoleController.cs +++ b/sample/Util.Samples.Angular.Material/Areas/Systems/Controllers/RoleController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Util.Ui.Controllers; -namespace Util.Samples.Webs.Areas.Systems.Controllers { +namespace Util.Samples.Areas.Systems.Controllers { /// /// 角色控制器 /// diff --git a/sample/Util.Samples.Webs/Areas/Systems/Views/Application/Detail.cshtml b/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Application/Detail.cshtml similarity index 99% rename from sample/Util.Samples.Webs/Areas/Systems/Views/Application/Detail.cshtml rename to sample/Util.Samples.Angular.Material/Areas/Systems/Views/Application/Detail.cshtml index ac6977fe..672702e8 100644 --- a/sample/Util.Samples.Webs/Areas/Systems/Views/Application/Detail.cshtml +++ b/sample/Util.Samples.Angular.Material/Areas/Systems/Views/Application/Detail.cshtml @@ -1,4 +1,4 @@ -@model ApplicationDto +@model Util.Samples.Services.Dtos.Systems.ApplicationDto