Skip to content

Commit 523f0d5

Browse files
antosubashantosubash
committed
build working
1 parent 8014735 commit 523f0d5

File tree

33 files changed

+88
-133
lines changed

33 files changed

+88
-133
lines changed

‎Tasky.sln‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tasky.ProjectService.TestBa
162162
EndProject
163163
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tasky.Shared.Microservice.Hosting", "shared\Tasky.Shared.Microservice.Hosting\Tasky.Shared.Microservice.Hosting.csproj", "{F5E002D0-009C-4C3E-97F4-6448649390CE}"
164164
EndProject
165-
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{E8E3594C-AB25-4419-9231-76690E50B329}"
165+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tasky.AuthServer", "apps\Tasky.AuthServer\Tasky.AuthServer.csproj", "{A0A6ADA8-2D94-49D9-8A07-0DD9096ED505}"
166166
EndProject
167167
Global
168168
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -398,10 +398,10 @@ Global
398398
{F5E002D0-009C-4C3E-97F4-6448649390CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
399399
{F5E002D0-009C-4C3E-97F4-6448649390CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
400400
{F5E002D0-009C-4C3E-97F4-6448649390CE}.Release|Any CPU.Build.0 = Release|Any CPU
401-
{E8E3594C-AB25-4419-9231-76690E50B329}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
402-
{E8E3594C-AB25-4419-9231-76690E50B329}.Debug|Any CPU.Build.0 = Debug|Any CPU
403-
{E8E3594C-AB25-4419-9231-76690E50B329}.Release|Any CPU.ActiveCfg = Release|Any CPU
404-
{E8E3594C-AB25-4419-9231-76690E50B329}.Release|Any CPU.Build.0 = Release|Any CPU
401+
{A0A6ADA8-2D94-49D9-8A07-0DD9096ED505}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
402+
{A0A6ADA8-2D94-49D9-8A07-0DD9096ED505}.Debug|Any CPU.Build.0 = Debug|Any CPU
403+
{A0A6ADA8-2D94-49D9-8A07-0DD9096ED505}.Release|Any CPU.ActiveCfg = Release|Any CPU
404+
{A0A6ADA8-2D94-49D9-8A07-0DD9096ED505}.Release|Any CPU.Build.0 = Release|Any CPU
405405
EndGlobalSection
406406
GlobalSection(SolutionProperties) = preSolution
407407
HideSolutionNode = FALSE
@@ -480,6 +480,7 @@ Global
480480
{EA1859AB-5FEE-4A7C-AD1F-021DCE66ECBF} = {A5966E90-BBCA-45E8-B26C-4A909479480C}
481481
{CBB5D4AD-848F-4963-A610-E9CB7B61F921} = {A5966E90-BBCA-45E8-B26C-4A909479480C}
482482
{F5E002D0-009C-4C3E-97F4-6448649390CE} = {E6A2A6FA-BA0D-41ED-88BA-02EE33083AA5}
483+
{A0A6ADA8-2D94-49D9-8A07-0DD9096ED505} = {5E41397F-59A3-47C4-9939-CB6496177D36}
483484
EndGlobalSection
484485
GlobalSection(ExtensibilityGlobals) = postSolution
485486
SolutionGuid = {CF0783F4-2CF9-4E4A-A123-F4E3832F6122}

‎apps/Tasky.AuthServer/Pages/Index.cshtml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
@using Microsoft.AspNetCore.Http.Extensions
33
@using Microsoft.AspNetCore.Mvc.Localization
44
@using Tasky.Pages
5-
@using Tasky.Localization
65
@using Volo.Abp.Users
76
@using Volo.Abp.AspNetCore.Mvc.UI.Theming
87
@using Volo.Abp.Ui.Branding
98
@model IndexModel
10-
@inject IHtmlLocalizer<TaskyResource> L
9+
@inject IHtmlLocalizer L
1110
@inject ICurrentUser CurrentUser
1211
@inject IBrandingProvider BrandingProvider
1312
@inject ITheme Theme

‎apps/Tasky.AuthServer/Properties/launchSettings.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"iisSettings": {
3-
"windowsAuthentication": false,
3+
"windowsAuthentication": false,
44
"anonymousAuthentication": true,
55
"iisExpress": {
66
"applicationUrl": "https://localhost:44321",
@@ -18,10 +18,10 @@
1818
"Tasky.AuthServer": {
1919
"commandName": "Project",
2020
"launchBrowser": true,
21-
"applicationUrl": "https://localhost:44321",
21+
"applicationUrl": "https://localhost:7600;http://localhost:7600",
2222
"environmentVariables": {
2323
"ASPNETCORE_ENVIRONMENT": "Development"
2424
}
2525
}
2626
}
27-
}
27+
}

‎apps/Tasky.AuthServer/Tasky.AuthServer.csproj‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
3-
<Import Project="..\..\common.props" />
4-
52
<PropertyGroup>
63
<TargetFramework>net6.0</TargetFramework>
74
<RootNamespace>Tasky</RootNamespace>
@@ -31,7 +28,7 @@
3128
</ItemGroup>
3229

3330
<ItemGroup>
34-
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
31+
<PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
3532
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
3633
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.5" />
3734
<PackageReference Include="DistributedLock.Redis" Version="1.0.2" />
@@ -49,7 +46,13 @@
4946
<PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="6.0.2" />
5047
<PackageReference Include="Volo.Abp.Account.Application" Version="6.0.2" />
5148
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="6.0.2" />
52-
<ProjectReference Include="..\Tasky.EntityFrameworkCore\Tasky.EntityFrameworkCore.csproj" />
49+
</ItemGroup>
50+
51+
<ItemGroup>
52+
<ProjectReference Include="..\..\services\administration\src\Tasky.AdministrationService.EntityFrameworkCore\Tasky.AdministrationService.EntityFrameworkCore.csproj" />
53+
<ProjectReference Include="..\..\services\identity\src\Tasky.IdentityService.EntityFrameworkCore\Tasky.IdentityService.EntityFrameworkCore.csproj" />
54+
<ProjectReference Include="..\..\services\saas\src\Tasky.SaasService.EntityFrameworkCore\Tasky.SaasService.EntityFrameworkCore.csproj" />
55+
<ProjectReference Include="..\..\shared\Tasky.Shared.Microservice.Hosting\Tasky.Shared.Microservice.Hosting.csproj" />
5356
</ItemGroup>
5457

5558
</Project>

‎apps/Tasky.AuthServer/TaskyAuthServerModule.cs‎

Lines changed: 14 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,16 @@
11
using System;
2-
using System.IO;
32
using System.Linq;
4-
using Localization.Resources.AbpUi;
53
using Medallion.Threading;
64
using Medallion.Threading.Redis;
75
using Microsoft.AspNetCore.Builder;
86
using Microsoft.AspNetCore.Cors;
97
using Microsoft.AspNetCore.DataProtection;
108
using Microsoft.Extensions.DependencyInjection;
119
using Microsoft.Extensions.Hosting;
12-
using Tasky.EntityFrameworkCore;
13-
using Tasky.Localization;
14-
using Tasky.MultiTenancy;
1510
using StackExchange.Redis;
1611
using Volo.Abp;
1712
using Volo.Abp.Account;
1813
using Volo.Abp.Account.Web;
19-
using Volo.Abp.AspNetCore.Mvc.UI;
20-
using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
2114
using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
2215
using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
2316
using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
@@ -29,11 +22,12 @@
2922
using Volo.Abp.Caching;
3023
using Volo.Abp.Caching.StackExchangeRedis;
3124
using Volo.Abp.DistributedLocking;
32-
using Volo.Abp.Localization;
3325
using Volo.Abp.Modularity;
3426
using Volo.Abp.UI.Navigation.Urls;
35-
using Volo.Abp.UI;
36-
using Volo.Abp.VirtualFileSystem;
27+
using Tasky.IdentityService.EntityFrameworkCore;
28+
using Tasky.SaaSService.EntityFrameworkCore;
29+
using Tasky.AdministrationService.EntityFrameworkCore;
30+
using Tasky.Shared.Microservice.Hosting;
3731

3832
namespace Tasky;
3933

@@ -45,8 +39,11 @@ namespace Tasky;
4539
typeof(AbpAccountApplicationModule),
4640
typeof(AbpAccountHttpApiModule),
4741
typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
48-
typeof(TaskyEntityFrameworkCoreModule),
49-
typeof(AbpAspNetCoreSerilogModule)
42+
typeof(AbpAspNetCoreSerilogModule),
43+
typeof(AdministrationServiceEntityFrameworkCoreModule),
44+
typeof(SaaSServiceEntityFrameworkCoreModule),
45+
typeof(IdentityServiceEntityFrameworkCoreModule),
46+
typeof(TaskyMicroserviceHosting)
5047
)]
5148
public class TaskyAuthServerModule : AbpModule
5249
{
@@ -68,36 +65,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
6865
var hostingEnvironment = context.Services.GetHostingEnvironment();
6966
var configuration = context.Services.GetConfiguration();
7067

71-
Configure<AbpLocalizationOptions>(options =>
72-
{
73-
options.Resources
74-
.Get<TaskyResource>()
75-
.AddBaseTypes(
76-
typeof(AbpUiResource)
77-
);
78-
79-
options.Languages.Add(new LanguageInfo("ar", "ar", "العربية"));
80-
options.Languages.Add(new LanguageInfo("cs", "cs", "Čeština"));
81-
options.Languages.Add(new LanguageInfo("en", "en", "English"));
82-
options.Languages.Add(new LanguageInfo("en-GB", "en-GB", "English (UK)"));
83-
options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish"));
84-
options.Languages.Add(new LanguageInfo("fr", "fr", "Français"));
85-
options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in"));
86-
options.Languages.Add(new LanguageInfo("is", "is", "Icelandic", "is"));
87-
options.Languages.Add(new LanguageInfo("it", "it", "Italiano", "it"));
88-
options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar"));
89-
options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português"));
90-
options.Languages.Add(new LanguageInfo("ro-RO", "ro-RO", "Română"));
91-
options.Languages.Add(new LanguageInfo("ru", "ru", "Русский"));
92-
options.Languages.Add(new LanguageInfo("sk", "sk", "Slovak"));
93-
options.Languages.Add(new LanguageInfo("tr", "tr", "Türkçe"));
94-
options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文"));
95-
options.Languages.Add(new LanguageInfo("zh-Hant", "zh-Hant", "繁體中文"));
96-
options.Languages.Add(new LanguageInfo("de-DE", "de-DE", "Deutsch", "de"));
97-
options.Languages.Add(new LanguageInfo("es", "es", "Español", "es"));
98-
options.Languages.Add(new LanguageInfo("el", "el", "Ελληνικά"));
99-
});
100-
10168
Configure<AbpBundlingOptions>(options =>
10269
{
10370
options.StyleBundles.Configure(
@@ -111,19 +78,10 @@ public override void ConfigureServices(ServiceConfigurationContext context)
11178

11279
Configure<AbpAuditingOptions>(options =>
11380
{
114-
//options.IsEnabledForGetRequests = true;
115-
options.ApplicationName = "AuthServer";
81+
//options.IsEnabledForGetRequests = true;
82+
options.ApplicationName = "AuthServer";
11683
});
11784

118-
if (hostingEnvironment.IsDevelopment())
119-
{
120-
Configure<AbpVirtualFileSystemOptions>(options =>
121-
{
122-
options.FileSets.ReplaceEmbeddedByPhysical<TaskyDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}Tasky.Domain.Shared"));
123-
options.FileSets.ReplaceEmbeddedByPhysical<TaskyDomainModule>(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}Tasky.Domain"));
124-
});
125-
}
126-
12785
Configure<AppUrlOptions>(options =>
12886
{
12987
options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"];
@@ -149,7 +107,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
149107
var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]);
150108
dataProtectionBuilder.PersistKeysToStackExchangeRedis(redis, "Tasky-Protection-Keys");
151109
}
152-
110+
153111
context.Services.AddSingleton<IDistributedLockProvider>(sp =>
154112
{
155113
var connection = ConnectionMultiplexer
@@ -200,11 +158,8 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
200158
app.UseCors();
201159
app.UseAuthentication();
202160
app.UseAbpOpenIddictValidation();
203-
204-
if (MultiTenancyConsts.IsEnabled)
205-
{
206-
app.UseMultiTenancy();
207-
}
161+
162+
app.UseMultiTenancy();
208163

209164
app.UseUnitOfWork();
210165
app.UseAuthorization();

‎apps/Tasky.AuthServer/appsettings.json‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,29 @@
22
"App": {
33
"SelfUrl": "https://localhost:44321",
44
"ClientUrl": "http://localhost:4200",
5-
"CorsOrigins": "https://*.Tasky.com,http://localhost:4200,https://localhost:44389,https://localhost:44354",
6-
"RedirectAllowedUrls": "http://localhost:4200,https://localhost:44346,https://localhost:44389,https://localhost:44382"
5+
"CorsOrigins": "http://localhost:4200,http://localhost:3000,https://localhost:7001,https://localhost:7002,https://localhost:7003,https://localhost:7004,https://localhost:7005",
6+
"RedirectAllowedUrls": "http://localhost:4200,http://localhost:3000,https://localhost:7001"
77
},
88
"ConnectionStrings": {
9-
"Default": "Host=localhost;Port=5432;Database=Tasky;User ID=root;Password=myPassword;"
9+
"SaaS": "User ID=postgres;Password=postgres;Host=localhost;Port=5432;Database=SaasService;Pooling=false;",
10+
"IdentityService": "User ID=postgres;Password=postgres;Host=localhost;Port=5432;Database=IdentityService;Pooling=false;",
11+
"Administration": "User ID=postgres;Password=postgres;Host=localhost;Port=5432;Database=AdministrationService;Pooling=false;"
1012
},
1113
"Redis": {
1214
"Configuration": "127.0.0.1"
1315
},
1416
"StringEncryption": {
1517
"DefaultPassPhrase": "gbbuVvCPDDNSvLem"
18+
},
19+
"RabbitMQ": {
20+
"Connections": {
21+
"Default": {
22+
"HostName": "localhost"
23+
}
24+
},
25+
"EventBus": {
26+
"ClientName": "Tasky_AuthServer",
27+
"ExchangeName": "Tasky"
28+
}
1629
}
1730
}

‎apps/Tasky.IdentityServer/Tasky.IdentityServer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
<ItemGroup>
3535
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
36-
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
36+
<PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
3737
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
3838
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.0" />
3939
</ItemGroup>

‎docker-compose.dcproj‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎services/administration/src/Tasky.AdministrationService.Application.Contracts/Tasky.AdministrationService.Application.Contracts.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\common.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>netstandard2.0</TargetFramework>
6+
<TargetFramework>net6.0</TargetFramework>
77
<RootNamespace>Tasky.AdministrationService</RootNamespace>
88
</PropertyGroup>
99

‎services/administration/src/Tasky.AdministrationService.Application/Tasky.AdministrationService.Application.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\common.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>netstandard2.0</TargetFramework>
6+
<TargetFramework>net6.0</TargetFramework>
77
<RootNamespace>Tasky.AdministrationService</RootNamespace>
88
</PropertyGroup>
99

0 commit comments

Comments
 (0)