diff --git a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Client/CmskitServiceHttpApiClientModule.cs b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Client/CmskitServiceHttpApiClientModule.cs
index 1a6abe16..2838bae5 100644
--- a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Client/CmskitServiceHttpApiClientModule.cs
+++ b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Client/CmskitServiceHttpApiClientModule.cs
@@ -9,7 +9,8 @@ namespace EShopOnAbp.CmskitService;
[DependsOn(
typeof(CmskitServiceApplicationContractsModule),
typeof(AbpHttpClientModule),
- typeof(CmsKitHttpApiClientModule))]
+ typeof(CmsKitHttpApiClientModule)
+ )]
public class CmskitServiceHttpApiClientModule : AbpModule
{
public override void PreConfigureServices(ServiceConfigurationContext context)
diff --git a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.csproj b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.csproj
index 9932ca2b..bf5936b7 100644
--- a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.csproj
+++ b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.csproj
@@ -22,6 +22,8 @@
+
+
diff --git a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.json b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.json
index db340fed..151dd3ec 100644
--- a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.json
+++ b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.json
@@ -19,7 +19,6 @@
"AllowedHosts": "*",
"ConnectionStrings": {
"CmskitService": "User ID=postgres;Password=myPassw0rd;Host=localhost;Port=5432;Database=EShopOnAbp_Cmskit;Pooling=false",
- "CmsKit": "User ID=postgres;Password=myPassw0rd;Host=localhost;Port=5432;Database=EShopOnAbp_Cmskit;Pooling=false",
"AdministrationService": "User ID=postgres;Password=myPassw0rd;Host=localhost;Port=5432;Database=EShopOnAbp_Administration;Pooling=false;"
},
"StringEncryption": {
@@ -41,5 +40,19 @@
},
"ElasticSearch": {
"Url": "http://localhost:9200"
+ },
+ "RemoteServices": {
+ "AbpIdentity": {
+ "BaseUrl": "https://localhost:44351"
+ }
+ },
+ "IdentityClients": {
+ "Default": {
+ "GrantType": "client_credentials",
+ "ClientId": "EShopOnAbp_CmskitService",
+ "ClientSecret": "1q2w3e*",
+ "Authority": "https://localhost:44330",
+ "Scope": "IdentityService"
+ }
}
}
diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Client/IdentityServiceHttpApiClientModule.cs b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Client/IdentityServiceHttpApiClientModule.cs
index 72b8576c..12387c0f 100644
--- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Client/IdentityServiceHttpApiClientModule.cs
+++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Client/IdentityServiceHttpApiClientModule.cs
@@ -1,5 +1,4 @@
using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Account;
using Volo.Abp.Identity;
using Volo.Abp.Modularity;
@@ -7,7 +6,6 @@ namespace EShopOnAbp.IdentityService
{
[DependsOn(
typeof(IdentityServiceApplicationContractsModule),
- typeof(AbpAccountHttpApiClientModule),
typeof(AbpIdentityHttpApiClientModule)
)]
public class IdentityServiceHttpApiClientModule : AbpModule
diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServerDataSeeder.cs b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServerDataSeeder.cs
index 37160541..9ce1c9a2 100644
--- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServerDataSeeder.cs
+++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServerDataSeeder.cs
@@ -298,6 +298,18 @@ public class IdentityServerDataSeeder : IDataSeedContributor, ITransientDependen
secret: "1q2w3e*".Sha256(),
permissions: new[] { IdentityPermissions.Users.Default }
);
+
+ //Cmskit Service Client
+ await CreateClientAsync(
+ name: "EShopOnAbp_CmskitService",
+ scopes: commonScopes.Union(new[]
+ {
+ "IdentityService"
+ }),
+ grantTypes: new[] { "client_credentials" },
+ secret: "1q2w3e*".Sha256(),
+ permissions: new[] { IdentityPermissions.UserLookup.Default }
+ );
}
private async Task CreateClientAsync(
diff --git a/shared/EShopOnAbp.Shared.Hosting/EShopOnAbpSharedHostingModule.cs b/shared/EShopOnAbp.Shared.Hosting/EShopOnAbpSharedHostingModule.cs
index 89cdaad2..c516d61d 100644
--- a/shared/EShopOnAbp.Shared.Hosting/EShopOnAbpSharedHostingModule.cs
+++ b/shared/EShopOnAbp.Shared.Hosting/EShopOnAbpSharedHostingModule.cs
@@ -32,6 +32,12 @@ namespace EShopOnAbp.Shared.Hosting
database.MappedConnections.Add("AbpIdentity");
database.MappedConnections.Add("AbpIdentityServer");
});
+
+ options.Databases.Configure("CmskitService", database =>
+ {
+ database.MappedConnections.Add("CmsKit");
+ database.MappedConnections.Add("CmskitService");
+ });
});
}
}