From f1ac4f67b5485f3155ea1be0a28206998d9e8814 Mon Sep 17 00:00:00 2001 From: ChenYi <296215406@outlook.com> Date: Mon, 23 Mar 2026 10:35:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configs/appsettings.Development.json | 2 +- src/JiShe.IoT.DbMigrator/appsettings.json | 124 +++++------------- 2 files changed, 31 insertions(+), 95 deletions(-) diff --git a/host/JiShe.IoT.HttpApi.Host/configs/appsettings.Development.json b/host/JiShe.IoT.HttpApi.Host/configs/appsettings.Development.json index c9e0026..344bab8 100644 --- a/host/JiShe.IoT.HttpApi.Host/configs/appsettings.Development.json +++ b/host/JiShe.IoT.HttpApi.Host/configs/appsettings.Development.json @@ -5,7 +5,7 @@ }, "ConnectionStrings": { //"Default": "Data Source=192.168.111.174;Port=13306;Database=JiSheIoTProDB386;uid=root;pwd=JiShe!aqG#5kGgh&0;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;TreatTinyAsBoolean=false;SslMode=None;Pooling=true;" - "Default": "Host=192.168.111.174;Port=5432;Database=jisheiotprodb;Username=postgres;Password=JiShe!aqG#5kGgh&0;Encoding=UTF8;Pooling=true;Pooling=true;Minimum Pool Size=5;Maximum Pool Size=100;" + "Default": "Host=192.168.111.174;Port=5432;Database=jisheiotprodb68;Username=postgres;Password=JiShe!aqG#5kGgh&0;Encoding=UTF8;Pooling=true;Pooling=true;Minimum Pool Size=5;Maximum Pool Size=100;" }, "Hangfire": { "Redis": { diff --git a/src/JiShe.IoT.DbMigrator/appsettings.json b/src/JiShe.IoT.DbMigrator/appsettings.json index 5a815dc..bfa311c 100644 --- a/src/JiShe.IoT.DbMigrator/appsettings.json +++ b/src/JiShe.IoT.DbMigrator/appsettings.json @@ -1,37 +1,41 @@ { - "App": { - "SelfUrl": "http://localhost:44315", - "CorsOrigins": "https://*.IoT.com,http://localhost:4200,http://localhost:3100,http://localhost:80,http://10.10.10.104:4200" - }, "ConnectionStrings": { - "Default": "Host=47.110.53.196;Port=35432;Database=jisheiotprodb68;Username=postgres;Password=JiShe!aqG#5kGgh&0;Encoding=UTF8;Pooling=true;Pooling=true;Minimum Pool Size=5;Maximum Pool Size=100;" + "Default": "Host=192.168.111.174;Port=5432;Database=jisheiotprodb68;Username=postgres;Password=JiShe!aqG#5kGgh&0;Encoding=UTF8;Pooling=true;Pooling=true;Minimum Pool Size=5;Maximum Pool Size=100;" }, - "Hangfire": { - "Redis": { - "Host": "47.110.53.196:30712,password=1q3J@BGf!yhTaD46nS#", - "DB": "2" - } + "IoTDBOptions": { + "UserName": "root", + "Password": "Lixiao@1980", + //"TreeModelClusterList": [ "192.168.111.174:6667", "47.110.60.222:6667", "47.110.62.104:6667" ], + //"TableModelClusterList": [ "192.168.111.174:6667", "47.110.60.222:6667", "47.110.62.104:6667" ], + "TreeModelClusterList": [ "192.168.111.174:30710" ], + "TableModelClusterList": [ "192.168.111.174:30710" ], + "PoolSize": 32, + "DataBaseName": "jisheiotdata", + "OpenDebugMode": false, + "UseTableSessionPoolByDefault": false }, - "Redis": { - "Configuration": "47.110.53.196:30712,password=1q3J@BGf!yhTaD46nS#,defaultdatabase=5" + "FreeRedisOptions": { + "ConnectionString": "192.168.111.42:30712,password=1q3J@BGf!yhTaD46nS#,abortConnect=false,connectTimeout=30000,allowAdmin=true,maxPoolSize=500,defaultdatabase=14", + "UseDistributedCache": true }, - "Kafka": { - "BootstrapServers": "47.110.62.104:9094,47.110.53.196:9094,47.110.60.222:9094", - "EnableFilter": true, - "EnableAuthorization": false, - "SaslUserName": "lixiao", - "SaslPassword": "lixiao@1980", - "KafkaReplicationFactor": 3, - "NumPartitions": 30, - "TaskThreadCount": -1 + "ServerApplicationOptions": { + "ServerTagName": "JiSheCollectBus10", + "FirstCollectionTime": "2025-04-28 15:07:00", + "AutomaticVerificationTime": "16:07:00", + "AutomaticTerminalVersionTime": "17:07:00", + "AutomaticTelematicsModuleTime": "17:30:00", + "AutomaticDayFreezeTime": "02:30:00", + "AutomaticMonthFreezeTime": "03:30:00", + "DefaultProtocolPlugin": "T37612012ProtocolPlugin", + "VerifySignatureToken": "SIcPQnpMgaFDmNlIjNmzq5smshz7cKrh", + "DistributedMessage": 2 }, "Pulsar": { - "ServiceUrl": "pulsar://47.110.53.196:9093", //pulsar+ssl://iot-north-mq.heclouds.com:6651 ，pulsar://47.110.53.196:26974 - "WebUrl": "http://47.110.53.196:9094", + "ServiceUrl": "pulsar://47.110.60.222:9093", + "WebUrl": "http://47.110.60.222:9094", "UserName": "admin", "TenantName": "1YMVZZkAkRArjxSD8457", "Namespace": "OneNET", - "MessageTTL": 3600, "PulsarSecretKey": "0fd7afb8b0d04e6abc4fdfdac2190a79", "PulsarSubscriptionCustomName": "sub", "EnableTls": false, @@ -44,78 +48,10 @@ "DefaultPartitions": 16, "DefaultBundles": 16, "EnableAutoCreation": true, //开启自动创建Topic - "TopicMode": "Static", //Dynamic、Static 主题模式 + "TopicMode": "Static", //Dynamic 主题模式 "EnableTopicTypeFilter": true, //允许Topic类型过滤 "AllowedTopicTypes": [ "Static" ], //允许的Topic类型 "AllowedClusters": [ "pulsar-cluster-1" ], //允许的集群 - "AdminRoles": [ "admin" ], - "EnableConsumerIdleCleanup": true, - "ConsumerIdleCleanupMinutes": 120, - "EnableProducerIdleCleanup": true, - "ProducerIdleCleanupMinutes": 60 - }, - "IoTDBOptions": { - "UserName": "root", - "Password": "Li#xiao@198!0", - //"TreeModelClusterList": [ "47.110.53.196:6667", "47.110.60.222:6667", "47.110.62.104:6667" ], - //"TableModelClusterList": [ "47.110.53.196:6667", "47.110.60.222:6667", "47.110.62.104:6667" ], - "TreeModelClusterList": [ "47.110.53.196:30710" ], - "TableModelClusterList": [ "47.110.53.196:30710" ], - "PoolSize": 32, - "DataBaseName": "jisheiotdata", - "OpenDebugMode": true, - "UseTableSessionPoolByDefault": false, - "BatchInsertSize": 1000 - }, - "ServerApplicationOptions": { - "ServerTagName": "JiSheCollectBus12", - "FirstCollectionTime": "2025-04-28 15:07:00", - "AutomaticVerificationTime": "16:07:00", - "AutomaticTerminalVersionTime": "17:07:00", - "AutomaticTelematicsModuleTime": "17:30:00", - "AutomaticDayFreezeTime": "02:30:00", - "AutomaticMonthFreezeTime": "03:30:00", - "DefaultProtocolPlugin": "T37612012ProtocolPlugin", - "SignatureToken": "SIcPQnpMgaFDmNlIjNmzq5smshz7cKrh", - "AesSecurityKey": "RPTEIGCA1KvDEXS1", - "IsAesEncrypted": false, - "DistributedMessage": 2, - "SnowflakeWorkerId": 1, - "DownloadDeviceFirmwareBasicUrl": "http://121.42.175.177:32580/Aggregation/Device/DownloadFirmware?Id=", - "MQTTServerType": 1 - }, - "Jwt": { - "Audience": "JiShe.IoT", - "SecurityKey": "dzehzRz9a8asdfaf43ghVD@d#fasdfaf567sdadfasdf=", - "Issuer": "JiShe.IoT", - "ExpirationTime": 2 - }, - "Cap": { - "RabbitMq": { - "HostName": "localhost", - "UserName": "admin", - "Password": "1q2w3E*", - "Port": 5672 - } - }, - "FreeRedisOptions": { - "ConnectionString": "47.110.53.196:30712,password=1q3J@BGf!yhTaD46nS#,abortConnect=false,connectTimeout=30000,allowAdmin=true,maxPoolSize=500,defaultdatabase=14", - "UseDistributedCache": true - }, - "FreeSqlProviderOptions": { - "UsePrepayDB": false, - "UseEnergyDB": false, - "PrintLog": false, - "DataType": 1 - }, - "OneNETSecureReceiveOptions": { - "OneNETVerifySignatureToken": "SIcPQnpMgaFDmNlIjNmzq5smshz7cKrh", - "OneNETAesKey": "RPTEIGCA1KvDEXS1" - }, - "DataChannelOptions": { - "DefaultBatchSize": 10000, - "TelemetryBatchSize": 10000, - "EmptyWaitmilliseconds": 500, - "TimeoutMilliseconds": 500 + "AdminRoles": [ "admin" ] } } \ No newline at end of file