From 7f5c578d785cc5908de0a044c4ed601231e247e8 Mon Sep 17 00:00:00 2001 From: ChenYi <296215406@outlook.com> Date: Thu, 12 Jun 2025 09:29:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=A3=E5=86=B3=E6=96=B9?= =?UTF-8?q?=E6=A1=88=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Directory.Build.props | 7 +++++-- gateways/JiShe.IoT.WebGateway/JiShe.IoT.WebGateway.csproj | 2 +- host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj | 2 +- host/JiShe.IoT.HttpApi.Host/appsettings.Production.json | 4 +++- .../JiShe.IoT.Application.Contracts.csproj | 2 +- src/JiShe.IoT.Application/JiShe.IoT.Application.csproj | 2 +- src/JiShe.IoT.DbMigrator/JiShe.IoT.DbMigrator.csproj | 2 +- src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj | 2 +- src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj | 2 +- .../JiShe.IoT.EntityFrameworkCore.csproj | 2 +- .../JiShe.IoT.HttpApi.Client.csproj | 2 +- src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj | 2 +- .../JiShe.IoT.Application.Tests.csproj | 2 +- test/JiShe.IoT.Domain.Tests/JiShe.IoT.Domain.Tests.csproj | 2 +- .../JiShe.IoT.EntityFrameworkCore.Tests.csproj | 2 +- .../JiShe.IoT.HttpApi.Client.ConsoleTestApp.csproj | 2 +- test/JiShe.IoT.TestBase/JiShe.IoT.TestBase.csproj | 2 +- 17 files changed, 23 insertions(+), 18 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index c751906..a6e6f30 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -6,7 +6,10 @@ 9.1.1 - - 9.0.0 + + 9.0.0 + + + net9.0 \ No newline at end of file diff --git a/gateways/JiShe.IoT.WebGateway/JiShe.IoT.WebGateway.csproj b/gateways/JiShe.IoT.WebGateway/JiShe.IoT.WebGateway.csproj index ed9a587..19ffcf6 100644 --- a/gateways/JiShe.IoT.WebGateway/JiShe.IoT.WebGateway.csproj +++ b/gateways/JiShe.IoT.WebGateway/JiShe.IoT.WebGateway.csproj @@ -1,7 +1,7 @@ - net9.0 + $(DotnetTargetFrameworkVersion) diff --git a/host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj b/host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj index 3217c6d..e6de1b7 100644 --- a/host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj +++ b/host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj @@ -2,7 +2,7 @@ - net9.0 + $(DotnetTargetFrameworkVersion) JiShe.IoT true JiShe.IoT-4681b4fd-151f-4221-84a4-929d86723e4c diff --git a/host/JiShe.IoT.HttpApi.Host/appsettings.Production.json b/host/JiShe.IoT.HttpApi.Host/appsettings.Production.json index 31cffae..91125c8 100644 --- a/host/JiShe.IoT.HttpApi.Host/appsettings.Production.json +++ b/host/JiShe.IoT.HttpApi.Host/appsettings.Production.json @@ -4,7 +4,9 @@ "CorsOrigins": "https://*.IoT.com,http://localhost:4200,http://localhost:3100,http://localhost:80,http://localhost" }, "ConnectionStrings": { - "Default": "Data Source=47.110.60.222;Port=13306;Database=JiSheIoTProDB;uid=root;pwd=JiShe!aqG#5kGgh&0;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;" + "Default": "Data Source=47.110.60.222;Port=13306;Database=JiSheIoTProDB;uid=root;pwd=JiShe!aqG#5kGgh&0;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;", + "PrepayDB": "server=rm-m5el3d1u1k0wzk70n2o.sqlserver.rds.aliyuncs.com,3433;database=jishe.sysdb;uid=v3sa;pwd=JiShe123;Encrypt=False;Trust Server Certificate=False", + "EnergyDB": "server=rm-wz9hw529i3j1e3b5fbo.sqlserver.rds.aliyuncs.com,3433;database=db_energy;uid=yjdb;pwd=Kdjdhf+9*7ad222LL;Encrypt=False;Trust Server Certificate=False" }, "Redis": { "Configuration": "localhost,password=1q2w3E*,defaultdatabase=1" diff --git a/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj b/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj index 32c5ee7..79bbac3 100644 --- a/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj +++ b/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj @@ -1,7 +1,7 @@  - net9.0 + $(DotnetTargetFrameworkVersion) JiShe.IoT diff --git a/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj b/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj index 9412cc5..e867ee4 100644 --- a/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj +++ b/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj @@ -2,7 +2,7 @@ - net9.0 + $(DotnetTargetFrameworkVersion) JiShe.IoT diff --git a/src/JiShe.IoT.DbMigrator/JiShe.IoT.DbMigrator.csproj b/src/JiShe.IoT.DbMigrator/JiShe.IoT.DbMigrator.csproj index 3f543e0..75c5323 100644 --- a/src/JiShe.IoT.DbMigrator/JiShe.IoT.DbMigrator.csproj +++ b/src/JiShe.IoT.DbMigrator/JiShe.IoT.DbMigrator.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + $(DotnetTargetFrameworkVersion) diff --git a/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj b/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj index 34c7217..8e3e2b7 100644 --- a/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj +++ b/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj @@ -1,6 +1,6 @@  - net9.0 + $(DotnetTargetFrameworkVersion) JiShe.IoT true diff --git a/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj b/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj index e74523e..a8de89e 100644 --- a/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj +++ b/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj @@ -1,6 +1,6 @@  - net9.0 + $(DotnetTargetFrameworkVersion) JiShe.IoT diff --git a/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj b/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj index 92cc77c..fdf0888 100644 --- a/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj +++ b/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj @@ -1,6 +1,6 @@  - net9.0 + $(DotnetTargetFrameworkVersion) JiShe.IoT diff --git a/src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj b/src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj index 8325f77..f621e35 100644 --- a/src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj +++ b/src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj @@ -1,6 +1,6 @@  - net9.0 + $(DotnetTargetFrameworkVersion) JiShe.IoT diff --git a/src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj b/src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj index 3cd70b5..2ebb2ba 100644 --- a/src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj +++ b/src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj @@ -1,7 +1,7 @@  - net9.0 + $(DotnetTargetFrameworkVersion) JiShe.IoT diff --git a/test/JiShe.IoT.Application.Tests/JiShe.IoT.Application.Tests.csproj b/test/JiShe.IoT.Application.Tests/JiShe.IoT.Application.Tests.csproj index 62dabdd..0e20cf2 100644 --- a/test/JiShe.IoT.Application.Tests/JiShe.IoT.Application.Tests.csproj +++ b/test/JiShe.IoT.Application.Tests/JiShe.IoT.Application.Tests.csproj @@ -1,6 +1,6 @@ - net9.0 + $(DotnetTargetFrameworkVersion) JiShe.IoT false diff --git a/test/JiShe.IoT.Domain.Tests/JiShe.IoT.Domain.Tests.csproj b/test/JiShe.IoT.Domain.Tests/JiShe.IoT.Domain.Tests.csproj index 51d711d..07bc26e 100644 --- a/test/JiShe.IoT.Domain.Tests/JiShe.IoT.Domain.Tests.csproj +++ b/test/JiShe.IoT.Domain.Tests/JiShe.IoT.Domain.Tests.csproj @@ -1,6 +1,6 @@ - net9.0 + $(DotnetTargetFrameworkVersion) JiShe.IoT false diff --git a/test/JiShe.IoT.EntityFrameworkCore.Tests/JiShe.IoT.EntityFrameworkCore.Tests.csproj b/test/JiShe.IoT.EntityFrameworkCore.Tests/JiShe.IoT.EntityFrameworkCore.Tests.csproj index efc6b15..58d5127 100644 --- a/test/JiShe.IoT.EntityFrameworkCore.Tests/JiShe.IoT.EntityFrameworkCore.Tests.csproj +++ b/test/JiShe.IoT.EntityFrameworkCore.Tests/JiShe.IoT.EntityFrameworkCore.Tests.csproj @@ -1,6 +1,6 @@ - net9.0 + $(DotnetTargetFrameworkVersion) JiShe.IoT false diff --git a/test/JiShe.IoT.HttpApi.Client.ConsoleTestApp/JiShe.IoT.HttpApi.Client.ConsoleTestApp.csproj b/test/JiShe.IoT.HttpApi.Client.ConsoleTestApp/JiShe.IoT.HttpApi.Client.ConsoleTestApp.csproj index e4ca46d..e0afb74 100644 --- a/test/JiShe.IoT.HttpApi.Client.ConsoleTestApp/JiShe.IoT.HttpApi.Client.ConsoleTestApp.csproj +++ b/test/JiShe.IoT.HttpApi.Client.ConsoleTestApp/JiShe.IoT.HttpApi.Client.ConsoleTestApp.csproj @@ -1,7 +1,7 @@ Exe - net9.0 + $(DotnetTargetFrameworkVersion) false diff --git a/test/JiShe.IoT.TestBase/JiShe.IoT.TestBase.csproj b/test/JiShe.IoT.TestBase/JiShe.IoT.TestBase.csproj index 0c9eea8..9f91fd0 100644 --- a/test/JiShe.IoT.TestBase/JiShe.IoT.TestBase.csproj +++ b/test/JiShe.IoT.TestBase/JiShe.IoT.TestBase.csproj @@ -1,6 +1,6 @@ - net9.0 + $(DotnetTargetFrameworkVersion) JiShe.IoT false