admin/JiShe.CollectBus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev

Browse Source
This commit is contained in:
zenghongyao 2025-05-19 08:51:40 +08:00
commit 75b6da16a0
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/JiShe.CollectBus.Kafka/AdminClient/AdminClientService.cs
View File

@ -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;
}

8
web/JiShe.CollectBus.Host/CollectBusHostModule.Configure.cs
View File

@ -259,10 +259,10 @@ namespace JiShe.CollectBus.Host
.AddMongoDb(configuration.GetConnectionString("Default"), "MongoDB", HealthStatus.Unhealthy)
.AddRedis(configuration.GetValue<string>("Redis:Configuration") ?? string.Empty, "Redis",
HealthStatus.Unhealthy)
.AddKafka(new Confluent.Kafka.ProducerConfig
{
BootstrapServers = configuration.GetValue<string>("Kafka:BootstrapServers")
}, "Kafka", failureStatus: HealthStatus.Unhealthy)
//.AddKafka(new Confluent.Kafka.ProducerConfig
//{
// BootstrapServers = configuration.GetValue<string>("Kafka:BootstrapServers")
//}, "Kafka", failureStatus: HealthStatus.Unhealthy)
//.AddCheck<CassandraHealthCheck>("Cassandra")
.AddCheck<IoTdbHealthCheck>("IoTDB");

4
web/JiShe.CollectBus.Host/appsettings.Production.json
View File

@ -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",