依赖模块版本升级

Directory.Build.Microsoft.targets

@@ -21,10 +21,11 @@
         <PackageReference Update="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0"/>
 		<PackageReference Update="Microsoft.AspNetCore.Http.Features" Version="2.3.0"/>
 		<PackageReference Update="Microsoft.CSharp" Version="5.0.0"/>
-		<PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
+		<PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0" />
-		<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
+		<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
-		<PackageReference Update="Microsoft.CodeAnalysis.Common " Version="5.0.0" />
+		<PackageReference Update="Microsoft.CodeAnalysis.Common " Version="5.3.0" />
-		<PackageReference Update="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0" />
+		<PackageReference Update="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.3.0" />
+		<PackageReference Update="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.3.0" />
         <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
     </ItemGroup>
 </Project>

Directory.Build.props

@@ -4,10 +4,10 @@
 		<!--JiShe.ServicePro版本-->
 		<ServiceProVersion>1.0.5.40</ServiceProVersion>
 		<!--Volo Abp 版本-->
-		<VoloAbpVersion>10.0.2</VoloAbpVersion>
+		<VoloAbpVersion>10.1.1</VoloAbpVersion>
 
 		<!--Dotnet 组件 版本-->
-		<DotnetInfoVersion>10.0.2</DotnetInfoVersion>
+		<DotnetInfoVersion>10.0.5</DotnetInfoVersion>
 
 		<!--Dotnet 框架 版本-->
 		<DotnetTargetFrameworkVersion>net10.0</DotnetTargetFrameworkVersion>

Directory.Build.targets

@@ -63,9 +63,9 @@
 		<PackageReference Update="Savorboard.CAP.InMemoryMessageQueue" Version="8.2.1"/>
 
 		<!-- Swagger-->
-		<PackageReference Update="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.4"/>
+		<!--<PackageReference Update="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.4"/>-->
-		<PackageReference Update="Swashbuckle.AspNetCore" Version="9.0.4"/>
+		 <PackageReference Update="Swashbuckle.AspNetCore" Version="10.1.5"/>
-		<PackageReference Update="Swashbuckle.AspNetCore.Annotations" Version="9.0.4"/>
+        <PackageReference Update="Swashbuckle.AspNetCore.Annotations" Version="10.1.5"/>
 
 		<!-- Serilog 日志-->
 		<PackageReference Update="Serilog" Version="4.3.0"/>
@@ -111,7 +111,7 @@
 		<!-- Humanizer 中文格式包-->
 		<PackageReference Update="Humanizer.Core.zh-Hans" Version="2.14.1"/>
 
-		<PackageReference Update="Scriban" Version="5.4.4" />
+		<PackageReference Update="Scriban" Version="6.6.0" />
 
 		<PackageReference Update="Otp.NET" Version="1.4.0" />
 		<PackageReference Update="QRCoder" Version="1.6.0" />

src/JiShe.IoT.DbMigrator/appsettings.json

@@ -1,7 +1,6 @@
 {
   "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=jisheiotprodb67;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=jisheiotprodb;Username=postgres;Password=JiShe!aqG#5kGgh&0;Encoding=UTF8;Pooling=true;Pooling=true;Minimum Pool Size=5;Maximum Pool Size=100;"
   },
   "IoTDBOptions": {
     "UserName": "root",

src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj

@@ -7,9 +7,9 @@
     <ItemGroup>
         <ProjectReference Include="..\JiShe.IoT.Domain\JiShe.IoT.Domain.csproj" />
         <PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" />
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"  Version="5.3.0"  />
-		<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0" />
+		<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common"  Version="5.3.0"  />
-		<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0" />
+		<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild"  Version="5.3.0"  />
     </ItemGroup>
 
 	<ItemGroup Condition=" '$(Configuration)' == 'Debug'" Label="Debug">

src/JiShe.IoT.EntityFrameworkCore/Migrations/20260128012938_updatedevicethingmodel.cs

@@ -1,30 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace JiShe.IoT.Migrations
-{
-    /// <inheritdoc />
-    public partial class updatedevicethingmodel : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "IsEnable",
-                table: "ServiceProDeviceThingModelCommandInfo",
-                type: "boolean",
-                nullable: false,
-                defaultValue: false,
-                comment: "是否启用");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "IsEnable",
-                table: "ServiceProDeviceThingModelCommandInfo");
-        }
-    }
-}

src/JiShe.IoT.EntityFrameworkCore/Migrations/20260128015625_updatedeviceinfo20260128.cs

@@ -1,30 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace JiShe.IoT.Migrations
-{
-    /// <inheritdoc />
-    public partial class updatedeviceinfo20260128 : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "ReadingMode",
-                table: "ServiceProDeviceInfo",
-                type: "integer",
-                nullable: false,
-                defaultValue: 1,
-                comment: "抄读模式");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "ReadingMode",
-                table: "ServiceProDeviceInfo");
-        }
-    }
-}

src/JiShe.IoT.EntityFrameworkCore/Migrations/20260128020928_updatedeviceinfo202601281007.cs

@@ -1,28 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace JiShe.IoT.Migrations
-{
-    /// <inheritdoc />
-    public partial class updatedeviceinfo202601281007 : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.RenameColumn(
-                name: "IsNeedConfigDevicMdoel",
-                table: "ServiceProDeviceInfo",
-                newName: "IsNeedConfigDeviceModel");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.RenameColumn(
-                name: "IsNeedConfigDeviceModel",
-                table: "ServiceProDeviceInfo",
-                newName: "IsNeedConfigDevicMdoel");
-        }
-    }
-}

src/JiShe.IoT.EntityFrameworkCore/Migrations/20260310025324_alertOneNETProduct20260310.cs

@@ -1,52 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace JiShe.IoT.Migrations
-{
-    /// <inheritdoc />
-    public partial class alertOneNETProduct20260310 : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "DataPushInfo",
-                table: "ServiceProOneNETProductInfo",
-                type: "text",
-                nullable: true,
-                comment: "数据推送信息,HTTP推送就是推送地址，Reist推送主题或者key");
-
-            migrationBuilder.AddColumn<int>(
-                name: "DataPushType",
-                table: "ServiceProOneNETProductInfo",
-                type: "integer",
-                nullable: true,
-                comment: "数据推送类型, 1-HttpPost；2-ReisSubscription");
-
-            migrationBuilder.AddColumn<bool>(
-                name: "IsNeedPushData",
-                table: "ServiceProOneNETProductInfo",
-                type: "boolean",
-                nullable: false,
-                defaultValue: false,
-                comment: "是否需要推送数据");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "DataPushInfo",
-                table: "ServiceProOneNETProductInfo");
-
-            migrationBuilder.DropColumn(
-                name: "DataPushType",
-                table: "ServiceProOneNETProductInfo");
-
-            migrationBuilder.DropColumn(
-                name: "IsNeedPushData",
-                table: "ServiceProOneNETProductInfo");
-        }
-    }
-}

src/JiShe.IoT.EntityFrameworkCore/Migrations/20260311060722_alterOneNETProductInfos20260311.cs

@@ -1,51 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace JiShe.IoT.Migrations
-{
-    /// <inheritdoc />
-    public partial class alterOneNETProductInfos20260311 : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<string>(
-                name: "DataPushInfo",
-                table: "ServiceProOneNETProductInfo",
-                type: "text",
-                nullable: true,
-                comment: "数据推送信息,HTTP推送就是推送路径，Redis推送主题或者key",
-                oldClrType: typeof(string),
-                oldType: "text",
-                oldNullable: true,
-                oldComment: "数据推送信息,HTTP推送就是推送地址，Reist推送主题或者key");
-
-            migrationBuilder.AddColumn<string>(
-                name: "DataPushServer",
-                table: "ServiceProOneNETProductInfo",
-                type: "text",
-                nullable: true,
-                comment: "数据推送服务地址信息，例如HTTP地址：http://192.168.1.1:8080，Redis订阅地址：192.168.1.1:6379");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "DataPushServer",
-                table: "ServiceProOneNETProductInfo");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "DataPushInfo",
-                table: "ServiceProOneNETProductInfo",
-                type: "text",
-                nullable: true,
-                comment: "数据推送信息,HTTP推送就是推送地址，Reist推送主题或者key",
-                oldClrType: typeof(string),
-                oldType: "text",
-                oldNullable: true,
-                oldComment: "数据推送信息,HTTP推送就是推送路径，Redis推送主题或者key");
-        }
-    }
-}