From b141ee134f609dd526a97202326b988abdde0bae Mon Sep 17 00:00:00 2001 From: ChenYi <296215406@outlook.com> Date: Mon, 9 Jun 2025 10:47:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Directory.Build.props | 2 +- .../IoTHttpApiHostModule.Configure.cs | 4 +- .../appsettings.Development.json | 15 ++++--- .../appsettings.Production.json | 42 ++++++++++++++++++- 4 files changed, 51 insertions(+), 12 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index a495e49..00dae4f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - 1.0.5.8 + 1.0.5.16 9.1.1 diff --git a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs index a61b982..914ed2d 100644 --- a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs +++ b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs @@ -117,12 +117,12 @@ public partial class IoTHttpApiHostModule private void ConfigureCache(ServiceConfigurationContext context) { Configure( - options => { options.KeyPrefix = "AbpPro:"; }); + options => { options.KeyPrefix = "JiSheIoT:"; }); var configuration = context.Services.GetConfiguration(); var redis = ConnectionMultiplexer.Connect(configuration.GetValue("Redis:Configuration")); context.Services .AddDataProtection() - .PersistKeysToStackExchangeRedis(redis, "AbpPro-Protection-Keys"); + .PersistKeysToStackExchangeRedis(redis, "JiSheIoTAdmin-Protection-Keys"); } /// diff --git a/host/JiShe.IoT.HttpApi.Host/appsettings.Development.json b/host/JiShe.IoT.HttpApi.Host/appsettings.Development.json index 9d0138b..877e9d3 100644 --- a/host/JiShe.IoT.HttpApi.Host/appsettings.Development.json +++ b/host/JiShe.IoT.HttpApi.Host/appsettings.Development.json @@ -10,23 +10,22 @@ }, "Hangfire": { "Redis": { - "Host": "47.110.60.222:6379,password=3JBGfyhTaD46nS", + "Host": "47.110.53.196:6379,password=1q3J@BGf!yhTaD46nS#", "DB": "2" } }, "Redis": { - "Configuration": "47.110.60.222:6379,password=3JBGfyhTaD46nS,defaultdatabase=5" + "Configuration": "47.110.53.196:6379,password=1q3J@BGf!yhTaD46nS#,defaultdatabase=5" }, "Kafka": { - "BootstrapServers": "47.110.62.104:9092,47.110.53.196:9092,47.110.60.222:9092", + "BootstrapServers": "47.110.62.104:9094,47.110.53.196:9094,47.110.60.222:9094", "EnableFilter": true, "EnableAuthorization": true, "SaslUserName": "lixiao", "SaslPassword": "lixiao@1980", "KafkaReplicationFactor": 3, "NumPartitions": 30, - "TaskThreadCount": -1, - "FirstCollectionTime": "2025-04-22 16:07:00" + "TaskThreadCount": -1 }, "IoTDBOptions": { "UserName": "root", @@ -39,7 +38,7 @@ "UseTableSessionPoolByDefault": false }, "ServerApplicationOptions": { - "ServerTagName": "JiSheCollectBus77", + "ServerTagName": "JiSheCollectBus10", "SystemType": "Energy", "FirstCollectionTime": "2025-04-28 15:07:00", "AutomaticVerificationTime": "16:07:00", @@ -51,7 +50,7 @@ }, "Jwt": { "Audience": "JiShe.IoT", - "SecurityKey": "dzehzRz9a8asdfasfdadfasdfasdfafsdadfasbasdf=", + "SecurityKey": "dzehzRz9a8asdfaf43ghVD@d#fasdfaf567sdadfasdf=", "Issuer": "JiShe.IoT", "ExpirationTime": 2 }, @@ -64,7 +63,7 @@ } }, "FreeRedisOptions": { - "ConnectionString": "47.110.60.222:6379,password=3JBGfyhTaD46nS,defaultdatabase=1", + "ConnectionString": "47.110.53.196:6379,password=1q3J@BGf!yhTaD46nS#,abortConnect=false,connectTimeout=30000,allowAdmin=true,maxPoolSize=50,defaultdatabase=14", "UseDistributedCache": true }, "FreeSqlProviderOptions": { diff --git a/host/JiShe.IoT.HttpApi.Host/appsettings.Production.json b/host/JiShe.IoT.HttpApi.Host/appsettings.Production.json index ecbf6e0..31cffae 100644 --- a/host/JiShe.IoT.HttpApi.Host/appsettings.Production.json +++ b/host/JiShe.IoT.HttpApi.Host/appsettings.Production.json @@ -11,7 +11,7 @@ }, "Jwt": { "Audience": "JiShe.IoT", - "SecurityKey": "dzehzRz9a8asdfasfdadfasdfasdfafsdadfasbasdf=", + "SecurityKey": "dzehzRz9a8asdfaf43ghVD@d#fasdfaf567sdadfasdf=", "Issuer": "JiShe.IoT", "ExpirationTime": 2 }, @@ -28,5 +28,45 @@ "Host": "localhost,password=1q2w3E*", "DB": "2" } + }, + "FreeRedisOptions": { + "ConnectionString": "172.21.40.198:6379,password=1q3J@BGf!yhTaD46nS#,syncTimeout=30000,abortConnect=false,connectTimeout=30000,allowAdmin=true,maxPoolSize=50,defaultdatabase=14", + "UseDistributedCache": true + }, + "FreeSqlProviderOptions": { + "UsePrepayDB": true, + "UseEnergyDB": true, + "PrintLog": true + }, + "Kafka": { + "BootstrapServers": "172.21.40.198:9092,172.21.40.197:9092,172.21.40.199:9092", + "EnableFilter": true, + "EnableAuthorization": false, + "SaslUserName": "lixiao", + "SaslPassword": "lixiao1980", + "KafkaReplicationFactor": 3, + "NumPartitions": 30, + "TaskThreadCount": -1 + }, + "IoTDBOptions": { + "UserName": "root", + "Password": "Lixiao@1980", + "TreeModelClusterList": [ "172.21.40.198:6667", "172.21.40.197:6667", "172.21.40.199:6667" ], + "TableModelClusterList": [ "172.21.40.198:6667", "172.21.40.197:6667", "172.21.40.199:6667" ], + "PoolSize": 32, + "TableModelDataBaseName": "energy", + "OpenDebugMode": true, + "UseTableSessionPoolByDefault": false + }, + "ServerApplicationOptions": { + "ServerTagName": "JiSheCollectBus77", + "SystemType": "Energy", + "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" } } \ No newline at end of file