diff --git a/api/.gitignore b/api/.gitignore index 9d9001a8..862e1dd3 100644 --- a/api/.gitignore +++ b/api/.gitignore @@ -252,14 +252,14 @@ paket-files/ *.sln.iml # Platform -src/Kurs.Platform.Web/Logs/* -src/Kurs.Platform.Web.Host/Logs/* -src/Kurs.Platform.AuthServer/Logs/* -src/Kurs.Platform.HttpApi.Host/Logs/* -src/Kurs.Platform.HttpApi.Host/Logs/* -src/Kurs.Platform.DbMigrator/Logs/* -src/Kurs.Platform.Blazor.Server/Logs/* -src/Kurs.Platform.Blazor.Server.Tiered/Logs/* +src/Erp.Platform.Web/Logs/* +src/Erp.Platform.Web.Host/Logs/* +src/Erp.Platform.AuthServer/Logs/* +src/Erp.Platform.HttpApi.Host/Logs/* +src/Erp.Platform.HttpApi.Host/Logs/* +src/Erp.Platform.DbMigrator/Logs/* +src/Erp.Platform.Blazor.Server/Logs/* +src/Erp.Platform.Blazor.Server.Tiered/Logs/* # Use abp install-libs to restore. **/wwwroot/libs/* diff --git a/api/Erp.Platform.DbMigrator.Dockerfile b/api/Erp.Platform.DbMigrator.Dockerfile new file mode 100644 index 00000000..b0466755 --- /dev/null +++ b/api/Erp.Platform.DbMigrator.Dockerfile @@ -0,0 +1,48 @@ +FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build +ENV DOTNET_NUGET_SIGNATURE_VERIFICATION=false +WORKDIR /app + +COPY "modules/Erp.Languages/Erp.Languages.Application.Contracts/Erp.Languages.Application.Contracts.csproj" "modules/Erp.Languages/Erp.Languages.Application.Contracts/" +COPY "modules/Erp.Languages/Erp.Languages.Domain/Erp.Languages.Domain.csproj" "modules/Erp.Languages/Erp.Languages.Domain/" +COPY "modules/Erp.Languages/Erp.Languages.Domain.Shared/Erp.Languages.Domain.Shared.csproj" "modules/Erp.Languages/Erp.Languages.Domain.Shared/" +COPY "modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/Erp.Languages.EntityFrameworkCore.csproj" "modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/" +COPY "modules/Erp.MailQueue/Erp.MailQueue.csproj" "modules/Erp.MailQueue/" +COPY "modules/Erp.Notifications/Erp.Notifications.Application.Contracts/Erp.Notifications.Application.Contracts.csproj" "modules/Erp.Notifications/Erp.Notifications.Application.Contracts/" +COPY "modules/Erp.Notifications/Erp.Notifications.Domain/Erp.Notifications.Domain.csproj" "modules/Erp.Notifications/Erp.Notifications.Domain/" +COPY "modules/Erp.Notifications/Erp.Notifications.Domain.Shared/Erp.Notifications.Domain.Shared.csproj" "modules/Erp.Notifications/Erp.Notifications.Domain.Shared/" +COPY "modules/Erp.Notifications/Erp.Notifications.EntityFrameworkCore/Erp.Notifications.EntityFrameworkCore.csproj" "modules/Erp.Notifications/Erp.Notifications.EntityFrameworkCore/" +COPY "modules/Erp.Sender/Erp.Sender.csproj" "modules/Erp.Sender/" +COPY "modules/Erp.Settings/Erp.Settings.Application.Contracts/Erp.Settings.Application.Contracts.csproj" "modules/Erp.Settings/Erp.Settings.Application.Contracts/" +COPY "modules/Erp.Settings/Erp.Settings.Domain/Erp.Settings.Domain.csproj" "modules/Erp.Settings/Erp.Settings.Domain/" +COPY "modules/Erp.Settings/Erp.Settings.Domain.Shared/Erp.Settings.Domain.Shared.csproj" "modules/Erp.Settings/Erp.Settings.Domain.Shared/" +COPY "modules/Erp.Settings/Erp.Settings.EntityFrameworkCore/Erp.Settings.EntityFrameworkCore.csproj" "modules/Erp.Settings/Erp.Settings.EntityFrameworkCore/" +COPY "src/Erp.Platform.Application.Contracts/Erp.Platform.Application.Contracts.csproj" "src/Erp.Platform.Application.Contracts/" +COPY "src/Erp.Platform.DbMigrator/Erp.Platform.DbMigrator.csproj" "src/Erp.Platform.DbMigrator/" +COPY "src/Erp.Platform.Domain/Erp.Platform.Domain.csproj" "src/Erp.Platform.Domain/" +COPY "src/Erp.Platform.Domain.Shared/Erp.Platform.Domain.Shared.csproj" "src/Erp.Platform.Domain.Shared/" +COPY "src/Erp.Platform.EntityFrameworkCore/Erp.Platform.EntityFrameworkCore.csproj" "src/Erp.Platform.EntityFrameworkCore/" +RUN dotnet restore "src/Erp.Platform.DbMigrator/Erp.Platform.DbMigrator.csproj" + +COPY . . +RUN dotnet publish "src/Erp.Platform.DbMigrator/Erp.Platform.DbMigrator.csproj" -c Release -o /app/publish --no-restore + +FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS final +ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ + LC_ALL=tr_TR.UTF-8 \ + LANG=tr_TR.UTF-8 + +# icu'lar dotnet culture icin gerekli +# lib'ler wkhtmltopdf icin gerekli +RUN apk update +RUN apk add --no-cache \ + icu-data-full \ + icu-libs \ + libgdiplus \ + libc6-compat \ + libc-dev + +WORKDIR /srv/app +COPY --from=build /app/publish . +ENTRYPOINT ["./Erp.Platform.DbMigrator"] + + diff --git a/api/Erp.Platform.HttpApi.Host.Dockerfile b/api/Erp.Platform.HttpApi.Host.Dockerfile new file mode 100644 index 00000000..9a658587 --- /dev/null +++ b/api/Erp.Platform.HttpApi.Host.Dockerfile @@ -0,0 +1,77 @@ +FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build +ENV DOTNET_NUGET_SIGNATURE_VERIFICATION=false +WORKDIR /app +RUN apk update && apk upgrade +RUN apk add nodejs~=22 npm~=11 + +RUN dotnet tool install -g Volo.Abp.Cli +ENV PATH="/root/.dotnet/tools:${PATH}" +COPY "src/Erp.Platform.HttpApi.Host/Erp.Platform.HttpApi.Host.csproj" "src/Erp.Platform.HttpApi.Host/" +COPY "src/Erp.Platform.HttpApi.Host/package.json" "src/Erp.Platform.HttpApi.Host/" +COPY "src/Erp.Platform.HttpApi.Host/package-lock.json" "src/Erp.Platform.HttpApi.Host/" +WORKDIR /app/src/Erp.Platform.HttpApi.Host +RUN abp install-libs +WORKDIR /app + +COPY "modules/Erp.Languages/Erp.Languages.Application/Erp.Languages.Application.csproj" "modules/Erp.Languages/Erp.Languages.Application/" +COPY "modules/Erp.Languages/Erp.Languages.Application.Contracts/Erp.Languages.Application.Contracts.csproj" "modules/Erp.Languages/Erp.Languages.Application.Contracts/" +COPY "modules/Erp.Languages/Erp.Languages.Domain/Erp.Languages.Domain.csproj" "modules/Erp.Languages/Erp.Languages.Domain/" +COPY "modules/Erp.Languages/Erp.Languages.Domain.Shared/Erp.Languages.Domain.Shared.csproj" "modules/Erp.Languages/Erp.Languages.Domain.Shared/" +COPY "modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/Erp.Languages.EntityFrameworkCore.csproj" "modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/" +COPY "modules/Erp.MailQueue/Erp.MailQueue.csproj" "modules/Erp.MailQueue/" +COPY "modules/Erp.Notifications/Erp.Notifications.Application/Erp.Notifications.Application.csproj" "modules/Erp.Notifications/Erp.Notifications.Application/" +COPY "modules/Erp.Notifications/Erp.Notifications.Application.Contracts/Erp.Notifications.Application.Contracts.csproj" "modules/Erp.Notifications/Erp.Notifications.Application.Contracts/" +COPY "modules/Erp.Notifications/Erp.Notifications.Domain/Erp.Notifications.Domain.csproj" "modules/Erp.Notifications/Erp.Notifications.Domain/" +COPY "modules/Erp.Notifications/Erp.Notifications.Domain.Shared/Erp.Notifications.Domain.Shared.csproj" "modules/Erp.Notifications/Erp.Notifications.Domain.Shared/" +COPY "modules/Erp.Notifications/Erp.Notifications.EntityFrameworkCore/Erp.Notifications.EntityFrameworkCore.csproj" "modules/Erp.Notifications/Erp.Notifications.EntityFrameworkCore/" +COPY "modules/Erp.Sender/Erp.Sender.csproj" "modules/Erp.Sender/" +COPY "modules/Erp.Settings/Erp.Settings.Application/Erp.Settings.Application.csproj" "modules/Erp.Settings/Erp.Settings.Application/" +COPY "modules/Erp.Settings/Erp.Settings.Application.Contracts/Erp.Settings.Application.Contracts.csproj" "modules/Erp.Settings/Erp.Settings.Application.Contracts/" +COPY "modules/Erp.Settings/Erp.Settings.Domain/Erp.Settings.Domain.csproj" "modules/Erp.Settings/Erp.Settings.Domain/" +COPY "modules/Erp.Settings/Erp.Settings.Domain.Shared/Erp.Settings.Domain.Shared.csproj" "modules/Erp.Settings/Erp.Settings.Domain.Shared/" +COPY "modules/Erp.Settings/Erp.Settings.EntityFrameworkCore/Erp.Settings.EntityFrameworkCore.csproj" "modules/Erp.Settings/Erp.Settings.EntityFrameworkCore/" +COPY "src/Erp.Platform.Application/Erp.Platform.Application.csproj" "src/Erp.Platform.Application/" +COPY "src/Erp.Platform.Application.Contracts/Erp.Platform.Application.Contracts.csproj" "src/Erp.Platform.Application.Contracts/" +COPY "src/Erp.Platform.Domain/Erp.Platform.Domain.csproj" "src/Erp.Platform.Domain/" +COPY "src/Erp.Platform.Domain.Shared/Erp.Platform.Domain.Shared.csproj" "src/Erp.Platform.Domain.Shared/" +COPY "src/Erp.Platform.EntityFrameworkCore/Erp.Platform.EntityFrameworkCore.csproj" "src/Erp.Platform.EntityFrameworkCore/" +COPY "src/Erp.Platform.HttpApi/Erp.Platform.HttpApi.csproj" "src/Erp.Platform.HttpApi/" +COPY "src/Erp.Platform.HttpApi.Client/Erp.Platform.HttpApi.Client.csproj" "src/Erp.Platform.HttpApi.Client/" +COPY "src/Erp.Platform.HttpApi.Host/Erp.Platform.HttpApi.Host.csproj" "src/Erp.Platform.HttpApi.Host/" +COPY "test/Erp.Platform.EntityFrameworkCore.Tests/Erp.Platform.EntityFrameworkCore.Tests.csproj" "test/Erp.Platform.EntityFrameworkCore.Tests/" +COPY "test/Erp.Platform.TestBase/Erp.Platform.TestBase.csproj" "test/Erp.Platform.TestBase/" +RUN dotnet restore "src/Erp.Platform.HttpApi.Host/Erp.Platform.HttpApi.Host.csproj" + +COPY . . +RUN mkdir -p publish +RUN dotnet publish "src/Erp.Platform.HttpApi.Host/Erp.Platform.HttpApi.Host.csproj" -c Release -o /app/publish --no-restore + +FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS final +ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ + LC_ALL=tr_TR.UTF-8 \ + LANG=tr_TR.UTF-8 + +# icu'lar dotnet culture icin gerekli +# lib'ler wkhtmltopdf icin gerekli +RUN apk update +RUN apk add --no-cache \ + icu-data-full \ + icu-libs \ + libgdiplus \ + libc6-compat \ + libc-dev + +# OpenSSL default TLSv3 desteklediÄŸi için MSSQL 2012'ye baÄŸlanmıyor. Bunu çözmek için gerekli +RUN sed -i 's/\[openssl_init\]/# [openssl_init]/' /etc/ssl/openssl.cnf +RUN printf "\n\n[openssl_init]\nssl_conf = ssl_sect" >> /etc/ssl/openssl.cnf +RUN printf "\n\n[ssl_sect]\nsystem_default = ssl_default_sect" >> /etc/ssl/openssl.cnf +RUN printf "\n\n[ssl_default_sect]\nMinProtocol = TLSv1\nCipherString = DEFAULT@SECLEVEL=0\n" >> /etc/ssl/openssl.cnf + +EXPOSE 80 +EXPOSE 443 + +WORKDIR /srv/app +COPY --from=build /app/publish . +ENTRYPOINT ["./Erp.Platform.HttpApi.Host"] + + diff --git a/api/Kurs.Platform.sln b/api/Erp.Platform.sln similarity index 67% rename from api/Kurs.Platform.sln rename to api/Erp.Platform.sln index a043bc91..b88e9b38 100644 --- a/api/Kurs.Platform.sln +++ b/api/Erp.Platform.sln @@ -3,77 +3,77 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.4.33213.308 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Platform.Domain", "src\Kurs.Platform.Domain\Kurs.Platform.Domain.csproj", "{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Platform.Domain", "src\Erp.Platform.Domain\Erp.Platform.Domain.csproj", "{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Platform.Application", "src\Kurs.Platform.Application\Kurs.Platform.Application.csproj", "{1A94A50E-06DC-43C1-80B5-B662820EC3EB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Platform.Application", "src\Erp.Platform.Application\Erp.Platform.Application.csproj", "{1A94A50E-06DC-43C1-80B5-B662820EC3EB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Platform.EntityFrameworkCore", "src\Kurs.Platform.EntityFrameworkCore\Kurs.Platform.EntityFrameworkCore.csproj", "{C956DD76-69C8-4A9C-83EA-D17DF83340FD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Platform.EntityFrameworkCore", "src\Erp.Platform.EntityFrameworkCore\Erp.Platform.EntityFrameworkCore.csproj", "{C956DD76-69C8-4A9C-83EA-D17DF83340FD}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CA9AC87F-097E-4F15-8393-4BC07735A5B0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Platform.Domain.Shared", "src\Kurs.Platform.Domain.Shared\Kurs.Platform.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Platform.Domain.Shared", "src\Erp.Platform.Domain.Shared\Erp.Platform.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Platform.Application.Contracts", "src\Kurs.Platform.Application.Contracts\Kurs.Platform.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Platform.Application.Contracts", "src\Erp.Platform.Application.Contracts\Erp.Platform.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Platform.HttpApi", "src\Kurs.Platform.HttpApi\Kurs.Platform.HttpApi.csproj", "{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Platform.HttpApi", "src\Erp.Platform.HttpApi\Erp.Platform.HttpApi.csproj", "{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Platform.HttpApi.Client", "src\Kurs.Platform.HttpApi.Client\Kurs.Platform.HttpApi.Client.csproj", "{3B5A0094-670D-4BB1-BFDD-61B88A8773DC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Platform.HttpApi.Client", "src\Erp.Platform.HttpApi.Client\Erp.Platform.HttpApi.Client.csproj", "{3B5A0094-670D-4BB1-BFDD-61B88A8773DC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Platform.DbMigrator", "src\Kurs.Platform.DbMigrator\Kurs.Platform.DbMigrator.csproj", "{AA94D832-1CCC-4715-95A9-A483F23A1A5D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Platform.DbMigrator", "src\Erp.Platform.DbMigrator\Erp.Platform.DbMigrator.csproj", "{AA94D832-1CCC-4715-95A9-A483F23A1A5D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Platform.HttpApi.Host", "src\Kurs.Platform.HttpApi.Host\Kurs.Platform.HttpApi.Host.csproj", "{748584B1-BA69-4F6A-81AA-F4BDE6BCE29D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Platform.HttpApi.Host", "src\Erp.Platform.HttpApi.Host\Erp.Platform.HttpApi.Host.csproj", "{748584B1-BA69-4F6A-81AA-F4BDE6BCE29D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{03E1C8DA-035E-4882-AF81-F392139FCF38}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kurs.Sender", "Kurs.Sender", "{4D886EEF-D4CF-4879-A10D-249D762E4ED9}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Erp.Sender", "Erp.Sender", "{4D886EEF-D4CF-4879-A10D-249D762E4ED9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Sender", "modules\Kurs.Sender\Kurs.Sender.csproj", "{21B52B6A-FC09-4EDA-8A73-9516726BF50B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Sender", "modules\Erp.Sender\Erp.Sender.csproj", "{21B52B6A-FC09-4EDA-8A73-9516726BF50B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kurs.Languages", "Kurs.Languages", "{3B18248C-EE9C-43ED-9025-D3A78986EA7D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Erp.Languages", "Erp.Languages", "{3B18248C-EE9C-43ED-9025-D3A78986EA7D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Languages.Application", "modules\Kurs.Languages\Kurs.Languages.Application\Kurs.Languages.Application.csproj", "{E9D256F2-B12F-4A90-8CF6-B52724716A94}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Languages.Application", "modules\Erp.Languages\Erp.Languages.Application\Erp.Languages.Application.csproj", "{E9D256F2-B12F-4A90-8CF6-B52724716A94}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Languages.Application.Contracts", "modules\Kurs.Languages\Kurs.Languages.Application.Contracts\Kurs.Languages.Application.Contracts.csproj", "{F1EC497F-D361-4927-AFE6-156A0F7D8A1C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Languages.Application.Contracts", "modules\Erp.Languages\Erp.Languages.Application.Contracts\Erp.Languages.Application.Contracts.csproj", "{F1EC497F-D361-4927-AFE6-156A0F7D8A1C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Languages.Domain", "modules\Kurs.Languages\Kurs.Languages.Domain\Kurs.Languages.Domain.csproj", "{9020ECD8-81D6-4604-A379-260796918C28}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Languages.Domain", "modules\Erp.Languages\Erp.Languages.Domain\Erp.Languages.Domain.csproj", "{9020ECD8-81D6-4604-A379-260796918C28}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Languages.Domain.Shared", "modules\Kurs.Languages\Kurs.Languages.Domain.Shared\Kurs.Languages.Domain.Shared.csproj", "{A3933E06-9DFE-480D-85C4-66F28F076164}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Languages.Domain.Shared", "modules\Erp.Languages\Erp.Languages.Domain.Shared\Erp.Languages.Domain.Shared.csproj", "{A3933E06-9DFE-480D-85C4-66F28F076164}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Languages.EntityFrameworkCore", "modules\Kurs.Languages\Kurs.Languages.EntityFrameworkCore\Kurs.Languages.EntityFrameworkCore.csproj", "{556AC2C2-9765-4B3D-8F38-9EAF3DA61AC5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Languages.EntityFrameworkCore", "modules\Erp.Languages\Erp.Languages.EntityFrameworkCore\Erp.Languages.EntityFrameworkCore.csproj", "{556AC2C2-9765-4B3D-8F38-9EAF3DA61AC5}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kurs.Settings", "Kurs.Settings", "{4D880243-0276-49A9-9FF2-FAD8BA727F74}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Erp.Settings", "Erp.Settings", "{4D880243-0276-49A9-9FF2-FAD8BA727F74}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Settings.Application", "modules\Kurs.Settings\Kurs.Settings.Application\Kurs.Settings.Application.csproj", "{5F288ACC-A9CF-470B-BB68-B1C8B102CDDD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Settings.Application", "modules\Erp.Settings\Erp.Settings.Application\Erp.Settings.Application.csproj", "{5F288ACC-A9CF-470B-BB68-B1C8B102CDDD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Settings.Application.Contracts", "modules\Kurs.Settings\Kurs.Settings.Application.Contracts\Kurs.Settings.Application.Contracts.csproj", "{A926F04F-631B-4A05-853C-6C76555BF26A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Settings.Application.Contracts", "modules\Erp.Settings\Erp.Settings.Application.Contracts\Erp.Settings.Application.Contracts.csproj", "{A926F04F-631B-4A05-853C-6C76555BF26A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Settings.Domain", "modules\Kurs.Settings\Kurs.Settings.Domain\Kurs.Settings.Domain.csproj", "{E14E0128-D4FF-462D-B684-7238EA876D69}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Settings.Domain", "modules\Erp.Settings\Erp.Settings.Domain\Erp.Settings.Domain.csproj", "{E14E0128-D4FF-462D-B684-7238EA876D69}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Settings.Domain.Shared", "modules\Kurs.Settings\Kurs.Settings.Domain.Shared\Kurs.Settings.Domain.Shared.csproj", "{DBFD0F4B-5592-4E34-8624-04F7540E34B9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Settings.Domain.Shared", "modules\Erp.Settings\Erp.Settings.Domain.Shared\Erp.Settings.Domain.Shared.csproj", "{DBFD0F4B-5592-4E34-8624-04F7540E34B9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Settings.EntityFrameworkCore", "modules\Kurs.Settings\Kurs.Settings.EntityFrameworkCore\Kurs.Settings.EntityFrameworkCore.csproj", "{C2F5630E-A6E2-48D5-B182-5FE9278D3E37}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Settings.EntityFrameworkCore", "modules\Erp.Settings\Erp.Settings.EntityFrameworkCore\Erp.Settings.EntityFrameworkCore.csproj", "{C2F5630E-A6E2-48D5-B182-5FE9278D3E37}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{62A235F3-B95E-4CB4-B59E-AAE30A0E6C5B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Platform.TestBase", "test\Kurs.Platform.TestBase\Kurs.Platform.TestBase.csproj", "{3E13749E-82D1-434B-B867-F7B094B66065}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Platform.TestBase", "test\Erp.Platform.TestBase\Erp.Platform.TestBase.csproj", "{3E13749E-82D1-434B-B867-F7B094B66065}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Platform.EntityFrameworkCore.Tests", "test\Kurs.Platform.EntityFrameworkCore.Tests\Kurs.Platform.EntityFrameworkCore.Tests.csproj", "{620D9F08-EB9F-469F-806A-64E915437154}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Platform.EntityFrameworkCore.Tests", "test\Erp.Platform.EntityFrameworkCore.Tests\Erp.Platform.EntityFrameworkCore.Tests.csproj", "{620D9F08-EB9F-469F-806A-64E915437154}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kurs.MailQueue", "Kurs.MailQueue", "{70BCE3C5-D122-4EF8-97EC-DB804AEE92D5}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Erp.MailQueue", "Erp.MailQueue", "{70BCE3C5-D122-4EF8-97EC-DB804AEE92D5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.MailQueue", "modules\Kurs.MailQueue\Kurs.MailQueue.csproj", "{088B3139-68D3-4A5F-B159-0C8FE94CD969}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.MailQueue", "modules\Erp.MailQueue\Erp.MailQueue.csproj", "{088B3139-68D3-4A5F-B159-0C8FE94CD969}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kurs.Notifications", "Kurs.Notifications", "{41A473FE-2537-4223-8CF3-A4A2A4A4F41E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Erp.Notifications", "Erp.Notifications", "{41A473FE-2537-4223-8CF3-A4A2A4A4F41E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Notifications.Application", "modules\Kurs.Notifications\Kurs.Notifications.Application\Kurs.Notifications.Application.csproj", "{A972109D-D974-4BB2-BA01-72BD845ACBBA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Notifications.Application", "modules\Erp.Notifications\Erp.Notifications.Application\Erp.Notifications.Application.csproj", "{A972109D-D974-4BB2-BA01-72BD845ACBBA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Notifications.Application.Contracts", "modules\Kurs.Notifications\Kurs.Notifications.Application.Contracts\Kurs.Notifications.Application.Contracts.csproj", "{297B7268-DEF3-4669-98DF-78FA08619EDF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Notifications.Application.Contracts", "modules\Erp.Notifications\Erp.Notifications.Application.Contracts\Erp.Notifications.Application.Contracts.csproj", "{297B7268-DEF3-4669-98DF-78FA08619EDF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Notifications.Domain", "modules\Kurs.Notifications\Kurs.Notifications.Domain\Kurs.Notifications.Domain.csproj", "{631092C7-B59D-4EA7-92D0-5E181AB4F9F6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Notifications.Domain", "modules\Erp.Notifications\Erp.Notifications.Domain\Erp.Notifications.Domain.csproj", "{631092C7-B59D-4EA7-92D0-5E181AB4F9F6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Notifications.Domain.Shared", "modules\Kurs.Notifications\Kurs.Notifications.Domain.Shared\Kurs.Notifications.Domain.Shared.csproj", "{23659070-58F7-403B-8973-B2E20B5E9BE1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Notifications.Domain.Shared", "modules\Erp.Notifications\Erp.Notifications.Domain.Shared\Erp.Notifications.Domain.Shared.csproj", "{23659070-58F7-403B-8973-B2E20B5E9BE1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kurs.Notifications.EntityFrameworkCore", "modules\Kurs.Notifications\Kurs.Notifications.EntityFrameworkCore\Kurs.Notifications.EntityFrameworkCore.csproj", "{D9E0D333-60F3-493F-A5B2-5758ACA42A17}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Erp.Notifications.EntityFrameworkCore", "modules\Erp.Notifications\Erp.Notifications.EntityFrameworkCore\Erp.Notifications.EntityFrameworkCore.csproj", "{D9E0D333-60F3-493F-A5B2-5758ACA42A17}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{722BAAEF-70B8-4381-A8AD-7F2C205D2D0A}" ProjectSection(SolutionItems) = preProject @@ -241,3 +241,5 @@ Global SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} EndGlobalSection EndGlobal + + diff --git a/api/Kurs.Platform.sln.DotSettings b/api/Erp.Platform.sln.DotSettings similarity index 100% rename from api/Kurs.Platform.sln.DotSettings rename to api/Erp.Platform.sln.DotSettings diff --git a/api/Kurs.Platform.DbMigrator.Dockerfile b/api/Kurs.Platform.DbMigrator.Dockerfile deleted file mode 100644 index 19b201c3..00000000 --- a/api/Kurs.Platform.DbMigrator.Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build -ENV DOTNET_NUGET_SIGNATURE_VERIFICATION=false -WORKDIR /app - -COPY "modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Kurs.Languages.Application.Contracts.csproj" "modules/Kurs.Languages/Kurs.Languages.Application.Contracts/" -COPY "modules/Kurs.Languages/Kurs.Languages.Domain/Kurs.Languages.Domain.csproj" "modules/Kurs.Languages/Kurs.Languages.Domain/" -COPY "modules/Kurs.Languages/Kurs.Languages.Domain.Shared/Kurs.Languages.Domain.Shared.csproj" "modules/Kurs.Languages/Kurs.Languages.Domain.Shared/" -COPY "modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/Kurs.Languages.EntityFrameworkCore.csproj" "modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/" -COPY "modules/Kurs.MailQueue/Kurs.MailQueue.csproj" "modules/Kurs.MailQueue/" -COPY "modules/Kurs.Notifications/Kurs.Notifications.Application.Contracts/Kurs.Notifications.Application.Contracts.csproj" "modules/Kurs.Notifications/Kurs.Notifications.Application.Contracts/" -COPY "modules/Kurs.Notifications/Kurs.Notifications.Domain/Kurs.Notifications.Domain.csproj" "modules/Kurs.Notifications/Kurs.Notifications.Domain/" -COPY "modules/Kurs.Notifications/Kurs.Notifications.Domain.Shared/Kurs.Notifications.Domain.Shared.csproj" "modules/Kurs.Notifications/Kurs.Notifications.Domain.Shared/" -COPY "modules/Kurs.Notifications/Kurs.Notifications.EntityFrameworkCore/Kurs.Notifications.EntityFrameworkCore.csproj" "modules/Kurs.Notifications/Kurs.Notifications.EntityFrameworkCore/" -COPY "modules/Kurs.Sender/Kurs.Sender.csproj" "modules/Kurs.Sender/" -COPY "modules/Kurs.Settings/Kurs.Settings.Application.Contracts/Kurs.Settings.Application.Contracts.csproj" "modules/Kurs.Settings/Kurs.Settings.Application.Contracts/" -COPY "modules/Kurs.Settings/Kurs.Settings.Domain/Kurs.Settings.Domain.csproj" "modules/Kurs.Settings/Kurs.Settings.Domain/" -COPY "modules/Kurs.Settings/Kurs.Settings.Domain.Shared/Kurs.Settings.Domain.Shared.csproj" "modules/Kurs.Settings/Kurs.Settings.Domain.Shared/" -COPY "modules/Kurs.Settings/Kurs.Settings.EntityFrameworkCore/Kurs.Settings.EntityFrameworkCore.csproj" "modules/Kurs.Settings/Kurs.Settings.EntityFrameworkCore/" -COPY "src/Kurs.Platform.Application.Contracts/Kurs.Platform.Application.Contracts.csproj" "src/Kurs.Platform.Application.Contracts/" -COPY "src/Kurs.Platform.DbMigrator/Kurs.Platform.DbMigrator.csproj" "src/Kurs.Platform.DbMigrator/" -COPY "src/Kurs.Platform.Domain/Kurs.Platform.Domain.csproj" "src/Kurs.Platform.Domain/" -COPY "src/Kurs.Platform.Domain.Shared/Kurs.Platform.Domain.Shared.csproj" "src/Kurs.Platform.Domain.Shared/" -COPY "src/Kurs.Platform.EntityFrameworkCore/Kurs.Platform.EntityFrameworkCore.csproj" "src/Kurs.Platform.EntityFrameworkCore/" -RUN dotnet restore "src/Kurs.Platform.DbMigrator/Kurs.Platform.DbMigrator.csproj" - -COPY . . -RUN dotnet publish "src/Kurs.Platform.DbMigrator/Kurs.Platform.DbMigrator.csproj" -c Release -o /app/publish --no-restore - -FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS final -ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ - LC_ALL=tr_TR.UTF-8 \ - LANG=tr_TR.UTF-8 - -# icu'lar dotnet culture icin gerekli -# lib'ler wkhtmltopdf icin gerekli -RUN apk update -RUN apk add --no-cache \ - icu-data-full \ - icu-libs \ - libgdiplus \ - libc6-compat \ - libc-dev - -WORKDIR /srv/app -COPY --from=build /app/publish . -ENTRYPOINT ["./Kurs.Platform.DbMigrator"] diff --git a/api/Kurs.Platform.HttpApi.Host.Dockerfile b/api/Kurs.Platform.HttpApi.Host.Dockerfile deleted file mode 100644 index e5e0d8f8..00000000 --- a/api/Kurs.Platform.HttpApi.Host.Dockerfile +++ /dev/null @@ -1,75 +0,0 @@ -FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build -ENV DOTNET_NUGET_SIGNATURE_VERIFICATION=false -WORKDIR /app -RUN apk update && apk upgrade -RUN apk add nodejs~=22 npm~=11 - -RUN dotnet tool install -g Volo.Abp.Cli -ENV PATH="/root/.dotnet/tools:${PATH}" -COPY "src/Kurs.Platform.HttpApi.Host/Kurs.Platform.HttpApi.Host.csproj" "src/Kurs.Platform.HttpApi.Host/" -COPY "src/Kurs.Platform.HttpApi.Host/package.json" "src/Kurs.Platform.HttpApi.Host/" -COPY "src/Kurs.Platform.HttpApi.Host/package-lock.json" "src/Kurs.Platform.HttpApi.Host/" -WORKDIR /app/src/Kurs.Platform.HttpApi.Host -RUN abp install-libs -WORKDIR /app - -COPY "modules/Kurs.Languages/Kurs.Languages.Application/Kurs.Languages.Application.csproj" "modules/Kurs.Languages/Kurs.Languages.Application/" -COPY "modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Kurs.Languages.Application.Contracts.csproj" "modules/Kurs.Languages/Kurs.Languages.Application.Contracts/" -COPY "modules/Kurs.Languages/Kurs.Languages.Domain/Kurs.Languages.Domain.csproj" "modules/Kurs.Languages/Kurs.Languages.Domain/" -COPY "modules/Kurs.Languages/Kurs.Languages.Domain.Shared/Kurs.Languages.Domain.Shared.csproj" "modules/Kurs.Languages/Kurs.Languages.Domain.Shared/" -COPY "modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/Kurs.Languages.EntityFrameworkCore.csproj" "modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/" -COPY "modules/Kurs.MailQueue/Kurs.MailQueue.csproj" "modules/Kurs.MailQueue/" -COPY "modules/Kurs.Notifications/Kurs.Notifications.Application/Kurs.Notifications.Application.csproj" "modules/Kurs.Notifications/Kurs.Notifications.Application/" -COPY "modules/Kurs.Notifications/Kurs.Notifications.Application.Contracts/Kurs.Notifications.Application.Contracts.csproj" "modules/Kurs.Notifications/Kurs.Notifications.Application.Contracts/" -COPY "modules/Kurs.Notifications/Kurs.Notifications.Domain/Kurs.Notifications.Domain.csproj" "modules/Kurs.Notifications/Kurs.Notifications.Domain/" -COPY "modules/Kurs.Notifications/Kurs.Notifications.Domain.Shared/Kurs.Notifications.Domain.Shared.csproj" "modules/Kurs.Notifications/Kurs.Notifications.Domain.Shared/" -COPY "modules/Kurs.Notifications/Kurs.Notifications.EntityFrameworkCore/Kurs.Notifications.EntityFrameworkCore.csproj" "modules/Kurs.Notifications/Kurs.Notifications.EntityFrameworkCore/" -COPY "modules/Kurs.Sender/Kurs.Sender.csproj" "modules/Kurs.Sender/" -COPY "modules/Kurs.Settings/Kurs.Settings.Application/Kurs.Settings.Application.csproj" "modules/Kurs.Settings/Kurs.Settings.Application/" -COPY "modules/Kurs.Settings/Kurs.Settings.Application.Contracts/Kurs.Settings.Application.Contracts.csproj" "modules/Kurs.Settings/Kurs.Settings.Application.Contracts/" -COPY "modules/Kurs.Settings/Kurs.Settings.Domain/Kurs.Settings.Domain.csproj" "modules/Kurs.Settings/Kurs.Settings.Domain/" -COPY "modules/Kurs.Settings/Kurs.Settings.Domain.Shared/Kurs.Settings.Domain.Shared.csproj" "modules/Kurs.Settings/Kurs.Settings.Domain.Shared/" -COPY "modules/Kurs.Settings/Kurs.Settings.EntityFrameworkCore/Kurs.Settings.EntityFrameworkCore.csproj" "modules/Kurs.Settings/Kurs.Settings.EntityFrameworkCore/" -COPY "src/Kurs.Platform.Application/Kurs.Platform.Application.csproj" "src/Kurs.Platform.Application/" -COPY "src/Kurs.Platform.Application.Contracts/Kurs.Platform.Application.Contracts.csproj" "src/Kurs.Platform.Application.Contracts/" -COPY "src/Kurs.Platform.Domain/Kurs.Platform.Domain.csproj" "src/Kurs.Platform.Domain/" -COPY "src/Kurs.Platform.Domain.Shared/Kurs.Platform.Domain.Shared.csproj" "src/Kurs.Platform.Domain.Shared/" -COPY "src/Kurs.Platform.EntityFrameworkCore/Kurs.Platform.EntityFrameworkCore.csproj" "src/Kurs.Platform.EntityFrameworkCore/" -COPY "src/Kurs.Platform.HttpApi/Kurs.Platform.HttpApi.csproj" "src/Kurs.Platform.HttpApi/" -COPY "src/Kurs.Platform.HttpApi.Client/Kurs.Platform.HttpApi.Client.csproj" "src/Kurs.Platform.HttpApi.Client/" -COPY "src/Kurs.Platform.HttpApi.Host/Kurs.Platform.HttpApi.Host.csproj" "src/Kurs.Platform.HttpApi.Host/" -COPY "test/Kurs.Platform.EntityFrameworkCore.Tests/Kurs.Platform.EntityFrameworkCore.Tests.csproj" "test/Kurs.Platform.EntityFrameworkCore.Tests/" -COPY "test/Kurs.Platform.TestBase/Kurs.Platform.TestBase.csproj" "test/Kurs.Platform.TestBase/" -RUN dotnet restore "src/Kurs.Platform.HttpApi.Host/Kurs.Platform.HttpApi.Host.csproj" - -COPY . . -RUN mkdir -p publish -RUN dotnet publish "src/Kurs.Platform.HttpApi.Host/Kurs.Platform.HttpApi.Host.csproj" -c Release -o /app/publish --no-restore - -FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS final -ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ - LC_ALL=tr_TR.UTF-8 \ - LANG=tr_TR.UTF-8 - -# icu'lar dotnet culture icin gerekli -# lib'ler wkhtmltopdf icin gerekli -RUN apk update -RUN apk add --no-cache \ - icu-data-full \ - icu-libs \ - libgdiplus \ - libc6-compat \ - libc-dev - -# OpenSSL default TLSv3 desteklediği için MSSQL 2012'ye bağlanmıyor. Bunu çözmek için gerekli -RUN sed -i 's/\[openssl_init\]/# [openssl_init]/' /etc/ssl/openssl.cnf -RUN printf "\n\n[openssl_init]\nssl_conf = ssl_sect" >> /etc/ssl/openssl.cnf -RUN printf "\n\n[ssl_sect]\nsystem_default = ssl_default_sect" >> /etc/ssl/openssl.cnf -RUN printf "\n\n[ssl_default_sect]\nMinProtocol = TLSv1\nCipherString = DEFAULT@SECLEVEL=0\n" >> /etc/ssl/openssl.cnf - -EXPOSE 80 -EXPOSE 443 - -WORKDIR /srv/app -COPY --from=build /app/publish . -ENTRYPOINT ["./Kurs.Platform.HttpApi.Host"] diff --git a/api/README.md b/api/README.md index f40cb069..3120f7e8 100644 --- a/api/README.md +++ b/api/README.md @@ -1,10 +1,10 @@ -# Yeni Modul Ekleme +# Yeni Modul Ekleme -`abp new Kurs.Notification -t module --no-ui -m none --database-provider ef --version 7.2.2 --old` +`abp new Erp.Notification -t module --no-ui -m none --database-provider ef --version 7.2.2 --old` # Code Format -`dotnet format --include .\modules\Kurs.Notification\ --folder` +`dotnet format --include .\modules\Erp.Notification\ --folder` # Migrations @@ -17,13 +17,13 @@ `dotnet ef migrations remove` `dotnet ef database update "20240822114716_ABP_822"` -- SQL Veritabanını Entity Class oluştur. +- SQL Veritabanını Entity Class oluÅŸtur. `dotnet ef dbcontext scaffold "Server=SERVERNAME;Database=DBNAME;User ID=USERNAME;Password=PASSWORD;TrustServerCertificate=True;" Microsoft.EntityFrameworkCore.SqlServer --context MyDbContext --output-dir Models --data-annotations --force` # Custom Endpoints ``` -Token İsteği Örnek: +Token İsteÄŸi Örnek: POST /connect/token HTTP/1.1 Host: localhost:44344 Content-Type: application/x-www-form-urlencoded @@ -35,28 +35,28 @@ username=system%40sozsoft.com &scope=offline_access%20Platform ``` -## Whatsapp Ayarları +## Whatsapp Ayarları -- Normal facebook üyeliği yapılır. -- https://developers.facebook.com/ sitesinden yeni developer üyeliği oluşturulur. Developer üyeliği seçilir. -- CreateApp butonu ile yeni uygulama oluşturulur. Uygulama adı belirlenir. 'Kurs Messenger' -- AppType olarak İşletme seçilir ve App oluşturulur. -- Add Products kısmında WhatsApp seçilir ve Business Account oluşturulur. -- 3 noktadan (menüden) WhatsApp Manager sayfasına gidilir. Manage Templates seçilir, istenirse yeni template oluşturulur. 'hello_world' -- WhatsApp Manager üzerinde menüden Settings -> Users -> System Users eklenir. Kullanıcı adı 'admin' ve Role ise 'Admin' seçilir. -- Eklenen 'admin' kullanıcısında 'Assign Assets' seçilir ve full yetki verilir. -- admin kullanıcısı üzerinden 'Generate Token' seçilir ve aşağıdaki yetkiler verilir. +- Normal facebook üyeliÄŸi yapılır. +- https://developers.facebook.com/ sitesinden yeni developer üyeliÄŸi oluÅŸturulur. Developer üyeliÄŸi seçilir. +- CreateApp butonu ile yeni uygulama oluÅŸturulur. Uygulama adı belirlenir. 'Erp Messenger' +- AppType olarak İşletme seçilir ve App oluÅŸturulur. +- Add Products kısmında WhatsApp seçilir ve Business Account oluÅŸturulur. +- 3 noktadan (menüden) WhatsApp Manager sayfasına gidilir. Manage Templates seçilir, istenirse yeni template oluÅŸturulur. 'hello_world' +- WhatsApp Manager üzerinde menüden Settings -> Users -> System Users eklenir. Kullanıcı adı 'admin' ve Role ise 'Admin' seçilir. +- Eklenen 'admin' kullanıcısında 'Assign Assets' seçilir ve full yetki verilir. +- admin kullanıcısı üzerinden 'Generate Token' seçilir ve aÅŸağıdaki yetkiler verilir. ``` - whatsapp_business_management' - 'whatsapp_business_messaging' ``` -- WhatsApp -> API Setup kısmından "From" kısmında yeni telefon numarası eklenir. -- WhatsApp -> API Setup kısmından Generate Access Token oluşturulur. +- WhatsApp -> API Setup kısmından "From" kısmında yeni telefon numarası eklenir. +- WhatsApp -> API Setup kısmından Generate Access Token oluÅŸturulur. - token: EAASM83pDJf0BO0ZCYBr3Fx4SES0ox8XiZCgP3FIteprYpwawZCkGYjpMlKk4OZCWgRNZC2Ttofgf8amMf929ZBuDcgYIOsXkPMGBNmVxm2czipzq63LmtbYfyCWsKVy0q1jtay0nRoeDuO2FKhqCfLLtNn9cSWjINVLcz26ptK8a2Oko83cZBzrNsp3cpIECnzqRfEjHdEz1U73y3ZB1MZBOhHilax7yZALf4ZA1Tmk -- WhatsApp telefon numarasını Register etmek için aşağıdaki postman Curl gönderilir. +- WhatsApp telefon numarasını Register etmek için aÅŸağıdaki postman Curl gönderilir. ``` curl --location 'https://graph.facebook.com/v21.0/521106361082067/register' \ @@ -68,12 +68,12 @@ username=system%40sozsoft.com }' ``` -- Message göndermek için url : https://graph.facebook.com/v21.0/521106361082067/messages +- Message göndermek için url : https://graph.facebook.com/v21.0/521106361082067/messages ``` { "messaging_product": "whatsapp", - "to": "{+gönderilecek gsm numarası}", + "to": "{+gönderilecek gsm numarası}", "type": "template", "template": { "name": "{message_template_name}", @@ -86,7 +86,7 @@ username=system%40sozsoft.com "parameters": [ { "type": "text", - "text": "Test mesajı" + "text": "Test mesajı" } ] } @@ -99,15 +99,16 @@ username=system%40sozsoft.com - https://abp.io/docs/latest/release-info/upgrading - https://abp.io/docs/9.0/release-info/migration-guides/abp-9-0 - https://learn.microsoft.com/en-us/aspnet/core/migration/80-90?view=aspnetcore-9.0&tabs=visual-studio-code -- Adımlar: - - abp cli güncellenir dotnet tool update --global Volo.Abp.Cli - - abp update ile sln içindeki referanslar update edilir - - modules/ klasörü *.csproj içinde ara&düzenle ile update edilir (örn. 8.3.4 -> 9.0.2) - - .net sürümü arttıysa Microsoft'un dotnet upgrade dokümanı takip edilir - - Yeni dotnet sdk kurulumu yapılır (örn dotnet 9 sdk) - - ef tools güncellenir (dotnet tool update --global dotnet-ef) - - Dockerfile dosyalarındaki base imajlar yeni dotnet sürümüne güncellenir - - Abp upgrade dokümanı takip edilir - - Proje build olmuyorsa hatalar çözülür - - Yeni migration eklenir (varsa). Migration boş çıkıyorsa kaldırılır. (Örn dotnet ef migrations add Abp902 ve dotnet ef migrations remove) - - Migration boş değilse çalıştırılır (dotnet ef database update) +- Adımlar: + - abp cli güncellenir dotnet tool update --global Volo.Abp.Cli + - abp update ile sln içindeki referanslar update edilir + - modules/ klasörü *.csproj içinde ara&düzenle ile update edilir (örn. 8.3.4 -> 9.0.2) + - .net sürümü arttıysa Microsoft'un dotnet upgrade dokümanı takip edilir + - Yeni dotnet sdk kurulumu yapılır (örn dotnet 9 sdk) + - ef tools güncellenir (dotnet tool update --global dotnet-ef) + - Dockerfile dosyalarındaki base imajlar yeni dotnet sürümüne güncellenir + - Abp upgrade dokümanı takip edilir + - Proje build olmuyorsa hatalar çözülür + - Yeni migration eklenir (varsa). Migration boÅŸ çıkıyorsa kaldırılır. (Örn dotnet ef migrations add Abp902 ve dotnet ef migrations remove) + - Migration boÅŸ deÄŸilse çalıştırılır (dotnet ef database update) + diff --git a/api/migrate-database.ps1 b/api/migrate-database.ps1 index 1b2037f2..1c7086bb 100644 --- a/api/migrate-database.ps1 +++ b/api/migrate-database.ps1 @@ -1 +1 @@ -dotnet run --project src/Kurs.Platform.DbMigrator \ No newline at end of file +dotnet run --project src/Erp.Platform.DbMigrator diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageDto.cs b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageDto.cs similarity index 93% rename from api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageDto.cs rename to api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageDto.cs index 673dc196..d348bc77 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageDto.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageDto.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using Volo.Abp.Application.Dtos; -namespace Kurs.Languages; +namespace Erp.Languages; public class LanguageDto : FullAuditedEntityDto { @@ -18,3 +18,4 @@ public class LanguageDto : FullAuditedEntityDto [Required] public bool IsEnabled { get; set; } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageKeyDto.cs b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageKeyDto.cs similarity index 91% rename from api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageKeyDto.cs rename to api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageKeyDto.cs index 7f98cf3f..6130d561 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageKeyDto.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageKeyDto.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using Volo.Abp.Application.Dtos; -namespace Kurs.Languages; +namespace Erp.Languages; public class LanguageKeyDto : FullAuditedEntityDto { @@ -12,3 +12,4 @@ public class LanguageKeyDto : FullAuditedEntityDto [Required] public string ResourceName { get; set; } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageTextCreateUpdateDto.cs b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageTextCreateUpdateDto.cs similarity index 92% rename from api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageTextCreateUpdateDto.cs rename to api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageTextCreateUpdateDto.cs index 43891b82..9e8ad2fe 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageTextCreateUpdateDto.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageTextCreateUpdateDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Kurs.Languages; +namespace Erp.Languages; public class LanguageTextCreateUpdateDto { @@ -16,3 +16,4 @@ public class LanguageTextCreateUpdateDto [Required] public string ResourceName { get; set; } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageTextDto.cs b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageTextDto.cs similarity index 91% rename from api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageTextDto.cs rename to api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageTextDto.cs index 748a84b9..ac7ae3a2 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageTextDto.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageTextDto.cs @@ -1,7 +1,7 @@ using System; using Volo.Abp.Application.Dtos; -namespace Kurs.Languages; +namespace Erp.Languages; public class LanguageTextDto : FullAuditedEntityDto { @@ -10,3 +10,4 @@ public class LanguageTextDto : FullAuditedEntityDto public string Key { get; set; } public string Value { get; set; } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageTextFilteredDto.cs b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageTextFilteredDto.cs similarity index 91% rename from api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageTextFilteredDto.cs rename to api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageTextFilteredDto.cs index 6b84d446..4e3eef40 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageTextFilteredDto.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageTextFilteredDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Kurs.Languages; +namespace Erp.Languages; public class LanguageTextFilteredDto { @@ -13,3 +13,4 @@ public class LanguageTextFilteredDto [Required] public string Key { get; set; } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageTextTranslatedDto.cs b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageTextTranslatedDto.cs similarity index 93% rename from api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageTextTranslatedDto.cs rename to api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageTextTranslatedDto.cs index 0bc12a80..c2ac5ee9 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageTextTranslatedDto.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageTextTranslatedDto.cs @@ -1,7 +1,7 @@ using System; using Volo.Abp.Application.Dtos; -namespace Kurs.Languages; +namespace Erp.Languages; public class LanguageTextTranslatedDto : FullAuditedEntityDto { @@ -12,3 +12,4 @@ public class LanguageTextTranslatedDto : FullAuditedEntityDto public string ResourceName { get; set; } public string Key { get; set; } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageTextTranslatedRequestDto.cs b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageTextTranslatedRequestDto.cs similarity index 93% rename from api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageTextTranslatedRequestDto.cs rename to api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageTextTranslatedRequestDto.cs index 50b47530..e84acd85 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Dtos/LanguageTextTranslatedRequestDto.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Dtos/LanguageTextTranslatedRequestDto.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using Volo.Abp.Application.Dtos; -namespace Kurs.Languages; +namespace Erp.Languages; public class LanguageTextTranslatedRequestDto : PagedAndSortedResultRequestDto { @@ -15,3 +15,4 @@ public class LanguageTextTranslatedRequestDto : PagedAndSortedResultRequestDto public string Key { get; set; } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Kurs.Languages.Application.Contracts.abppkg b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Erp.Languages.Application.Contracts.abppkg similarity index 100% rename from api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Kurs.Languages.Application.Contracts.abppkg rename to api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Erp.Languages.Application.Contracts.abppkg diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Kurs.Languages.Application.Contracts.csproj b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Erp.Languages.Application.Contracts.csproj similarity index 63% rename from api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Kurs.Languages.Application.Contracts.csproj rename to api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Erp.Languages.Application.Contracts.csproj index 4fc5129d..37a584db 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Kurs.Languages.Application.Contracts.csproj +++ b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Erp.Languages.Application.Contracts.csproj @@ -1,16 +1,17 @@ - + net9.0 - Kurs.Languages + Erp.Languages - + + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/FodyWeavers.xml b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/FodyWeavers.xml similarity index 100% rename from api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/FodyWeavers.xml rename to api/modules/Erp.Languages/Erp.Languages.Application.Contracts/FodyWeavers.xml diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/FodyWeavers.xsd b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/FodyWeavers.xsd similarity index 100% rename from api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/FodyWeavers.xsd rename to api/modules/Erp.Languages/Erp.Languages.Application.Contracts/FodyWeavers.xsd diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/ILanguageAppService.cs b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/ILanguageAppService.cs similarity index 92% rename from api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/ILanguageAppService.cs rename to api/modules/Erp.Languages/Erp.Languages.Application.Contracts/ILanguageAppService.cs index c1cef1e9..6b718336 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/ILanguageAppService.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/ILanguageAppService.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; -namespace Kurs.Languages; +namespace Erp.Languages; public interface ILanguageAppService : ICrudAppService< LanguageDto, @@ -12,3 +12,4 @@ public interface ILanguageAppService : ICrudAppService< { Task GetLanguageByCultureNameAsync(string CultureName); } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/ILanguageKeyAppService.cs b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/ILanguageKeyAppService.cs similarity index 89% rename from api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/ILanguageKeyAppService.cs rename to api/modules/Erp.Languages/Erp.Languages.Application.Contracts/ILanguageKeyAppService.cs index b8458afd..608589a4 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/ILanguageKeyAppService.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/ILanguageKeyAppService.cs @@ -2,7 +2,7 @@ using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; -namespace Kurs.Languages; +namespace Erp.Languages; public interface ILanguageKeyAppService : ICrudAppService< LanguageKeyDto, @@ -11,3 +11,4 @@ public interface ILanguageKeyAppService : ICrudAppService< { } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/ILanguageKeyIntegrationService.cs b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/ILanguageKeyIntegrationService.cs similarity index 94% rename from api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/ILanguageKeyIntegrationService.cs rename to api/modules/Erp.Languages/Erp.Languages.Application.Contracts/ILanguageKeyIntegrationService.cs index 5a60e4fc..e4a70498 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/ILanguageKeyIntegrationService.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/ILanguageKeyIntegrationService.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using Volo.Abp; -namespace Kurs.Languages; +namespace Erp.Languages; [IntegrationService] public interface ILanguageKeyIntegrationService @@ -19,3 +19,4 @@ public interface ILanguageKeyIntegrationService string MainGroupKey, string SubGroupKey); } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/ILanguageTextAppService.cs b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/ILanguageTextAppService.cs similarity index 96% rename from api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/ILanguageTextAppService.cs rename to api/modules/Erp.Languages/Erp.Languages.Application.Contracts/ILanguageTextAppService.cs index 7f3dc409..392debf1 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/ILanguageTextAppService.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/ILanguageTextAppService.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; -namespace Kurs.Languages; +namespace Erp.Languages; public interface ILanguageTextAppService : ICrudAppService< LanguageTextDto, @@ -17,3 +17,4 @@ public interface ILanguageTextAppService : ICrudAppService< Task UpdateLanguageTextAsync(LanguageTextCreateUpdateDto input); Task> GetLanguageTextByCultureNameAsync(string CultureName); } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/LanguagesApplicationContractsModule.cs b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/LanguagesApplicationContractsModule.cs similarity index 91% rename from api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/LanguagesApplicationContractsModule.cs rename to api/modules/Erp.Languages/Erp.Languages.Application.Contracts/LanguagesApplicationContractsModule.cs index b282c780..7acce093 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/LanguagesApplicationContractsModule.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/LanguagesApplicationContractsModule.cs @@ -2,7 +2,7 @@ using Volo.Abp.Modularity; using Volo.Abp.Authorization; -namespace Kurs.Languages; +namespace Erp.Languages; [DependsOn( typeof(LanguagesDomainSharedModule), @@ -13,3 +13,4 @@ public class LanguagesApplicationContractsModule : AbpModule { } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/LanguagesRemoteServiceConsts.cs b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/LanguagesRemoteServiceConsts.cs similarity index 84% rename from api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/LanguagesRemoteServiceConsts.cs rename to api/modules/Erp.Languages/Erp.Languages.Application.Contracts/LanguagesRemoteServiceConsts.cs index 34774d33..70096321 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/LanguagesRemoteServiceConsts.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/LanguagesRemoteServiceConsts.cs @@ -1,4 +1,4 @@ -namespace Kurs.Languages; +namespace Erp.Languages; public class LanguagesRemoteServiceConsts { @@ -6,3 +6,4 @@ public class LanguagesRemoteServiceConsts public const string ModuleName = "languages"; } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Permissions/LanguagesPermissionDefinitionProvider.cs b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Permissions/LanguagesPermissionDefinitionProvider.cs similarity index 86% rename from api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Permissions/LanguagesPermissionDefinitionProvider.cs rename to api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Permissions/LanguagesPermissionDefinitionProvider.cs index 3398bf86..e96169a4 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Permissions/LanguagesPermissionDefinitionProvider.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Permissions/LanguagesPermissionDefinitionProvider.cs @@ -1,8 +1,8 @@ -using Kurs.Languages.Localization; +using Erp.Languages.Localization; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Localization; -namespace Kurs.Languages.Permissions; +namespace Erp.Languages.Permissions; public class LanguagesPermissionDefinitionProvider : PermissionDefinitionProvider { @@ -16,3 +16,4 @@ public class LanguagesPermissionDefinitionProvider : PermissionDefinitionProvide return LocalizableString.Create(name); } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Permissions/LanguagesPermissions.cs b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Permissions/LanguagesPermissions.cs similarity index 87% rename from api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Permissions/LanguagesPermissions.cs rename to api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Permissions/LanguagesPermissions.cs index 3c061f85..fbc14a16 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application.Contracts/Permissions/LanguagesPermissions.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application.Contracts/Permissions/LanguagesPermissions.cs @@ -1,6 +1,6 @@ using Volo.Abp.Reflection; -namespace Kurs.Languages.Permissions; +namespace Erp.Languages.Permissions; public class LanguagesPermissions { @@ -11,3 +11,4 @@ public class LanguagesPermissions return ReflectionHelper.GetPublicConstantsRecursively(typeof(LanguagesPermissions)); } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application/Kurs.Languages.Application.abppkg b/api/modules/Erp.Languages/Erp.Languages.Application/Erp.Languages.Application.abppkg similarity index 100% rename from api/modules/Kurs.Languages/Kurs.Languages.Application/Kurs.Languages.Application.abppkg rename to api/modules/Erp.Languages/Erp.Languages.Application/Erp.Languages.Application.abppkg diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application/Kurs.Languages.Application.csproj b/api/modules/Erp.Languages/Erp.Languages.Application/Erp.Languages.Application.csproj similarity index 57% rename from api/modules/Kurs.Languages/Kurs.Languages.Application/Kurs.Languages.Application.csproj rename to api/modules/Erp.Languages/Erp.Languages.Application/Erp.Languages.Application.csproj index 423d2d6e..1956653d 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application/Kurs.Languages.Application.csproj +++ b/api/modules/Erp.Languages/Erp.Languages.Application/Erp.Languages.Application.csproj @@ -1,18 +1,19 @@ - + net9.0 - Kurs.Languages + Erp.Languages - - + + + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application/FodyWeavers.xml b/api/modules/Erp.Languages/Erp.Languages.Application/FodyWeavers.xml similarity index 100% rename from api/modules/Kurs.Languages/Kurs.Languages.Application/FodyWeavers.xml rename to api/modules/Erp.Languages/Erp.Languages.Application/FodyWeavers.xml diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application/FodyWeavers.xsd b/api/modules/Erp.Languages/Erp.Languages.Application/FodyWeavers.xsd similarity index 100% rename from api/modules/Kurs.Languages/Kurs.Languages.Application/FodyWeavers.xsd rename to api/modules/Erp.Languages/Erp.Languages.Application/FodyWeavers.xsd diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application/LanguageAppService.cs b/api/modules/Erp.Languages/Erp.Languages.Application/LanguageAppService.cs similarity index 94% rename from api/modules/Kurs.Languages/Kurs.Languages.Application/LanguageAppService.cs rename to api/modules/Erp.Languages/Erp.Languages.Application/LanguageAppService.cs index 8c9a0987..6a4cc3d3 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application/LanguageAppService.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application/LanguageAppService.cs @@ -1,5 +1,5 @@ -using Kurs.Languages.Entities; -using Kurs.Languages.Localization; +using Erp.Languages.Entities; +using Erp.Languages.Localization; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -10,7 +10,7 @@ using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Repositories; using Volo.Abp.Validation; -namespace Kurs.Languages; +namespace Erp.Languages; public class LanguageAppService : CrudAppService< Language, @@ -51,3 +51,4 @@ public class LanguageAppService : CrudAppService< return ObjectMapper.Map(item); } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application/LanguageKeyAppService.cs b/api/modules/Erp.Languages/Erp.Languages.Application/LanguageKeyAppService.cs similarity index 93% rename from api/modules/Kurs.Languages/Kurs.Languages.Application/LanguageKeyAppService.cs rename to api/modules/Erp.Languages/Erp.Languages.Application/LanguageKeyAppService.cs index f353523f..9e87d1d2 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application/LanguageKeyAppService.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application/LanguageKeyAppService.cs @@ -1,5 +1,5 @@ -using Kurs.Languages.Entities; -using Kurs.Languages.Localization; +using Erp.Languages.Entities; +using Erp.Languages.Localization; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -9,7 +9,7 @@ using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; using Volo.Abp.Validation; -namespace Kurs.Languages; +namespace Erp.Languages; public class LanguageKeyAppService : CrudAppService< LanguageKey, @@ -46,3 +46,4 @@ public class LanguageKeyAppService : CrudAppService< return await base.CreateAsync(input); } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application/LanguageKeyIntegrationService.cs b/api/modules/Erp.Languages/Erp.Languages.Application/LanguageKeyIntegrationService.cs similarity index 97% rename from api/modules/Kurs.Languages/Kurs.Languages.Application/LanguageKeyIntegrationService.cs rename to api/modules/Erp.Languages/Erp.Languages.Application/LanguageKeyIntegrationService.cs index b08a56ba..6421a2d0 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application/LanguageKeyIntegrationService.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application/LanguageKeyIntegrationService.cs @@ -1,11 +1,11 @@ using System; using System.Threading.Tasks; -using Kurs.Languages.Entities; +using Erp.Languages.Entities; using Volo.Abp; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; -namespace Kurs.Languages; +namespace Erp.Languages; [IntegrationService] public class LanguageKeyIntegrationService : ILanguageKeyIntegrationService, ITransientDependency @@ -61,3 +61,4 @@ public class LanguageKeyIntegrationService : ILanguageKeyIntegrationService, ITr await _repository.DeleteAsync(a => a.Key == SubGroupKey && a.ResourceName == LanguagesConsts.AppName); } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application/LanguageTextAppService.cs b/api/modules/Erp.Languages/Erp.Languages.Application/LanguageTextAppService.cs similarity index 98% rename from api/modules/Kurs.Languages/Kurs.Languages.Application/LanguageTextAppService.cs rename to api/modules/Erp.Languages/Erp.Languages.Application/LanguageTextAppService.cs index 00af2d73..05d0238e 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application/LanguageTextAppService.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application/LanguageTextAppService.cs @@ -1,5 +1,5 @@ -using Kurs.Languages.Entities; -using Kurs.Languages.Localization; +using Erp.Languages.Entities; +using Erp.Languages.Localization; using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; @@ -15,7 +15,7 @@ using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Repositories; using Volo.Abp.Validation; -namespace Kurs.Languages; +namespace Erp.Languages; public class LanguageTextAppService : CrudAppService< LanguageText, @@ -174,3 +174,4 @@ public class LanguageTextAppService : CrudAppService< return query; } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application/LanguagesAppService.cs b/api/modules/Erp.Languages/Erp.Languages.Application/LanguagesAppService.cs similarity index 81% rename from api/modules/Kurs.Languages/Kurs.Languages.Application/LanguagesAppService.cs rename to api/modules/Erp.Languages/Erp.Languages.Application/LanguagesAppService.cs index 6a3f226e..6e6fdff6 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application/LanguagesAppService.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application/LanguagesAppService.cs @@ -1,7 +1,7 @@ -using Kurs.Languages.Localization; +using Erp.Languages.Localization; using Volo.Abp.Application.Services; -namespace Kurs.Languages; +namespace Erp.Languages; public abstract class LanguagesAppService : ApplicationService { @@ -11,3 +11,4 @@ public abstract class LanguagesAppService : ApplicationService ObjectMapperContext = typeof(LanguagesApplicationModule); } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application/LanguagesApplicationAutoMapperProfile.cs b/api/modules/Erp.Languages/Erp.Languages.Application/LanguagesApplicationAutoMapperProfile.cs similarity index 94% rename from api/modules/Kurs.Languages/Kurs.Languages.Application/LanguagesApplicationAutoMapperProfile.cs rename to api/modules/Erp.Languages/Erp.Languages.Application/LanguagesApplicationAutoMapperProfile.cs index 9b795ec2..f9379774 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application/LanguagesApplicationAutoMapperProfile.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application/LanguagesApplicationAutoMapperProfile.cs @@ -1,9 +1,9 @@ using AutoMapper; -using Kurs.Languages.Entities; +using Erp.Languages.Entities; using Volo.Abp.AutoMapper; using Volo.Abp.Localization; -namespace Kurs.Languages; +namespace Erp.Languages; public class LanguagesApplicationAutoMapperProfile : Profile { @@ -27,3 +27,4 @@ public class LanguagesApplicationAutoMapperProfile : Profile } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Application/LanguagesApplicationModule.cs b/api/modules/Erp.Languages/Erp.Languages.Application/LanguagesApplicationModule.cs similarity index 96% rename from api/modules/Kurs.Languages/Kurs.Languages.Application/LanguagesApplicationModule.cs rename to api/modules/Erp.Languages/Erp.Languages.Application/LanguagesApplicationModule.cs index d5392ff5..998e8f0d 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Application/LanguagesApplicationModule.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Application/LanguagesApplicationModule.cs @@ -3,7 +3,7 @@ using Volo.Abp.Application; using Volo.Abp.AutoMapper; using Volo.Abp.Modularity; -namespace Kurs.Languages; +namespace Erp.Languages; [DependsOn( typeof(LanguagesDomainModule), @@ -23,3 +23,4 @@ public class LanguagesApplicationModule : AbpModule }); } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/Kurs.Languages.Domain.Shared.abppkg b/api/modules/Erp.Languages/Erp.Languages.Domain.Shared/Erp.Languages.Domain.Shared.abppkg similarity index 100% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/Kurs.Languages.Domain.Shared.abppkg rename to api/modules/Erp.Languages/Erp.Languages.Domain.Shared/Erp.Languages.Domain.Shared.abppkg diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/Kurs.Languages.Domain.Shared.csproj b/api/modules/Erp.Languages/Erp.Languages.Domain.Shared/Erp.Languages.Domain.Shared.csproj similarity index 100% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/Kurs.Languages.Domain.Shared.csproj rename to api/modules/Erp.Languages/Erp.Languages.Domain.Shared/Erp.Languages.Domain.Shared.csproj diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/FodyWeavers.xml b/api/modules/Erp.Languages/Erp.Languages.Domain.Shared/FodyWeavers.xml similarity index 100% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/FodyWeavers.xml rename to api/modules/Erp.Languages/Erp.Languages.Domain.Shared/FodyWeavers.xml diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/FodyWeavers.xsd b/api/modules/Erp.Languages/Erp.Languages.Domain.Shared/FodyWeavers.xsd similarity index 100% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/FodyWeavers.xsd rename to api/modules/Erp.Languages/Erp.Languages.Domain.Shared/FodyWeavers.xsd diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/LanguagesConsts.cs b/api/modules/Erp.Languages/Erp.Languages.Domain.Shared/LanguagesConsts.cs similarity index 75% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/LanguagesConsts.cs rename to api/modules/Erp.Languages/Erp.Languages.Domain.Shared/LanguagesConsts.cs index 426bbaf1..3fec864b 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/LanguagesConsts.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Domain.Shared/LanguagesConsts.cs @@ -1,7 +1,8 @@ -namespace Kurs.Languages; +namespace Erp.Languages; public static class LanguagesConsts { public const string AppName = "Languages"; } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/LanguagesDomainSharedModule.cs b/api/modules/Erp.Languages/Erp.Languages.Domain.Shared/LanguagesDomainSharedModule.cs similarity index 93% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/LanguagesDomainSharedModule.cs rename to api/modules/Erp.Languages/Erp.Languages.Domain.Shared/LanguagesDomainSharedModule.cs index 41c6cded..d4ae8d5b 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/LanguagesDomainSharedModule.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Domain.Shared/LanguagesDomainSharedModule.cs @@ -1,4 +1,4 @@ -using Kurs.Languages.Localization; +using Erp.Languages.Localization; using Volo.Abp.Domain; using Volo.Abp.Localization; using Volo.Abp.Localization.ExceptionHandling; @@ -6,7 +6,7 @@ using Volo.Abp.Modularity; using Volo.Abp.Validation; using Volo.Abp.VirtualFileSystem; -namespace Kurs.Languages; +namespace Erp.Languages; [DependsOn( typeof(AbpValidationModule), @@ -32,3 +32,4 @@ public class LanguagesDomainSharedModule : AbpModule }); } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/LanguagesErrorCodes.cs b/api/modules/Erp.Languages/Erp.Languages.Domain.Shared/LanguagesErrorCodes.cs similarity index 77% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/LanguagesErrorCodes.cs rename to api/modules/Erp.Languages/Erp.Languages.Domain.Shared/LanguagesErrorCodes.cs index b005ff67..1ee663fe 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/LanguagesErrorCodes.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Domain.Shared/LanguagesErrorCodes.cs @@ -1,6 +1,7 @@ -namespace Kurs.Languages; +namespace Erp.Languages; public static class LanguagesErrorCodes { //Add your business exception error codes here... } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/Localization/Languages.cs b/api/modules/Erp.Languages/Erp.Languages.Domain.Shared/Localization/Languages.cs similarity index 97% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/Localization/Languages.cs rename to api/modules/Erp.Languages/Erp.Languages.Domain.Shared/Localization/Languages.cs index 11fc7507..fad0ea8f 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/Localization/Languages.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Domain.Shared/Localization/Languages.cs @@ -1,4 +1,4 @@ -namespace Kurs.Languages.Languages +namespace Erp.Languages.Languages { public static class LanguageCodes { @@ -42,3 +42,4 @@ public const string Zh = "繁體中文"; } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/Localization/LanguagesResource.cs b/api/modules/Erp.Languages/Erp.Languages.Domain.Shared/Localization/LanguagesResource.cs similarity index 75% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/Localization/LanguagesResource.cs rename to api/modules/Erp.Languages/Erp.Languages.Domain.Shared/Localization/LanguagesResource.cs index a9e25879..486ef3ed 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Domain.Shared/Localization/LanguagesResource.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Domain.Shared/Localization/LanguagesResource.cs @@ -1,9 +1,10 @@ using Volo.Abp.Localization; -namespace Kurs.Languages.Localization; +namespace Erp.Languages.Localization; [LocalizationResourceName(LanguagesConsts.AppName)] public class LanguagesResource { } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Entities/Language.cs b/api/modules/Erp.Languages/Erp.Languages.Domain/Entities/Language.cs similarity index 90% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain/Entities/Language.cs rename to api/modules/Erp.Languages/Erp.Languages.Domain/Entities/Language.cs index 0e1b23cf..b4506a33 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Entities/Language.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Domain/Entities/Language.cs @@ -1,7 +1,7 @@ using System; using Volo.Abp.Domain.Entities.Auditing; -namespace Kurs.Languages.Entities; +namespace Erp.Languages.Entities; public class Language : FullAuditedEntity { @@ -12,3 +12,4 @@ public class Language : FullAuditedEntity public string TwoLetterISOLanguageName { get; set; } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Entities/LanguageKey.cs b/api/modules/Erp.Languages/Erp.Languages.Domain/Entities/LanguageKey.cs similarity index 89% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain/Entities/LanguageKey.cs rename to api/modules/Erp.Languages/Erp.Languages.Domain/Entities/LanguageKey.cs index 7d549adf..72ce8412 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Entities/LanguageKey.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Domain/Entities/LanguageKey.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Volo.Abp.Domain.Entities.Auditing; -namespace Kurs.Languages.Entities; +namespace Erp.Languages.Entities; public class LanguageKey : FullAuditedEntity { @@ -12,3 +12,4 @@ public class LanguageKey : FullAuditedEntity public virtual ICollection Texts { get; set; } = []; } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Entities/LanguageText.cs b/api/modules/Erp.Languages/Erp.Languages.Domain/Entities/LanguageText.cs similarity index 90% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain/Entities/LanguageText.cs rename to api/modules/Erp.Languages/Erp.Languages.Domain/Entities/LanguageText.cs index 4aab8a2e..9e16595d 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Entities/LanguageText.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Domain/Entities/LanguageText.cs @@ -1,7 +1,7 @@ using System; using Volo.Abp.Domain.Entities.Auditing; -namespace Kurs.Languages.Entities; +namespace Erp.Languages.Entities; public class LanguageText : FullAuditedEntity { @@ -12,3 +12,4 @@ public class LanguageText : FullAuditedEntity public virtual LanguageKey LanguageKey { get; set; } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Kurs.Languages.Domain.abppkg b/api/modules/Erp.Languages/Erp.Languages.Domain/Erp.Languages.Domain.abppkg similarity index 100% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain/Kurs.Languages.Domain.abppkg rename to api/modules/Erp.Languages/Erp.Languages.Domain/Erp.Languages.Domain.abppkg diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Kurs.Languages.Domain.csproj b/api/modules/Erp.Languages/Erp.Languages.Domain/Erp.Languages.Domain.csproj similarity index 63% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain/Kurs.Languages.Domain.csproj rename to api/modules/Erp.Languages/Erp.Languages.Domain/Erp.Languages.Domain.csproj index 657a0658..3d863149 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Kurs.Languages.Domain.csproj +++ b/api/modules/Erp.Languages/Erp.Languages.Domain/Erp.Languages.Domain.csproj @@ -1,16 +1,17 @@ - + net9.0 - Kurs.Languages + Erp.Languages - + + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain/FodyWeavers.xml b/api/modules/Erp.Languages/Erp.Languages.Domain/FodyWeavers.xml similarity index 100% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain/FodyWeavers.xml rename to api/modules/Erp.Languages/Erp.Languages.Domain/FodyWeavers.xml diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain/FodyWeavers.xsd b/api/modules/Erp.Languages/Erp.Languages.Domain/FodyWeavers.xsd similarity index 100% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain/FodyWeavers.xsd rename to api/modules/Erp.Languages/Erp.Languages.Domain/FodyWeavers.xsd diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Languages/LanguageListCacheItem.cs b/api/modules/Erp.Languages/Erp.Languages.Domain/Languages/LanguageListCacheItem.cs similarity index 86% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain/Languages/LanguageListCacheItem.cs rename to api/modules/Erp.Languages/Erp.Languages.Domain/Languages/LanguageListCacheItem.cs index 2c5f924c..c67f22a5 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Languages/LanguageListCacheItem.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Domain/Languages/LanguageListCacheItem.cs @@ -1,9 +1,10 @@ using System.Collections.Generic; using Volo.Abp.Localization; -namespace Kurs.Languages; +namespace Erp.Languages; public class LanguageListCacheItem { public IReadOnlyList Languages { get; set; } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Languages/LanguageTextCacheItem.cs b/api/modules/Erp.Languages/Erp.Languages.Domain/Languages/LanguageTextCacheItem.cs similarity index 86% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain/Languages/LanguageTextCacheItem.cs rename to api/modules/Erp.Languages/Erp.Languages.Domain/Languages/LanguageTextCacheItem.cs index 544c8ad7..f5eb0c7e 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Languages/LanguageTextCacheItem.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Domain/Languages/LanguageTextCacheItem.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Kurs.Languages; +namespace Erp.Languages; public class LanguageTextCacheItem : object { @@ -11,7 +11,8 @@ public class LanguageTextCacheItem : object public static string CalculateCacheKey(string resourceName, string cultureName) { - // .en.Kurs.Dynamics + // .en.Erp.Dynamics return $".{cultureName}.{resourceName}"; } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Languages/LanguageTextCacheItemInvalidator.cs b/api/modules/Erp.Languages/Erp.Languages.Domain/Languages/LanguageTextCacheItemInvalidator.cs similarity index 93% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain/Languages/LanguageTextCacheItemInvalidator.cs rename to api/modules/Erp.Languages/Erp.Languages.Domain/Languages/LanguageTextCacheItemInvalidator.cs index a606ffa2..51645ad8 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Languages/LanguageTextCacheItemInvalidator.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Domain/Languages/LanguageTextCacheItemInvalidator.cs @@ -1,11 +1,11 @@ using System.Threading.Tasks; -using Kurs.Languages.Entities; +using Erp.Languages.Entities; using Volo.Abp.Caching; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Entities.Events; using Volo.Abp.EventBus; -namespace Kurs.Languages; +namespace Erp.Languages; public class LanguageTextCacheItemInvalidator : ILocalEventHandler>, @@ -26,3 +26,4 @@ public class LanguageTextCacheItemInvalidator : return; } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Languages/LanguageTextCacheItemInvalidatorDistributed.cs b/api/modules/Erp.Languages/Erp.Languages.Domain/Languages/LanguageTextCacheItemInvalidatorDistributed.cs similarity index 97% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain/Languages/LanguageTextCacheItemInvalidatorDistributed.cs rename to api/modules/Erp.Languages/Erp.Languages.Domain/Languages/LanguageTextCacheItemInvalidatorDistributed.cs index f95827ec..fd3cb396 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Languages/LanguageTextCacheItemInvalidatorDistributed.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Domain/Languages/LanguageTextCacheItemInvalidatorDistributed.cs @@ -1,4 +1,4 @@ -using Kurs.Languages.Entities; +using Erp.Languages.Entities; using System; using System.Threading.Tasks; using Volo.Abp.Caching; @@ -7,7 +7,7 @@ using Volo.Abp.Domain.Entities.Events.Distributed; using Volo.Abp.Domain.Repositories; using Volo.Abp.EventBus.Distributed; -namespace Kurs.Languages; +namespace Erp.Languages; public class LanguageTextCacheItemInvalidatorDistributed : IDistributedEventHandler>, @@ -75,3 +75,4 @@ public class LanguageTextEto // }); //} + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain/LanguagesDbProperties.cs b/api/modules/Erp.Languages/Erp.Languages.Domain/LanguagesDbProperties.cs similarity index 93% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain/LanguagesDbProperties.cs rename to api/modules/Erp.Languages/Erp.Languages.Domain/LanguagesDbProperties.cs index 9f3f7d56..9ad6e8d3 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Domain/LanguagesDbProperties.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Domain/LanguagesDbProperties.cs @@ -1,4 +1,4 @@ -namespace Kurs.Languages; +namespace Erp.Languages; public static class Prefix { @@ -16,3 +16,4 @@ public static class TablePrefix return $"{Prefix.MenuPrefix}_{Prefix.HostPrefix}_{tableName}"; } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain/LanguagesDomainModule.cs b/api/modules/Erp.Languages/Erp.Languages.Domain/LanguagesDomainModule.cs similarity index 90% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain/LanguagesDomainModule.cs rename to api/modules/Erp.Languages/Erp.Languages.Domain/LanguagesDomainModule.cs index 0f56436b..3a3b74f4 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Domain/LanguagesDomainModule.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Domain/LanguagesDomainModule.cs @@ -1,10 +1,10 @@ -using Kurs.Languages.Localization; +using Erp.Languages.Localization; using Volo.Abp.Caching.StackExchangeRedis; using Volo.Abp.Domain; using Volo.Abp.Localization; using Volo.Abp.Modularity; -namespace Kurs.Languages; +namespace Erp.Languages; [DependsOn( typeof(AbpDddDomainModule), @@ -22,3 +22,4 @@ public class LanguagesDomainModule : AbpModule }); } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Localization/DatabaseLanguageProvider.cs b/api/modules/Erp.Languages/Erp.Languages.Domain/Localization/DatabaseLanguageProvider.cs similarity index 95% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain/Localization/DatabaseLanguageProvider.cs rename to api/modules/Erp.Languages/Erp.Languages.Domain/Localization/DatabaseLanguageProvider.cs index a0bf032d..da80eec8 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Localization/DatabaseLanguageProvider.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Domain/Localization/DatabaseLanguageProvider.cs @@ -2,13 +2,13 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Kurs.Languages.Entities; +using Erp.Languages.Entities; using Volo.Abp.Caching; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; using Volo.Abp.Localization; -namespace Kurs.Languages.Localization; +namespace Erp.Languages.Localization; [Dependency(ReplaceServices = true)] public class DatabaseLanguageProvider : ILanguageProvider, ITransientDependency @@ -43,3 +43,4 @@ public class DatabaseLanguageProvider : ILanguageProvider, ITransientDependency }; } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Localization/DatabaseLocalizationResourceContributor.cs b/api/modules/Erp.Languages/Erp.Languages.Domain/Localization/DatabaseLocalizationResourceContributor.cs similarity index 97% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain/Localization/DatabaseLocalizationResourceContributor.cs rename to api/modules/Erp.Languages/Erp.Languages.Domain/Localization/DatabaseLocalizationResourceContributor.cs index 6252109f..f013b1c2 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Localization/DatabaseLocalizationResourceContributor.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Domain/Localization/DatabaseLocalizationResourceContributor.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Localization; using Volo.Abp.Localization; -namespace Kurs.Languages.Localization; +namespace Erp.Languages.Localization; public class DatabaseLocalizationResourceContributor : ILocalizationResourceContributor { @@ -43,3 +43,4 @@ public class DatabaseLocalizationResourceContributor : ILocalizationResourceCont return langs.Select(a => a.CultureName).ToList(); } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Localization/DatabaseResourceLocalizer.cs b/api/modules/Erp.Languages/Erp.Languages.Domain/Localization/DatabaseResourceLocalizer.cs similarity index 97% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain/Localization/DatabaseResourceLocalizer.cs rename to api/modules/Erp.Languages/Erp.Languages.Domain/Localization/DatabaseResourceLocalizer.cs index 53a2a801..e9c99ab0 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Localization/DatabaseResourceLocalizer.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Domain/Localization/DatabaseResourceLocalizer.cs @@ -1,4 +1,4 @@ -using Kurs.Languages.Entities; +using Erp.Languages.Entities; using Microsoft.Extensions.Localization; using System; using System.Collections.Generic; @@ -10,7 +10,7 @@ using Volo.Abp.Domain.Repositories; using Volo.Abp.Localization; using Volo.Abp.Threading; -namespace Kurs.Languages.Localization; +namespace Erp.Languages.Localization; public class DatabaseResourceLocalizer : IDatabaseResourceLocalizer, ISingletonDependency { @@ -87,3 +87,4 @@ public class DatabaseResourceLocalizer : IDatabaseResourceLocalizer, ISingletonD }; } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Localization/IDatabaseResourceLocalizer.cs b/api/modules/Erp.Languages/Erp.Languages.Domain/Localization/IDatabaseResourceLocalizer.cs similarity index 93% rename from api/modules/Kurs.Languages/Kurs.Languages.Domain/Localization/IDatabaseResourceLocalizer.cs rename to api/modules/Erp.Languages/Erp.Languages.Domain/Localization/IDatabaseResourceLocalizer.cs index fd407950..2d756a22 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.Domain/Localization/IDatabaseResourceLocalizer.cs +++ b/api/modules/Erp.Languages/Erp.Languages.Domain/Localization/IDatabaseResourceLocalizer.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Volo.Abp.Localization; -namespace Kurs.Languages.Localization; +namespace Erp.Languages.Localization; public interface IDatabaseResourceLocalizer { @@ -11,3 +11,4 @@ public interface IDatabaseResourceLocalizer Task FillAsync(LocalizationResourceBase resource, string cultureName, Dictionary dictionary); LocalizedString GetOrNull(LocalizationResourceBase resource, string cultureName, string name); } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/EntityFrameworkCore/ILanguagesDbContext.cs b/api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/EntityFrameworkCore/ILanguagesDbContext.cs similarity index 85% rename from api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/EntityFrameworkCore/ILanguagesDbContext.cs rename to api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/EntityFrameworkCore/ILanguagesDbContext.cs index eb65f012..7fe4e68d 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/EntityFrameworkCore/ILanguagesDbContext.cs +++ b/api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/EntityFrameworkCore/ILanguagesDbContext.cs @@ -1,7 +1,7 @@ using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; -namespace Kurs.Languages.EntityFrameworkCore; +namespace Erp.Languages.EntityFrameworkCore; [ConnectionStringName(Prefix.ConnectionStringName)] public interface ILanguagesDbContext : IEfCoreDbContext @@ -10,3 +10,4 @@ public interface ILanguagesDbContext : IEfCoreDbContext * DbSet Questions { get; } */ } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContext.cs b/api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContext.cs similarity index 89% rename from api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContext.cs rename to api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContext.cs index aeca7368..109fcfe2 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContext.cs +++ b/api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContext.cs @@ -1,9 +1,9 @@ -using Kurs.Languages.Entities; +using Erp.Languages.Entities; using Microsoft.EntityFrameworkCore; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; -namespace Kurs.Languages.EntityFrameworkCore; +namespace Erp.Languages.EntityFrameworkCore; [ConnectionStringName(Prefix.ConnectionStringName)] public class LanguagesDbContext : AbpDbContext, ILanguagesDbContext @@ -25,3 +25,4 @@ public class LanguagesDbContext : AbpDbContext, ILanguagesDb builder.ConfigureLanguages(); } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContextModelCreatingExtensions.cs b/api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContextModelCreatingExtensions.cs similarity index 96% rename from api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContextModelCreatingExtensions.cs rename to api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContextModelCreatingExtensions.cs index 53ce1d36..b693ec3d 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContextModelCreatingExtensions.cs +++ b/api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContextModelCreatingExtensions.cs @@ -1,9 +1,9 @@ -using Kurs.Languages.Entities; +using Erp.Languages.Entities; using Microsoft.EntityFrameworkCore; using Volo.Abp; using Volo.Abp.EntityFrameworkCore.Modeling; -namespace Kurs.Languages.EntityFrameworkCore; +namespace Erp.Languages.EntityFrameworkCore; public static class LanguagesDbContextModelCreatingExtensions { @@ -59,3 +59,4 @@ public static class LanguagesDbContextModelCreatingExtensions }); } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesEntityFrameworkCoreModule.cs b/api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesEntityFrameworkCoreModule.cs similarity index 93% rename from api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesEntityFrameworkCoreModule.cs rename to api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesEntityFrameworkCoreModule.cs index 64230715..20782d32 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesEntityFrameworkCoreModule.cs +++ b/api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesEntityFrameworkCoreModule.cs @@ -2,7 +2,7 @@ using Volo.Abp.EntityFrameworkCore; using Volo.Abp.Modularity; -namespace Kurs.Languages.EntityFrameworkCore; +namespace Erp.Languages.EntityFrameworkCore; [DependsOn( typeof(LanguagesDomainModule), @@ -21,3 +21,4 @@ public class LanguagesEntityFrameworkCoreModule : AbpModule }); } } + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/Kurs.Languages.EntityFrameworkCore.abppkg b/api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/Erp.Languages.EntityFrameworkCore.abppkg similarity index 100% rename from api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/Kurs.Languages.EntityFrameworkCore.abppkg rename to api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/Erp.Languages.EntityFrameworkCore.abppkg diff --git a/api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/Kurs.Languages.EntityFrameworkCore.csproj b/api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/Erp.Languages.EntityFrameworkCore.csproj similarity index 58% rename from api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/Kurs.Languages.EntityFrameworkCore.csproj rename to api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/Erp.Languages.EntityFrameworkCore.csproj index 72f49ce0..c27df837 100644 --- a/api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/Kurs.Languages.EntityFrameworkCore.csproj +++ b/api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/Erp.Languages.EntityFrameworkCore.csproj @@ -1,15 +1,16 @@ - + net9.0 - Kurs.Languages + Erp.Languages - + + diff --git a/api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/FodyWeavers.xml b/api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/FodyWeavers.xml similarity index 100% rename from api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/FodyWeavers.xml rename to api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/FodyWeavers.xml diff --git a/api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/FodyWeavers.xsd b/api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/FodyWeavers.xsd similarity index 100% rename from api/modules/Kurs.Languages/Kurs.Languages.EntityFrameworkCore/FodyWeavers.xsd rename to api/modules/Erp.Languages/Erp.Languages.EntityFrameworkCore/FodyWeavers.xsd diff --git a/api/modules/Kurs.Languages/common.props b/api/modules/Erp.Languages/common.props similarity index 100% rename from api/modules/Kurs.Languages/common.props rename to api/modules/Erp.Languages/common.props diff --git a/api/modules/Erp.MailQueue/Application/MailQueueAppService.cs b/api/modules/Erp.MailQueue/Application/MailQueueAppService.cs new file mode 100644 index 00000000..a8f913a4 --- /dev/null +++ b/api/modules/Erp.MailQueue/Application/MailQueueAppService.cs @@ -0,0 +1,14 @@ +using Erp.MailQueue.Domain.Shared; +using Volo.Abp.Application.Services; + +namespace Erp.MailQueue.Application; + +public abstract class MailQueueAppService : ApplicationService +{ + protected MailQueueAppService() + { + LocalizationResource = typeof(ErpMailQueueResource); + ObjectMapperContext = typeof(ErpMailQueueModule); + } +} + diff --git a/api/modules/Kurs.MailQueue/Application/MailQueueAutoMapperProfile.cs b/api/modules/Erp.MailQueue/Application/MailQueueAutoMapperProfile.cs similarity index 77% rename from api/modules/Kurs.MailQueue/Application/MailQueueAutoMapperProfile.cs rename to api/modules/Erp.MailQueue/Application/MailQueueAutoMapperProfile.cs index 05ee7f2f..74a922de 100644 --- a/api/modules/Kurs.MailQueue/Application/MailQueueAutoMapperProfile.cs +++ b/api/modules/Erp.MailQueue/Application/MailQueueAutoMapperProfile.cs @@ -1,6 +1,6 @@ using AutoMapper; -namespace Kurs.MailQueue.Application; +namespace Erp.MailQueue.Application; public class MailQueueAutoMapperProfile : Profile { @@ -10,3 +10,4 @@ public class MailQueueAutoMapperProfile : Profile } } + diff --git a/api/modules/Kurs.MailQueue/Domain.Shared/Localization/KetsMailQueueResource.cs b/api/modules/Erp.MailQueue/Domain.Shared/Localization/KetsMailQueueResource.cs similarity index 54% rename from api/modules/Kurs.MailQueue/Domain.Shared/Localization/KetsMailQueueResource.cs rename to api/modules/Erp.MailQueue/Domain.Shared/Localization/KetsMailQueueResource.cs index 4a80ad5d..cc729dac 100644 --- a/api/modules/Kurs.MailQueue/Domain.Shared/Localization/KetsMailQueueResource.cs +++ b/api/modules/Erp.MailQueue/Domain.Shared/Localization/KetsMailQueueResource.cs @@ -1,8 +1,9 @@ using Volo.Abp.Localization; -namespace Kurs.MailQueue.Domain.Shared; +namespace Erp.MailQueue.Domain.Shared; [LocalizationResourceName(MailQueueConsts.AppName)] -public class KursMailQueueResource +public class ErpMailQueueResource { } + diff --git a/api/modules/Kurs.MailQueue/Domain.Shared/MailQueueConsts.cs b/api/modules/Erp.MailQueue/Domain.Shared/MailQueueConsts.cs similarity index 67% rename from api/modules/Kurs.MailQueue/Domain.Shared/MailQueueConsts.cs rename to api/modules/Erp.MailQueue/Domain.Shared/MailQueueConsts.cs index ff6fa776..1565210d 100644 --- a/api/modules/Kurs.MailQueue/Domain.Shared/MailQueueConsts.cs +++ b/api/modules/Erp.MailQueue/Domain.Shared/MailQueueConsts.cs @@ -1,7 +1,8 @@ -namespace Kurs.MailQueue.Domain.Shared; +namespace Erp.MailQueue.Domain.Shared; public static class MailQueueConsts { public const string AppName = "MailQueue"; } + diff --git a/api/modules/Kurs.MailQueue/Domain.Shared/MailQueueWorkerOptions.cs b/api/modules/Erp.MailQueue/Domain.Shared/MailQueueWorkerOptions.cs similarity index 89% rename from api/modules/Kurs.MailQueue/Domain.Shared/MailQueueWorkerOptions.cs rename to api/modules/Erp.MailQueue/Domain.Shared/MailQueueWorkerOptions.cs index e17f3d3b..6c413c60 100644 --- a/api/modules/Kurs.MailQueue/Domain.Shared/MailQueueWorkerOptions.cs +++ b/api/modules/Erp.MailQueue/Domain.Shared/MailQueueWorkerOptions.cs @@ -1,4 +1,4 @@ -namespace Kurs.MailQueue.Domain.Shared; +namespace Erp.MailQueue.Domain.Shared; public class MailQueueWorkerOptions { @@ -7,3 +7,4 @@ public class MailQueueWorkerOptions public string MailTemplate { get; set; } // Render edilecek html template public string Tablo { get; set; } // Bu maildeki tablolar örn. {0:MT3_GECIKEN_SIPARIS:IN:Order Delay Notification:0:} } + diff --git a/api/modules/Kurs.MailQueue/Domain/Entities/BackgroundWorker_MailQueue.cs b/api/modules/Erp.MailQueue/Domain/Entities/BackgroundWorker_MailQueue.cs similarity index 95% rename from api/modules/Kurs.MailQueue/Domain/Entities/BackgroundWorker_MailQueue.cs rename to api/modules/Erp.MailQueue/Domain/Entities/BackgroundWorker_MailQueue.cs index 59d823b4..74b9b57e 100644 --- a/api/modules/Kurs.MailQueue/Domain/Entities/BackgroundWorker_MailQueue.cs +++ b/api/modules/Erp.MailQueue/Domain/Entities/BackgroundWorker_MailQueue.cs @@ -1,6 +1,6 @@ using Volo.Abp.Domain.Entities.Auditing; -namespace Kurs.MailQueue.Domain.Entities; +namespace Erp.MailQueue.Domain.Entities; public class BackgroundWorker_MailQueue : FullAuditedEntity { @@ -20,3 +20,4 @@ public class BackgroundWorker_MailQueue : FullAuditedEntity public virtual ICollection Events { get; set; } public virtual BackgroundWorker_MailQueueTableFormat TableFormat { get; set; } } + diff --git a/api/modules/Kurs.MailQueue/Domain/Entities/BackgroundWorker_MailQueueEvents.cs b/api/modules/Erp.MailQueue/Domain/Entities/BackgroundWorker_MailQueueEvents.cs similarity index 91% rename from api/modules/Kurs.MailQueue/Domain/Entities/BackgroundWorker_MailQueueEvents.cs rename to api/modules/Erp.MailQueue/Domain/Entities/BackgroundWorker_MailQueueEvents.cs index dbddf8c2..74e48c94 100644 --- a/api/modules/Kurs.MailQueue/Domain/Entities/BackgroundWorker_MailQueueEvents.cs +++ b/api/modules/Erp.MailQueue/Domain/Entities/BackgroundWorker_MailQueueEvents.cs @@ -1,6 +1,6 @@ using Volo.Abp.Domain.Entities.Auditing; -namespace Kurs.MailQueue.Domain.Entities; +namespace Erp.MailQueue.Domain.Entities; public partial class BackgroundWorker_MailQueueEvents : FullAuditedEntity { @@ -12,3 +12,4 @@ public partial class BackgroundWorker_MailQueueEvents : FullAuditedEntity public virtual BackgroundWorker_MailQueue MailQueue { get; set; } } + diff --git a/api/modules/Kurs.MailQueue/Domain/Entities/BackgroundWorker_MailQueueTableFormat.cs b/api/modules/Erp.MailQueue/Domain/Entities/BackgroundWorker_MailQueueTableFormat.cs similarity index 94% rename from api/modules/Kurs.MailQueue/Domain/Entities/BackgroundWorker_MailQueueTableFormat.cs rename to api/modules/Erp.MailQueue/Domain/Entities/BackgroundWorker_MailQueueTableFormat.cs index 798749d9..c71875b3 100644 --- a/api/modules/Kurs.MailQueue/Domain/Entities/BackgroundWorker_MailQueueTableFormat.cs +++ b/api/modules/Erp.MailQueue/Domain/Entities/BackgroundWorker_MailQueueTableFormat.cs @@ -1,6 +1,6 @@ using Volo.Abp.Domain.Entities; -namespace Kurs.MailQueue.Domain.Entities; +namespace Erp.MailQueue.Domain.Entities; public partial class BackgroundWorker_MailQueueTableFormat : Entity { @@ -20,3 +20,4 @@ public partial class BackgroundWorker_MailQueueTableFormat : Entity public virtual ICollection MailQueues { get; set; } } + diff --git a/api/modules/Kurs.MailQueue/Domain/LogManager.cs b/api/modules/Erp.MailQueue/Domain/LogManager.cs similarity index 98% rename from api/modules/Kurs.MailQueue/Domain/LogManager.cs rename to api/modules/Erp.MailQueue/Domain/LogManager.cs index e2326b1d..e6e07c66 100644 --- a/api/modules/Kurs.MailQueue/Domain/LogManager.cs +++ b/api/modules/Erp.MailQueue/Domain/LogManager.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Logging; using Volo.Abp.Domain.Services; -namespace Kurs.MailQueue.Domain; +namespace Erp.MailQueue.Domain; public interface ILogManager : IDomainService { @@ -40,3 +40,4 @@ public class NullLogManager : DomainService, ILogManager public void LogWarning(string logDetayi, string kategori = null, string kayitTipi = null, Guid? kayitId = null, string jobId = null) => Log(LogLevel.Warning, logDetayi, kategori, kayitTipi, kayitId, jobId); } + diff --git a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Extractors/AttachmentExtractor.cs b/api/modules/Erp.MailQueue/Domain/MailGeneration/Extractors/AttachmentExtractor.cs similarity index 95% rename from api/modules/Kurs.MailQueue/Domain/MailGeneration/Extractors/AttachmentExtractor.cs rename to api/modules/Erp.MailQueue/Domain/MailGeneration/Extractors/AttachmentExtractor.cs index 371a4c5e..b56daac5 100644 --- a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Extractors/AttachmentExtractor.cs +++ b/api/modules/Erp.MailQueue/Domain/MailGeneration/Extractors/AttachmentExtractor.cs @@ -1,7 +1,7 @@ -using Kurs.MailQueue.MailGeneration.Models; +using Erp.MailQueue.MailGeneration.Models; using Volo.Abp.DependencyInjection; -namespace Kurs.MailQueue.Domain.MailGeneration; +namespace Erp.MailQueue.Domain.MailGeneration; public interface IAttachmentExtractor { @@ -61,3 +61,4 @@ public class AttachmentExtractor : IAttachmentExtractor, ITransientDependency return result; } } + diff --git a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Extractors/CssExtractor.cs b/api/modules/Erp.MailQueue/Domain/MailGeneration/Extractors/CssExtractor.cs similarity index 95% rename from api/modules/Kurs.MailQueue/Domain/MailGeneration/Extractors/CssExtractor.cs rename to api/modules/Erp.MailQueue/Domain/MailGeneration/Extractors/CssExtractor.cs index af8e0232..47aee98d 100644 --- a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Extractors/CssExtractor.cs +++ b/api/modules/Erp.MailQueue/Domain/MailGeneration/Extractors/CssExtractor.cs @@ -1,6 +1,6 @@ using Volo.Abp.DependencyInjection; -namespace Kurs.MailQueue.Domain.MailGeneration; +namespace Erp.MailQueue.Domain.MailGeneration; public interface ICssExtractor { @@ -41,3 +41,4 @@ public class CssExtractor : ICssExtractor, ITransientDependency return values; } } + diff --git a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Extractors/ParameterExtractor.cs b/api/modules/Erp.MailQueue/Domain/MailGeneration/Extractors/ParameterExtractor.cs similarity index 97% rename from api/modules/Kurs.MailQueue/Domain/MailGeneration/Extractors/ParameterExtractor.cs rename to api/modules/Erp.MailQueue/Domain/MailGeneration/Extractors/ParameterExtractor.cs index 5dc6ec4c..aacdc079 100644 --- a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Extractors/ParameterExtractor.cs +++ b/api/modules/Erp.MailQueue/Domain/MailGeneration/Extractors/ParameterExtractor.cs @@ -1,6 +1,6 @@ using Volo.Abp.DependencyInjection; -namespace Kurs.MailQueue.Domain.MailGeneration; +namespace Erp.MailQueue.Domain.MailGeneration; public interface IParameterExtractor { @@ -77,3 +77,4 @@ public class ParameterExtractor : IParameterExtractor, ITransientDependency return null; } } + diff --git a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Extractors/TableExtractor.cs b/api/modules/Erp.MailQueue/Domain/MailGeneration/Extractors/TableExtractor.cs similarity index 93% rename from api/modules/Kurs.MailQueue/Domain/MailGeneration/Extractors/TableExtractor.cs rename to api/modules/Erp.MailQueue/Domain/MailGeneration/Extractors/TableExtractor.cs index 6df4a8f3..565be184 100644 --- a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Extractors/TableExtractor.cs +++ b/api/modules/Erp.MailQueue/Domain/MailGeneration/Extractors/TableExtractor.cs @@ -1,7 +1,7 @@ -using Kurs.MailQueue.MailGeneration.Models; +using Erp.MailQueue.MailGeneration.Models; using Volo.Abp.DependencyInjection; -namespace Kurs.MailQueue.Domain.MailGeneration; +namespace Erp.MailQueue.Domain.MailGeneration; public interface ITableExtractor { @@ -46,3 +46,4 @@ public class TableExtractor : ITableExtractor, ITransientDependency return result; } } + diff --git a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Generators/AttachmentGenerator.cs b/api/modules/Erp.MailQueue/Domain/MailGeneration/Generators/AttachmentGenerator.cs similarity index 98% rename from api/modules/Kurs.MailQueue/Domain/MailGeneration/Generators/AttachmentGenerator.cs rename to api/modules/Erp.MailQueue/Domain/MailGeneration/Generators/AttachmentGenerator.cs index 3a3f3bbb..f69279ff 100644 --- a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Generators/AttachmentGenerator.cs +++ b/api/modules/Erp.MailQueue/Domain/MailGeneration/Generators/AttachmentGenerator.cs @@ -1,11 +1,11 @@ -using Kurs.MailQueue.FileGeneration; -using Kurs.MailQueue.MailGeneration.Models; +using Erp.MailQueue.FileGeneration; +using Erp.MailQueue.MailGeneration.Models; using Microsoft.Extensions.Configuration; using Volo.Abp.DependencyInjection; using Volo.Abp.Guids; using Volo.Abp.TextTemplating; -namespace Kurs.MailQueue.Domain.MailGeneration; +namespace Erp.MailQueue.Domain.MailGeneration; public interface IAttachmentGenerator { @@ -224,3 +224,4 @@ public class AttachmentGenerator : IAttachmentGenerator, ITransientDependency } } } + diff --git a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Generators/MailBodyGenerator.cs b/api/modules/Erp.MailQueue/Domain/MailGeneration/Generators/MailBodyGenerator.cs similarity index 97% rename from api/modules/Kurs.MailQueue/Domain/MailGeneration/Generators/MailBodyGenerator.cs rename to api/modules/Erp.MailQueue/Domain/MailGeneration/Generators/MailBodyGenerator.cs index 3bb76454..9198835e 100644 --- a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Generators/MailBodyGenerator.cs +++ b/api/modules/Erp.MailQueue/Domain/MailGeneration/Generators/MailBodyGenerator.cs @@ -1,9 +1,9 @@ -using Kurs.MailQueue.MailGeneration.Models; +using Erp.MailQueue.MailGeneration.Models; using Microsoft.Extensions.Configuration; using Volo.Abp.DependencyInjection; using Volo.Abp.TextTemplating; -namespace Kurs.MailQueue.Domain.MailGeneration; +namespace Erp.MailQueue.Domain.MailGeneration; public interface IMailBodyGenerator { @@ -101,3 +101,4 @@ public class MailBodyGenerator : IMailBodyGenerator, ITransientDependency } } } + diff --git a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Generators/TableGenerator.cs b/api/modules/Erp.MailQueue/Domain/MailGeneration/Generators/TableGenerator.cs similarity index 95% rename from api/modules/Kurs.MailQueue/Domain/MailGeneration/Generators/TableGenerator.cs rename to api/modules/Erp.MailQueue/Domain/MailGeneration/Generators/TableGenerator.cs index 3a8a3de5..db0e7721 100644 --- a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Generators/TableGenerator.cs +++ b/api/modules/Erp.MailQueue/Domain/MailGeneration/Generators/TableGenerator.cs @@ -1,13 +1,13 @@ using System.Data; -using Kurs.MailQueue.Domain.Entities; -using Kurs.MailQueue.EntityFrameworkCore; -using Kurs.MailQueue.MailGeneration.Models; +using Erp.MailQueue.Domain.Entities; +using Erp.MailQueue.EntityFrameworkCore; +using Erp.MailQueue.MailGeneration.Models; using Microsoft.EntityFrameworkCore; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; using Volo.Abp.TextTemplating; -namespace Kurs.MailQueue.Domain.MailGeneration; +namespace Erp.MailQueue.Domain.MailGeneration; public interface ITableGenerator { @@ -102,3 +102,4 @@ public class TableGenerator : ITableGenerator, ITransientDependency x => x); } } + diff --git a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Models/AttachmentModel.cs b/api/modules/Erp.MailQueue/Domain/MailGeneration/Models/AttachmentModel.cs similarity index 87% rename from api/modules/Kurs.MailQueue/Domain/MailGeneration/Models/AttachmentModel.cs rename to api/modules/Erp.MailQueue/Domain/MailGeneration/Models/AttachmentModel.cs index f6f78653..907c36cc 100644 --- a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Models/AttachmentModel.cs +++ b/api/modules/Erp.MailQueue/Domain/MailGeneration/Models/AttachmentModel.cs @@ -1,4 +1,4 @@ -namespace Kurs.MailQueue.MailGeneration.Models; +namespace Erp.MailQueue.MailGeneration.Models; public class AttachmentModel { @@ -9,3 +9,4 @@ public class AttachmentModel public Dictionary Filtreler { get; set; } public string MailEkAdi { get; set; } } + diff --git a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Models/MailTemplateModel.cs b/api/modules/Erp.MailQueue/Domain/MailGeneration/Models/MailTemplateModel.cs similarity index 78% rename from api/modules/Kurs.MailQueue/Domain/MailGeneration/Models/MailTemplateModel.cs rename to api/modules/Erp.MailQueue/Domain/MailGeneration/Models/MailTemplateModel.cs index 4cb27335..a3ae2b30 100644 --- a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Models/MailTemplateModel.cs +++ b/api/modules/Erp.MailQueue/Domain/MailGeneration/Models/MailTemplateModel.cs @@ -1,4 +1,4 @@ -namespace Kurs.MailQueue.MailGeneration.Models; +namespace Erp.MailQueue.MailGeneration.Models; public class MailTemplateModel { @@ -6,3 +6,4 @@ public class MailTemplateModel public Dictionary Tablolar { get; set; } } + diff --git a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Models/MailTemplateTableColumnModel.cs b/api/modules/Erp.MailQueue/Domain/MailGeneration/Models/MailTemplateTableColumnModel.cs similarity index 92% rename from api/modules/Kurs.MailQueue/Domain/MailGeneration/Models/MailTemplateTableColumnModel.cs rename to api/modules/Erp.MailQueue/Domain/MailGeneration/Models/MailTemplateTableColumnModel.cs index 56b58d4b..656fda23 100644 --- a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Models/MailTemplateTableColumnModel.cs +++ b/api/modules/Erp.MailQueue/Domain/MailGeneration/Models/MailTemplateTableColumnModel.cs @@ -1,4 +1,4 @@ -namespace Kurs.MailQueue.MailGeneration.Models; +namespace Erp.MailQueue.MailGeneration.Models; public class MailTemplateTableColumnModel { @@ -16,3 +16,4 @@ public class MailTemplateTableColumnModel public int Genislik { get; set; } } + diff --git a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Models/MailTemplateTableModel.cs b/api/modules/Erp.MailQueue/Domain/MailGeneration/Models/MailTemplateTableModel.cs similarity index 90% rename from api/modules/Kurs.MailQueue/Domain/MailGeneration/Models/MailTemplateTableModel.cs rename to api/modules/Erp.MailQueue/Domain/MailGeneration/Models/MailTemplateTableModel.cs index efddb6df..fa1f943a 100644 --- a/api/modules/Kurs.MailQueue/Domain/MailGeneration/Models/MailTemplateTableModel.cs +++ b/api/modules/Erp.MailQueue/Domain/MailGeneration/Models/MailTemplateTableModel.cs @@ -1,4 +1,4 @@ -namespace Kurs.MailQueue.MailGeneration.Models; +namespace Erp.MailQueue.MailGeneration.Models; public class MailTemplateTableModel { @@ -12,3 +12,4 @@ public class MailTemplateTableModel public string Korumalimi { get; set; } public string DosyaAciklama { get; set; } } + diff --git a/api/modules/Kurs.MailQueue/Domain/MailQueueDbProperties.cs b/api/modules/Erp.MailQueue/Domain/MailQueueDbProperties.cs similarity index 92% rename from api/modules/Kurs.MailQueue/Domain/MailQueueDbProperties.cs rename to api/modules/Erp.MailQueue/Domain/MailQueueDbProperties.cs index 3094a026..8b556168 100644 --- a/api/modules/Kurs.MailQueue/Domain/MailQueueDbProperties.cs +++ b/api/modules/Erp.MailQueue/Domain/MailQueueDbProperties.cs @@ -1,4 +1,4 @@ -namespace Kurs.MailQueue.Domain; +namespace Erp.MailQueue.Domain; public static class Prefix { @@ -15,4 +15,4 @@ public static class TablePrefix { return $"{Prefix.MenuPrefix}_{Prefix.HostPrefix}_{tableName}"; } -} \ No newline at end of file +} diff --git a/api/modules/Kurs.MailQueue/Domain/MailQueueWorker.cs b/api/modules/Erp.MailQueue/Domain/MailQueueWorker.cs similarity index 96% rename from api/modules/Kurs.MailQueue/Domain/MailQueueWorker.cs rename to api/modules/Erp.MailQueue/Domain/MailQueueWorker.cs index d6ee556b..c623c98f 100644 --- a/api/modules/Kurs.MailQueue/Domain/MailQueueWorker.cs +++ b/api/modules/Erp.MailQueue/Domain/MailQueueWorker.cs @@ -1,6 +1,6 @@ -using Kurs.Sender.Mail; -using Kurs.MailQueue.Domain.MailGeneration; -using Kurs.MailQueue.Domain.Shared; +using Erp.Sender.Mail; +using Erp.MailQueue.Domain.MailGeneration; +using Erp.MailQueue.Domain.Shared; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.BackgroundWorkers; @@ -9,7 +9,7 @@ using Volo.Abp.Guids; using Volo.Abp.Timing; using Volo.Abp.Uow; -namespace Kurs.MailQueue.Domain; +namespace Erp.MailQueue.Domain; public class MailQueueWorker : BackgroundWorkerBase { @@ -17,7 +17,7 @@ public class MailQueueWorker : BackgroundWorkerBase public string TemplateName { get; set; } public MailQueueWorkerOptions Options { get; set; } - protected IKursEmailSender KursEmailSender { get; } + protected IErpEmailSender ErpEmailSender { get; } protected IRepository Repository { get; } public IClock Clock { get; } public IConfiguration Configuration { get; } @@ -28,7 +28,7 @@ public class MailQueueWorker : BackgroundWorkerBase public IGuidGenerator GuidGenerator { get; } public MailQueueWorker( - IKursEmailSender kursEmailSender, + IErpEmailSender ErpEmailSender, IRepository repository, IClock clock, IConfiguration configuration, @@ -39,7 +39,7 @@ public class MailQueueWorker : BackgroundWorkerBase IGuidGenerator guidGenerator ) { - KursEmailSender = kursEmailSender; + ErpEmailSender = ErpEmailSender; Repository = repository; Clock = clock; Configuration = configuration; @@ -173,7 +173,7 @@ public class MailQueueWorker : BackgroundWorkerBase var sender = new KeyValuePair( senderKeyValue.ElementAtOrDefault(0), senderKeyValue.ElementAtOrDefault(1)); - var result = await KursEmailSender.SendEmailAsync( + var result = await ErpEmailSender.SendEmailAsync( queue.To.Split(";").Select(a => a.Trim()).ToArray(), sender, null, @@ -224,3 +224,4 @@ public class MailQueueWorker : BackgroundWorkerBase //Logger.LogInformation("Executed MailWorker..!"); } } + diff --git a/api/modules/Kurs.MailQueue/Domain/MailTracking/MailTrackingManager.cs b/api/modules/Erp.MailQueue/Domain/MailTracking/MailTrackingManager.cs similarity index 98% rename from api/modules/Kurs.MailQueue/Domain/MailTracking/MailTrackingManager.cs rename to api/modules/Erp.MailQueue/Domain/MailTracking/MailTrackingManager.cs index 73113115..3445b787 100644 --- a/api/modules/Kurs.MailQueue/Domain/MailTracking/MailTrackingManager.cs +++ b/api/modules/Erp.MailQueue/Domain/MailTracking/MailTrackingManager.cs @@ -2,13 +2,13 @@ using Amazon; using Amazon.SQS; using Amazon.SQS.Model; -using Kurs.Sender.Mail.AmazonSes; -using Kurs.MailQueue.Domain.Entities; +using Erp.Sender.Mail.AmazonSes; +using Erp.MailQueue.Domain.Entities; using Microsoft.Extensions.Configuration; using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Services; -namespace Kurs.MailQueue.Domain.MailTracking; +namespace Erp.MailQueue.Domain.MailTracking; public class MailTrackingManager : DomainService { @@ -134,3 +134,4 @@ public class MailTrackingManager : DomainService } } + diff --git a/api/modules/Kurs.MailQueue/EntityFrameworkCore/IMailQueueDbContext.cs b/api/modules/Erp.MailQueue/EntityFrameworkCore/IMailQueueDbContext.cs similarity index 78% rename from api/modules/Kurs.MailQueue/EntityFrameworkCore/IMailQueueDbContext.cs rename to api/modules/Erp.MailQueue/EntityFrameworkCore/IMailQueueDbContext.cs index 91751b29..2235538a 100644 --- a/api/modules/Kurs.MailQueue/EntityFrameworkCore/IMailQueueDbContext.cs +++ b/api/modules/Erp.MailQueue/EntityFrameworkCore/IMailQueueDbContext.cs @@ -1,8 +1,8 @@ -using Kurs.MailQueue.Domain; +using Erp.MailQueue.Domain; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; -namespace Kurs.MailQueue.EntityFrameworkCore; +namespace Erp.MailQueue.EntityFrameworkCore; [ConnectionStringName(Prefix.ConnectionStringName)] public interface IMailQueueDbContext : IEfCoreDbContext @@ -11,3 +11,4 @@ public interface IMailQueueDbContext : IEfCoreDbContext * DbSet Questions { get; } */ } + diff --git a/api/modules/Kurs.MailQueue/EntityFrameworkCore/MailQueueDbContext.cs b/api/modules/Erp.MailQueue/EntityFrameworkCore/MailQueueDbContext.cs similarity index 91% rename from api/modules/Kurs.MailQueue/EntityFrameworkCore/MailQueueDbContext.cs rename to api/modules/Erp.MailQueue/EntityFrameworkCore/MailQueueDbContext.cs index d02cd9cd..9f940f73 100644 --- a/api/modules/Kurs.MailQueue/EntityFrameworkCore/MailQueueDbContext.cs +++ b/api/modules/Erp.MailQueue/EntityFrameworkCore/MailQueueDbContext.cs @@ -1,9 +1,9 @@ -using Kurs.MailQueue.Domain; +using Erp.MailQueue.Domain; using Microsoft.EntityFrameworkCore; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; -namespace Kurs.MailQueue.EntityFrameworkCore; +namespace Erp.MailQueue.EntityFrameworkCore; [ConnectionStringName(Prefix.ConnectionStringName)] public class MailQueueDbContext : AbpDbContext, IMailQueueDbContext @@ -25,3 +25,4 @@ public class MailQueueDbContext : AbpDbContext, IMailQueueDb builder.ConfigureMailQueue(); } } + diff --git a/api/modules/Kurs.MailQueue/EntityFrameworkCore/MailQueueDbContextModelCreatingExtensions.cs b/api/modules/Erp.MailQueue/EntityFrameworkCore/MailQueueDbContextModelCreatingExtensions.cs similarity index 96% rename from api/modules/Kurs.MailQueue/EntityFrameworkCore/MailQueueDbContextModelCreatingExtensions.cs rename to api/modules/Erp.MailQueue/EntityFrameworkCore/MailQueueDbContextModelCreatingExtensions.cs index d547c67f..6b07b885 100644 --- a/api/modules/Kurs.MailQueue/EntityFrameworkCore/MailQueueDbContextModelCreatingExtensions.cs +++ b/api/modules/Erp.MailQueue/EntityFrameworkCore/MailQueueDbContextModelCreatingExtensions.cs @@ -1,10 +1,10 @@ -using Kurs.MailQueue.Domain; -using Kurs.MailQueue.Domain.Entities; +using Erp.MailQueue.Domain; +using Erp.MailQueue.Domain.Entities; using Microsoft.EntityFrameworkCore; using Volo.Abp; using Volo.Abp.EntityFrameworkCore.Modeling; -namespace Kurs.MailQueue.EntityFrameworkCore; +namespace Erp.MailQueue.EntityFrameworkCore; public static class MailQueueDbContextModelCreatingExtensions { @@ -74,3 +74,4 @@ public static class MailQueueDbContextModelCreatingExtensions }); } } + diff --git a/api/modules/Kurs.MailQueue/EntityFrameworkCore/QueryRepository.cs b/api/modules/Erp.MailQueue/EntityFrameworkCore/QueryRepository.cs similarity index 94% rename from api/modules/Kurs.MailQueue/EntityFrameworkCore/QueryRepository.cs rename to api/modules/Erp.MailQueue/EntityFrameworkCore/QueryRepository.cs index ee5b6e0c..05454fc2 100644 --- a/api/modules/Kurs.MailQueue/EntityFrameworkCore/QueryRepository.cs +++ b/api/modules/Erp.MailQueue/EntityFrameworkCore/QueryRepository.cs @@ -1,10 +1,10 @@ using System.Data; -using Kurs.MailQueue.Domain.Entities; +using Erp.MailQueue.Domain.Entities; using Microsoft.EntityFrameworkCore; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; -namespace Kurs.MailQueue.EntityFrameworkCore; +namespace Erp.MailQueue.EntityFrameworkCore; public interface IQueryRepository { @@ -50,3 +50,4 @@ public class QueryRepository : IQueryRepository, ITransientDependency return table; } } + diff --git a/api/modules/Kurs.MailQueue/Kurs.MailQueue.csproj b/api/modules/Erp.MailQueue/Erp.MailQueue.csproj similarity index 96% rename from api/modules/Kurs.MailQueue/Kurs.MailQueue.csproj rename to api/modules/Erp.MailQueue/Erp.MailQueue.csproj index 1b1b8bda..f73ec4a2 100644 --- a/api/modules/Kurs.MailQueue/Kurs.MailQueue.csproj +++ b/api/modules/Erp.MailQueue/Erp.MailQueue.csproj @@ -38,7 +38,7 @@ - + @@ -47,3 +47,4 @@ + diff --git a/api/modules/Kurs.MailQueue/KursMailQueueModule.cs b/api/modules/Erp.MailQueue/ErpMailQueueModule.cs similarity index 77% rename from api/modules/Kurs.MailQueue/KursMailQueueModule.cs rename to api/modules/Erp.MailQueue/ErpMailQueueModule.cs index d65b40ef..2559e581 100644 --- a/api/modules/Kurs.MailQueue/KursMailQueueModule.cs +++ b/api/modules/Erp.MailQueue/ErpMailQueueModule.cs @@ -1,7 +1,7 @@ using System.Reflection; -using Kurs.Sender; -using Kurs.MailQueue.Domain.Shared; -using Kurs.MailQueue.EntityFrameworkCore; +using Erp.Sender; +using Erp.MailQueue.Domain.Shared; +using Erp.MailQueue.EntityFrameworkCore; using Microsoft.CodeAnalysis; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Application; @@ -16,7 +16,7 @@ using Volo.Abp.TextTemplating.Razor; using Volo.Abp.VirtualFileSystem; using Wkhtmltopdf.NetCore; -namespace Kurs.MailQueue; +namespace Erp.MailQueue; [DependsOn( typeof(AbpDddDomainModule), @@ -26,26 +26,26 @@ namespace Kurs.MailQueue; typeof(AbpAuthorizationModule), typeof(AbpEntityFrameworkCoreModule), typeof(AbpTextTemplatingRazorModule), - typeof(KursSenderModule) + typeof(ErpSenderModule) )] -public class KursMailQueueModule : AbpModule +public class ErpMailQueueModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddAutoMapperObjectMapper(); + context.Services.AddAutoMapperObjectMapper(); Configure(options => { - options.AddMaps(validate: true); + options.AddMaps(validate: true); }); Configure(options => { - options.Resources.Add("en"); + options.Resources.Add("en"); }); Configure(options => { - options.MapCodeNamespace("MailQueue", typeof(KursMailQueueResource)); + options.MapCodeNamespace("MailQueue", typeof(ErpMailQueueResource)); }); context.Services.AddAbpDbContext(options => @@ -55,7 +55,7 @@ public class KursMailQueueModule : AbpModule Configure(options => { - options.References.Add(MetadataReference.CreateFromFile(typeof(KursMailQueueModule).Assembly.Location)); + options.References.Add(MetadataReference.CreateFromFile(typeof(ErpMailQueueModule).Assembly.Location)); }); Configure(options => @@ -73,10 +73,11 @@ public class KursMailQueueModule : AbpModule // FileGenerationModule Configure(options => { - options.FileSets.AddEmbedded(); + options.FileSets.AddEmbedded(); }); context.Services.AddWkhtmltopdf($"FileGeneration{Path.DirectorySeparatorChar}Rotativa"); // FileGenerationModule } } + diff --git a/api/modules/Kurs.MailQueue/FileGeneration/IFileGenerator.cs b/api/modules/Erp.MailQueue/FileGeneration/IFileGenerator.cs similarity index 51% rename from api/modules/Kurs.MailQueue/FileGeneration/IFileGenerator.cs rename to api/modules/Erp.MailQueue/FileGeneration/IFileGenerator.cs index ea30ce52..dd284d28 100644 --- a/api/modules/Kurs.MailQueue/FileGeneration/IFileGenerator.cs +++ b/api/modules/Erp.MailQueue/FileGeneration/IFileGenerator.cs @@ -1,8 +1,9 @@ -using Kurs.MailQueue.MailGeneration.Models; +using Erp.MailQueue.MailGeneration.Models; -namespace Kurs.MailQueue.FileGeneration; +namespace Erp.MailQueue.FileGeneration; public interface IFileGenerator { Task Generate(MailTemplateTableModel table); } + diff --git a/api/modules/Kurs.MailQueue/FileGeneration/PDFFileGenerator.cs b/api/modules/Erp.MailQueue/FileGeneration/PDFFileGenerator.cs similarity index 88% rename from api/modules/Kurs.MailQueue/FileGeneration/PDFFileGenerator.cs rename to api/modules/Erp.MailQueue/FileGeneration/PDFFileGenerator.cs index 07e8b805..767fbb92 100644 --- a/api/modules/Kurs.MailQueue/FileGeneration/PDFFileGenerator.cs +++ b/api/modules/Erp.MailQueue/FileGeneration/PDFFileGenerator.cs @@ -1,9 +1,9 @@ -using Kurs.MailQueue.MailGeneration.Models; +using Erp.MailQueue.MailGeneration.Models; using Volo.Abp.DependencyInjection; using Volo.Abp.TextTemplating; using Wkhtmltopdf.NetCore; -namespace Kurs.MailQueue.FileGeneration; +namespace Erp.MailQueue.FileGeneration; public class PDFFileGenerator : IFileGenerator, ITransientDependency { @@ -24,3 +24,4 @@ public class PDFFileGenerator : IFileGenerator, ITransientDependency return pdfGenerator.GetPDF(html); } } + diff --git a/api/modules/Kurs.MailQueue/FileGeneration/Rotativa/Linux/libwkhtmltox.so b/api/modules/Erp.MailQueue/FileGeneration/Rotativa/Linux/libwkhtmltox.so similarity index 100% rename from api/modules/Kurs.MailQueue/FileGeneration/Rotativa/Linux/libwkhtmltox.so rename to api/modules/Erp.MailQueue/FileGeneration/Rotativa/Linux/libwkhtmltox.so diff --git a/api/modules/Kurs.MailQueue/FileGeneration/Rotativa/Linux/wkhtmltopdf b/api/modules/Erp.MailQueue/FileGeneration/Rotativa/Linux/wkhtmltopdf similarity index 100% rename from api/modules/Kurs.MailQueue/FileGeneration/Rotativa/Linux/wkhtmltopdf rename to api/modules/Erp.MailQueue/FileGeneration/Rotativa/Linux/wkhtmltopdf diff --git a/api/modules/Kurs.MailQueue/FileGeneration/Rotativa/Mac/libwkhtmltox.dylib b/api/modules/Erp.MailQueue/FileGeneration/Rotativa/Mac/libwkhtmltox.dylib similarity index 100% rename from api/modules/Kurs.MailQueue/FileGeneration/Rotativa/Mac/libwkhtmltox.dylib rename to api/modules/Erp.MailQueue/FileGeneration/Rotativa/Mac/libwkhtmltox.dylib diff --git a/api/modules/Kurs.MailQueue/FileGeneration/Rotativa/Mac/wkhtmltopdf b/api/modules/Erp.MailQueue/FileGeneration/Rotativa/Mac/wkhtmltopdf similarity index 100% rename from api/modules/Kurs.MailQueue/FileGeneration/Rotativa/Mac/wkhtmltopdf rename to api/modules/Erp.MailQueue/FileGeneration/Rotativa/Mac/wkhtmltopdf diff --git a/api/modules/Kurs.MailQueue/FileGeneration/Rotativa/Windows/wkhtmltopdf.exe b/api/modules/Erp.MailQueue/FileGeneration/Rotativa/Windows/wkhtmltopdf.exe similarity index 100% rename from api/modules/Kurs.MailQueue/FileGeneration/Rotativa/Windows/wkhtmltopdf.exe rename to api/modules/Erp.MailQueue/FileGeneration/Rotativa/Windows/wkhtmltopdf.exe diff --git a/api/modules/Kurs.MailQueue/FileGeneration/Rotativa/Windows/wkhtmltox.dll b/api/modules/Erp.MailQueue/FileGeneration/Rotativa/Windows/wkhtmltox.dll similarity index 100% rename from api/modules/Kurs.MailQueue/FileGeneration/Rotativa/Windows/wkhtmltox.dll rename to api/modules/Erp.MailQueue/FileGeneration/Rotativa/Windows/wkhtmltox.dll diff --git a/api/modules/Kurs.MailQueue/FileGeneration/TXTFileGenerator.cs b/api/modules/Erp.MailQueue/FileGeneration/TXTFileGenerator.cs similarity index 90% rename from api/modules/Kurs.MailQueue/FileGeneration/TXTFileGenerator.cs rename to api/modules/Erp.MailQueue/FileGeneration/TXTFileGenerator.cs index 977f767c..a5409901 100644 --- a/api/modules/Kurs.MailQueue/FileGeneration/TXTFileGenerator.cs +++ b/api/modules/Erp.MailQueue/FileGeneration/TXTFileGenerator.cs @@ -1,8 +1,8 @@ using System.Text; -using Kurs.MailQueue.MailGeneration.Models; +using Erp.MailQueue.MailGeneration.Models; using Volo.Abp.DependencyInjection; -namespace Kurs.MailQueue.FileGeneration; +namespace Erp.MailQueue.FileGeneration; public class TXTFileGenerator : IFileGenerator, ITransientDependency { @@ -21,3 +21,4 @@ public class TXTFileGenerator : IFileGenerator, ITransientDependency return await Task.FromResult(Encoding.UTF8.GetBytes(sb.ToString())); } } + diff --git a/api/modules/Kurs.MailQueue/FileGeneration/Templates/MailQueueFileGenerationTemplateDefinitionProvider.cs b/api/modules/Erp.MailQueue/FileGeneration/Templates/MailQueueFileGenerationTemplateDefinitionProvider.cs similarity index 89% rename from api/modules/Kurs.MailQueue/FileGeneration/Templates/MailQueueFileGenerationTemplateDefinitionProvider.cs rename to api/modules/Erp.MailQueue/FileGeneration/Templates/MailQueueFileGenerationTemplateDefinitionProvider.cs index 68b4733a..8a7b591d 100644 --- a/api/modules/Kurs.MailQueue/FileGeneration/Templates/MailQueueFileGenerationTemplateDefinitionProvider.cs +++ b/api/modules/Erp.MailQueue/FileGeneration/Templates/MailQueueFileGenerationTemplateDefinitionProvider.cs @@ -1,7 +1,7 @@ using Volo.Abp.TextTemplating; using Volo.Abp.TextTemplating.Razor; -namespace Kurs.MailQueue.FileGeneration.Templates; +namespace Erp.MailQueue.FileGeneration.Templates; public class MailQueueFileGenerationTemplateDefinitionProvider : TemplateDefinitionProvider { @@ -13,3 +13,4 @@ public class MailQueueFileGenerationTemplateDefinitionProvider : TemplateDefinit .WithVirtualFilePath("/FileGeneration/Templates/Table.cshtml", true)); } } + diff --git a/api/modules/Kurs.MailQueue/FileGeneration/Templates/Table.cshtml b/api/modules/Erp.MailQueue/FileGeneration/Templates/Table.cshtml similarity index 92% rename from api/modules/Kurs.MailQueue/FileGeneration/Templates/Table.cshtml rename to api/modules/Erp.MailQueue/FileGeneration/Templates/Table.cshtml index 05714436..9679c68c 100644 --- a/api/modules/Kurs.MailQueue/FileGeneration/Templates/Table.cshtml +++ b/api/modules/Erp.MailQueue/FileGeneration/Templates/Table.cshtml @@ -1,6 +1,6 @@ @using System.Collections.Generic -@using Kurs.MailQueue.MailGeneration.Models -@inherits Volo.Abp.TextTemplating.Razor.RazorTemplatePageBase +@using Erp.MailQueue.MailGeneration.Models +@inherits Volo.Abp.TextTemplating.Razor.RazorTemplatePageBase