Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c53056c750 | |||
| dadd0ee66c | |||
| b71d948e0e | |||
| a189340aac | |||
| e35ad0ebfb | |||
| 0364749342 | |||
| 07e420de1b | |||
| f471ee468a | |||
| 3f22628bf4 | |||
| 452544b527 | |||
| 47c0bcd76f | |||
| 3e3033386d | |||
| b7057e0928 | |||
| 97b62e9168 | |||
| 2a2599973e | |||
| 2d2840485f |
@@ -4,7 +4,7 @@ name: Push nuget and docker image Actions Workflow
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- stage
|
||||
- stage-new
|
||||
jobs:
|
||||
Deploy:
|
||||
runs-on: windows
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
name: Build and Deploy to Production
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- production
|
||||
|
||||
env:
|
||||
REGISTRY: gitea-svc:3000
|
||||
EXTERNAL_REGISTRY: git.foursat.afrino.co
|
||||
IMAGE_NAME: admin/frontoffice-bff
|
||||
|
||||
jobs:
|
||||
build-and-deploy:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: docker:latest
|
||||
options: --privileged
|
||||
env:
|
||||
HTTP_PROXY: http://proxyuser:87zH26nbqT2@46.249.98.211:3128
|
||||
HTTPS_PROXY: http://proxyuser:87zH26nbqT2@46.249.98.211:3128
|
||||
NO_PROXY: localhost,127.0.0.1,gitea-svc,45.149.79.127,194.5.195.53,10.0.0.0/8
|
||||
steps:
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
apk add --no-cache git curl
|
||||
curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
|
||||
chmod +x kubectl
|
||||
mv kubectl /usr/local/bin/
|
||||
|
||||
- name: Start Docker daemon
|
||||
run: |
|
||||
mkdir -p /etc/docker
|
||||
cat > /etc/docker/daemon.json << 'DAEMON'
|
||||
{
|
||||
"insecure-registries": ["git.foursat.afrino.co", "gitea-svc:3000"]
|
||||
}
|
||||
DAEMON
|
||||
mkdir -p ~/.docker
|
||||
cat > ~/.docker/config.json << 'CONF'
|
||||
{
|
||||
"proxies": {
|
||||
"default": {
|
||||
"httpProxy": "http://proxyuser:87zH26nbqT2@46.249.98.211:3128",
|
||||
"httpsProxy": "http://proxyuser:87zH26nbqT2@46.249.98.211:3128",
|
||||
"noProxy": "localhost,127.0.0.1,gitea-svc,194.5.195.53,10.0.0.0/8"
|
||||
}
|
||||
}
|
||||
}
|
||||
CONF
|
||||
dockerd &
|
||||
for i in $(seq 1 30); do docker info >/dev/null 2>&1 && break || sleep 2; done
|
||||
|
||||
- name: Checkout code
|
||||
run: |
|
||||
git clone --depth 1 --branch production http://gitea-svc:3000/admin/FrontOffice.BFF.git .
|
||||
git log -1 --format="%H %s"
|
||||
|
||||
- name: Build Docker Image
|
||||
run: |
|
||||
cd src
|
||||
docker build -f FrontOffice.BFF.WebApi/Dockerfile \
|
||||
-t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \
|
||||
-t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:prod \
|
||||
-t ${{ env.EXTERNAL_REGISTRY }}/${{ env.IMAGE_NAME }}:prod \
|
||||
--build-arg HTTP_PROXY=http://proxyuser:87zH26nbqT2@46.249.98.211:3128 \
|
||||
--build-arg HTTPS_PROXY=http://proxyuser:87zH26nbqT2@46.249.98.211:3128 \
|
||||
.
|
||||
|
||||
- name: Push to Registry
|
||||
run: |
|
||||
echo "87zH26nbqT" | docker login ${{ env.REGISTRY }} -u admin --password-stdin
|
||||
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
|
||||
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:prod
|
||||
echo "87zH26nbqT" | docker login ${{ env.EXTERNAL_REGISTRY }} -u admin --password-stdin
|
||||
docker push ${{ env.EXTERNAL_REGISTRY }}/${{ env.IMAGE_NAME }}:prod
|
||||
|
||||
- name: Deploy to Production
|
||||
run: |
|
||||
mkdir -p ~/.kube
|
||||
echo "${{ secrets.KUBECONFIG_PROD }}" | base64 -d > ~/.kube/config
|
||||
kubectl rollout restart deployment/frontoffice-bff || echo "Deployment not found"
|
||||
kubectl rollout status deployment/frontoffice-bff --timeout=5m || echo "Rollout pending"
|
||||
@@ -10,6 +10,7 @@ using CMSMicroservice.Protobuf.Protos.UserAddress;
|
||||
using CMSMicroservice.Protobuf.Protos.UserCarts;
|
||||
using CMSMicroservice.Protobuf.Protos.Commission;
|
||||
using CMSMicroservice.Protobuf.Protos.Configuration;
|
||||
using CMSMicroservice.Protobuf.Protos.AppVersion;
|
||||
using CMSMicroservice.Protobuf.Protos.UserContract;
|
||||
using CMSMicroservice.Protobuf.Protos.UserOrder;
|
||||
using CMSMicroservice.Protobuf.Protos.UserWallet;
|
||||
@@ -63,6 +64,9 @@ public interface IApplicationContractContext
|
||||
|
||||
// Geography System (GMS)
|
||||
CityContract.CityContractClient Cities { get; }
|
||||
|
||||
// App Version System
|
||||
AppVersionContract.AppVersionContractClient AppVersion { get; }
|
||||
#endregion
|
||||
|
||||
#region PYMS
|
||||
|
||||
+8
@@ -0,0 +1,8 @@
|
||||
using FrontOffice.BFF.Configuration.Protobuf.Protos.AppVersion;
|
||||
|
||||
namespace FrontOffice.BFF.Application.ConfigurationCQ.Queries.GetAppVersion;
|
||||
|
||||
/// <summary>
|
||||
/// دریافت نسخه اپلیکیشن برای بررسی نیاز به پاک کردن کش
|
||||
/// </summary>
|
||||
public record GetAppVersionQuery(string AppName, string? CurrentClientVersion) : IRequest<GetAppVersionResponseDto>;
|
||||
+44
@@ -0,0 +1,44 @@
|
||||
using CMSMicroservice.Protobuf.Protos.AppVersion;
|
||||
|
||||
namespace FrontOffice.BFF.Application.ConfigurationCQ.Queries.GetAppVersion;
|
||||
|
||||
/// <summary>
|
||||
/// هندلر دریافت نسخه اپلیکیشن از CMS
|
||||
/// </summary>
|
||||
public class GetAppVersionQueryHandler : IRequestHandler<GetAppVersionQuery, GetAppVersionResponseDto>
|
||||
{
|
||||
private readonly IApplicationContractContext _context;
|
||||
|
||||
public GetAppVersionQueryHandler(IApplicationContractContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public async Task<GetAppVersionResponseDto> Handle(GetAppVersionQuery request, CancellationToken cancellationToken)
|
||||
{
|
||||
var cmsRequest = new GetAppVersionRequest
|
||||
{
|
||||
AppName = request.AppName
|
||||
};
|
||||
|
||||
if (!string.IsNullOrEmpty(request.CurrentClientVersion))
|
||||
{
|
||||
cmsRequest.CurrentClientVersion = request.CurrentClientVersion;
|
||||
}
|
||||
|
||||
var response = await _context.AppVersion.GetAppVersionAsync(cmsRequest, cancellationToken: cancellationToken);
|
||||
|
||||
return new GetAppVersionResponseDto
|
||||
{
|
||||
Found = response.Found,
|
||||
AppName = response.AppName,
|
||||
CurrentVersion = response.CurrentVersion,
|
||||
MinRequiredVersion = response.MinRequiredVersion,
|
||||
RequiresFullCacheClear = response.RequiresFullCacheClear,
|
||||
RequiresUpdate = response.RequiresUpdate,
|
||||
UpdateMessage = response.UpdateMessage,
|
||||
ReleaseNotes = response.ReleaseNotes,
|
||||
LastUpdated = response.LastUpdated?.ToDateTime()
|
||||
};
|
||||
}
|
||||
}
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
namespace FrontOffice.BFF.Application.ConfigurationCQ.Queries.GetAppVersion;
|
||||
|
||||
/// <summary>
|
||||
/// DTO پاسخ نسخه اپلیکیشن
|
||||
/// </summary>
|
||||
public class GetAppVersionResponseDto
|
||||
{
|
||||
public bool Found { get; set; }
|
||||
public string AppName { get; set; } = string.Empty;
|
||||
public string CurrentVersion { get; set; } = string.Empty;
|
||||
public string MinRequiredVersion { get; set; } = string.Empty;
|
||||
public bool RequiresFullCacheClear { get; set; }
|
||||
public bool RequiresUpdate { get; set; }
|
||||
public string? UpdateMessage { get; set; }
|
||||
public string? ReleaseNotes { get; set; }
|
||||
public DateTime? LastUpdated { get; set; }
|
||||
}
|
||||
@@ -15,6 +15,7 @@
|
||||
<ProjectReference Include="..\FrontOffice.BFF.Domain\FrontOffice.BFF.Domain.csproj" />
|
||||
<ProjectReference Include="..\Protobufs\FrontOffice.BFF.UserOrder.Protobuf\FrontOffice.BFF.UserOrder.Protobuf.csproj" />
|
||||
<ProjectReference Include="..\Protobufs\FrontOffice.BFF.Category.Protobuf\FrontOffice.BFF.Category.Protobuf.csproj" />
|
||||
<ProjectReference Include="..\Protobufs\FrontOffice.BFF.Configuration.Protobuf\FrontOffice.BFF.Configuration.Protobuf.csproj" />
|
||||
<!-- CMS Protobuf for Commission, ClubMembership, NetworkMembership, Configuration -->
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
+1
@@ -85,6 +85,7 @@ public class GetMyNetworkTreeQueryHandler : IRequestHandler<GetMyNetworkTreeQuer
|
||||
JoinedAt = cmsNode.JoinedAt?.ToDateTime(),
|
||||
IsClubActive = cmsNode.IsClubActive,
|
||||
ActivationWeekDefinitionId = cmsNode.ActivationWeekDefinitionId,
|
||||
ReferralCode = cmsNode.ReferralCode,
|
||||
LeftChild = leftChild != null ? BuildNodeRecursive(leftChild, allNodes, nodeDict, level + 1) : null,
|
||||
RightChild = rightChild != null ? BuildNodeRecursive(rightChild, allNodes, nodeDict, level + 1) : null
|
||||
};
|
||||
|
||||
+5
@@ -84,4 +84,9 @@ public class NetworkNodeDto
|
||||
/// شماره هفته فعالسازی
|
||||
/// </summary>
|
||||
public long? ActivationWeekDefinitionId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// کد معرف کاربر
|
||||
/// </summary>
|
||||
public string? ReferralCode { get; set; }
|
||||
}
|
||||
|
||||
+1
@@ -92,6 +92,7 @@ public class GetSubordinateTreeQueryHandler : IRequestHandler<GetSubordinateTree
|
||||
IsActive = cmsNode.IsActive,
|
||||
JoinedAt = cmsNode.JoinedAt?.ToDateTime(),
|
||||
IsClubActive = cmsNode.IsClubActive,
|
||||
ReferralCode = cmsNode.ReferralCode,
|
||||
ActivationWeekDefinitionId = cmsNode.ActivationWeekDefinitionId,
|
||||
LeftChild = leftChild != null ? BuildNodeRecursive(leftChild, allNodes, nodeDict, level + 1) : null,
|
||||
RightChild = rightChild != null ? BuildNodeRecursive(rightChild, allNodes, nodeDict, level + 1) : null
|
||||
|
||||
+1
@@ -31,4 +31,5 @@ public class GetSubordinateTreeResponseDto
|
||||
/// شناسه parent برای بازگشت به عقب
|
||||
/// </summary>
|
||||
public long? ParentUserId { get; set; }
|
||||
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Afrino.PYMSMicroservice.Protobuf" Version="0.0.11" />
|
||||
<PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.156" />
|
||||
<PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.159" />
|
||||
<PackageReference Include="Google.Protobuf" Version="3.33.0" />
|
||||
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.54.0" />
|
||||
<PackageReference Include="Grpc.Tools" Version="2.76.0">
|
||||
|
||||
@@ -10,6 +10,7 @@ using CMSMicroservice.Protobuf.Protos.UserAddress;
|
||||
using CMSMicroservice.Protobuf.Protos.UserCarts;
|
||||
using CMSMicroservice.Protobuf.Protos.Commission;
|
||||
using CMSMicroservice.Protobuf.Protos.Configuration;
|
||||
using CMSMicroservice.Protobuf.Protos.AppVersion;
|
||||
using CMSMicroservice.Protobuf.Protos.UserContract;
|
||||
using CMSMicroservice.Protobuf.Protos.UserOrder;
|
||||
using CMSMicroservice.Protobuf.Protos.UserWallet;
|
||||
@@ -90,6 +91,9 @@ public class ApplicationContractContext : IApplicationContractContext
|
||||
|
||||
// Geography System (GMS)
|
||||
public CityContract.CityContractClient Cities => GetService<CityContract.CityContractClient>();
|
||||
|
||||
// App Version System
|
||||
public AppVersionContract.AppVersionContractClient AppVersion => GetService<AppVersionContract.AppVersionContractClient>();
|
||||
#endregion
|
||||
|
||||
#region PYMS
|
||||
|
||||
@@ -40,6 +40,7 @@ public class NetworkMembershipProfile : IRegister
|
||||
.Map(dest => dest.LeftChild, src => src.LeftChild)
|
||||
.Map(dest => dest.RightChild, src => src.RightChild)
|
||||
.Map(dest => dest.Level, src => src.Level)
|
||||
.Map(dest => dest.ReferralCode, src => src.ReferralCode)
|
||||
.Map(dest => dest.HasChildren, src => src.HasChildren)
|
||||
.Map(dest => dest.IsActive, src => src.IsActive)
|
||||
.Map(dest => dest.JoinedAt, src => src.JoinedAt.HasValue ? Timestamp.FromDateTime(DateTime.SpecifyKind(src.JoinedAt.Value, DateTimeKind.Utc)) : null)
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
using FrontOffice.BFF.WebApi.Common.Services;
|
||||
using FrontOffice.BFF.Application.ConfigurationCQ.Queries.GetAppVersion;
|
||||
using FrontOffice.BFF.Configuration.Protobuf.Protos.AppVersion;
|
||||
|
||||
namespace FrontOffice.BFF.WebApi.Services;
|
||||
|
||||
/// <summary>
|
||||
/// سرویس نسخه اپلیکیشن - برای بررسی نیاز به پاک کردن کش
|
||||
/// </summary>
|
||||
public class AppVersionGrpcService : AppVersionContract.AppVersionContractBase
|
||||
{
|
||||
private readonly IDispatchRequestToCQRS _dispatchRequestToCQRS;
|
||||
|
||||
public AppVersionGrpcService(IDispatchRequestToCQRS dispatchRequestToCQRS)
|
||||
{
|
||||
_dispatchRequestToCQRS = dispatchRequestToCQRS;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// دریافت نسخه اپلیکیشن
|
||||
/// </summary>
|
||||
public override async Task<GetAppVersionResponse> GetAppVersion(GetAppVersionRequest request, ServerCallContext context)
|
||||
{
|
||||
return await _dispatchRequestToCQRS.Handle<GetAppVersionRequest, GetAppVersionQuery, GetAppVersionResponse>(request, context);
|
||||
}
|
||||
}
|
||||
+9
-2
@@ -10,11 +10,18 @@
|
||||
}
|
||||
},
|
||||
"GrpcChannelOptions": {
|
||||
"CMSMSAddress": "https://cms.kbs1.ir",
|
||||
"PYMSMSAddress": "https://ipg.afrino.co"
|
||||
"CMSMSAddress": "http://cms-svc",
|
||||
"PYMSMSAddress": "https://ipg.afrino.co"
|
||||
},
|
||||
"CmsSignalR": {
|
||||
"HubPath": "/hubs/token-notification"
|
||||
},
|
||||
"Authentication": {
|
||||
"Authority": "https://ids.domain.com/",
|
||||
"Audience": "domain_api"
|
||||
},
|
||||
"Seq": {
|
||||
"ServerUrl": "http://seq-svc:5341",
|
||||
"ApiKey": ""
|
||||
}
|
||||
}
|
||||
@@ -10,10 +10,8 @@
|
||||
}
|
||||
},
|
||||
"GrpcChannelOptions": {
|
||||
"CMSMSAddress": "http://cms-svc",
|
||||
// "CMSMSAddress": "https://cms.foursat.afrino.co",
|
||||
// "CMSMSAddress": "https://localhost:32846/",
|
||||
"PYMSMSAddress": "https://ipg.afrino.co"
|
||||
"CMSMSAddress": "https://cms.foursat.afrino.co",
|
||||
"PYMSMSAddress": "https://ipg.afrino.co"
|
||||
},
|
||||
"CmsSignalR": {
|
||||
"HubPath": "/hubs/token-notification"
|
||||
|
||||
+11
-1
@@ -4,7 +4,7 @@
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<Version>0.0.2</Version>
|
||||
<Version>0.0.4</Version>
|
||||
<DebugType>None</DebugType>
|
||||
<DebugSymbols>False</DebugSymbols>
|
||||
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
|
||||
@@ -24,6 +24,16 @@
|
||||
|
||||
<ItemGroup>
|
||||
<Protobuf Include="Protos\configuration.proto" ProtoRoot="Protos\" GrpcServices="Both" />
|
||||
<Protobuf Include="Protos\appversion.proto" ProtoRoot="Protos\" GrpcServices="Both" />
|
||||
</ItemGroup>
|
||||
<Target Name="PushToFourSat" AfterTargets="Pack">
|
||||
<PropertyGroup>
|
||||
<NugetPackagePath>$(PackageOutputPath)$(PackageId).$(Version).nupkg</NugetPackagePath>
|
||||
<PushCommand>
|
||||
dotnet nuget push **/*.nupkg --source https://git.afrino.co/api/packages/FourSat/nuget/index.json --api-key 061a5cb15517c6da39c16cfce8556c55ae104d0d --skip-duplicate
|
||||
</PushCommand>
|
||||
</PropertyGroup>
|
||||
|
||||
<Exec Command="$(PushCommand)" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
syntax = "proto3";
|
||||
|
||||
package appversion;
|
||||
|
||||
import "google/protobuf/empty.proto";
|
||||
import "google/protobuf/wrappers.proto";
|
||||
import "google/protobuf/timestamp.proto";
|
||||
import "google/api/annotations.proto";
|
||||
|
||||
option csharp_namespace = "FrontOffice.BFF.Configuration.Protobuf.Protos.AppVersion";
|
||||
|
||||
// Service for tracking app versions and cache invalidation
|
||||
service AppVersionContract
|
||||
{
|
||||
// Get current version for an app - called by frontends to check if cache clear is needed
|
||||
rpc GetAppVersion(GetAppVersionRequest) returns (GetAppVersionResponse){
|
||||
option (google.api.http) = {
|
||||
get: "/AppVersion/Get"
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
// Request to get current version for specific app
|
||||
message GetAppVersionRequest
|
||||
{
|
||||
string app_name = 1; // e.g., "FrontOffice", "BackOffice", "Mobile"
|
||||
google.protobuf.StringValue current_client_version = 2; // Current version on client for comparison
|
||||
}
|
||||
|
||||
// Response with version info
|
||||
message GetAppVersionResponse
|
||||
{
|
||||
bool found = 1; // Whether the app was found
|
||||
string app_name = 2;
|
||||
string current_version = 3;
|
||||
string min_required_version = 4;
|
||||
bool requires_full_cache_clear = 5;
|
||||
bool requires_update = 6; // True if client version < min_required_version
|
||||
google.protobuf.StringValue update_message = 7;
|
||||
google.protobuf.StringValue release_notes = 8;
|
||||
google.protobuf.Timestamp last_updated = 9;
|
||||
}
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<Version>0.0.4</Version>
|
||||
<Version>0.0.5</Version>
|
||||
<PackageId>Foursat.FrontOffice.BFF.NetworkMembership.Protobuf</PackageId>
|
||||
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
|
||||
<DebugSymbols>False</DebugSymbols>
|
||||
|
||||
+1
@@ -76,6 +76,7 @@ message NetworkNodeModel
|
||||
google.protobuf.Timestamp joined_at = 11;
|
||||
bool is_club_active = 12;
|
||||
google.protobuf.Int64Value activation_week_definition_id = 13;
|
||||
google.protobuf.StringValue referral_code = 14;
|
||||
}
|
||||
|
||||
// ============ GetMyNetworkStatistics ============
|
||||
|
||||
Reference in New Issue
Block a user