From 4ad10606ff4766b76989eff6f475dc180c211223 Mon Sep 17 00:00:00 2001
From: cli <377476583@qq.com>
Date: Wed, 26 Mar 2025 17:18:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9B=86=E7=BE=A4=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EnergySystem/CacheAppService.cs           |  5 ++-
 .../CollectBusHostModule.Configure.cs         |  5 +++
 src/JiShe.CollectBus.Host/appsettings.json    | 34 ++++++++++++-------
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/JiShe.CollectBus.Application/EnergySystem/CacheAppService.cs b/src/JiShe.CollectBus.Application/EnergySystem/CacheAppService.cs
index f930b1c..d4ace87 100644
--- a/src/JiShe.CollectBus.Application/EnergySystem/CacheAppService.cs
+++ b/src/JiShe.CollectBus.Application/EnergySystem/CacheAppService.cs
@@ -9,6 +9,10 @@ using JiShe.CollectBus.EnergySystems.TableViews;
 using JiShe.CollectBus.FreeSql;
 using Volo.Abp.Domain.Repositories;
 using JiShe.CollectBus.IotSystems.PrepayModel;
+using JiShe.CollectBus.Ammeters;
+using JiShe.CollectBus.Common.BuildSendDatas;
+using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Common.Helpers;
 
 namespace JiShe.CollectBus.EnergySystem
 {
@@ -24,7 +28,6 @@ namespace JiShe.CollectBus.EnergySystem
             {
                 await FreeRedisProvider.Instance.HSetAsync($"{RedisConst.CacheAmmeterFocusKey}:{group.Key}", group.ToDictionary(a => $"{a.ID}_{a.Address}", b => b));
             }
-
         }
     }
 }
diff --git a/src/JiShe.CollectBus.Host/CollectBusHostModule.Configure.cs b/src/JiShe.CollectBus.Host/CollectBusHostModule.Configure.cs
index 6ffa1d0..aaa8043 100644
--- a/src/JiShe.CollectBus.Host/CollectBusHostModule.Configure.cs
+++ b/src/JiShe.CollectBus.Host/CollectBusHostModule.Configure.cs
@@ -262,6 +262,11 @@ namespace JiShe.CollectBus.Host
                 x.UseKafka(option =>
                 {
                     option.Servers = kafka;
+                    if (!Convert.ToBoolean(configuration["Kafka:EnableAuthorization"])) return;
+                    option.MainConfig.Add("security.protocol", configuration["Kafka:SecurityProtocol"]);
+                    option.MainConfig.Add("sasl.mechanism", configuration["Kafka:SaslMechanism"]);
+                    option.MainConfig.Add("sasl.username", configuration["Kafka:SaslUserName"]);
+                    option.MainConfig.Add("sasl.password", configuration["Kafka:SaslPassword"]);
                 });
 
                 x.UseDashboard();
diff --git a/src/JiShe.CollectBus.Host/appsettings.json b/src/JiShe.CollectBus.Host/appsettings.json
index 50c459b..473d79e 100644
--- a/src/JiShe.CollectBus.Host/appsettings.json
+++ b/src/JiShe.CollectBus.Host/appsettings.json
@@ -1,4 +1,4 @@
-  {
+{
   "Serilog": {
     "Using": [
       "Serilog.Sinks.Console",
@@ -20,7 +20,7 @@
       {
         "Name": "Console"
       },
-      { 
+      {
         "Name": "File",
         "Args": {
           "path": "logs/logs-.txt",
@@ -33,17 +33,18 @@
     "SelfUrl": "http://localhost:44315",
     "CorsOrigins": "http://localhost:4200,http://localhost:3100"
   },
-    "ConnectionStrings": {
-      "Default": "mongodb://admin:admin02023@118.190.144.92:37117,118.190.144.92:37119,118.190.144.92:37120/JiSheCollectBus?authSource=admin&maxPoolSize=400&minPoolSize=10&waitQueueTimeoutMS=5000",
-      "Kafka": "121.42.242.91:29092,121.42.242.91:39092,121.42.242.91:49092",
-      "PrepayDB": "server=118.190.144.92;database=jishe.sysdb;uid=sa;pwd=admin@2023;Encrypt=False;Trust Server Certificate=False",
-      "EnergyDB": "server=118.190.144.92;database=db_energy;uid=sa;pwd=admin@2023;Encrypt=False;Trust Server Certificate=False"
-    },
-    "Redis": {
-      "Configuration": "118.190.144.92:6379,syncTimeout=30000,abortConnect=false,connectTimeout=30000,allowAdmin=true",
-      "DefaultDB": "14",
-      "HangfireDB": "15"
-    },
+  "ConnectionStrings": {
+    "Default": "mongodb://admin:admin02023@118.190.144.92:37117,118.190.144.92:37119,118.190.144.92:37120/JiSheCollectBus?authSource=admin&maxPoolSize=400&minPoolSize=10&waitQueueTimeoutMS=5000",
+    //"Kafka": "121.42.242.91:29092,121.42.242.91:39092,121.42.242.91:49092",
+    "Kafka": "8.148.227.21:9092,8.148.224.127:9092,8.138.38.208:9092",
+    "PrepayDB": "server=118.190.144.92;database=jishe.sysdb;uid=sa;pwd=admin@2023;Encrypt=False;Trust Server Certificate=False",
+    "EnergyDB": "server=118.190.144.92;database=db_energy;uid=sa;pwd=admin@2023;Encrypt=False;Trust Server Certificate=False"
+  },
+  "Redis": {
+    "Configuration": "118.190.144.92:6379,syncTimeout=30000,abortConnect=false,connectTimeout=30000,allowAdmin=true",
+    "DefaultDB": "14",
+    "HangfireDB": "15"
+  },
   "Jwt": {
     "Audience": "JiShe.CollectBus",
     "SecurityKey": "dzehzRz9a8asdfasfdadfasdfasdfafsdadfasbasdf=",
@@ -80,5 +81,12 @@
       "Password": "123456",
       "Port": 5672
     }
+  },
+  "Kafka": {
+    "EnableAuthorization": true,
+    "SecurityProtocol": "SASL_PLAINTEXT",
+    "SaslMechanism": "PLAIN",
+    "SaslUserName": "lixiao",
+    "SaslPassword": "lixiao1980"
   }
 }
\ No newline at end of file