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

缓存设备端物模型信息

Browse Source
This commit is contained in:
ChenYi 2025-12-08 16:27:42 +08:00
parent 6d681f4b0f
commit 8190de6eff
10 changed files with 100 additions and 6081 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Directory.Build.targets
View File

@ -23,11 +23,22 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<!-- Ocelot 网关--> <!-- Ocelot 网关-->
<PackageReference Update="Ocelot" Version="18.0.0"/> <PackageReference Update="Ocelot" Version="18.0.0"/>
<PackageReference Update="Ocelot.Provider.Consul" Version="18.0.0"/> <PackageReference Update="Ocelot.Provider.Consul" Version="18.0.0"/>
<PackageReference Update="Ocelot.Provider.Polly" Version="18.0.0"/> <PackageReference Update="Ocelot.Provider.Polly" Version="18.0.0"/>
<!--FreeRedis-->
<PackageReference Update="FreeRedis" Version="1.3.7"/>
<PackageReference Update="FreeRedis.DistributedCache" Version="1.3.7"/>
<!--FreeSql-->
<PackageReference Update="FreeSql.Cloud" Version="2.0.1" />
<PackageReference Update="FreeSql.Extensions.JsonMap" Version="3.5.303" />
<PackageReference Update="FreeSql" Version="3.5.303"/>
<PackageReference Update="FreeSql.Provider.MysqlConnector" Version="3.5.303"/>
<PackageReference Update="FreeSql.Provider.Sqlite" Version="3.5.303"/>
<PackageReference Update="FreeSql.Provider.SqlServer" Version="3.5.303" />
<!-- 单元测试包--> <!-- 单元测试包-->
<PackageReference Update="xunit" Version="2.9.3"/> <PackageReference Update="xunit" Version="2.9.3"/>
@ -69,8 +80,8 @@
<!-- Magicodes 导入导出Excel--> <!-- Magicodes 导入导出Excel-->
<PackageReference Update="Magicodes.IE.Excel" Version="2.7.5.2"/> <PackageReference Update="Magicodes.IE.Excel" Version="2.8.0"/>
<PackageReference Update="Magicodes.IE.Excel.AspNetCore" Version="2.7.5.2"/> <PackageReference Update="Magicodes.IE.Excel.AspNetCore" Version="2.8.0"/>
<!-- MiniProfiler 查看接口耗时,sql耗时--> <!-- MiniProfiler 查看接口耗时,sql耗时-->
<PackageReference Update="MiniProfiler.AspNetCore.Mvc" Version="4.5.4"/> <PackageReference Update="MiniProfiler.AspNetCore.Mvc" Version="4.5.4"/>
@ -104,8 +115,28 @@
<PackageReference Update="Otp.NET" Version="1.4.0" /> <PackageReference Update="Otp.NET" Version="1.4.0" />
<PackageReference Update="QRCoder" Version="1.6.0" /> <PackageReference Update="QRCoder" Version="1.6.0" />
<!--Flurl-->
<PackageReference Update="Flurl.Http" Version="4.0.2" />
<PackageReference Update="Mapster" Version="7.4.0" />
<!--Apache.IoTDB-->
<PackageReference Update="Apache.IoTDB" Version="2.0.2.12" />
<!--Kafka-->
<PackageReference Update="Confluent.Kafka" Version="2.11.0" />
<!--DotPulsar-->
<PackageReference Update="DotPulsar" Version="5.1.0" />
<PackageReference Update="K4os.Compression.LZ4" Version="1.3.8" />
<PackageReference Update="ZstdNet" Version="1.4.5" />
<PackageReference Update="ZstdSharp.Port" Version="0.8.6" />
<!--SixLabors.ImageSharp--> <!--SixLabors.ImageSharp-->
<PackageReference Update="SixLabors.ImageSharp" Version="3.1.12" /> <PackageReference Update="SixLabors.ImageSharp" Version="3.1.12" />
<!--SkiaSharp-->
<PackageReference Update="SkiaSharp" Version="3.119.1" />
</ItemGroup> </ItemGroup>

59
DockerComposeShells/mysql/init/init-db.sql
View File

File diff suppressed because one or more lines are too long

2
JiShe.ServicePro

@ -1 +1 @@
Subproject commit c3d3ced4b1a82967373e389877632349afee0de0 Subproject commit 8908fbcc16d36745ed4b6f08017c8255f04a6775

4
NuGet.Config
View File

@ -2,7 +2,7 @@
<configuration> <configuration>
<packageSources> <packageSources>
<add key="JiSheTeam" value="http://localhost:5020/v3/index.json" protocolVersion="3" allowInsecureConnections="true" /> <add key="JiSheTeam" value="http://192.168.111.248:9511/nuget/JiSheTeam/v3/index.json" protocolVersion="3" allowInsecureConnections="true" />
<add key="nuget" value="https://api.nuget.org/v3/index.json" allowInsecureConnections="True" /> <add key="nuget" value="https://api.nuget.org/v3/index.json" />
</packageSources> </packageSources>
</configuration> </configuration>

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

@ -4,19 +4,19 @@
"CorsOrigins": "https://*.IoT.com,http://localhost:4200,http://localhost:3100,http://localhost:80,http://10.10.90.3:4200" "CorsOrigins": "https://*.IoT.com,http://localhost:4200,http://localhost:3100,http://localhost:80,http://10.10.90.3:4200"
}, },
"ConnectionStrings": { "ConnectionStrings": {
"Default": "Data Source=localhost;Port=33306;Database=JiSheIoTProDB54;uid=root;pwd=123456789;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;TreatTinyAsBoolean=false;SslMode=None;Pooling=true;" "Default": "Data Source=192.168.111.174;Port=13306;Database=JiSheIoTProDB;uid=root;pwd=JiShe!aqG#5kGgh&0;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;TreatTinyAsBoolean=false;SslMode=None;Pooling=true;"
}, },
"Hangfire": { "Hangfire": {
"Redis": { "Redis": {
"Host": "47.110.53.196:30712,password=1q3J@BGf!yhTaD46nS#", "Host": "192.168.111.174:30712,password=1q3J@BGf!yhTaD46nS#",
"DB": "2" "DB": "2"
} }
}, },
"Redis": { "Redis": {
"Configuration": "47.110.53.196:30712,password=1q3J@BGf!yhTaD46nS#,defaultdatabase=5" "Configuration": "192.168.111.174:30712,password=1q3J@BGf!yhTaD46nS#,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:9094,192.168.111.174:9094,47.110.60.222:9094",
"EnableFilter": true, "EnableFilter": true,
"EnableAuthorization": false, "EnableAuthorization": false,
"SaslUserName": "lixiao", "SaslUserName": "lixiao",
@ -26,8 +26,8 @@
"TaskThreadCount": -1 "TaskThreadCount": -1
}, },
"Pulsar": { "Pulsar": {
"ServiceUrl": "pulsar+ssl://iot-north-mq.heclouds.com:6651", //pulsar+ssl://iot-north-mq.heclouds.com:6651 ，pulsar://47.110.53.196:26974 "ServiceUrl": "pulsar+ssl://iot-north-mq.heclouds.com:6651", //pulsar+ssl://iot-north-mq.heclouds.com:6651 ，pulsar://192.168.111.174:26974
"WebUrl": "http://47.110.53.196:9094", "WebUrl": "http://192.168.111.174:9094",
"UserName": "admin", "UserName": "admin",
"TenantName": "1YMVZZkAkRArjxSD8457", "TenantName": "1YMVZZkAkRArjxSD8457",
"Namespace": "OneNET", "Namespace": "OneNET",
@ -57,10 +57,10 @@
"IoTDBOptions": { "IoTDBOptions": {
"UserName": "root", "UserName": "root",
"Password": "Lixiao@1980", "Password": "Lixiao@1980",
//"TreeModelClusterList": [ "47.110.53.196:6667", "47.110.60.222:6667", "47.110.62.104:6667" ], //"TreeModelClusterList": [ "192.168.111.174: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" ], //"TableModelClusterList": [ "192.168.111.174:6667", "47.110.60.222:6667", "47.110.62.104:6667" ],
"TreeModelClusterList": [ "47.110.53.196:30710" ], "TreeModelClusterList": [ "192.168.111.174:30710" ],
"TableModelClusterList": [ "47.110.53.196:30710" ], "TableModelClusterList": [ "192.168.111.174:30710" ],
"PoolSize": 32, "PoolSize": 32,
"DataBaseName": "jisheiotdata", "DataBaseName": "jisheiotdata",
"OpenDebugMode": true, "OpenDebugMode": true,
@ -97,7 +97,7 @@
} }
}, },
"FreeRedisOptions": { "FreeRedisOptions": {
"ConnectionString": "47.110.53.196:30712,password=1q3J@BGf!yhTaD46nS#,abortConnect=false,connectTimeout=30000,allowAdmin=true,maxPoolSize=500,defaultdatabase=14", "ConnectionString": "192.168.111.174:30712,password=1q3J@BGf!yhTaD46nS#,abortConnect=false,connectTimeout=30000,allowAdmin=true,maxPoolSize=500,defaultdatabase=14",
"UseDistributedCache": true "UseDistributedCache": true
}, },
"FreeSqlProviderOptions": { "FreeSqlProviderOptions": {

10
src/JiShe.IoT.DbMigrator/appsettings.json
View File

@ -1,14 +1,14 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
"Default": "Data Source=localhost;Port=33306;Database=JiSheIoTProDB54;uid=root;pwd=123456789;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;TreatTinyAsBoolean=false;SslMode=None;Pooling=true;" "Default": "Data Source=192.168.111.174;Port=13306;Database=JiSheIoTProDB;uid=root;pwd=JiShe!aqG#5kGgh&0;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;TreatTinyAsBoolean=false;SslMode=None;Pooling=true;"
}, },
"IoTDBOptions": { "IoTDBOptions": {
"UserName": "root", "UserName": "root",
"Password": "Lixiao@1980", "Password": "Lixiao@1980",
//"TreeModelClusterList": [ "47.110.53.196:6667", "47.110.60.222:6667", "47.110.62.104:6667" ], //"TreeModelClusterList": [ "192.168.111.174: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" ], //"TableModelClusterList": [ "192.168.111.174:6667", "47.110.60.222:6667", "47.110.62.104:6667" ],
"TreeModelClusterList": [ "47.110.53.196:30710" ], "TreeModelClusterList": [ "192.168.111.174:30710" ],
"TableModelClusterList": [ "47.110.53.196:30710" ], "TableModelClusterList": [ "192.168.111.174:30710" ],
"PoolSize": 32, "PoolSize": 32,
"DataBaseName": "jisheiotdata", "DataBaseName": "jisheiotdata",
"OpenDebugMode": false, "OpenDebugMode": false,

3831
src/JiShe.IoT.EntityFrameworkCore/Migrations/20251207122557_InitialCreate.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

2208
src/JiShe.IoT.EntityFrameworkCore/Migrations/20251207122557_InitialCreate.cs
View File

File diff suppressed because it is too large Load Diff

2
src/JiShe.IoT.EntityFrameworkCore/Migrations/20251207055002_InitialCreate.Designer.cs → src/JiShe.IoT.EntityFrameworkCore/Migrations/20251208010754_InitialCreate.Designer.cs generated
View File

@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore;
namespace JiShe.IoT.Migrations namespace JiShe.IoT.Migrations
{ {
[DbContext(typeof(IoTDbContext))] [DbContext(typeof(IoTDbContext))]
[Migration("20251207055002_InitialCreate")] [Migration("20251208010754_InitialCreate")]
partial class InitialCreate partial class InitialCreate
{ {
/// <inheritdoc /> /// <inheritdoc />

0
src/JiShe.IoT.EntityFrameworkCore/Migrations/20251207055002_InitialCreate.cs → src/JiShe.IoT.EntityFrameworkCore/Migrations/20251208010754_InitialCreate.cs
View File