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

Compare commits

base: admin:7b67519d9ea1fd134c7490e002b42596bead24ea
Branches Tags
admin:master
admin:物模型服务调用
admin:master_net9_Pomelo
..
compare: admin:cc2dd5d3ab91e0d7008f4d54d4de564de8061d7c
Branches Tags
admin:master
admin:物模型服务调用
admin:master_net9_Pomelo

No commits in common. "7b67519d9ea1fd134c7490e002b42596bead24ea" and "cc2dd5d3ab91e0d7008f4d54d4de564de8061d7c" have entirely different histories.
7b67519d9e ... cc2dd5d3ab

4 changed files with 16 additions and 56 deletions
Show Stats Expand all files Collapse all files

2
Directory.Build.props
View File

@ -2,7 +2,7 @@
<!-- 定义项目加载属性 --> <!-- 定义项目加载属性 -->
<PropertyGroup> <PropertyGroup>
<!--JiShe.ServicePro版本--> <!--JiShe.ServicePro版本-->
<ServiceProVersion>1.0.5.16</ServiceProVersion> <ServiceProVersion>1.0.5.15</ServiceProVersion>
<!--Volo Abp 版本--> <!--Volo Abp 版本-->
<VoloAbpVersion>9.1.1</VoloAbpVersion> <VoloAbpVersion>9.1.1</VoloAbpVersion>

7
host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs
View File

@ -1,6 +1,5 @@
using Hangfire.Redis.StackExchange; using Hangfire.Redis.StackExchange;
using JiShe.ServicePro.Core; using JiShe.ServicePro.Core;
using JiShe.ServicePro.FreeRedisProvider;
using Medallion.Threading; using Medallion.Threading;
using Medallion.Threading.Redis; using Medallion.Threading.Redis;
using Volo.Abp.BlobStoring; using Volo.Abp.BlobStoring;
@ -118,12 +117,12 @@ public partial class IoTHttpApiHostModule
private void ConfigureCache(ServiceConfigurationContext context) private void ConfigureCache(ServiceConfigurationContext context)
{ {
Configure<AbpDistributedCacheOptions>( Configure<AbpDistributedCacheOptions>(
options => { options.KeyPrefix = "JiSheIoT:"; }); options => { options.KeyPrefix = "AbpPro:"; });
var configuration = context.Services.GetConfiguration(); var configuration = context.Services.GetConfiguration();
var redis = ConnectionMultiplexer.Connect(configuration.GetValue<string>("Redis:Configuration"));
context.Services context.Services
.AddDataProtection() .AddDataProtection()
.PersistKeysToStackFreeRedis("JiSheIoTAdmin-Protection-Keys"); .PersistKeysToStackExchangeRedis(redis, "AbpPro-Protection-Keys");
} }
/// <summary> /// <summary>

21
host/JiShe.IoT.HttpApi.Host/appsettings.Development.json
View File

@ -10,35 +10,36 @@
}, },
"Hangfire": { "Hangfire": {
"Redis": { "Redis": {
"Host": "47.110.53.196:6379,password=1q3J@BGf!yhTaD46nS#", "Host": "47.110.60.222:6379,password=3JBGfyhTaD46nS",
"DB": "2" "DB": "2"
} }
}, },
"Redis": { "Redis": {
"Configuration": "47.110.53.196:6379,password=1q3J@BGf!yhTaD46nS#,defaultdatabase=5" "Configuration": "47.110.60.222:6379,password=3JBGfyhTaD46nS,defaultdatabase=5"
}, },
"Kafka": { "Kafka": {
"BootstrapServers": "47.110.62.104:9094,47.110.53.196:9094,47.110.60.222:9094", "BootstrapServers": "47.110.62.104:9092,47.110.53.196:9092,47.110.60.222:9092",
"EnableFilter": true, "EnableFilter": true,
"EnableAuthorization": true, "EnableAuthorization": true,
"SaslUserName": "lixiao", "SaslUserName": "lixiao",
"SaslPassword": "lixiao@1980", "SaslPassword": "lixiao@1980",
"KafkaReplicationFactor": 3, "KafkaReplicationFactor": 3,
"NumPartitions": 30, "NumPartitions": 30,
"TaskThreadCount": -1 "TaskThreadCount": -1,
"FirstCollectionTime": "2025-04-22 16:07:00"
}, },
"IoTDBOptions": { "IoTDBOptions": {
"UserName": "root", "UserName": "root",
"Password": "Lixiao@1980", "Password": "root",
"TreeModelClusterList": [ "47.110.53.196:6667", "47.110.60.222:6667", "47.110.62.104:6667" ], "TreeModelClusterList": [ "121.42.175.177:16667" ],
"TableModelClusterList": [ "47.110.53.196:6667", "47.110.60.222:6667", "47.110.62.104:6667" ], "TableModelClusterList": [ "121.42.175.177:16667" ],
"PoolSize": 32, "PoolSize": 32,
"TableModelDataBaseName": "energy", "TableModelDataBaseName": "energy",
"OpenDebugMode": true, "OpenDebugMode": true,
"UseTableSessionPoolByDefault": false "UseTableSessionPoolByDefault": false
}, },
"ServerApplicationOptions": { "ServerApplicationOptions": {
"ServerTagName": "JiSheCollectBus10", "ServerTagName": "JiSheCollectBus77",
"SystemType": "Energy", "SystemType": "Energy",
"FirstCollectionTime": "2025-04-28 15:07:00", "FirstCollectionTime": "2025-04-28 15:07:00",
"AutomaticVerificationTime": "16:07:00", "AutomaticVerificationTime": "16:07:00",
@ -50,7 +51,7 @@
}, },
"Jwt": { "Jwt": {
"Audience": "JiShe.IoT", "Audience": "JiShe.IoT",
"SecurityKey": "dzehzRz9a8asdfaf43ghVD@d#fasdfaf567sdadfasdf=", "SecurityKey": "dzehzRz9a8asdfasfdadfasdfasdfafsdadfasbasdf=",
"Issuer": "JiShe.IoT", "Issuer": "JiShe.IoT",
"ExpirationTime": 2 "ExpirationTime": 2
}, },
@ -63,7 +64,7 @@
} }
}, },
"FreeRedisOptions": { "FreeRedisOptions": {
"ConnectionString": "47.110.53.196:6379,password=1q3J@BGf!yhTaD46nS#,abortConnect=false,connectTimeout=30000,allowAdmin=true,maxPoolSize=50,defaultdatabase=14", "ConnectionString": "47.110.60.222:6379,password=3JBGfyhTaD46nS,defaultdatabase=1",
"UseDistributedCache": true "UseDistributedCache": true
}, },
"FreeSqlProviderOptions": { "FreeSqlProviderOptions": {

42
host/JiShe.IoT.HttpApi.Host/appsettings.Production.json
View File

@ -11,7 +11,7 @@
}, },
"Jwt": { "Jwt": {
"Audience": "JiShe.IoT", "Audience": "JiShe.IoT",
"SecurityKey": "dzehzRz9a8asdfaf43ghVD@d#fasdfaf567sdadfasdf=", "SecurityKey": "dzehzRz9a8asdfasfdadfasdfasdfafsdadfasbasdf=",
"Issuer": "JiShe.IoT", "Issuer": "JiShe.IoT",
"ExpirationTime": 2 "ExpirationTime": 2
}, },
@ -28,45 +28,5 @@
"Host": "localhost,password=1q2w3E*", "Host": "localhost,password=1q2w3E*",
"DB": "2" "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"
} }
} }