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-05-27 16:16:07 +08:00
parent 1cdd4d2e7c
commit 050a41008e
21 changed files with 8013 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
Directory.Build.JiShe.targets
View File

@ -1,71 +1,75 @@
<Project> <Project>
<!-- JiShe.ServicePro包--> <!-- JiShe.ServicePro包-->
<ItemGroup> <ItemGroup>
<PackageReference Update="JiShe.ServicePro.Core" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.Core" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.CAP" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.CAP" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.CAP.EntityFrameworkCore" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.CAP.EntityFrameworkCore" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.Localization" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.Localization" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.Oidc" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.Oidc" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.TwoFactor" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.TwoFactor" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.Shared.Hosting.Microservices" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.Shared.Hosting.Microservices" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.Shared.Hosting.Gateways" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.Shared.Hosting.Gateways" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.Application" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.BasicManagement.Application" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.Application.Contracts" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.BasicManagement.Application.Contracts" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.Domain" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.BasicManagement.Domain" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.Domain.Shared" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.BasicManagement.Domain.Shared" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.EntityFrameworkCore" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.BasicManagement.EntityFrameworkCore" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.HttpApi" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.BasicManagement.HttpApi" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.HttpApi.Client" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.BasicManagement.HttpApi.Client" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.Application" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.NotificationManagement.Application" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.Application.Contracts" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.NotificationManagement.Application.Contracts" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.Domain" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.NotificationManagement.Domain" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.Domain.Shared" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.NotificationManagement.Domain.Shared" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.EntityFrameworkCore" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.NotificationManagement.EntityFrameworkCore" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.HttpApi" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.NotificationManagement.HttpApi" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.HttpApi.Client" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.NotificationManagement.HttpApi.Client" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Application" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Application" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Application.Contracts" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Application.Contracts" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Domain" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Domain" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Domain.Shared" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Domain.Shared" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.EntityFrameworkCore" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.EntityFrameworkCore" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.HttpApi" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.HttpApi" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.HttpApi.Client" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.HttpApi.Client" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.Application" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.LanguageManagement.Application" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.Application.Contracts" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.LanguageManagement.Application.Contracts" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.Domain" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.LanguageManagement.Domain" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.Domain.Shared" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.LanguageManagement.Domain.Shared" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.EntityFrameworkCore" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.LanguageManagement.EntityFrameworkCore" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.HttpApi" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.LanguageManagement.HttpApi" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.HttpApi.Client" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.LanguageManagement.HttpApi.Client" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.Application" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.CodeManagement.Application" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.Application.Contracts" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.CodeManagement.Application.Contracts" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.Domain" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.CodeManagement.Domain" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.Domain.Shared" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.CodeManagement.Domain.Shared" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.EntityFrameworkCore" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.CodeManagement.EntityFrameworkCore" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.HttpApi" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.CodeManagement.HttpApi" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.HttpApi.Client" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.CodeManagement.HttpApi.Client" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.Application" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.TemplateManagement.Application" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.Application.Contracts" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.TemplateManagement.Application.Contracts" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.Domain" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.TemplateManagement.Domain" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.Domain.Shared" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.TemplateManagement.Domain.Shared" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.EntityFrameworkCore" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.TemplateManagement.EntityFrameworkCore" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.HttpApi" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.TemplateManagement.HttpApi" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.HttpApi.Client" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.TemplateManagement.HttpApi.Client" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Application" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Application" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Application.Contracts" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Application.Contracts" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Domain" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Domain" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Domain.Shared" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Domain.Shared" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.EntityFrameworkCore" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.EntityFrameworkCore" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.HttpApi" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.HttpApi" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.HttpApi.Client" Version="9.1.1.909"/> <PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.HttpApi.Client" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.FreeRedisProvider" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.FreeSqlProvider" Version="1.0.1"/>
</ItemGroup> </ItemGroup>
</Project> </Project>

6
Directory.Build.targets
View File

@ -27,11 +27,7 @@
<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"/>
<!-- FreeSql-->
<PackageReference Update="FreeSql" Version="3.5.104"/>
<PackageReference Update="FreeSql.Provider.MysqlConnector" Version="3.5.104"/>
<PackageReference Update="FreeSql.Provider.Sqlite" Version="3.2.806"/>
<!-- 单元测试包--> <!-- 单元测试包-->
<PackageReference Update="xunit" Version="2.9.2"/> <PackageReference Update="xunit" Version="2.9.2"/>

11
JiShe.IoT.Admin.sln
View File

@ -34,20 +34,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.DbMigrator", "src
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.Solution Items", "0.Solution Items", "{2C4A6DB8-8D9E-42E6-B7C3-1EDB7B3DE22E}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.Solution Items", "0.Solution Items", "{2C4A6DB8-8D9E-42E6-B7C3-1EDB7B3DE22E}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
NuGet.Config = NuGet.Config Directory.Build.JiShe.targets = Directory.Build.JiShe.targets
Directory.Build.Microsoft.targets = Directory.Build.Microsoft.targets Directory.Build.Microsoft.targets = Directory.Build.Microsoft.targets
Directory.Build.targets = Directory.Build.targets Directory.Build.targets = Directory.Build.targets
Directory.Build.Volo.targets = Directory.Build.Volo.targets Directory.Build.Volo.targets = Directory.Build.Volo.targets
Directory.Build.Lion.targets = Directory.Build.Lion.targets
Dockerfile = Dockerfile Dockerfile = Dockerfile
NuGet.Config = NuGet.Config
EndProjectSection EndProjectSection
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "host", "host", "{8C1B8C6C-C518-4290-B070-622CCA6004DA}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "host", "host", "{8C1B8C6C-C518-4290-B070-622CCA6004DA}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.HttpApi.Host", "host\JiShe.IoT.HttpApi.Host\JiShe.IoT.HttpApi.Host.csproj", "{FB20372D-6C96-4733-9AAC-12522F15CAA6}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.HttpApi.Host", "host\JiShe.IoT.HttpApi.Host\JiShe.IoT.HttpApi.Host.csproj", "{FB20372D-6C96-4733-9AAC-12522F15CAA6}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.FreeSqlRepository", "src\JiShe.IoT.FreeSqlRepository\JiShe.IoT.FreeSqlRepository.csproj", "{27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gateways", "gateways", "{81A8FF2E-DE2E-479D-A209-EDA81C2AF08A}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gateways", "gateways", "{81A8FF2E-DE2E-479D-A209-EDA81C2AF08A}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.IoT.WebGateway", "gateways\JiShe.IoT.WebGateway\JiShe.IoT.WebGateway.csproj", "{F1D46EE1-13D5-4227-80DC-066DEB0E4FD1}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.IoT.WebGateway", "gateways\JiShe.IoT.WebGateway\JiShe.IoT.WebGateway.csproj", "{F1D46EE1-13D5-4227-80DC-066DEB0E4FD1}"
@ -114,10 +112,6 @@ Global
{FB20372D-6C96-4733-9AAC-12522F15CAA6}.Debug|Any CPU.Build.0 = Debug|Any CPU {FB20372D-6C96-4733-9AAC-12522F15CAA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FB20372D-6C96-4733-9AAC-12522F15CAA6}.Release|Any CPU.ActiveCfg = Release|Any CPU {FB20372D-6C96-4733-9AAC-12522F15CAA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB20372D-6C96-4733-9AAC-12522F15CAA6}.Release|Any CPU.Build.0 = Release|Any CPU {FB20372D-6C96-4733-9AAC-12522F15CAA6}.Release|Any CPU.Build.0 = Release|Any CPU
{27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}.Debug|Any CPU.Build.0 = Debug|Any CPU
{27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}.Release|Any CPU.ActiveCfg = Release|Any CPU
{27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}.Release|Any CPU.Build.0 = Release|Any CPU
{F1D46EE1-13D5-4227-80DC-066DEB0E4FD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F1D46EE1-13D5-4227-80DC-066DEB0E4FD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F1D46EE1-13D5-4227-80DC-066DEB0E4FD1}.Debug|Any CPU.Build.0 = Debug|Any CPU {F1D46EE1-13D5-4227-80DC-066DEB0E4FD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F1D46EE1-13D5-4227-80DC-066DEB0E4FD1}.Release|Any CPU.ActiveCfg = Release|Any CPU {F1D46EE1-13D5-4227-80DC-066DEB0E4FD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -141,7 +135,6 @@ Global
{EF480016-9127-4916-8735-D2466BDBC582} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} {EF480016-9127-4916-8735-D2466BDBC582} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
{AA94D832-1CCC-4715-95A9-A483F23A1A5D} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {AA94D832-1CCC-4715-95A9-A483F23A1A5D} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
{FB20372D-6C96-4733-9AAC-12522F15CAA6} = {8C1B8C6C-C518-4290-B070-622CCA6004DA} {FB20372D-6C96-4733-9AAC-12522F15CAA6} = {8C1B8C6C-C518-4290-B070-622CCA6004DA}
{27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
{F1D46EE1-13D5-4227-80DC-066DEB0E4FD1} = {81A8FF2E-DE2E-479D-A209-EDA81C2AF08A} {F1D46EE1-13D5-4227-80DC-066DEB0E4FD1} = {81A8FF2E-DE2E-479D-A209-EDA81C2AF08A}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution

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

@ -4,7 +4,9 @@
"CorsOrigins": "https://*.IoT.com,http://localhost:4200,http://localhost:3100,http://localhost:80,http://localhost" "CorsOrigins": "https://*.IoT.com,http://localhost:4200,http://localhost:3100,http://localhost:80,http://localhost"
}, },
"ConnectionStrings": { "ConnectionStrings": {
"Default": "Data Source=localhost;Port=3306;Database=JiSheIoTProDB;uid=root;pwd=admin123;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true" "Default": "Data Source=localhost;Port=3306;Database=JiSheIoTProDB;uid=root;pwd=admin123;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true",
"PrepayDB": "server=118.190.144.92;database=jishe.sysdb;uid=sa;pwd=admin@2023;Encrypt=False;Trust Server Certificate=False",
"EnergyDB": "server=118.190.144.92;database=db_energy;uid=sa;pwd=admin@2023;Encrypt=False;Trust Server Certificate=False"
}, },
"Hangfire": { "Hangfire": {
"Redis": { "Redis": {
@ -48,5 +50,14 @@
"Password": "1q2w3E*", "Password": "1q2w3E*",
"Port": 5672 "Port": 5672
} }
},
"FreeRedisOptions": {
"ConnectionString": "192.168.5.9:6380,password=1q2w3e!@#,defaultdatabase=1",
"UseDistributedCache": true
},
"FreeSqlProviderOptions": {
"UsePrepayDB": true,
"UseEnergyDB": false,
"PrintLog": false
} }
} }

1
src/JiShe.IoT.Application/GlobalUsings.cs
View File

@ -8,7 +8,6 @@ global using JiShe.ServicePro.BasicManagement;
global using JiShe.ServicePro.DataDictionaryManagement; global using JiShe.ServicePro.DataDictionaryManagement;
global using JiShe.ServicePro.LanguageManagement; global using JiShe.ServicePro.LanguageManagement;
global using JiShe.ServicePro.NotificationManagement; global using JiShe.ServicePro.NotificationManagement;
global using JiShe.IoT.FreeSqlRepository;
global using JiShe.IoT.Permissions; global using JiShe.IoT.Permissions;
global using Microsoft.AspNetCore.Authorization; global using Microsoft.AspNetCore.Authorization;
global using Microsoft.Extensions.Configuration; global using Microsoft.Extensions.Configuration;

6
src/JiShe.IoT.Application/IoTAppService.cs
View File

@ -1,9 +1,15 @@
using JiShe.ServicePro.FreeRedisProvider;
using JiShe.ServicePro.FreeSqlProvider;
namespace JiShe.IoT namespace JiShe.IoT
{ {
/* Inherit your application services from this class. /* Inherit your application services from this class.
*/ */
public abstract class IoTAppService : ApplicationService public abstract class IoTAppService : ApplicationService
{ {
protected IFreeSqlProvider FreeSqlDbContext => LazyServiceProvider.LazyGetRequiredService<IFreeSqlProvider>();
protected IFreeRedisProviderService FreeRedis => LazyServiceProvider.LazyGetRequiredService<IFreeRedisProviderService>();
protected IoTAppService() protected IoTAppService()
{ {
LocalizationResource = typeof(IoTResource); LocalizationResource = typeof(IoTResource);

4
src/JiShe.IoT.Application/IoTApplicationModule.cs
View File

@ -1,5 +1,7 @@
using JiShe.ServicePro.CodeManagement; using JiShe.ServicePro.CodeManagement;
using JiShe.ServicePro.DynamicMenuManagement; using JiShe.ServicePro.DynamicMenuManagement;
using JiShe.ServicePro.FreeRedisProvider;
using JiShe.ServicePro.FreeSqlProvider;
using JiShe.ServicePro.TemplateManagement; using JiShe.ServicePro.TemplateManagement;
namespace JiShe.IoT namespace JiShe.IoT
@ -14,7 +16,7 @@ namespace JiShe.IoT
typeof(CodeManagementApplicationModule), typeof(CodeManagementApplicationModule),
typeof(TemplateManagementApplicationModule), typeof(TemplateManagementApplicationModule),
typeof(DynamicMenuManagementApplicationModule), typeof(DynamicMenuManagementApplicationModule),
typeof(IoTFreeSqlModule) typeof(FreeRedisProviderModule)
)] )]
public class IoTApplicationModule : AbpModule public class IoTApplicationModule : AbpModule
{ {

24
src/JiShe.IoT.Application/JiShe.IoT.Application.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
@ -7,23 +7,23 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\JiShe.IoT.Domain\JiShe.IoT.Domain.csproj"/> <ProjectReference Include="..\JiShe.IoT.Domain\JiShe.IoT.Domain.csproj" />
<ProjectReference Include="..\JiShe.IoT.Application.Contracts\JiShe.IoT.Application.Contracts.csproj"/> <ProjectReference Include="..\JiShe.IoT.Application.Contracts\JiShe.IoT.Application.Contracts.csproj" />
<ProjectReference Include="..\JiShe.IoT.FreeSqlRepository\JiShe.IoT.FreeSqlRepository.csproj"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="JiShe.ServicePro.BasicManagement.Application"/> <PackageReference Include="JiShe.ServicePro.BasicManagement.Application" />
<PackageReference Include="JiShe.ServicePro.NotificationManagement.Application"/> <PackageReference Include="JiShe.ServicePro.NotificationManagement.Application" />
<PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.Application"/> <PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.Application" />
<PackageReference Include="JiShe.ServicePro.LanguageManagement.Application"/> <PackageReference Include="JiShe.ServicePro.LanguageManagement.Application" />
<PackageReference Include="JiShe.ServicePro.CodeManagement.Application"/> <PackageReference Include="JiShe.ServicePro.CodeManagement.Application" />
<PackageReference Include="JiShe.ServicePro.TemplateManagement.Application"/> <PackageReference Include="JiShe.ServicePro.TemplateManagement.Application" />
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Application"/> <PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Application" />
<PackageReference Include="JiShe.ServicePro.FreeRedisProvider" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.BackgroundJobs.HangFire"/> <PackageReference Include="Volo.Abp.BackgroundJobs.HangFire" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@ -1,5 +1,5 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
"Default": "Data Source=localhost;Port=3306;Database=JiSheServiceProDB;uid=root;pwd=admin123;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true" "Default": "Data Source=localhost;Port=3306;Database=JiSheIoTProDB;uid=root;pwd=admin123;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
} }
} }

31
src/JiShe.IoT.Domain.Shared/IBasicEntiy.cs Normal file
View File

@ -0,0 +1,31 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JiShe.IoT.Domain.Shared
{
/// <summary>
/// 基础实体
/// </summary>
public interface IBasicEntiy<TKey>
{
/// <summary>
/// 备注
/// </summary>
string Remark { get; set; }
/// <summary>
/// 创建Id,需要主动调用，如果没有主动调用，Id值使用EF驱动时自动生成，使用FreeSql时，也会自动生成
/// </summary>
/// <param name="Id"></param>
void CreateId(TKey Id);
///// <summary>
///// 处理自定义属性
///// </summary>
///// <param name="keyValuePairs"></param>
//void HandleExtraProperties(ExtraPropertyDictionary keyValuePairs);
}
}

2
src/JiShe.IoT.Domain.Shared/IoTDomainSharedModule.cs
View File

@ -1,5 +1,6 @@
using JiShe.ServicePro.CodeManagement; using JiShe.ServicePro.CodeManagement;
using JiShe.ServicePro.DynamicMenuManagement; using JiShe.ServicePro.DynamicMenuManagement;
using JiShe.ServicePro.FreeSqlProvider;
using JiShe.ServicePro.TemplateManagement; using JiShe.ServicePro.TemplateManagement;
namespace JiShe.IoT namespace JiShe.IoT
@ -12,6 +13,7 @@ namespace JiShe.IoT
typeof(CodeManagementDomainSharedModule), typeof(CodeManagementDomainSharedModule),
typeof(TemplateManagementDomainSharedModule), typeof(TemplateManagementDomainSharedModule),
typeof(DynamicMenuManagementDomainSharedModule), typeof(DynamicMenuManagementDomainSharedModule),
typeof(AbpFreeSqlProviderModule),
typeof(ServiceProCoreModule) typeof(ServiceProCoreModule)
)] )]
public class IoTDomainSharedModule : AbpModule public class IoTDomainSharedModule : AbpModule

6
src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>JiShe.IoT</RootNamespace> <RootNamespace>JiShe.IoT</RootNamespace>
@ -20,6 +20,6 @@
<PackageReference Include="JiShe.ServicePro.CodeManagement.Domain.Shared"/> <PackageReference Include="JiShe.ServicePro.CodeManagement.Domain.Shared"/>
<PackageReference Include="JiShe.ServicePro.TemplateManagement.Domain.Shared"/> <PackageReference Include="JiShe.ServicePro.TemplateManagement.Domain.Shared"/>
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Domain.Shared"/> <PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Domain.Shared"/>
</ItemGroup> <PackageReference Include="JiShe.ServicePro.FreeSqlProvider" />
</ItemGroup>
</Project> </Project>

62
src/JiShe.IoT.Domain/BasicEntiy.cs Normal file
View File

@ -0,0 +1,62 @@
using FreeSql.DataAnnotations;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Domain.Entities.Auditing;
using Volo.Abp.Guids;
namespace JiShe.IoT.Domain.Shared
{
/// <summary>
/// jishe基础实体
/// </summary>
public class BasicEntiy<TKey> : FullAuditedAggregateRoot<TKey>, IBasicEntiy<TKey>, IMultiTenant
{
/// <summary>
/// 租户Id
/// </summary>
[Comment("租户ID")]
public Guid? TenantId { get; set; }
/// <summary>
/// 备注
/// </summary>
[Comment("备注")]
public string Remark { get; set; }
/// <summary>
/// 旧系统授权创建者Id
/// </summary>
[Comment("旧系统授权创建者Id")]
public int? OSACreatorId { get; set; }
/// <summary>
/// 旧系统授权最后修改者Id
/// </summary>
[Comment("旧系统授权最后修改者Id")]
public int? OSALastModifierId { get; set; }
/// <summary>
/// 旧系统授权最后删除者Id
/// </summary>
[Comment("旧系统授权最后删除者Id")]
public int? OSADeleterId { get; set; }
/// <summary>
/// 扩展属性,用于存储自定义字段,JSON格式
/// </summary>
[Comment("扩展属性,用于存储自定义字段,JSON格式")]
[JsonMap]
public new ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
public void CreateId(TKey Id)
{
base.Id = Id;
}
}
}

1
src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj
View File

@ -16,6 +16,7 @@
<PackageReference Include="JiShe.ServicePro.CodeManagement.Domain"/> <PackageReference Include="JiShe.ServicePro.CodeManagement.Domain"/>
<PackageReference Include="JiShe.ServicePro.TemplateManagement.Domain"/> <PackageReference Include="JiShe.ServicePro.TemplateManagement.Domain"/>
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Domain"/> <PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Domain"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2999
src/JiShe.IoT.EntityFrameworkCore/Migrations/20250527071110_InitialCreate.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

1821
src/JiShe.IoT.EntityFrameworkCore/Migrations/20250527071110_InitialCreate.cs Normal file
View File

File diff suppressed because it is too large Load Diff

2996
src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs Normal file
View File

File diff suppressed because it is too large Load Diff

14
src/JiShe.IoT.FreeSqlRepository/FreeSqlBasicRepository.cs
View File

@ -1,14 +0,0 @@
namespace JiShe.IoT.FreeSqlRepository;
public abstract class FreeSqlBasicRepository : DomainService
{
protected IFreeSql FreeSql => LazyServiceProvider.LazyGetRequiredService<IFreeSql>();
private ICancellationTokenProvider CancellationTokenProvider =>
LazyServiceProvider.LazyGetService<ICancellationTokenProvider>(NullCancellationTokenProvider.Instance);
protected virtual CancellationToken GetCancellationToken(CancellationToken preferredValue = default)
{
return CancellationTokenProvider.FallbackToProvider(preferredValue);
}
}

7
src/JiShe.IoT.FreeSqlRepository/GlobalUsings.cs
View File

@ -1,7 +0,0 @@
// Global using directives
global using Microsoft.Extensions.Configuration;
global using Microsoft.Extensions.DependencyInjection;
global using Volo.Abp.Domain.Services;
global using Volo.Abp.Modularity;
global using Volo.Abp.Threading;

15
src/JiShe.IoT.FreeSqlRepository/IoTFreeSqlModule.cs
View File

@ -1,15 +0,0 @@
namespace JiShe.IoT.FreeSqlRepository;
public class IoTFreeSqlModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
var configuration = context.Services.GetConfiguration();
var connectionString = configuration.GetConnectionString("Default");
var freeSql = new FreeSql.FreeSqlBuilder()
.UseConnectionString(FreeSql.DataType.MySql, connectionString)
.Build();
context.Services.AddSingleton<IFreeSql>(freeSql);
}
}

17
src/JiShe.IoT.FreeSqlRepository/JiShe.IoT.FreeSqlRepository.csproj
View File

@ -1,17 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FreeSql"/>
<PackageReference Include="FreeSql.Provider.MysqlConnector"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\JiShe.IoT.Domain\JiShe.IoT.Domain.csproj"/>
</ItemGroup>
</Project>