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

解决合并冲突

Browse Source
This commit is contained in:
zenghongyao 2025-04-19 00:37:36 +08:00
parent 2612cd5d0b
commit 40b62caa83
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/JiShe.CollectBus.Host/appsettings.json
View File

@ -84,12 +84,7 @@
"SaslPassword": "lixiao1980",
"KafkaReplicationFactor": 3,
"NumPartitions": 30,
<<<<<<< HEAD
"ServerTagName": "JiSheCollectBus99"
=======
"ServerTagName": "JiSheCollectBus3",
"FirstCollectionTime": "2025-04-18 00:00:00"
>>>>>>> fe51402b1f105dc536f08ec2249d4ab13fa8f172
"ServerTagName": "JiSheCollectBus2"
},
"IoTDBOptions": {
"UserName": "root",
@ -100,10 +95,7 @@
"OpenDebugMode": true,
"UseTableSessionPoolByDefault": false
},
<<<<<<< HEAD
"ServerTagName": "JiSheCollectBus",
=======
>>>>>>> fe51402b1f105dc536f08ec2249d4ab13fa8f172
"ServerTagName": "JiSheCollectBus3",
"Cassandra": {
"ReplicationStrategy": {
"Class": "NetworkTopologyStrategy", //策略为NetworkTopologyStrategy时才会有多个数据中心，SimpleStrategy用在只有一个数据中心的情况下