Merge branch 'kub-stage' into production

# Conflicts: # src/CMSMicroservice.WebApi/Program.cs
2025-12-27 01:49:11 +03:30
parent 81d2b39ee1 cd2549775a
commit 1425fb187b
5 changed files with 111 additions and 16 deletions
@@ -492,3 +492,8 @@ fabric.properties
 .idea/caches/build_file_checksums.ser

 /src/.idea
+
+# Environment-specific configuration files with sensitive data
+**/appsettings.Staging.json
+**/appsettings.Production.json
+**/appsettings.*.local.json
@@ -7,6 +7,10 @@
      <DockerfileContext>..\..\..</DockerfileContext>
  </PropertyGroup>
  
+  <ItemGroup>
+      <Content Update="appsettings.*.json" CopyToPublishDirectory="PreserveNewest" />
+  </ItemGroup>
+  
  <ItemGroup>
      <PackageReference Include="Google.Protobuf" Version="3.23.3" />
      <PackageReference Include="Grpc.AspNetCore" Version="2.54.0" />
@@ -3,6 +3,7 @@ using CMSMicroservice.Infrastructure.Data.Seeding;
 using CMSMicroservice.Application.Common.Interfaces;
 using CMSMicroservice.WebApi.Hubs;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.AspNetCore.Hosting;
@@ -208,17 +209,28 @@ using (var scope = app.Services.CreateScope())
 {
    var recurringJobManager = scope.ServiceProvider.GetRequiredService<IRecurringJobManager>();
    
-    // Weekly Commission Calculation: Every Sunday at 00:05 (UTC)
+    // Weekly Commission Calculation: Every Sunday at 00:05 (configurable)
+    var weeklyCommissionEnabled = app.Configuration.GetValue<bool>("BackgroundJobs:WeeklyCommissionCalculation:Enabled", true);
+    var weeklyCommissionCron = app.Configuration.GetValue<string>("BackgroundJobs:WeeklyCommissionCalculation:CronExpression", "5 0 * * 0");
+    
+    if (weeklyCommissionEnabled)
+    {
        recurringJobManager.AddOrUpdate<CMSMicroservice.Infrastructure.BackgroundJobs.WeeklyCommissionJob>(
            recurringJobId: "weekly-commission-calculation",
            methodCall: job => job.ExecuteAsync(null, CancellationToken.None),
-        cronExpression: "5 0 * * 0", // Sunday at 00:05
+            cronExpression: weeklyCommissionCron,
            options: new RecurringJobOptions
            {
                TimeZone = TimeZoneInfo.Local
            });
        
-    app.Logger.LogInformation("✅ Hangfire recurring job 'weekly-commission-calculation' registered (Cron: 5 0 * * 0 - Sunday 00:05 UTC)");
+        app.Logger.LogInformation("✅ Hangfire recurring job 'weekly-commission-calculation' registered (Cron: {Cron})", weeklyCommissionCron);
+    }
+    else
+    {
+        recurringJobManager.RemoveIfExists("weekly-commission-calculation");
+        app.Logger.LogInformation("⚠️ Hangfire recurring job 'weekly-commission-calculation' is DISABLED in configuration");
+    }
    
    // Daya Loan Check: Every 15 minutes
    CMSMicroservice.WebApi.Workers.DayaLoanCheckWorker.Schedule(recurringJobManager);
@@ -1,10 +1,78 @@
 {
-  "Logging": {
-    "LogLevel": {
-      "Default": "Debug",
-      "System": "Information",
-      "Grpc": "Information",
-      "Microsoft": "Information"
-    }
+  "UseRealPaymentGateway": false,
+  "JwtSecurityKey": "TvlZVx5TJaHs8e9HgUdGzhGP2CIidoI444nAj+8+g7c=",
+  "JwtIssuer": "https://localhost",
+  "JwtAudience": "https://localhost",
+  "JwtExpiryInDays": 5,
+  "ConnectionStrings": {
+    "DefaultConnection": "Data Source=194.5.195.53,31433; Initial Catalog=Foursat;User ID=sa;Password=87zH26nbqT;Connection Timeout=300000;MultipleActiveResultSets=True;Encrypt=False",
+    "providerName": "System.Data.SqlClient"
+  },
+  "Otp": {
+    "Secret": "K2w8k1h1mH2Qz1kqWk0c8kQ2Pq8q9H1eE2nqN1qQ8x7M="
+  },
+  "Monitoring": {
+    "SentryEnabled": false,
+    "SentryDsn": "",
+    "SlackEnabled": false,
+    "SlackWebhookUrl": "",
+    "EmailAlertsEnabled": false,
+    "AdminEmails": [
+      "admin@example.com"
+    ],
+    "SmsNotificationsEnabled": false,
+    "SmsApiKey": "",
+    "SmsGatewayUrl": ""
+  },
+  "Email": {
+    "Enabled": true,
+    "SmtpHost": "smtp.gmail.com",
+    "SmtpPort": 587,
+    "SmtpUsername": "your-email@gmail.com",
+    "SmtpPassword": "your-app-password",
+    "FromEmail": "noreply@foursat.com",
+    "FromName": "FourSat CMS",
+    "EnableSsl": true
+  },
+  "Sms": {
+    "Enabled": true,
+    "Provider": "Kavenegar",
+    "KavenegarApiKey": "497263626F32626A48685A6137524C4F78575A766E4C74694A556B79317648424964655030682B554545413D",
+    "Sender": "1000001110100"
+  },
+  "DayaPayment": {
+    "BaseUrl": "https://api.daya.ir",
+    "ApiKey": "YOUR_DAYA_API_KEY"
+  },
+  "DayaApi": {
+    "UseMock": false,
+    "BaseAddress": "https://Dayadiamond.ir",
+    "MerchantPermissionKey": "56146364$04sXjethI5WxhItR1Q9xnmFdJzl2BB8Bclsq8dAy7YVSZp3vtt-wP7ivrcCvmKLq",
+    "CacheDurationMinutes": 20
+  },
+  "Chatika": {
+    "Enabled": true,
+    "BaseUrl": "https://api.chatika.ir",
+    "ApiKey": "tIukvL8dnV4cB3yVWcCD9Xyfbj8rBxm5wPt2mLyJCgTsBBoMTWjt6mFEqQwpw-er"
+  },
+  "BackgroundJobs": {
+    "WeeklyCommissionCalculation": {
+      "Enabled": true,
+      "CronExpression": "5 0 * * 0"
+    }
+  },
+  "AllowedHosts": "*",
+  "Kestrel": {
+    "EndpointDefaults": {
+      "Protocols": "Http2"
+    }
+  },
+  "Authentication": {
+    "Authority": "https://ids.domain.com/",
+    "Audience": "domain_api"
+  },
+  "Seq": {
+    "ServerUrl": "https://seq.afrino.co",
+    "ApiKey": "oxpvpUzU1pZxMS4s3Fqq"
  }
 }
@@ -55,6 +55,12 @@
    "BaseUrl": "https://api.chatika.ir",
    "ApiKey": "tIukvL8dnV4cB3yVWcCD9Xyfbj8rBxm5wPt2mLyJCgTsBBoMTWjt6mFEqQwpw-er"
  },
+  "BackgroundJobs": {
+    "WeeklyCommissionCalculation": {
+      "Enabled": true,
+      "CronExpression": "5 0 * * 0"
+    }
+  },
  "AllowedHosts": "*",
  "Kestrel": {
    "EndpointDefaults": {