From ea5edf369926c85851ffd362f01ce142870f5ac6 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Thu, 23 May 2019 18:56:46 +0300 Subject: [PATCH] Move MyProjectNameResource to MyCompanyName.MyProjectName.Localization namespace --- ...ProjectNamePermissionDefinitionProvider.cs | 2 +- .../MyProjectNameResource.cs | 2 +- .../MyProjectNameDomainSharedModule.cs | 2 +- .../Controllers/MyProjectNameController.cs | 13 +++++++++ .../Controllers/TestController.cs | 28 +++++++++++++++++++ .../Models/Test/TestModel.cs | 11 ++++++++ .../MyProjectNameIdentityServerModule.cs | 2 +- .../Menus/MyProjectNameMenuContributor.cs | 2 +- .../MyProjectNameWebModule.cs | 2 +- .../Pages/MyProjectNamePageBase.cs | 2 +- .../Pages/MyProjectNamePageModelBase.cs | 2 +- .../Menus/MyProjectNameMenuContributor.cs | 2 +- .../MyProjectNameWebModule.cs | 2 +- .../Pages/MyProjectNamePageBase.cs | 2 +- .../Pages/MyProjectNamePageModelBase.cs | 2 +- .../MyProjectNameWebTestModule.cs | 2 +- 16 files changed, 65 insertions(+), 13 deletions(-) rename templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/{MyProjectName => }/MyProjectNameResource.cs (67%) create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/Controllers/MyProjectNameController.cs create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/Controllers/TestController.cs create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/Models/Test/TestModel.cs diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Application/Permissions/MyProjectNamePermissionDefinitionProvider.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Application/Permissions/MyProjectNamePermissionDefinitionProvider.cs index 9ce60cf1e2..ec0308c085 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Application/Permissions/MyProjectNamePermissionDefinitionProvider.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Application/Permissions/MyProjectNamePermissionDefinitionProvider.cs @@ -1,4 +1,4 @@ -using MyCompanyName.MyProjectName.Localization.MyProjectName; +using MyCompanyName.MyProjectName.Localization; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Localization; diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/MyProjectNameResource.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectNameResource.cs similarity index 67% rename from templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/MyProjectNameResource.cs rename to templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectNameResource.cs index 82105b148e..6ca0ab55f0 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/MyProjectNameResource.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectNameResource.cs @@ -1,6 +1,6 @@ using Volo.Abp.Localization; -namespace MyCompanyName.MyProjectName.Localization.MyProjectName +namespace MyCompanyName.MyProjectName.Localization { [LocalizationResourceName("MyProjectName")] public class MyProjectNameResource diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs index ce416f976d..2de342535f 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs @@ -1,4 +1,4 @@ -using MyCompanyName.MyProjectName.Localization.MyProjectName; +using MyCompanyName.MyProjectName.Localization; using Volo.Abp.AuditLogging; using Volo.Abp.BackgroundJobs; using Volo.Abp.FeatureManagement; diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/Controllers/MyProjectNameController.cs b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/Controllers/MyProjectNameController.cs new file mode 100644 index 0000000000..c80e008681 --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/Controllers/MyProjectNameController.cs @@ -0,0 +1,13 @@ +using MyCompanyName.MyProjectName.Localization; +using Volo.Abp.AspNetCore.Mvc; + +namespace MyCompanyName.MyProjectName.Controllers +{ + public abstract class MyProjectNameController : AbpController + { + protected MyProjectNameController() + { + LocalizationResource = typeof(MyProjectNameResource); + } + } +} \ No newline at end of file diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/Controllers/TestController.cs b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/Controllers/TestController.cs new file mode 100644 index 0000000000..449beaf29c --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/Controllers/TestController.cs @@ -0,0 +1,28 @@ +using Microsoft.AspNetCore.Mvc; +using MyCompanyName.MyProjectName.Models.Test; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace MyCompanyName.MyProjectName.Controllers +{ + [Route("api/test")] + public class TestController : MyProjectNameController + { + public TestController() + { + + } + + [HttpGet] + [Route("")] + public async Task> GetAsync() + { + return new List + { + new TestModel {Name = "John", BirthDate = new DateTime(1942, 11, 18)}, + new TestModel {Name = "Adams", BirthDate = new DateTime(1997, 05, 24)} + }; + } + } +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/Models/Test/TestModel.cs b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/Models/Test/TestModel.cs new file mode 100644 index 0000000000..ccec2232ed --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/Models/Test/TestModel.cs @@ -0,0 +1,11 @@ +using System; + +namespace MyCompanyName.MyProjectName.Models.Test +{ + public class TestModel + { + public string Name { get; set; } + + public DateTime BirthDate { get; set; } + } +} \ No newline at end of file diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs index d148cc21c0..6d7935af28 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using MyCompanyName.MyProjectName.EntityFrameworkCore; -using MyCompanyName.MyProjectName.Localization.MyProjectName; +using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.MultiTenancy; using StackExchange.Redis; using Volo.Abp; diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs index 557a657f8d..9e313144d7 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Localization; -using MyCompanyName.MyProjectName.Localization.MyProjectName; +using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.MultiTenancy; using Volo.Abp.TenantManagement.Web.Navigation; using Volo.Abp.UI.Navigation; diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs index 739b4a7b44..4ce92707bc 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs @@ -2,7 +2,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; -using MyCompanyName.MyProjectName.Localization.MyProjectName; using MyCompanyName.MyProjectName.Menus; using Swashbuckle.AspNetCore.Swagger; using System.IO; @@ -10,6 +9,7 @@ using Microsoft.AspNetCore.Authentication.OAuth.Claims; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.Configuration; using Microsoft.IdentityModel.Protocols.OpenIdConnect; +using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.MultiTenancy; using StackExchange.Redis; using Volo.Abp; diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/MyProjectNamePageBase.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/MyProjectNamePageBase.cs index db58806e7b..fde2c858b9 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/MyProjectNamePageBase.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/MyProjectNamePageBase.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc.Localization; using Microsoft.AspNetCore.Mvc.Razor.Internal; -using MyCompanyName.MyProjectName.Localization.MyProjectName; +using MyCompanyName.MyProjectName.Localization; using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; namespace MyCompanyName.MyProjectName.Pages diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/MyProjectNamePageModelBase.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/MyProjectNamePageModelBase.cs index a0b868cf2a..88795db56d 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/MyProjectNamePageModelBase.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/MyProjectNamePageModelBase.cs @@ -1,4 +1,4 @@ -using MyCompanyName.MyProjectName.Localization.MyProjectName; +using MyCompanyName.MyProjectName.Localization; using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; namespace MyCompanyName.MyProjectName.Pages diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs index 557a657f8d..9e313144d7 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Localization; -using MyCompanyName.MyProjectName.Localization.MyProjectName; +using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.MultiTenancy; using Volo.Abp.TenantManagement.Web.Navigation; using Volo.Abp.UI.Navigation; diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index d171011f2c..d0fc09cdb4 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -3,11 +3,11 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using MyCompanyName.MyProjectName.EntityFrameworkCore; -using MyCompanyName.MyProjectName.Localization.MyProjectName; using MyCompanyName.MyProjectName.Menus; using Swashbuckle.AspNetCore.Swagger; using System.IO; using Microsoft.Extensions.Configuration; +using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.MultiTenancy; using Volo.Abp; using Volo.Abp.Account.Web; diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageBase.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageBase.cs index db58806e7b..fde2c858b9 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageBase.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageBase.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc.Localization; using Microsoft.AspNetCore.Mvc.Razor.Internal; -using MyCompanyName.MyProjectName.Localization.MyProjectName; +using MyCompanyName.MyProjectName.Localization; using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; namespace MyCompanyName.MyProjectName.Pages diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageModelBase.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageModelBase.cs index a0b868cf2a..88795db56d 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageModelBase.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageModelBase.cs @@ -1,4 +1,4 @@ -using MyCompanyName.MyProjectName.Localization.MyProjectName; +using MyCompanyName.MyProjectName.Localization; using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; namespace MyCompanyName.MyProjectName.Pages diff --git a/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs b/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs index 87ced58285..f99735b782 100644 --- a/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs +++ b/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Localization; using Microsoft.AspNetCore.Mvc.ApplicationParts; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using MyCompanyName.MyProjectName.Localization.MyProjectName; +using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.Menus; using Volo.Abp; using Volo.Abp.AspNetCore.TestBase;