Merge branch 'master' of https://github.com/leehom0123/bit-next-admin

aspnet-core/modules/tui-juhe/LINGYUN.Abp.TuiJuhe/LINGYUN.Abp.TuiJuhe.csproj

@@ -18,7 +18,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Volo.Abp.Caching" Version="$(VoloAbpPackageVersion)" />
-		<PackageReference Include="Volo.Abp.Json.Newtonsoft" Version="$(VoloAbpPackageVersion)" />
+		<PackageReference Include="Volo.Abp.Json.SystemTextJson" Version="$(VoloAbpPackageVersion)" />
 		<PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftPackageVersion)" />
 	</ItemGroup>
 

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))]

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<TParam, TResult>
     /// <summary>
     /// 状态码
     /// </summary>
-    [JsonProperty("code")]
+    [JsonPropertyName("code")]
     public int Code { get; set; }
     /// <summary>
     /// 错误消息
     /// </summary>
-    [JsonProperty("reason")]
+    [JsonPropertyName("reason")]
     public string Reason { get; set; }
     /// <summary>
     /// 响应数据
     /// </summary>
-    [JsonProperty("result")]
+    [JsonPropertyName("result")]
     public TResult Result { get; set; }
     /// <summary>
     /// 响应参数
     /// </summary>
-    [JsonProperty("params")]
+    [JsonPropertyName("params")]
     public TParam Params { get; set; }
 
     [JsonIgnore]

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);

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()

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);

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);

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);

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()

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);

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);

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);

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);

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);

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

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);

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"
         ]
       }
     ]

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
+.\start-http-api-host.bat LY.MicroService.IdentityServer identityserver --watchrun

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
+.\start-http-api-host.bat LY.MicroService.IdentityServer.HttpApi.Host identityserver4-admin --watchrun

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
+.\start-http-api-host.bat LY.MicroService.LocalizationManagement.HttpApi.Host localization --watchrun

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
+.\start-http-api-host.bat LY.MicroService.PlatformManagement.HttpApi.Host platform --watchrun

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
+.\start-http-api-host.bat LY.MicroService.RealtimeMessage.HttpApi.Host messages --watchrun

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
+.\start-http-api-host.bat LY.MicroService.TaskManagement.HttpApi.Host task-management --watchrun

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
+.\start-http-api-host.bat LY.MicroService.WebhooksManagement.HttpApi.Host webhooks-management--watchrun

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
+.\start-http-api-host.bat LY.MicroService.WorkflowManagement.HttpApi.Host workflow-management --watchrun

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
+.\start-http-api-host.bat LY.MicroService.BackendAdmin.HttpApi.Host admin --watchrun

starter/70.start-internal-gateway.bat

@@ -1,4 +1,4 @@
 @echo off
 cls
 cd ..\aspnet-core\
-.\start-internal-gateway.bat --run
+.\start-internal-gateway.bat