feat: integrate PYMS payment gateway, add blog/sitepage/image services, local file manager
Build and Deploy to Kubernetes / build-and-deploy (push) Successful in 8m44s
Build and Deploy to Kubernetes / build-and-deploy (push) Successful in 8m44s
Payment Gateway: - Add PYMSPaymentService: IPaymentGatewayService via gRPC to PYMS microservice - Add ZarinPalPaymentService: direct ZarinPal integration (backup) - Register 'pyms' payment provider in DI ConfigureServices - Add PYMS proto files (pyms_transaction.proto, pyms_public_messages.proto) - Fix VerifyDiscountWalletCharge: pass 'OK' as status instead of Authority - Update appsettings: PaymentProvider=pyms, sandbox mode, merchant ID Blog System: - Add BlogCategory, BlogPost, BlogPostImage entities and CQRS - Add proto files and gRPC services for blog management - Add Mapster profiles for blog responses Content Management: - Add SitePage entity and CQRS for static pages - Add proto and gRPC service for site pages Image/File Management: - Add LocalFileManager with disk storage + base64 serving + FMS fallback - Add ImagePathResolverInterceptor for gRPC responses - Add ImageResolverService for explicit image resolution - Add UploadsController for public file serving with FMS fallback - Add PaymentCallbackController for discount order payment callbacks Database: - Add blog and content entity migrations - Remove ImagePath MaxLength constraints - Remove old FileManagementService (replaced by LocalFileManager)
This commit is contained in:
@@ -1,13 +1,20 @@
|
||||
using Google.Protobuf;
|
||||
using Grpc.Core.Interceptors;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using CMSMicroservice.Application.Common.Interfaces;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
namespace CMSMicroservice.WebApi.Common.Behaviours;
|
||||
|
||||
public class LoggingBehaviour : Interceptor
|
||||
public partial class LoggingBehaviour : Interceptor
|
||||
{
|
||||
private readonly ILogger _logger;
|
||||
private readonly ICurrentUserService _currentUserService;
|
||||
|
||||
// فیلدهایی که نباید لاگ شوند (بایتهای تصویر / فایل)
|
||||
[GeneratedRegex(@"""(File|ImageFile|image_file|file)"":\s*\{[^}]*\}", RegexOptions.Singleline)]
|
||||
private static partial Regex BinaryFieldPattern();
|
||||
|
||||
public LoggingBehaviour(ILogger<LoggingBehaviour> logger, ICurrentUserService currentUserService)
|
||||
{
|
||||
_logger = logger;
|
||||
@@ -21,8 +28,11 @@ public class LoggingBehaviour : Interceptor
|
||||
{
|
||||
var requestName = typeof(TRequest).Name;
|
||||
var userId = _currentUserService.UserId ?? string.Empty;
|
||||
_logger.LogInformation("gRPC Starting receiving call. Type/Method: {Type} / {Method} Request: {Name} {@UserId} {@Request}",
|
||||
MethodType.Unary, context.Method , requestName, userId, request);
|
||||
|
||||
// لاگ بدون بایتهای فایل
|
||||
var safeLog = SanitizeForLog(request);
|
||||
_logger.LogInformation("gRPC Starting receiving call. Type/Method: {Type} / {Method} Request: {Name} {UserId} {Request}",
|
||||
MethodType.Unary, context.Method, requestName, userId, safeLog);
|
||||
|
||||
try
|
||||
{
|
||||
@@ -30,9 +40,26 @@ public class LoggingBehaviour : Interceptor
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "gRPC Request: Unhandled Exception for Request {Name} {@Request}", requestName, request);
|
||||
|
||||
_logger.LogError(ex, "gRPC Request: Unhandled Exception for Request {Name} {Request}", requestName, safeLog);
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// حذف بایتهای فایل از لاگ — جایگزینی با [BINARY DATA]
|
||||
/// </summary>
|
||||
private static string SanitizeForLog<T>(T request)
|
||||
{
|
||||
if (request is IMessage protoMessage)
|
||||
{
|
||||
var json = JsonFormatter.Default.Format(protoMessage);
|
||||
// حذف محتوای فیلدهای باینری
|
||||
json = BinaryFieldPattern().Replace(json, "\"$1\": \"[BINARY DATA]\"");
|
||||
// اگر هنوز رشتههای base64 طولانی هست، خلاصه کن
|
||||
if (json.Length > 2000)
|
||||
return json[..2000] + "... [TRUNCATED]";
|
||||
return json;
|
||||
}
|
||||
return request?.ToString() ?? "";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,15 +1,21 @@
|
||||
using Google.Protobuf;
|
||||
using Grpc.Core.Interceptors;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using System.Diagnostics;
|
||||
using System.Text.RegularExpressions;
|
||||
using CMSMicroservice.Application.Common.Interfaces;
|
||||
|
||||
namespace CMSMicroservice.WebApi.Common.Behaviours;
|
||||
|
||||
public class PerformanceBehaviour : Interceptor
|
||||
public partial class PerformanceBehaviour : Interceptor
|
||||
{
|
||||
private readonly Stopwatch _timer;
|
||||
private readonly ILogger _logger;
|
||||
private readonly ICurrentUserService _currentUserService;
|
||||
|
||||
[GeneratedRegex(@"""(File|ImageFile|image_file|file)"":\s*\{[^}]*\}", RegexOptions.Singleline)]
|
||||
private static partial Regex BinaryFieldPattern();
|
||||
|
||||
public PerformanceBehaviour(ILogger<PerformanceBehaviour> logger, ICurrentUserService currentUserService)
|
||||
{
|
||||
_timer = new Stopwatch();
|
||||
@@ -34,11 +40,25 @@ public class PerformanceBehaviour : Interceptor
|
||||
{
|
||||
var requestName = typeof(TRequest).Name;
|
||||
var userId = _currentUserService.UserId ?? string.Empty;
|
||||
var safeLog = SanitizeForLog(request);
|
||||
|
||||
_logger.LogWarning("gRPC Long Running Request: {Name} ({ElapsedMilliseconds} milliseconds) {@UserId} {@Request}",
|
||||
requestName, elapsedMilliseconds, userId, request);
|
||||
_logger.LogWarning("gRPC Long Running Request: {Name} ({ElapsedMilliseconds} milliseconds) {UserId} {Request}",
|
||||
requestName, elapsedMilliseconds, userId, safeLog);
|
||||
}
|
||||
return response;
|
||||
}
|
||||
|
||||
private static string SanitizeForLog<T>(T request)
|
||||
{
|
||||
if (request is IMessage protoMessage)
|
||||
{
|
||||
var json = JsonFormatter.Default.Format(protoMessage);
|
||||
json = BinaryFieldPattern().Replace(json, "\"$1\": \"[BINARY DATA]\"");
|
||||
if (json.Length > 2000)
|
||||
return json[..2000] + "... [TRUNCATED]";
|
||||
return json;
|
||||
}
|
||||
return request?.ToString() ?? "";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
using Mapster;
|
||||
using ProtoBlogCategory = CMSMicroservice.Protobuf.Protos.BlogCategory;
|
||||
|
||||
namespace CMSMicroservice.WebApi.Common.Mappings;
|
||||
|
||||
public class BlogCategoryProfile : IRegister
|
||||
{
|
||||
void IRegister.Register(TypeAdapterConfig config)
|
||||
{
|
||||
// CreateBlogCategory: long → CreateBlogCategoryResponse
|
||||
config.NewConfig<long, ProtoBlogCategory.CreateBlogCategoryResponse>()
|
||||
.Map(dest => dest.Id, src => src);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
using CMSMicroservice.Application.BlogPostCQ.Commands.PublishBlogPost;
|
||||
using CMSMicroservice.Application.BlogPostCQ.Commands.ArchiveBlogPost;
|
||||
using Google.Protobuf.WellKnownTypes;
|
||||
using Mapster;
|
||||
using ProtoBlogPost = CMSMicroservice.Protobuf.Protos.BlogPost;
|
||||
|
||||
namespace CMSMicroservice.WebApi.Common.Mappings;
|
||||
|
||||
public class BlogPostProfile : IRegister
|
||||
{
|
||||
void IRegister.Register(TypeAdapterConfig config)
|
||||
{
|
||||
// PublishBlogPost: Command result → Proto response
|
||||
config.NewConfig<PublishBlogPostResult, ProtoBlogPost.PublishBlogPostResponse>()
|
||||
.Map(dest => dest.Success, src => src.Success)
|
||||
.Map(dest => dest.Message, src => src.Message)
|
||||
.Map(dest => dest.PublishedAt, src => src.PublishedAt.HasValue
|
||||
? Timestamp.FromDateTime(DateTime.SpecifyKind(src.PublishedAt.Value, DateTimeKind.Utc))
|
||||
: null);
|
||||
|
||||
// ArchiveBlogPost: Command result → Proto response
|
||||
config.NewConfig<ArchiveBlogPostResult, ProtoBlogPost.ArchiveBlogPostResponse>()
|
||||
.Map(dest => dest.Success, src => src.Success)
|
||||
.Map(dest => dest.Message, src => src.Message);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user