From e695c6452aa93b1ffa9926292c24726015531e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AE=8F?= Date: Sat, 12 Aug 2023 01:49:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=81=E7=A7=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E7=9A=84bat=E6=96=87=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E5=B7=B2=E6=B5=8B=E8=AF=95=20=E4=BF=AE=E6=94=B9=E5=90=AF?= =?UTF-8?q?=E7=94=A8=E6=89=80=E6=9C=89=E6=9C=8D=E5=8A=A1=E7=9A=84bat?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E4=B8=AD=E9=97=B4=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=97=B4=E9=9A=94=EF=BC=8C=E6=8F=90=E5=8D=87?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=80=9F=E5=BA=A6=20=E4=BF=AE=E6=94=B9bat?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A2=9E=E5=8A=A0=E6=A0=87=E9=A2=98=E5=8F=8A?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=97=B6=E7=9A=84=E9=A1=B9=E7=9B=AE=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E6=96=B9=E4=BE=BF=E6=9F=A5=E7=9C=8B=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=BA=E5=B0=91=E7=9A=84=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=8C=96=E6=96=87=E5=AD=97=20=E4=BF=AE=E6=94=B9single=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=9A=84=E8=BF=9E=E6=8E=A5=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aspnet-core/migrate-database.bat | 19 +++++++++++++ aspnet-core/migrate-db-cmd.bat | 28 +++++++++++++++++++ .../Localization/Resources/zh-Hans.json | 1 + aspnet-core/start-all-service.bat | 15 +++++++++- aspnet-core/start-http-api-host.bat | 3 ++ .../appsettings.Development.json | 18 ++++++------ 6 files changed, 74 insertions(+), 10 deletions(-) create mode 100644 aspnet-core/migrate-database.bat create mode 100644 aspnet-core/migrate-db-cmd.bat diff --git a/aspnet-core/migrate-database.bat b/aspnet-core/migrate-database.bat new file mode 100644 index 000000000..4ce04c22f --- /dev/null +++ b/aspnet-core/migrate-database.bat @@ -0,0 +1,19 @@ +@echo off +cls +set stime=8 + +start .\migrate-db-cmd.bat LY.MicroService.BackendAdmin.DbMigrator admin --run +ping -n %stime% 127.1 >nul +start .\migrate-db-cmd.bat LY.MicroService.AuthServer.DbMigrator auth-server --run +ping -n %stime% 127.1 >nul +start .\migrate-db-cmd.bat LY.MicroService.IdentityServer.DbMigrator identityserver4-admin --run +ping -n %stime% 127.1 >nul +start .\migrate-db-cmd.bat LY.MicroService.LocalizationManagement.DbMigrator localization --run +ping -n %stime% 127.1 >nul +start .\migrate-db-cmd.bat LY.MicroService.Platform.DbMigrator platform --run +ping -n %stime% 127.1 >nul +start .\migrate-db-cmd.bat LY.MicroService.RealtimeMessage.DbMigrator messages --run +ping -n %stime% 127.1 >nul +start .\migrate-db-cmd.bat LY.MicroService.TaskManagement.DbMigrator task-management --run +ping -n %stime% 127.1 >nul +start .\migrate-db-cmd.bat LY.MicroService.WebhooksManagement.DbMigrator webhooks-management --run diff --git a/aspnet-core/migrate-db-cmd.bat b/aspnet-core/migrate-db-cmd.bat new file mode 100644 index 000000000..87b9014f6 --- /dev/null +++ b/aspnet-core/migrate-db-cmd.bat @@ -0,0 +1,28 @@ +@echo off +cls +chcp 65001 + +title %2 + +@echo %2 migration running + +cd .\migrations\%1 + +if '%3' equ '--run' goto run +if '%3' equ '--restore' goto restore +if '%3' equ '--ef-u' goto efu +if '%3' equ '' goto run +exit + +:run +dotnet run +pause +exit + +:restore +dotnet restore +exit + +:efu +dotnet ef databse update +exit \ No newline at end of file diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN/Platform/Localization/Resources/zh-Hans.json b/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN/Platform/Localization/Resources/zh-Hans.json index 6dddd8baf..283841978 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN/Platform/Localization/Resources/zh-Hans.json +++ b/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN/Platform/Localization/Resources/zh-Hans.json @@ -21,6 +21,7 @@ "DisplayName:Code": "编号", "DisplayName:IsPublic": "是否公用的", "DisplayName:DisplayName": "显示名称", + "DisplayName:UIFramework": "UI框架", "DisplayName:Description": "说明", "DisplayName:AllowBeNull": "允许空值", "DisplayName:DefaultValue": "默认值", diff --git a/aspnet-core/start-all-service.bat b/aspnet-core/start-all-service.bat index 3fb1a6c24..77bace5bd 100644 --- a/aspnet-core/start-all-service.bat +++ b/aspnet-core/start-all-service.bat @@ -1,12 +1,25 @@ @echo off cls +set stime=8 start .\start-http-api-host.bat LY.MicroService.IdentityServer identityserver --run +ping -n %stime% 127.1 >nul start .\start-http-api-host.bat LY.MicroService.IdentityServer.HttpApi.Host identityserver4-admin --run +ping -n %stime% 127.1 >nul start .\start-http-api-host.bat LY.MicroService.LocalizationManagement.HttpApi.Host localization --run +ping -n %stime% 127.1 >nul start .\start-http-api-host.bat LY.MicroService.PlatformManagement.HttpApi.Host platform --run +ping -n %stime% 127.1 >nul start .\start-http-api-host.bat LY.MicroService.RealtimeMessage.HttpApi.Host messages --run +ping -n %stime% 127.1 >nul start .\start-http-api-host.bat LY.MicroService.TaskManagement.HttpApi.Host task-management --run +ping -n %stime% 127.1 >nul +start .\start-http-api-host.bat LY.MicroService.WebhooksManagement.HttpApi.Host webhooks-management--run +ping -n %stime% 127.1 >nul +start .\start-http-api-host.bat LY.MicroService.RealtimeMessage.HttpApi.Host realtime-message --run +ping -n %stime% 127.1 >nul +start .\start-http-api-host.bat LY.MicroService.WorkflowManagement.HttpApi.Host workflow-management --run +ping -n %stime% 127.1 >nul start .\start-http-api-host.bat LY.MicroService.BackendAdmin.HttpApi.Host admin --run -ping -n 10 127.1 >nul +ping -n %stime% 127.1 >nul start .\start-internal-gateway.bat --run \ No newline at end of file diff --git a/aspnet-core/start-http-api-host.bat b/aspnet-core/start-http-api-host.bat index cf24de8fd..7c64a265d 100644 --- a/aspnet-core/start-http-api-host.bat +++ b/aspnet-core/start-http-api-host.bat @@ -2,6 +2,9 @@ cls chcp 65001 +title %2-host +@echo %2-host + cd .\services\%1 if '%3' equ '--publish' goto publish diff --git a/gateways/web/LY.MicroService.ApiGateway/appsettings.Development.json b/gateways/web/LY.MicroService.ApiGateway/appsettings.Development.json index edfd81263..114264ea7 100644 --- a/gateways/web/LY.MicroService.ApiGateway/appsettings.Development.json +++ b/gateways/web/LY.MicroService.ApiGateway/appsettings.Development.json @@ -11,15 +11,15 @@ "CorsOrigins": "http://127.0.0.1:3100" }, "ConnectionStrings": { - "Default": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456", - "AbpIdentity": "Server=127.0.0.1;Database=IdentityServer;User Id=root;Password=123456", - "AbpIdentityServer": "Server=127.0.0.1;Database=IdentityServer;User Id=root;Password=123456", - "AbpSaas": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456", - "AbpSettingManagement": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456", - "AbpFeatureManagement": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456", - "AbpPermissionManagement": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456", - "AbpLocalizationManagement": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456", - "AbpTextTemplating": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456" + "Default": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", + "AbpIdentity": "Server=127.0.0.1;Database=IdentityServer-v70;User Id=root;Password=123456", + "AbpIdentityServer": "Server=127.0.0.1;Database=IdentityServer-v70;User Id=root;Password=123456", + "AbpSaas": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", + "AbpSettingManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", + "AbpFeatureManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", + "AbpPermissionManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", + "AbpLocalizationManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", + "AbpTextTemplating": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456" }, "AuthServer": { "Authority": "http://127.0.0.1:44385/",