diff --git a/modules/JiShe.CollectBus.Kafka/AdminClient/AdminClientService.cs b/modules/JiShe.CollectBus.Kafka/AdminClient/AdminClientService.cs index bef89ad..ac793b2 100644 --- a/modules/JiShe.CollectBus.Kafka/AdminClient/AdminClientService.cs +++ b/modules/JiShe.CollectBus.Kafka/AdminClient/AdminClientService.cs @@ -154,8 +154,8 @@ public class AdminClientService : IAdminClientService, IDisposable, ISingletonDe }; if (_kafkaOptionConfig.EnableAuthorization) { - adminClientConfig.SecurityProtocol = SecurityProtocol.SaslPlaintext; - adminClientConfig.SaslMechanism = SaslMechanism.Plain; + adminClientConfig.SecurityProtocol = _kafkaOptionConfig.SecurityProtocol; + adminClientConfig.SaslMechanism = _kafkaOptionConfig.SaslMechanism; adminClientConfig.SaslUsername = _kafkaOptionConfig.SaslUserName; adminClientConfig.SaslPassword = _kafkaOptionConfig.SaslPassword; } diff --git a/web/JiShe.CollectBus.Host/CollectBusHostModule.Configure.cs b/web/JiShe.CollectBus.Host/CollectBusHostModule.Configure.cs index 1180e95..b00b7b6 100644 --- a/web/JiShe.CollectBus.Host/CollectBusHostModule.Configure.cs +++ b/web/JiShe.CollectBus.Host/CollectBusHostModule.Configure.cs @@ -259,10 +259,10 @@ namespace JiShe.CollectBus.Host .AddMongoDb(configuration.GetConnectionString("Default"), "MongoDB", HealthStatus.Unhealthy) .AddRedis(configuration.GetValue("Redis:Configuration") ?? string.Empty, "Redis", HealthStatus.Unhealthy) - .AddKafka(new Confluent.Kafka.ProducerConfig - { - BootstrapServers = configuration.GetValue("Kafka:BootstrapServers") - }, "Kafka", failureStatus: HealthStatus.Unhealthy) + //.AddKafka(new Confluent.Kafka.ProducerConfig + //{ + // BootstrapServers = configuration.GetValue("Kafka:BootstrapServers") + //}, "Kafka", failureStatus: HealthStatus.Unhealthy) //.AddCheck("Cassandra") .AddCheck("IoTDB"); diff --git a/web/JiShe.CollectBus.Host/appsettings.Production.json b/web/JiShe.CollectBus.Host/appsettings.Production.json index 9c7d2e0..b43cc48 100644 --- a/web/JiShe.CollectBus.Host/appsettings.Production.json +++ b/web/JiShe.CollectBus.Host/appsettings.Production.json @@ -14,10 +14,8 @@ "BootstrapServers": "47.110.62.104:9092,47.110.53.196:9092,47.110.60.222:9092", "EnableFilter": true, "EnableAuthorization": false, - "SecurityProtocol": "SaslPlaintext", - "SaslMechanism": "Plain", "SaslUserName": "lixiao", - "SaslPassword": "lixiao1980", + "SaslPassword": "lixiao@1980", "KafkaReplicationFactor": 3, "NumPartitions": 30, "ServerTagName": "JiSheCollectBus100",