diff --git a/aspnet-core/.gitignore b/aspnet-core/.gitignore index e442fddad..a7eaf8aeb 100644 --- a/aspnet-core/.gitignore +++ b/aspnet-core/.gitignore @@ -2,7 +2,7 @@ LocalNuget *.DotSettings.user **/*.csproj.user -templates nupkg consoles +templates *.configs.cache \ No newline at end of file diff --git a/aspnet-core/migrations/LY.MicroService.TaskManagement.DbMigrator/TaskManagementDbMigratorHostedService.cs b/aspnet-core/migrations/LY.MicroService.TaskManagement.DbMigrator/TaskManagementDbMigratorHostedService.cs index 5eba27666..c635bf2c8 100644 --- a/aspnet-core/migrations/LY.MicroService.TaskManagement.DbMigrator/TaskManagementDbMigratorHostedService.cs +++ b/aspnet-core/migrations/LY.MicroService.TaskManagement.DbMigrator/TaskManagementDbMigratorHostedService.cs @@ -1,4 +1,4 @@ -using LY.MicroService.TaskManagement.DbMigrator.EntityFrameworkCore; +using LY.MicroService.TaskManagement.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; diff --git a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj index b8b091587..69fe5125e 100644 --- a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj +++ b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj @@ -13,12 +13,15 @@ ./nupkg MIT https://github.com/colinin/abp-next-admin + README.md + + diff --git a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/AxiosHttpApiScriptGenerator.cs b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/AxiosHttpApiScriptGenerator.cs index dba30de5d..d780f44ba 100644 --- a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/AxiosHttpApiScriptGenerator.cs +++ b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/AxiosHttpApiScriptGenerator.cs @@ -229,6 +229,7 @@ public class AxiosHttpApiScriptGenerator : IHttpApiScriptGenerator, ITransientDe apiScriptBuilder.AppendLine(" });"); apiScriptBuilder.AppendLine("};"); + apiScriptBuilder.AppendLine(); } return apiScriptBuilder.ToString(); diff --git a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/UniAppAxiosHttpApiScriptGenerator.cs b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/UniAppAxiosHttpApiScriptGenerator.cs index c1af79063..df5fcb50f 100644 --- a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/UniAppAxiosHttpApiScriptGenerator.cs +++ b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/UniAppAxiosHttpApiScriptGenerator.cs @@ -218,6 +218,7 @@ public class UniAppAxiosHttpApiScriptGenerator : IHttpApiScriptGenerator, ITrans apiScriptBuilder.AppendLine(" })"); apiScriptBuilder.AppendLine("}"); + apiScriptBuilder.AppendLine(); } return apiScriptBuilder.ToString(); diff --git a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/VbenAxiosHttpApiScriptGenerator.cs b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/VbenAxiosHttpApiScriptGenerator.cs index dfd853536..c1ef211fa 100644 --- a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/VbenAxiosHttpApiScriptGenerator.cs +++ b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/VbenAxiosHttpApiScriptGenerator.cs @@ -231,6 +231,7 @@ public class VbenAxiosHttpApiScriptGenerator : IHttpApiScriptGenerator, ITransie apiScriptBuilder.AppendLine(" });"); apiScriptBuilder.AppendLine("};"); + apiScriptBuilder.AppendLine(); } return apiScriptBuilder.ToString(); diff --git a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/VbenDynamicHttpApiScriptGenerator.cs b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/VbenDynamicHttpApiScriptGenerator.cs index 832b2ddb1..b5145ef7a 100644 --- a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/VbenDynamicHttpApiScriptGenerator.cs +++ b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/VbenDynamicHttpApiScriptGenerator.cs @@ -188,6 +188,7 @@ public class VbenDynamicHttpApiScriptGenerator : IHttpApiScriptGenerator, ITrans apiScriptBuilder.AppendLine(");"); apiScriptBuilder.AppendLine("};"); + apiScriptBuilder.AppendLine(); } return apiScriptBuilder.ToString(); diff --git a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/README.md b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/README.md new file mode 100644 index 000000000..91d948a8f --- /dev/null +++ b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/README.md @@ -0,0 +1,34 @@ +# Extension tool set based on abp cli + +Provides quick creation of template projects, JavaScript library commands and more. + +## Getting started + +```shell +dotnet tool install --global LINGYUN.Abp.Cli +``` + +## Usage + +```shell +Usage: + + labp [options] + +Command List: + + > help: Show command line help. Write ` labp help ` + > create: Generate a new solution based on the customed ABP startup templates. + > generate-proxy: Generates client service proxies and DTOs to consume HTTP APIs. + > generate-view: Generate the view code from the http api proxy. + +To get a detailed help for a command: + + labp help +``` + +## Feedback + +Have a question and need feedback? + +- [Github issuses](https://github.com/colinin/abp-next-admin/issuses) \ No newline at end of file diff --git a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/Dockerfile b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/Dockerfile index 2ffdd4a5d..576f0afde 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/Dockerfile +++ b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0 +FROM mcr.microsoft.com/dotnet/aspnet:7.0 LABEL maintainer="colin.in@foxmail.com" WORKDIR /app diff --git a/aspnet-core/services/LY.MicroService.AuthServer/Dockerfile b/aspnet-core/services/LY.MicroService.AuthServer/Dockerfile index e887a555a..3805494c8 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/Dockerfile +++ b/aspnet-core/services/LY.MicroService.AuthServer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0 +FROM mcr.microsoft.com/dotnet/aspnet:7.0 LABEL maintainer="colin.in@foxmail.com" WORKDIR /app diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Dockerfile b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Dockerfile index c5f093013..aa6d6e167 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Dockerfile +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0 +FROM mcr.microsoft.com/dotnet/aspnet:7.0 LABEL maintainer="colin.in@foxmail.com" WORKDIR /app diff --git a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/Dockerfile b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/Dockerfile index 87255cca0..c8d09cc8e 100644 --- a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/Dockerfile +++ b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0 +FROM mcr.microsoft.com/dotnet/aspnet:7.0 LABEL maintainer="colin.in@foxmail.com" WORKDIR /app diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Dockerfile b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Dockerfile index 269c8548d..b2eb713e1 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Dockerfile +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0 +FROM mcr.microsoft.com/dotnet/aspnet:7.0 LABEL maintainer="colin.in@foxmail.com" WORKDIR /app diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/Dockerfile b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/Dockerfile index 7da73331e..7c19c533c 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/Dockerfile +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0 +FROM mcr.microsoft.com/dotnet/aspnet:7.0 LABEL maintainer="colin.in@foxmail.com" WORKDIR /app diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/Dockerfile b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/Dockerfile index 3e9c90691..7687ba652 100644 --- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/Dockerfile +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0 +FROM mcr.microsoft.com/dotnet/aspnet:7.0 LABEL maintainer="colin.in@foxmail.com" WORKDIR /app diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Dockerfile b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Dockerfile index b5e30114c..31e0133ca 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Dockerfile +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0 +FROM mcr.microsoft.com/dotnet/aspnet:7.0 LABEL maintainer="colin.in@foxmail.com" WORKDIR /app diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Dockerfile b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Dockerfile index e11e9264f..6fb23662a 100644 --- a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Dockerfile +++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0 +FROM mcr.microsoft.com/dotnet/aspnet:7.0 LABEL maintainer="colin.in@foxmail.com" WORKDIR /app diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Dockerfile b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Dockerfile index 6b907d83d..8edce9f5a 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Dockerfile +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0 +FROM mcr.microsoft.com/dotnet/aspnet:7.0 LABEL maintainer="colin.in@foxmail.com" WORKDIR /app diff --git a/aspnet-core/services/LY.MicroService.identityServer/Dockerfile b/aspnet-core/services/LY.MicroService.identityServer/Dockerfile index 0e5e78257..af1b330a9 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/Dockerfile +++ b/aspnet-core/services/LY.MicroService.identityServer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0 +FROM mcr.microsoft.com/dotnet/aspnet:7.0 LABEL maintainer="colin.in@foxmail.com" WORKDIR /app