diff --git a/aspnet-core/modules/tui-juhe/LINGYUN.Abp.TuiJuhe/LINGYUN.Abp.TuiJuhe.csproj b/aspnet-core/modules/tui-juhe/LINGYUN.Abp.TuiJuhe/LINGYUN.Abp.TuiJuhe.csproj index 341e4212e..b612526ec 100644 --- a/aspnet-core/modules/tui-juhe/LINGYUN.Abp.TuiJuhe/LINGYUN.Abp.TuiJuhe.csproj +++ b/aspnet-core/modules/tui-juhe/LINGYUN.Abp.TuiJuhe/LINGYUN.Abp.TuiJuhe.csproj @@ -18,7 +18,7 @@ - + diff --git a/aspnet-core/modules/tui-juhe/LINGYUN.Abp.TuiJuhe/LINGYUN/Abp/TuiJuhe/AbpTuiJuheModule.cs b/aspnet-core/modules/tui-juhe/LINGYUN.Abp.TuiJuhe/LINGYUN/Abp/TuiJuhe/AbpTuiJuheModule.cs index 2097e55f0..12bebe00e 100644 --- a/aspnet-core/modules/tui-juhe/LINGYUN.Abp.TuiJuhe/LINGYUN/Abp/TuiJuhe/AbpTuiJuheModule.cs +++ b/aspnet-core/modules/tui-juhe/LINGYUN.Abp.TuiJuhe/LINGYUN/Abp/TuiJuhe/AbpTuiJuheModule.cs @@ -2,7 +2,7 @@ using LINGYUN.Abp.TuiJuhe.Localization; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Caching; -using Volo.Abp.Json.Newtonsoft; +using Volo.Abp.Json.SystemTextJson; using Volo.Abp.Localization; using Volo.Abp.Modularity; using Volo.Abp.Settings; @@ -11,7 +11,7 @@ using Volo.Abp.VirtualFileSystem; namespace LINGYUN.Abp.TuiJuhe; [DependsOn( - typeof(AbpJsonNewtonsoftModule), + typeof(AbpJsonSystemTextJsonModule), typeof(AbpSettingsModule), typeof(AbpCachingModule), typeof(AbpFeaturesLimitValidationModule))] diff --git a/aspnet-core/modules/tui-juhe/LINGYUN.Abp.TuiJuhe/LINGYUN/Abp/TuiJuhe/TuiJuheResult.cs b/aspnet-core/modules/tui-juhe/LINGYUN.Abp.TuiJuhe/LINGYUN/Abp/TuiJuhe/TuiJuheResult.cs index 7bdd8cacb..41bec129f 100644 --- a/aspnet-core/modules/tui-juhe/LINGYUN.Abp.TuiJuhe/LINGYUN/Abp/TuiJuhe/TuiJuheResult.cs +++ b/aspnet-core/modules/tui-juhe/LINGYUN.Abp.TuiJuhe/LINGYUN/Abp/TuiJuhe/TuiJuheResult.cs @@ -1,5 +1,5 @@ -using Newtonsoft.Json; -using System; +using System; +using System.Text.Json.Serialization; namespace LINGYUN.Abp.TuiJuhe; @@ -9,22 +9,22 @@ public class TuiJuheResult /// /// 状态码 /// - [JsonProperty("code")] + [JsonPropertyName("code")] public int Code { get; set; } /// /// 错误消息 /// - [JsonProperty("reason")] + [JsonPropertyName("reason")] public string Reason { get; set; } /// /// 响应数据 /// - [JsonProperty("result")] + [JsonPropertyName("result")] public TResult Result { get; set; } /// /// 响应参数 /// - [JsonProperty("params")] + [JsonPropertyName("params")] public TParam Params { get; set; } [JsonIgnore] diff --git a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/Program.cs index 08d7ce10a..2fe0bca06 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/Program.cs @@ -18,6 +18,7 @@ public class Program { try { + Console.Title = "IdentityServer.HttpApi.Host"; Log.Information("Starting IdentityServer.HttpApi.Host."); var builder = WebApplication.CreateBuilder(args); diff --git a/aspnet-core/services/LY.MicroService.AuthServer/Program.cs b/aspnet-core/services/LY.MicroService.AuthServer/Program.cs index 4fb8e18ed..e3de2e687 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/Program.cs +++ b/aspnet-core/services/LY.MicroService.AuthServer/Program.cs @@ -18,8 +18,9 @@ public class Program { try { + Console.Title = "IdentityServer"; Log.Information("Starting IdentityServer."); - + var builder = WebApplication.CreateBuilder(args); builder.Host.AddAppSettingsSecretsJson() .UseAutofac() diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Program.cs index a00fed23c..43d5fd564 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Program.cs @@ -18,6 +18,7 @@ public class Program { try { + Console.Title = "BackendAdmin.Host"; Log.Information("Starting BackendAdmin.Host."); var builder = WebApplication.CreateBuilder(args); diff --git a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/Program.cs index ac8e4e347..7353577ec 100644 --- a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/Program.cs @@ -18,6 +18,7 @@ public class Program { try { + Console.Title = "LocalizationManagement.HttpApi.Host"; Log.Information("Starting LocalizationManagement.HttpApi.Host."); var builder = WebApplication.CreateBuilder(args); diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Program.cs index 023d63470..9db30c68d 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Program.cs @@ -18,6 +18,7 @@ public class Program { try { + Console.Title = "PlatformManagement.HttpApi.Host"; Log.Information("Starting PlatformManagement.HttpApi.Host."); var builder = WebApplication.CreateBuilder(args); diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/Program.cs index 819f9fba7..18b35fdf4 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/Program.cs @@ -18,8 +18,8 @@ public class Program { try { + Console.Title = "RealtimeMessage.HttpApi.Host"; Log.Information("Starting RealtimeMessage.HttpApi.Host."); - var builder = WebApplication.CreateBuilder(args); builder.Host.AddAppSettingsSecretsJson() .UseAutofac() diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/Program.cs index c128e7393..f4035c672 100644 --- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/Program.cs @@ -18,6 +18,7 @@ public class Program { try { + Console.Title = "TaskManagement.HttpApi.Host"; Log.Information("Starting TaskManagement.HttpApi.Host."); var builder = WebApplication.CreateBuilder(args); diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Program.cs index 0b48c72e9..b895ee5d0 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Program.cs @@ -18,6 +18,7 @@ public class Program { try { + Console.Title = "Web.Host"; Log.Information("Starting web host."); var builder = WebApplication.CreateBuilder(args); diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Program.cs index 41aef61b2..566634709 100644 --- a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Program.cs @@ -18,6 +18,7 @@ public class Program { try { + Console.Title = "WorkflowManagement.HttpApi.Host"; Log.Information("Starting WorkflowManagement.HttpApi.Host."); var builder = WebApplication.CreateBuilder(args); diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs index 572f802aa..d0625474d 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs @@ -18,6 +18,7 @@ public class Program { try { + Console.Title = "IdentityServer.HttpApi.Host"; Log.Information("Starting IdentityServer.HttpApi.Host."); var builder = WebApplication.CreateBuilder(args); diff --git a/aspnet-core/services/LY.MicroService.identityServer/Program.cs b/aspnet-core/services/LY.MicroService.identityServer/Program.cs index b7f1f9f0d..445b3475a 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/Program.cs +++ b/aspnet-core/services/LY.MicroService.identityServer/Program.cs @@ -18,6 +18,7 @@ public class Program { try { + Console.Title = "IdentityServer"; Log.Information("Starting IdentityServer."); var builder = WebApplication.CreateBuilder(args); diff --git a/aspnet-core/start-http-api-host.bat b/aspnet-core/start-http-api-host.bat index 7c64a265d..a35e017b8 100644 --- a/aspnet-core/start-http-api-host.bat +++ b/aspnet-core/start-http-api-host.bat @@ -8,6 +8,7 @@ title %2-host cd .\services\%1 if '%3' equ '--publish' goto publish +if '%3' equ '--watchrun' goto watchrun if '%3' equ '--run' goto run if '%3' equ '--restore' goto restore if '%3' equ '--ef-u' goto efu @@ -23,6 +24,10 @@ exit dotnet run exit +:watchrun +dotnet watch run +exit + :restore dotnet restore exit diff --git a/aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/Program.cs b/aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/Program.cs index 0fbaf6dfa..459b72261 100644 --- a/aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/Program.cs +++ b/aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/Program.cs @@ -19,6 +19,7 @@ public class Program { try { + Console.Title = "Web.Host"; Log.Information("Starting web host."); var builder = WebApplication.CreateBuilder(args); diff --git a/build/modules.dependencies.json b/build/modules.dependencies.json index 3a50cfa50..60a762b19 100644 --- a/build/modules.dependencies.json +++ b/build/modules.dependencies.json @@ -1,6 +1,6 @@ [ { - "tag": "net6.0", + "tag": "net7.0", "dependencies": [ { "service": "Backend-Admin", @@ -26,7 +26,10 @@ "LINGYUN.Platform.Domain.Shared.dll", "LINGYUN.Abp.Tencent.dll", "LINGYUN.Abp.Tencent.QQ.dll", - "LINGYUN.Abp.Tencent.SettingManagement.dll" + "LINGYUN.Abp.Tencent.SettingManagement.dll", + "LINGYUN.Abp.WxPusher.SettingManagement.dll", + "LINGYUN.Abp.PushPlus.SettingManagement.dll", + "LINGYUN.Abp.TuiJuhe.SettingManagement.dll" ] }, { @@ -43,8 +46,7 @@ "Volo.Abp.Users.Domain.Shared.dll", "Volo.Abp.Users.Abstractions.dll", "LINGYUN.Abp.IdentityServer.Application.Contracts.dll", - "Volo.Abp.IdentityServer.Domain.Shared.dll", - "Volo.Abp.Json.Newtonsoft.dll" + "Volo.Abp.IdentityServer.Domain.Shared.dll" ] } ] @@ -60,8 +62,6 @@ "LINGYUN.Abp.Account.Templates.dll", "LINGYUN.Abp.Features.LimitValidation.dll", "LINGYUN.Abp.Features.LimitValidation.Redis.dll", - "LINGYUN.Abp.WorkflowManagement.Application.Contracts.dll", - "LINGYUN.Abp.WorkflowManagement.Domain.Shared.dll", "LINGYUN.Abp.BackgroundTasks.Abstractions.dll", "LINGYUN.Linq.Dynamic.Queryable.dll", "LINGYUN.Abp.Dynamic.Queryable.Application.Contracts.dll", @@ -69,7 +69,10 @@ "LINGYUN.Abp.TaskManagement.Domain.Shared.dll", "LINGYUN.Abp.Notifications.Core.dll", "LINGYUN.Abp.Notifications.Common.dll", - "LINGYUN.Abp.Notifications.dll" + "LINGYUN.Abp.Notifications.dll", + "LINGYUN.Abp.PushPlus.dll", + "LINGYUN.Abp.WxPusher.dll", + "LINGYUN.Abp.TuiJuhe.dll" ] } ] diff --git a/starter/10.start-ids.bat b/starter/10.start-ids.bat index 274356071..df8193c0d 100644 --- a/starter/10.start-ids.bat +++ b/starter/10.start-ids.bat @@ -1,4 +1,4 @@ @echo off cls cd ..\aspnet-core\ -.\start-http-api-host.bat LY.MicroService.IdentityServer identityserver --run \ No newline at end of file +.\start-http-api-host.bat LY.MicroService.IdentityServer identityserver --watchrun \ No newline at end of file diff --git a/starter/11.start-ids-admin.bat b/starter/11.start-ids-admin.bat index 6357b397a..333b8c6e7 100644 --- a/starter/11.start-ids-admin.bat +++ b/starter/11.start-ids-admin.bat @@ -1,4 +1,4 @@ @echo off cls cd ..\aspnet-core\ -.\start-http-api-host.bat LY.MicroService.IdentityServer.HttpApi.Host identityserver4-admin --run \ No newline at end of file +.\start-http-api-host.bat LY.MicroService.IdentityServer.HttpApi.Host identityserver4-admin --watchrun \ No newline at end of file diff --git a/starter/12.start-localization.bat b/starter/12.start-localization.bat index 3b564d396..df40be992 100644 --- a/starter/12.start-localization.bat +++ b/starter/12.start-localization.bat @@ -1,4 +1,4 @@ @echo off cls cd ..\aspnet-core\ -.\start-http-api-host.bat LY.MicroService.LocalizationManagement.HttpApi.Host localization --run \ No newline at end of file +.\start-http-api-host.bat LY.MicroService.LocalizationManagement.HttpApi.Host localization --watchrun \ No newline at end of file diff --git a/starter/13.start-platform.bat b/starter/13.start-platform.bat index 066ec1191..d65c1d21d 100644 --- a/starter/13.start-platform.bat +++ b/starter/13.start-platform.bat @@ -1,4 +1,4 @@ @echo off cls cd ..\aspnet-core\ -.\start-http-api-host.bat LY.MicroService.PlatformManagement.HttpApi.Host platform --run \ No newline at end of file +.\start-http-api-host.bat LY.MicroService.PlatformManagement.HttpApi.Host platform --watchrun \ No newline at end of file diff --git a/starter/14.start-messages.bat b/starter/14.start-messages.bat index efda80408..ab6c96c5c 100644 --- a/starter/14.start-messages.bat +++ b/starter/14.start-messages.bat @@ -1,4 +1,4 @@ @echo off cls cd ..\aspnet-core\ -.\start-http-api-host.bat LY.MicroService.RealtimeMessage.HttpApi.Host messages --run \ No newline at end of file +.\start-http-api-host.bat LY.MicroService.RealtimeMessage.HttpApi.Host messages --watchrun \ No newline at end of file diff --git a/starter/15.start-task-management.bat b/starter/15.start-task-management.bat index ba18a7b32..402d0d8ed 100644 --- a/starter/15.start-task-management.bat +++ b/starter/15.start-task-management.bat @@ -1,4 +1,4 @@ @echo off cls cd ..\aspnet-core\ -.\start-http-api-host.bat LY.MicroService.TaskManagement.HttpApi.Host task-management --run \ No newline at end of file +.\start-http-api-host.bat LY.MicroService.TaskManagement.HttpApi.Host task-management --watchrun \ No newline at end of file diff --git a/starter/16.start-webhooks-management.bat b/starter/16.start-webhooks-management.bat index 0ed1619d5..4c9e405f2 100644 --- a/starter/16.start-webhooks-management.bat +++ b/starter/16.start-webhooks-management.bat @@ -1,4 +1,4 @@ @echo off cls cd ..\aspnet-core\ -.\start-http-api-host.bat LY.MicroService.WebhooksManagement.HttpApi.Host webhooks-management--run \ No newline at end of file +.\start-http-api-host.bat LY.MicroService.WebhooksManagement.HttpApi.Host webhooks-management--watchrun \ No newline at end of file diff --git a/starter/17.start-workflow-management.bat b/starter/17.start-workflow-management.bat index d9c663a43..9f97f1b66 100644 --- a/starter/17.start-workflow-management.bat +++ b/starter/17.start-workflow-management.bat @@ -1,4 +1,4 @@ @echo off cls cd ..\aspnet-core\ -.\start-http-api-host.bat LY.MicroService.WorkflowManagement.HttpApi.Host workflow-management --run \ No newline at end of file +.\start-http-api-host.bat LY.MicroService.WorkflowManagement.HttpApi.Host workflow-management --watchrun \ No newline at end of file diff --git a/starter/18.start-admin.bat b/starter/18.start-admin.bat index 51631cfdd..3304a4411 100644 --- a/starter/18.start-admin.bat +++ b/starter/18.start-admin.bat @@ -1,4 +1,4 @@ @echo off cls cd ..\aspnet-core\ -.\start-http-api-host.bat LY.MicroService.BackendAdmin.HttpApi.Host admin --run \ No newline at end of file +.\start-http-api-host.bat LY.MicroService.BackendAdmin.HttpApi.Host admin --watchrun \ No newline at end of file diff --git a/starter/70.start-internal-gateway.bat b/starter/70.start-internal-gateway.bat index 8499c238c..dfb60d73c 100644 --- a/starter/70.start-internal-gateway.bat +++ b/starter/70.start-internal-gateway.bat @@ -1,4 +1,4 @@ @echo off cls cd ..\aspnet-core\ -.\start-internal-gateway.bat --run \ No newline at end of file +.\start-internal-gateway.bat \ No newline at end of file