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

Compare commits

base: admin:97bdcb238a7af75cbf61fa0973b249a5cf9ae72f
Branches Tags
admin:master
admin:dev
admin:feature_定时抄读_23_CY
admin:zhy_feat_dev_v11
admin:feature_定时抄读_20_CY
admin:zhy_feat_cev_v8
admin:zhy_feat_cev_v7
admin:feature_定时抄读_19_CY
admin:zhy_feat_cev_v5
admin:feature_定时抄读_16_CY
admin:feature_定时抄读_14_CY
admin:feature_定时抄读_11_CY
admin:feature_定时抄读_10_CY
admin:zhy_feat_cev_v3
admin:log
admin:V1.2.0
admin:v1.0.0
..
compare: admin:070173af4fae36ca346ef456b9b01abcf322caba
Branches Tags
admin:dev
admin:feature_定时抄读_23_CY
admin:zhy_feat_dev_v11
admin:master
admin:feature_定时抄读_20_CY
admin:zhy_feat_cev_v8
admin:zhy_feat_cev_v7
admin:feature_定时抄读_19_CY
admin:zhy_feat_cev_v5
admin:feature_定时抄读_16_CY
admin:feature_定时抄读_14_CY
admin:feature_定时抄读_11_CY
admin:feature_定时抄读_10_CY
admin:zhy_feat_cev_v3
admin:log
admin:V1.2.0
admin:v1.0.0

No commits in common. "97bdcb238a7af75cbf61fa0973b249a5cf9ae72f" and "070173af4fae36ca346ef456b9b01abcf322caba" have entirely different histories.
97bdcb238a ... 070173af4f

3 changed files with 9 additions and 7 deletions
Show Stats 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) if (_kafkaOptionConfig.EnableAuthorization)
{ {
adminClientConfig.SecurityProtocol = _kafkaOptionConfig.SecurityProtocol; adminClientConfig.SecurityProtocol = SecurityProtocol.SaslPlaintext;
adminClientConfig.SaslMechanism = _kafkaOptionConfig.SaslMechanism; adminClientConfig.SaslMechanism = SaslMechanism.Plain;
adminClientConfig.SaslUsername = _kafkaOptionConfig.SaslUserName; adminClientConfig.SaslUsername = _kafkaOptionConfig.SaslUserName;
adminClientConfig.SaslPassword = _kafkaOptionConfig.SaslPassword; 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) .AddMongoDb(configuration.GetConnectionString("Default"), "MongoDB", HealthStatus.Unhealthy)
.AddRedis(configuration.GetValue<string>("Redis:Configuration") ?? string.Empty, "Redis", .AddRedis(configuration.GetValue<string>("Redis:Configuration") ?? string.Empty, "Redis",
HealthStatus.Unhealthy) HealthStatus.Unhealthy)
//.AddKafka(new Confluent.Kafka.ProducerConfig .AddKafka(new Confluent.Kafka.ProducerConfig
//{ {
// BootstrapServers = configuration.GetValue<string>("Kafka:BootstrapServers") BootstrapServers = configuration.GetValue<string>("Kafka:BootstrapServers")
//}, "Kafka", failureStatus: HealthStatus.Unhealthy) }, "Kafka", failureStatus: HealthStatus.Unhealthy)
//.AddCheck<CassandraHealthCheck>("Cassandra") //.AddCheck<CassandraHealthCheck>("Cassandra")
.AddCheck<IoTdbHealthCheck>("IoTDB"); .AddCheck<IoTdbHealthCheck>("IoTDB");

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

@ -14,8 +14,10 @@
"BootstrapServers": "47.110.62.104:9092,47.110.53.196:9092,47.110.60.222:9092", "BootstrapServers": "47.110.62.104:9092,47.110.53.196:9092,47.110.60.222:9092",
"EnableFilter": true, "EnableFilter": true,
"EnableAuthorization": false, "EnableAuthorization": false,
"SecurityProtocol": "SaslPlaintext",
"SaslMechanism": "Plain",
"SaslUserName": "lixiao", "SaslUserName": "lixiao",
"SaslPassword": "lixiao@1980", "SaslPassword": "lixiao1980",
"KafkaReplicationFactor": 3, "KafkaReplicationFactor": 3,
"NumPartitions": 30, "NumPartitions": 30,
"ServerTagName": "JiSheCollectBus100", "ServerTagName": "JiSheCollectBus100",