From 75f873a947b173de2478157d867d8b4e8b8ed116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AE=8F?= Date: Tue, 8 Aug 2023 14:49:30 +0800 Subject: [PATCH 1/3] Database connection string uniform; Add simple document; Startup sloution add projects. --- aspnet-core/LINGYUN.MicroService.Startup.sln | 30 ++++ .../appsettings.Development.json | 20 +-- .../appsettings.Development.json | 2 +- .../appsettings.Development.json | 18 +-- .../appsettings.Development.json | 135 +++++++++++++----- docs/startup-readme.md | 5 + 6 files changed, 154 insertions(+), 56 deletions(-) create mode 100644 docs/startup-readme.md diff --git a/aspnet-core/LINGYUN.MicroService.Startup.sln b/aspnet-core/LINGYUN.MicroService.Startup.sln index 7d255ef92..19325f40f 100644 --- a/aspnet-core/LINGYUN.MicroService.Startup.sln +++ b/aspnet-core/LINGYUN.MicroService.Startup.sln @@ -35,6 +35,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LY.MicroService.TaskManagem EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LY.MicroService.WorkflowManagement.HttpApi.Host", "services\LY.MicroService.WorkflowManagement.HttpApi.Host\LY.MicroService.WorkflowManagement.HttpApi.Host.csproj", "{48F376EC-B951-4123-AF33-54217AD00B96}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "webhook", "webhook", "{E38F0CBE-BCFF-4F75-AA19-1959B7B75EF6}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LY.MicroService.WebhooksManagement.HttpApi.Host", "services\LY.MicroService.WebhooksManagement.HttpApi.Host\LY.MicroService.WebhooksManagement.HttpApi.Host.csproj", "{CDA6B0F4-389E-48C5-99CF-E2F1DB1163C2}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gateway", "gateway", "{78413EF4-17A8-49DD-9E4C-D15BF547AEEB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.MicroService.Internal.ApiGateway", "..\gateways\internal\LINGYUN.MicroService.Internal.ApiGateway\src\LINGYUN.MicroService.Internal.ApiGateway\LINGYUN.MicroService.Internal.ApiGateway.csproj", "{068D6BBE-BB98-40FF-84E1-D34166263623}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LY.MicroService.ApiGateway", "..\gateways\web\LY.MicroService.ApiGateway\LY.MicroService.ApiGateway.csproj", "{46BC00EE-3265-4B85-819E-0C28F16134C3}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "document", "document", "{D70EABBE-BDB5-4FDE-92DC-2EADE17E98D1}" + ProjectSection(SolutionItems) = preProject + ..\docs\startup-readme.md = ..\docs\startup-readme.md + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -73,6 +88,18 @@ Global {48F376EC-B951-4123-AF33-54217AD00B96}.Debug|Any CPU.Build.0 = Debug|Any CPU {48F376EC-B951-4123-AF33-54217AD00B96}.Release|Any CPU.ActiveCfg = Release|Any CPU {48F376EC-B951-4123-AF33-54217AD00B96}.Release|Any CPU.Build.0 = Release|Any CPU + {CDA6B0F4-389E-48C5-99CF-E2F1DB1163C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CDA6B0F4-389E-48C5-99CF-E2F1DB1163C2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CDA6B0F4-389E-48C5-99CF-E2F1DB1163C2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CDA6B0F4-389E-48C5-99CF-E2F1DB1163C2}.Release|Any CPU.Build.0 = Release|Any CPU + {068D6BBE-BB98-40FF-84E1-D34166263623}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {068D6BBE-BB98-40FF-84E1-D34166263623}.Debug|Any CPU.Build.0 = Debug|Any CPU + {068D6BBE-BB98-40FF-84E1-D34166263623}.Release|Any CPU.ActiveCfg = Release|Any CPU + {068D6BBE-BB98-40FF-84E1-D34166263623}.Release|Any CPU.Build.0 = Release|Any CPU + {46BC00EE-3265-4B85-819E-0C28F16134C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {46BC00EE-3265-4B85-819E-0C28F16134C3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {46BC00EE-3265-4B85-819E-0C28F16134C3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {46BC00EE-3265-4B85-819E-0C28F16134C3}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -86,6 +113,9 @@ Global {03A07A13-D9F3-4E70-B4D2-57BA2CF1E8DB} = {099F0FD1-645D-4029-8149-46523AD34933} {EDE83705-EFEA-46DC-A8EE-68A5D8159B84} = {3F453010-BA07-471D-87E5-B12346ED81EF} {48F376EC-B951-4123-AF33-54217AD00B96} = {E47CDAF7-1046-4886-A0CB-ADF9650F8318} + {CDA6B0F4-389E-48C5-99CF-E2F1DB1163C2} = {E38F0CBE-BCFF-4F75-AA19-1959B7B75EF6} + {068D6BBE-BB98-40FF-84E1-D34166263623} = {78413EF4-17A8-49DD-9E4C-D15BF547AEEB} + {46BC00EE-3265-4B85-819E-0C28F16134C3} = {78413EF4-17A8-49DD-9E4C-D15BF547AEEB} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A3905D9F-6EF7-4BFD-80B3-E0DD6AA82228} diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json index 591391386..cab22c86b 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json @@ -29,15 +29,15 @@ } }, "ConnectionStrings": { - "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" + "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" }, "CAP": { "EventBus": { @@ -49,7 +49,7 @@ }, "MySql": { "TableNamePrefix": "admin", - "ConnectionString": "Server=127.0.0.1;Database=Platform-V70;User Id=root;Password=123456" + "ConnectionString": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456" }, "RabbitMQ": { "HostName": "127.0.0.1", diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json index 55330f095..aa44f80fd 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json @@ -100,7 +100,7 @@ }, "MySql": { "TableNamePrefix": "msg", - "ConnectionString": "Server=127.0.0.1;Database=Messages;User Id=root;Password=123456" + "ConnectionString": "Server=127.0.0.1;Database=Messages-v70;User Id=root;Password=123456" }, "RabbitMQ": { "HostName": "127.0.0.1", diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json index 498a70d4a..7d35e0310 100644 --- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json @@ -29,7 +29,7 @@ }, "MySql": { "TableNamePrefix": "tsk", - "ConnectionString": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456" + "ConnectionString": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456" }, "RabbitMQ": { "HostName": "127.0.0.1", @@ -46,7 +46,7 @@ "quartz.jobStore.dataSource": "tkm", "quartz.jobStore.type": "Quartz.Impl.AdoJobStore.JobStoreTX,Quartz", "quartz.jobStore.driverDelegateType": "Quartz.Impl.AdoJobStore.MySQLDelegate,Quartz", - "quartz.dataSource.tkm.connectionString": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456", + "quartz.dataSource.tkm.connectionString": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", "quartz.dataSource.tkm.connectionStringName": "TaskManagement", "quartz.dataSource.tkm.provider": "MySqlConnector", "quartz.jobStore.clustered": "true", @@ -54,13 +54,13 @@ } }, "ConnectionStrings": { - "Default": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456", - "TaskManagement": "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", - "AbpSettingManagement": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456", - "AbpSaas": "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", + "TaskManagement": "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", + "AbpSettingManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", + "AbpSaas": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456" }, "RemoteServices": { "AbpOssManagement": { diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json index 4dce35345..e53fa0758 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json @@ -2,11 +2,14 @@ "AgileConfig": { "IsEnabled": false, "env": "DEV", - "appId": "LINGYUN.Abp.WebhooksManagement", + "appId": "LINGYUN.Abp.Workflow", "secret": "1q2w3E*", "nodes": "http://127.0.0.1:15000", - "name": "LINGYUN.Abp.WebhooksManagement", - "tag": "LINGYUN.Abp.WebhooksManagement" + "name": "LINGYUN.Abp.Workflow", + "tag": "LINGYUN.Abp.Workflow" + }, + "App": { + "CorsOrigins": "http://127.0.0.1:3100" }, "Auditing": { "AllEntitiesSelector": true @@ -20,27 +23,91 @@ } }, "ConnectionStrings": { - "Default": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", - "WebhooksManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", - "TaskManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", - "AbpSaas": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", + "Default": "Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456", + "Workflow": "Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456", + "WorkflowManagement": "Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456", + "AbpWorkflowCore": "Server=127.0.0.1;Database=Workflow;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", - "AbpSettingManagement": "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", + "AbpSettingManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", + "AbpSaas": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456" }, - "DistributedLock": { - "IsEnabled": true, - "Redis": { - "Configuration": "127.0.0.1,defaultDatabase=15" + "Quartz": { + "UsePersistentStore": false, + "Properties": { + "quartz.jobStore.dataSource": "tkm", + "quartz.jobStore.type": "Quartz.Impl.AdoJobStore.JobStoreTX,Quartz", + "quartz.jobStore.driverDelegateType": "Quartz.Impl.AdoJobStore.MySQLDelegate,Quartz", + "quartz.dataSource.tkm.connectionString": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", + "quartz.dataSource.tkm.connectionStringName": "TaskManagement", + "quartz.dataSource.tkm.provider": "MySqlConnector", + "quartz.jobStore.clustered": "true", + "quartz.serializer.type": "json", + "quartz.scheduler.instanceName": "workflow", + "quartz.scheduler.instanceId": "212c489d-cb5d-4e0a-bde9-80d4a29d379b" } }, - "OpenTelemetry": { - "IsEnabled": true, - "ZipKin": { - "Endpoint": "http://127.0.0.1:9411/api/v2/spans" + "Elsa": { + "Features": { + "DefaultPersistence": { + "Enabled": true, + "ConnectionStringIdentifier": "Workflow", + "EntityFrameworkCore": { + "MySql": { + "Enabled": true + } + } + }, + "Console": true, + "Http": true, + "Email": true, + "TemporalQuartz": true, + "JavaScriptActivities": true, + "UserTask": true, + "Conductor": true, + "Telnyx": true, + "BlobStoring": true, + "Emailing": true, + "Notification": true, + "Sms": true, + "IM": true, + "PublishWebhook": true, + "Webhooks": { + "Enabled": true, + "ConnectionStringIdentifier": "Workflow", + "EntityFrameworkCore": { + "MySql": { + "Enabled": true + } + } + }, + "WorkflowSettings": { + "Enabled": true, + "ConnectionStringIdentifier": "Workflow", + "EntityFrameworkCore": { + "MySql": { + "Enabled": true + } + } + } + }, + "Rebus": { + "RabbitMQ": { + "Connection": "amqp://guest:guest@127.0.0.1:5672/" + } + }, + "Server": { + "BaseUrl": "http://127.0.0.1:30035" + } + }, + "RemoteServices": { + "AbpOssManagement": { + "BaseUrl": "http://127.0.0.1:30025", + "IdentityClient": "InternalServiceClient", + "UseCurrentAccessToken": false } }, - "RemoteServices": {}, "IdentityClients": { "InternalServiceClient": { "Authority": "http://127.0.0.1:44385", @@ -51,17 +118,27 @@ "ClientSecret": "1q2w3E*" } }, + "OssManagement": { + "Bucket": "workflow" + }, + "DistributedLock": { + "IsEnabled": true, + "Redis": { + "Configuration": "127.0.0.1,defaultDatabase=15" + } + }, "CAP": { "EventBus": { - "DefaultGroupName": "WebhooksManagement", + "DefaultGroupName": "Workflow", "GroupNamePrefix": "Dev", "Version": "v1", "FailedRetryInterval": 300, - "FailedRetryCount": 10 + "FailedRetryCount": 10, + "CollectorCleaningInterval": 3600000 }, "MySql": { - "TableNamePrefix": "wkm", - "ConnectionString": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456" + "TableNamePrefix": "wf", + "ConnectionString": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456" }, "RabbitMQ": { "HostName": "127.0.0.1", @@ -72,21 +149,6 @@ "VirtualHost": "/" } }, - "Quartz": { - "UsePersistentStore": false, - "Properties": { - "quartz.jobStore.dataSource": "tkm", - "quartz.jobStore.type": "Quartz.Impl.AdoJobStore.JobStoreTX,Quartz", - "quartz.jobStore.driverDelegateType": "Quartz.Impl.AdoJobStore.MySQLDelegate,Quartz", - "quartz.dataSource.tkm.connectionString": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456", - "quartz.dataSource.tkm.connectionStringName": "TaskManagement", - "quartz.dataSource.tkm.provider": "MySqlConnector", - "quartz.jobStore.clustered": "true", - "quartz.serializer.type": "json", - "quartz.scheduler.instanceName": "webhook", - "quartz.scheduler.instanceId": "35bdbf8d-8c51-479b-970d-f09e6093b1ce" - } - }, "Redis": { "Configuration": "127.0.0.1,defaultDatabase=10", "InstanceName": "LINGYUN.Abp.Application" @@ -94,6 +156,7 @@ "AuthServer": { "Authority": "http://127.0.0.1:44385/", "ApiName": "lingyun-abp-application", + "ElsaClientId": "InternalServiceClient", "SwaggerClientId": "InternalServiceClient", "SwaggerClientSecret": "1q2w3E*" }, diff --git a/docs/startup-readme.md b/docs/startup-readme.md new file mode 100644 index 000000000..2caf2937f --- /dev/null +++ b/docs/startup-readme.md @@ -0,0 +1,5 @@ +启动项目说明： +使用各 Migrator 项目生成数据库，可以使用自带命令，也可打开各解决方案自行寻找项目运行； +打开 LINGYUN.MicroService.Startup.sln 解决方案； +启动除了gateway里的各项目； +开发阶段最后启动gateway中的 LINGYUN.MicroService.Internal.ApiGateway 项目。 \ No newline at end of file From d01c08173f80d5ee0afe472f047d536670f047f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AE=8F?= Date: Wed, 9 Aug 2023 16:19:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=9F=E4=B8=80Workflow=E4=B8=8EWebhooks?= =?UTF-8?q?=E9=87=8C=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/vue/package.json | 2 +- .../appsettings.Development.json | 8 ++++---- .../appsettings.Development.json | 20 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/apps/vue/package.json b/apps/vue/package.json index f47e75cf4..2a24d99fd 100644 --- a/apps/vue/package.json +++ b/apps/vue/package.json @@ -29,7 +29,7 @@ "test:gzip": "npx http-server dist --cors --gzip -c-1", "test:br": "npx http-server dist --cors --brotli -c-1", "reinstall": "rimraf pnpm-lock.yaml && rimraf package.lock.json && rimraf node_modules && npm run bootstrap", - "prepare": "husky install", + "prepare": "cd ../../ & husky install", "gen:icon": "esno ./build/generate/icon/index.ts" }, "dependencies": { diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json index e53fa0758..59420eb82 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json @@ -23,7 +23,7 @@ } }, "ConnectionStrings": { - "Default": "Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456", + "Default": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", "Workflow": "Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456", "WorkflowManagement": "Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456", "AbpWorkflowCore": "Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456", @@ -94,7 +94,7 @@ }, "Rebus": { "RabbitMQ": { - "Connection": "amqp://guest:guest@127.0.0.1:5672/" + "Connection": "amqp://admin:admin@127.0.0.1:5672/" } }, "Server": { @@ -143,8 +143,8 @@ "RabbitMQ": { "HostName": "127.0.0.1", "Port": 5672, - "UserName": "guest", - "Password": "guest", + "UserName": "admin", + "Password": "admin", "ExchangeName": "LINGYUN.Abp.Application", "VirtualHost": "/" } diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json index 5bf47d644..9da2e8a6e 100644 --- a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json @@ -27,11 +27,11 @@ "Workflow": "Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456", "WorkflowManagement": "Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456", "AbpWorkflowCore": "Server=127.0.0.1;Database=Workflow;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", - "AbpSettingManagement": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456", - "AbpSaas": "Server=127.0.0.1;Database=Platform;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", + "AbpSettingManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", + "AbpSaas": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456" }, "Quartz": { "UsePersistentStore": false, @@ -39,7 +39,7 @@ "quartz.jobStore.dataSource": "tkm", "quartz.jobStore.type": "Quartz.Impl.AdoJobStore.JobStoreTX,Quartz", "quartz.jobStore.driverDelegateType": "Quartz.Impl.AdoJobStore.MySQLDelegate,Quartz", - "quartz.dataSource.tkm.connectionString": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456", + "quartz.dataSource.tkm.connectionString": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", "quartz.dataSource.tkm.connectionStringName": "TaskManagement", "quartz.dataSource.tkm.provider": "MySqlConnector", "quartz.jobStore.clustered": "true", @@ -94,7 +94,7 @@ }, "Rebus": { "RabbitMQ": { - "Connection": "amqp://guest:guest@127.0.0.1:5672/" + "Connection": "amqp://admin:admin@127.0.0.1:5672/" } }, "Server": { @@ -138,13 +138,13 @@ }, "MySql": { "TableNamePrefix": "wf", - "ConnectionString": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456" + "ConnectionString": "Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456" }, "RabbitMQ": { "HostName": "127.0.0.1", "Port": 5672, - "UserName": "guest", - "Password": "guest", + "UserName": "admin", + "Password": "admin", "ExchangeName": "LINGYUN.Abp.Application", "VirtualHost": "/" } From 1151b4430cbb6662b63a622aa944571abf101918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AE=8F?= Date: Wed, 9 Aug 2023 16:36:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E5=BC=84=E9=94=99=E7=9A=84webhook=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appsettings.Development.json | 131 +++++------------- 1 file changed, 34 insertions(+), 97 deletions(-) diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json index 59420eb82..fcc334b6d 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json @@ -2,14 +2,11 @@ "AgileConfig": { "IsEnabled": false, "env": "DEV", - "appId": "LINGYUN.Abp.Workflow", + "appId": "LINGYUN.Abp.WebhooksManagement", "secret": "1q2w3E*", "nodes": "http://127.0.0.1:15000", - "name": "LINGYUN.Abp.Workflow", - "tag": "LINGYUN.Abp.Workflow" - }, - "App": { - "CorsOrigins": "http://127.0.0.1:3100" + "name": "LINGYUN.Abp.WebhooksManagement", + "tag": "LINGYUN.Abp.WebhooksManagement" }, "Auditing": { "AllEntitiesSelector": true @@ -24,90 +21,26 @@ }, "ConnectionStrings": { "Default": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", - "Workflow": "Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456", - "WorkflowManagement": "Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456", - "AbpWorkflowCore": "Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456", + "WebhooksManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", + "TaskManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", + "AbpSaas": "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", - "AbpSettingManagement": "Server=127.0.0.1;Database=Platform-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" }, - "Quartz": { - "UsePersistentStore": false, - "Properties": { - "quartz.jobStore.dataSource": "tkm", - "quartz.jobStore.type": "Quartz.Impl.AdoJobStore.JobStoreTX,Quartz", - "quartz.jobStore.driverDelegateType": "Quartz.Impl.AdoJobStore.MySQLDelegate,Quartz", - "quartz.dataSource.tkm.connectionString": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", - "quartz.dataSource.tkm.connectionStringName": "TaskManagement", - "quartz.dataSource.tkm.provider": "MySqlConnector", - "quartz.jobStore.clustered": "true", - "quartz.serializer.type": "json", - "quartz.scheduler.instanceName": "workflow", - "quartz.scheduler.instanceId": "212c489d-cb5d-4e0a-bde9-80d4a29d379b" - } - }, - "Elsa": { - "Features": { - "DefaultPersistence": { - "Enabled": true, - "ConnectionStringIdentifier": "Workflow", - "EntityFrameworkCore": { - "MySql": { - "Enabled": true - } - } - }, - "Console": true, - "Http": true, - "Email": true, - "TemporalQuartz": true, - "JavaScriptActivities": true, - "UserTask": true, - "Conductor": true, - "Telnyx": true, - "BlobStoring": true, - "Emailing": true, - "Notification": true, - "Sms": true, - "IM": true, - "PublishWebhook": true, - "Webhooks": { - "Enabled": true, - "ConnectionStringIdentifier": "Workflow", - "EntityFrameworkCore": { - "MySql": { - "Enabled": true - } - } - }, - "WorkflowSettings": { - "Enabled": true, - "ConnectionStringIdentifier": "Workflow", - "EntityFrameworkCore": { - "MySql": { - "Enabled": true - } - } - } - }, - "Rebus": { - "RabbitMQ": { - "Connection": "amqp://admin:admin@127.0.0.1:5672/" - } - }, - "Server": { - "BaseUrl": "http://127.0.0.1:30035" + "DistributedLock": { + "IsEnabled": true, + "Redis": { + "Configuration": "127.0.0.1,defaultDatabase=15" } }, - "RemoteServices": { - "AbpOssManagement": { - "BaseUrl": "http://127.0.0.1:30025", - "IdentityClient": "InternalServiceClient", - "UseCurrentAccessToken": false + "OpenTelemetry": { + "IsEnabled": true, + "ZipKin": { + "Endpoint": "http://127.0.0.1:9411/api/v2/spans" } }, + "RemoteServices": {}, "IdentityClients": { "InternalServiceClient": { "Authority": "http://127.0.0.1:44385", @@ -118,26 +51,16 @@ "ClientSecret": "1q2w3E*" } }, - "OssManagement": { - "Bucket": "workflow" - }, - "DistributedLock": { - "IsEnabled": true, - "Redis": { - "Configuration": "127.0.0.1,defaultDatabase=15" - } - }, "CAP": { "EventBus": { - "DefaultGroupName": "Workflow", + "DefaultGroupName": "WebhooksManagement", "GroupNamePrefix": "Dev", "Version": "v1", "FailedRetryInterval": 300, - "FailedRetryCount": 10, - "CollectorCleaningInterval": 3600000 + "FailedRetryCount": 10 }, "MySql": { - "TableNamePrefix": "wf", + "TableNamePrefix": "wkm", "ConnectionString": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456" }, "RabbitMQ": { @@ -149,6 +72,21 @@ "VirtualHost": "/" } }, + "Quartz": { + "UsePersistentStore": false, + "Properties": { + "quartz.jobStore.dataSource": "tkm", + "quartz.jobStore.type": "Quartz.Impl.AdoJobStore.JobStoreTX,Quartz", + "quartz.jobStore.driverDelegateType": "Quartz.Impl.AdoJobStore.MySQLDelegate,Quartz", + "quartz.dataSource.tkm.connectionString": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456", + "quartz.dataSource.tkm.connectionStringName": "TaskManagement", + "quartz.dataSource.tkm.provider": "MySqlConnector", + "quartz.jobStore.clustered": "true", + "quartz.serializer.type": "json", + "quartz.scheduler.instanceName": "webhook", + "quartz.scheduler.instanceId": "35bdbf8d-8c51-479b-970d-f09e6093b1ce" + } + }, "Redis": { "Configuration": "127.0.0.1,defaultDatabase=10", "InstanceName": "LINGYUN.Abp.Application" @@ -156,7 +94,6 @@ "AuthServer": { "Authority": "http://127.0.0.1:44385/", "ApiName": "lingyun-abp-application", - "ElsaClientId": "InternalServiceClient", "SwaggerClientId": "InternalServiceClient", "SwaggerClientSecret": "1q2w3E*" },