dev #3

Merged
admin merged 101 commits from dev into master 2025-04-27 03:42:51 +00:00
Showing only changes of commit 40b62caa83 - Show all commits

View File

@ -84,12 +84,7 @@
"SaslPassword": "lixiao1980", "SaslPassword": "lixiao1980",
"KafkaReplicationFactor": 3, "KafkaReplicationFactor": 3,
"NumPartitions": 30, "NumPartitions": 30,
<<<<<<< HEAD "ServerTagName": "JiSheCollectBus2"
"ServerTagName": "JiSheCollectBus99"
=======
"ServerTagName": "JiSheCollectBus3",
"FirstCollectionTime": "2025-04-18 00:00:00"
>>>>>>> fe51402b1f105dc536f08ec2249d4ab13fa8f172
}, },
"IoTDBOptions": { "IoTDBOptions": {
"UserName": "root", "UserName": "root",
@ -100,10 +95,7 @@
"OpenDebugMode": true, "OpenDebugMode": true,
"UseTableSessionPoolByDefault": false "UseTableSessionPoolByDefault": false
}, },
<<<<<<< HEAD "ServerTagName": "JiSheCollectBus3",
"ServerTagName": "JiSheCollectBus",
=======
>>>>>>> fe51402b1f105dc536f08ec2249d4ab13fa8f172
"Cassandra": { "Cassandra": {
"ReplicationStrategy": { "ReplicationStrategy": {
"Class": "NetworkTopologyStrategy", //NetworkTopologyStrategySimpleStrategy "Class": "NetworkTopologyStrategy", //NetworkTopologyStrategySimpleStrategy