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

Compare commits

base: admin:cca8a045740786f7caf09f32b6645fb863f0a152
Branches Tags
admin:master
admin:物模型服务调用
admin:master_net9_Pomelo
..
compare: admin:eaabdc3593cc4da6f9b0537a2af106fc52f8cb9b
Branches Tags
admin:master
admin:物模型服务调用
admin:master_net9_Pomelo

No commits in common. "cca8a045740786f7caf09f32b6645fb863f0a152" and "eaabdc3593cc4da6f9b0537a2af106fc52f8cb9b" have entirely different histories.
cca8a04574 ... eaabdc3593

207 changed files with 1703 additions and 4083 deletions
Show Stats Expand all files Collapse all files

310
.gitignore vendored
View File

@ -1,41 +1,271 @@
################################################################################ ## Ignore Visual Studio temporary files, build results, and
# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 ## files generated by popular Visual Studio add-ons.
################################################################################
/.vs # User-specific files
/gateways/JiShe.IoT.WebGateway/bin/Debug/net9.0 *.suo
/gateways/JiShe.IoT.WebGateway/obj *.user
/host/JiShe.IoT.HttpApi.Host/bin/Debug/net9.0 *.userosscache
/host/JiShe.IoT.HttpApi.Host/Logs *.sln.docstates
/host/JiShe.IoT.HttpApi.Host/obj
/src/JiShe.IoT.Application/bin/Debug/net9.0 # User-specific files (MonoDevelop/Xamarin Studio)
/src/JiShe.IoT.Application/obj/Debug/net9.0 *.userprefs
/src/JiShe.IoT.Application.Contracts/bin/Debug/net9.0
/src/JiShe.IoT.Application.Contracts/obj/Debug/net9.0 # Build results
/src/JiShe.IoT.DbMigrator/bin/Debug/net9.0 [Dd]ebug/
/src/JiShe.IoT.DbMigrator/obj [Dd]ebugPublic/
/src/JiShe.IoT.Domain/bin/Debug/net9.0 [Rr]elease/
/src/JiShe.IoT.Domain/obj [Rr]eleases/
/src/JiShe.IoT.Domain.Shared/bin/Debug/net9.0 x64/
/src/JiShe.IoT.Domain.Shared/obj/Debug/net9.0 x86/
/src/JiShe.IoT.EntityFrameworkCore/bin/Debug/net9.0 bld/
/src/JiShe.IoT.EntityFrameworkCore/obj [Bb]in/
/src/JiShe.IoT.FreeSqlRepository/bin/Debug/net9.0 [Oo]bj/
/src/JiShe.IoT.FreeSqlRepository/obj [Ll]og/
/src/JiShe.IoT.HttpApi/bin/Debug/net9.0 .DS_Store
/src/JiShe.IoT.HttpApi/obj # Visual Studio 2015 cache/options directory
/src/JiShe.IoT.HttpApi.Client/bin/Debug/net9.0 .vs/
/src/JiShe.IoT.HttpApi.Client/obj # Uncomment if you have tasks that create the project's static files in wwwroot
/test/JiShe.IoT.Application.Tests/bin/Debug/net9.0 #wwwroot/
/test/JiShe.IoT.Application.Tests/obj
/test/JiShe.IoT.Domain.Tests/bin/Debug/net9.0 # MSTest test Results
/test/JiShe.IoT.Domain.Tests/obj [Tt]est[Rr]esult*/
/test/JiShe.IoT.EntityFrameworkCore.Tests/bin/Debug/net9.0 [Bb]uild[Ll]og.*
/test/JiShe.IoT.EntityFrameworkCore.Tests/obj
/test/JiShe.IoT.HttpApi.Client.ConsoleTestApp/bin/Debug/net9.0 # NUNIT
/test/JiShe.IoT.HttpApi.Client.ConsoleTestApp/obj *.VisualState.xml
/test/JiShe.IoT.TestBase/bin/Debug/net9.0 TestResult.xml
/test/JiShe.IoT.TestBase/obj
/src/JiShe.IoT.Application/obj # Build Results of an ATL Project
/src/JiShe.IoT.Application.Contracts/obj [Dd]ebugPS/
/src/JiShe.IoT.Domain.Shared/obj [Rr]eleasePS/
dlldata.c
# DNX
project.lock.json
artifacts/
*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc
# Chutzpah Test files
_Chutzpah*
# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb
# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap
# TFS 2012 Local Workspace
$tf/
# Guidance Automation Toolkit
*.gpState
# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
# JustCode is a .NET coding add-in
.JustCode
# TeamCity is a build add-in
_TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover
# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*
# MightyMoose
*.mm.*
AutoTest.Net/
# Web workbench (sass)
.sass-cache/
# Installshield output folder
[Ee]xpress/
# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html
# Click-Once directory
publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj
# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/
# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
*.nuget.props
*.nuget.targets
# Microsoft Azure Build Output
csx/
*.build.csdef
# Microsoft Azure Emulator
ecf/
rcf/
# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt
# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/
# Others
ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.pfx
*.publishsettings
node_modules/
orleans.codegen.cs
# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/
# RIA/Silverlight projects
Generated_Code/
# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm
# SQL Server files
*.mdf
*.ldf
# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings
# Microsoft Fakes
FakesAssemblies/
# GhostDoc plugin setting file
*.GhostDoc.xml
# Node.js Tools for Visual Studio
.ntvs_analysis.dat
# Visual Studio 6 build log
*.plg
# Visual Studio 6 workspace options file
*.opt
# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions
# Paket dependency manager
.paket/paket.exe
paket-files/
# FAKE - F# Make
.fake/
# JetBrains Rider
.idea/
*.sln.iml
/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/logs
/aspnet-core/services/host/Lion.AbpPro.IdentityServer/Logs
/aspnet-core/services/host/Lion.AbpPro.IdentityServer/Logs
/aspnet-core/gateways/Lion.AbpPro.WebGateway/appsettings.Production.json
/aspnet-core/services/host/Lion.AbpPro.IdentityServer/appsettings.Production.json
/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.Production.json
aspnet-core/services/host/Lion.AbpPro.Web.Blazor.Server/Logs/logs.txt
/nupkgs
/aspnet-core/Lion.AbpPro.sln.DotSettings
/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/logs
/docs/site
/aspnet-core/modules/LanguageManagement/host/Lion.AbpPro.LanguageManagement.HttpApi.Host/Logs
/aspnet-core/frameworks/test/Lion.AbpPro.EntityFrameworkCore.Mysql.Tests/Logs
/aspnet-core/frameworks/test/Lion.AbpPro.EntityFrameworkCore.Mysql.Tests/wwwroot/libs
/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/logs
/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/logs
/vben28/pnpm-lock.yaml
/host/JiShe.IOT.HttpApi.Host/logs

79
Directory.Build.JiShe.targets
View File

@ -1,79 +0,0 @@
<Project>
<!-- JiShe.ServicePro包-->
<ItemGroup>
<PackageReference Update="JiShe.ServicePro.Core" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.CAP" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.CAP.EntityFrameworkCore" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.Localization" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.Oidc" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.TwoFactor" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.Shared.Hosting.Microservices" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.Shared.Hosting.Gateways" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.Application" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.Application.Contracts" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.Domain" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.Domain.Shared" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.EntityFrameworkCore" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.HttpApi" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.BasicManagement.HttpApi.Client" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.Application" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.Application.Contracts" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.Domain" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.Domain.Shared" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.EntityFrameworkCore" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.HttpApi" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.NotificationManagement.HttpApi.Client" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Application" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Application.Contracts" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Domain" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.Domain.Shared" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.EntityFrameworkCore" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.HttpApi" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DataDictionaryManagement.HttpApi.Client" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.Application" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.Application.Contracts" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.Domain" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.Domain.Shared" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.EntityFrameworkCore" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.HttpApi" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.LanguageManagement.HttpApi.Client" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.Application" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.Application.Contracts" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.Domain" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.Domain.Shared" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.EntityFrameworkCore" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.HttpApi" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.CodeManagement.HttpApi.Client" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.Application" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.Application.Contracts" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.Domain" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.Domain.Shared" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.EntityFrameworkCore" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.HttpApi" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.TemplateManagement.HttpApi.Client" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Application" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Application.Contracts" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Domain" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.Domain.Shared" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.EntityFrameworkCore" Version="1.0.1"/>
<PackageReference Update="JiShe.ServicePro.DynamicMenuManagement.HttpApi" Version="1.0.1"/>
<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"/>
<PackageReference Update="JiShe.CollectBus.IoTDB" Version="1.0.1"/>
<PackageReference Update="JiShe.CollectBus.Kafka" Version="1.0.1"/>
</ItemGroup>
</Project>

41
Directory.Build.Lion.targets Normal file
View File

@ -0,0 +1,41 @@
<Project>
<!-- Lion.AbpPro包-->
<ItemGroup>
<PackageReference Update="Lion.AbpPro.Core" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.Shared.Hosting.Microservices" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.Shared.Hosting.Gateways" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.BasicManagement.Application" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.BasicManagement.Application.Contracts" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.BasicManagement.Domain" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.BasicManagement.Domain.Shared" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.BasicManagement.EntityFrameworkCore" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.BasicManagement.HttpApi" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.BasicManagement.HttpApi.Client" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.NotificationManagement.Application" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.NotificationManagement.Application.Contracts" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.NotificationManagement.Domain" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.NotificationManagement.Domain.Shared" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.NotificationManagement.EntityFrameworkCore" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.NotificationManagement.HttpApi" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.NotificationManagement.HttpApi.Client" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.DataDictionaryManagement.Application" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.DataDictionaryManagement.Application.Contracts" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.DataDictionaryManagement.Domain" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.DataDictionaryManagement.Domain.Shared" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.DataDictionaryManagement.HttpApi" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.DataDictionaryManagement.HttpApi.Client" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.LanguageManagement.Application" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.LanguageManagement.Application.Contracts" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.LanguageManagement.Domain" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.LanguageManagement.Domain.Shared" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.LanguageManagement.EntityFrameworkCore" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.LanguageManagement.HttpApi" Version="9.0.6.10"/>
<PackageReference Update="Lion.AbpPro.LanguageManagement.HttpApi.Client" Version="9.0.6.10"/>
</ItemGroup>
</Project>

184
Directory.Build.Volo.targets
View File

@ -1,98 +1,94 @@
<Project> <Project>
<ItemGroup> <ItemGroup>
<PackageReference Update="Volo.Abp.Autofac" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Autofac" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Threading" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Threading" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Json" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Json" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Json.Abstractions" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Validation" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Validation" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Ddd.Domain" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Ddd.Domain" Version="9.1.1"/> <PackageReference Update="Volo.Abp.AutoMapper" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.AutoMapper" Version="9.1.1"/> <PackageReference Update="Volo.Abp.ObjectMapping" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Settings" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Identity.AspNetCore" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.ObjectMapping" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Caching" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Identity.AspNetCore" Version="9.1.1"/> <PackageReference Update="Volo.Abp.BlobStoring.Aliyun" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Caching" Version="9.1.1"/> <PackageReference Update="Volo.Abp.BackgroundJobs" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.BlobStoring.Aliyun" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Authorization.Abstractions" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.BlobStoring" Version="9.1.1"/> <PackageReference Update="Volo.Abp.BackgroundJobs.HangFire" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.BlobStoring.FileSystem" Version="9.1.1"/> <PackageReference Update="Volo.Abp.AspNetCore.SignalR" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.BackgroundJobs" Version="9.1.1"/> <PackageReference Update="Volo.Abp.TestBase" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Authorization.Abstractions" Version="9.1.1"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore.MySQL" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.HangFire" Version="9.1.1"/> <PackageReference Update="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.AspNetCore.SignalR" Version="9.1.1"/> <PackageReference Update="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.TestBase" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Identity.EntityFrameworkCore" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore.MySQL" Version="9.1.1"/> <PackageReference Update="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="9.1.1"/> <PackageReference Update="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="9.1.1"/> <PackageReference Update="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Identity.EntityFrameworkCore" Version="9.1.1"/> <PackageReference Update="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="9.1.1"/> <PackageReference Update="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="9.1.1"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc.Contracts" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Account.Web" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Caching.StackExchangeRedis" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="9.1.1"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.AspNetCore.Mvc.Contracts" Version="9.1.1"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Account.Web" Version="9.1.1"/> <PackageReference Update="Volo.Abp.AspNetCore.Serilog" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Caching.StackExchangeRedis" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Swashbuckle" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Ddd.Application" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Ddd.Application.Contracts" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.AspNetCore.Serilog" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Authorization" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Swashbuckle" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Dapper" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Ddd.Application" Version="9.1.1"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Ddd.Application.Contracts" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Http.Client" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Authorization" Version="9.1.1"/> <PackageReference Update="Volo.Abp.MongoDB" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Dapper" Version="9.1.1"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore.Sqlite" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.AspNetCore.Mvc" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Http.Client.IdentityModel" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Http.Client" Version="9.1.1"/> <PackageReference Update="Volo.Abp.AspNetCore.MultiTenancy" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.MongoDB" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Account.Application" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore.Sqlite" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Identity.Application" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Http.Client.IdentityModel" Version="9.1.1"/> <PackageReference Update="Volo.Abp.PermissionManagement.Application" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.AspNetCore.MultiTenancy" Version="9.1.1"/> <PackageReference Update="Volo.Abp.TenantManagement.Application" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Account.Application" Version="9.1.1"/> <PackageReference Update="Volo.Abp.FeatureManagement.Application" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Identity.Application" Version="9.1.1"/> <PackageReference Update="Volo.Abp.SettingManagement.Application" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Application" Version="9.1.1"/> <PackageReference Update="Volo.Abp.ObjectExtending" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.TenantManagement.Application" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Account.Application.Contracts" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Application" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Identity.Application.Contracts" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.SettingManagement.Application" Version="9.1.1"/> <PackageReference Update="Volo.Abp.PermissionManagement.Application.Contracts" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.ObjectExtending" Version="9.1.1"/> <PackageReference Update="Volo.Abp.TenantManagement.Application.Contracts" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Account.Application.Contracts" Version="9.1.1"/> <PackageReference Update="Volo.Abp.FeatureManagement.Application.Contracts" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Identity.Application.Contracts" Version="9.1.1"/> <PackageReference Update="Volo.Abp.SettingManagement.Application.Contracts" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Application.Contracts" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Emailing" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.TenantManagement.Application.Contracts" Version="9.1.1"/> <PackageReference Update="Volo.Abp.PermissionManagement.Domain.Identity" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Application.Contracts" Version="9.1.1"/> <PackageReference Update="Volo.Abp.BackgroundJobs.Domain" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.SettingManagement.Application.Contracts" Version="9.1.1"/> <PackageReference Update="Volo.Abp.AuditLogging.Domain" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Emailing" Version="9.1.1"/> <PackageReference Update="Volo.Abp.TenantManagement.Domain" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Domain.Identity" Version="9.1.1"/> <PackageReference Update="Volo.Abp.FeatureManagement.Domain" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.Domain" Version="9.1.1"/> <PackageReference Update="Volo.Abp.SettingManagement.Domain" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.AuditLogging.Domain" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Identity.Domain" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.TenantManagement.Domain" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Identity.Domain.Shared" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Domain" Version="9.1.1"/> <PackageReference Update="Volo.Abp.BackgroundJobs.Domain.Shared" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.SettingManagement.Domain" Version="9.1.1"/> <PackageReference Update="Volo.Abp.AuditLogging.Domain.Shared" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Identity.Domain" Version="9.1.1"/> <PackageReference Update="Volo.Abp.TenantManagement.Domain.Shared" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Identity.Domain.Shared" Version="9.1.1"/> <PackageReference Update="Volo.Abp.FeatureManagement.Domain.Shared" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.Domain.Shared" Version="9.1.1"/> <PackageReference Update="Volo.Abp.PermissionManagement.Domain.Shared" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.AuditLogging.Domain.Shared" Version="9.1.1"/> <PackageReference Update="Volo.Abp.SettingManagement.Domain.Shared" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.TenantManagement.Domain.Shared" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Account.HttpApi" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Domain.Shared" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Identity.HttpApi" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Domain.Shared" Version="9.1.1"/> <PackageReference Update="Volo.Abp.PermissionManagement.HttpApi" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.SettingManagement.Domain.Shared" Version="9.1.1"/> <PackageReference Update="Volo.Abp.TenantManagement.HttpApi" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Account.HttpApi" Version="9.1.1"/> <PackageReference Update="Volo.Abp.FeatureManagement.HttpApi" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Identity.HttpApi" Version="9.1.1"/> <PackageReference Update="Volo.Abp.SettingManagement.HttpApi" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.PermissionManagement.HttpApi" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Account.HttpApi.Client" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.TenantManagement.HttpApi" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Identity.HttpApi.Client" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.FeatureManagement.HttpApi" Version="9.1.1"/> <PackageReference Update="Volo.Abp.PermissionManagement.HttpApi.Client" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.SettingManagement.HttpApi" Version="9.1.1"/> <PackageReference Update="Volo.Abp.TenantManagement.HttpApi.Client" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Account.HttpApi.Client" Version="9.1.1"/> <PackageReference Update="Volo.Abp.FeatureManagement.HttpApi.Client" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Identity.HttpApi.Client" Version="9.1.1"/> <PackageReference Update="Volo.Abp.SettingManagement.HttpApi.Client" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.PermissionManagement.HttpApi.Client" Version="9.1.1"/> <PackageReference Update="Volo.Abp" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.TenantManagement.HttpApi.Client" Version="9.1.1"/> <PackageReference Update="Volo.Abp.AspNetCore" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.FeatureManagement.HttpApi.Client" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Core" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.SettingManagement.HttpApi.Client" Version="9.1.1"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore" Version="9.0.4"/>
<PackageReference Update="Volo.Abp" Version="9.1.1"/> <PackageReference Update="Volo.Abp.AspNetCore.TestBase" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.AspNetCore" Version="9.1.1"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.Core" Version="9.1.1"/> <PackageReference Update="Volo.Abp.EventBus" Version="9.0.4"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore" Version="9.1.1"/> <PackageReference Update="Volo.Abp.Localization" Version="9.0.4" />
<PackageReference Update="Volo.Abp.AspNetCore.TestBase" Version="9.1.1"/> <PackageReference Update="Volo.Abp.DistributedLocking" Version="9.0.4" />
<PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="9.1.1"/>
<PackageReference Update="Volo.Abp.EventBus" Version="9.1.1"/>
<PackageReference Update="Volo.Abp.Localization" Version="9.1.1" />
<PackageReference Update="Volo.Abp.DistributedLocking" Version="9.1.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

22
Directory.Build.targets
View File

@ -2,8 +2,8 @@
<Import Project="Directory.Build.Microsoft.targets"/> <Import Project="Directory.Build.Microsoft.targets"/>
<Import Project="Directory.Build.Volo.targets"/> <Import Project="Directory.Build.Volo.targets"/>
<Import Project="Directory.Build.JiShe.targets"/> <Import Project="Directory.Build.Lion.targets"/>
<PropertyGroup> <PropertyGroup>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<Version>1.0.0</Version> <Version>1.0.0</Version>
@ -27,7 +27,11 @@
<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"/>
@ -43,12 +47,12 @@
<PackageReference Update="Hangfire.Redis.StackExchange" Version="1.9.3"/> <PackageReference Update="Hangfire.Redis.StackExchange" Version="1.9.3"/>
<!-- CAP 分布式事务--> <!-- CAP 分布式事务-->
<PackageReference Update="DotNetCore.CAP" Version="8.3.3"/> <PackageReference Update="DotNetCore.CAP" Version="8.0.0"/>
<PackageReference Update="DotNetCore.CAP.Dashboard" Version="8.3.3"/> <PackageReference Update="DotNetCore.CAP.Dashboard" Version="8.0.0"/>
<PackageReference Update="DotNetCore.CAP.Mysql" Version="8.3.3"/> <PackageReference Update="DotNetCore.CAP.Mysql" Version="8.0.0"/>
<PackageReference Update="DotNetCore.CAP.RabbitMQ" Version="8.3.3"/> <PackageReference Update="DotNetCore.CAP.RabbitMQ" Version="8.0.0"/>
<PackageReference Update="DotNetCore.CAP.InMemoryStorage" Version="8.3.3"/> <PackageReference Update="DotNetCore.CAP.InMemoryStorage" Version="8.0.0"/>
<PackageReference Update="Savorboard.CAP.InMemoryMessageQueue" Version="8.2.1"/> <PackageReference Update="Savorboard.CAP.InMemoryMessageQueue" Version="7.0.0"/>
<!-- Swagger--> <!-- Swagger-->
<PackageReference Update="Swashbuckle.AspNetCore.SwaggerUI" Version="6.8.1"/> <PackageReference Update="Swashbuckle.AspNetCore.SwaggerUI" Version="6.8.1"/>

35
Dockerfile
View File

@ -1,6 +1,30 @@
# FROM mcr.microsoft.com/dotnet/aspnet:8.0
# # 创建目录
# RUN mkdir /app
# COPY publish /app
# # 设置工作目录
# WORKDIR /app
# # 暴露80端口
# EXPOSE 80
# # 设置时区 .net6 才有这个问题
# ENV TZ=Asia/Shanghai
# # 设置环境变量
# ENV ASPNETCORE_ENVIRONMENT=Production
# ENTRYPOINT ["dotnet", "JiShe.IOT.HttpApi.Host.dll"]
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
WORKDIR /app WORKDIR /app
EXPOSE 8080 EXPOSE 80
EXPOSE 443 EXPOSE 443
ENV TZ=Asia/Shanghai ENV TZ=Asia/Shanghai
ENV ASPNETCORE_ENVIRONMENT=Production ENV ASPNETCORE_ENVIRONMENT=Production
@ -8,14 +32,15 @@ ENV ASPNETCORE_ENVIRONMENT=Production
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .
WORKDIR "/host/JiShe.IoT.HttpApi.Host" WORKDIR "/src/host/JiShe.IOT.HttpApi.Host"
RUN dotnet build "JiShe.IoT.HttpApi.Host.csproj" -c Release -o /app/build RUN dotnet build "JiShe.IOT.HttpApi.Host.csproj" -c Release -o /app/build
FROM build AS publish FROM build AS publish
RUN dotnet publish "JiShe.IoT.HttpApi.Host.csproj" -c Release -o /app/publish /p:UseAppHost=false RUN dotnet publish "JiShe.IOT.HttpApi.Host.csproj" -c Release -o /app/publish /p:UseAppHost=false
FROM base AS final FROM base AS final
WORKDIR /app WORKDIR /app
COPY --from=publish /app/publish . COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "JiShe.IoT.HttpApi.Host.dll"] ENTRYPOINT ["dotnet", "JiShe.IOT.HttpApi.Host.dll"]

52
JiShe.IoT.Admin.sln → JiShe.IOT.sln
View File

@ -2,53 +2,52 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17 # Visual Studio Version 17
VisualStudioVersion = 17.0.31410.414 VisualStudioVersion = 17.0.31410.414
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.Domain", "src\JiShe.IoT.Domain\JiShe.IoT.Domain.csproj", "{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IOT.Domain", "src\JiShe.IOT.Domain\JiShe.IOT.Domain.csproj", "{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.Application", "src\JiShe.IoT.Application\JiShe.IoT.Application.csproj", "{1A94A50E-06DC-43C1-80B5-B662820EC3EB}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IOT.Application", "src\JiShe.IOT.Application\JiShe.IOT.Application.csproj", "{1A94A50E-06DC-43C1-80B5-B662820EC3EB}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.EntityFrameworkCore", "src\JiShe.IoT.EntityFrameworkCore\JiShe.IoT.EntityFrameworkCore.csproj", "{C956DD76-69C8-4A9C-83EA-D17DF83340FD}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IOT.EntityFrameworkCore", "src\JiShe.IOT.EntityFrameworkCore\JiShe.IOT.EntityFrameworkCore.csproj", "{C956DD76-69C8-4A9C-83EA-D17DF83340FD}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CA9AC87F-097E-4F15-8393-4BC07735A5B0}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CA9AC87F-097E-4F15-8393-4BC07735A5B0}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{04DBDB01-70F4-4E06-B468-8F87850B22BE}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{04DBDB01-70F4-4E06-B468-8F87850B22BE}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.Application.Tests", "test\JiShe.IoT.Application.Tests\JiShe.IoT.Application.Tests.csproj", "{50B2631D-129C-47B3-A587-029CCD6099BC}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IOT.Application.Tests", "test\JiShe.IOT.Application.Tests\JiShe.IOT.Application.Tests.csproj", "{50B2631D-129C-47B3-A587-029CCD6099BC}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.Domain.Shared", "src\JiShe.IoT.Domain.Shared\JiShe.IoT.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IOT.Domain.Shared", "src\JiShe.IOT.Domain.Shared\JiShe.IOT.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.Application.Contracts", "src\JiShe.IoT.Application.Contracts\JiShe.IoT.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IOT.Application.Contracts", "src\JiShe.IOT.Application.Contracts\JiShe.IOT.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.HttpApi", "src\JiShe.IoT.HttpApi\JiShe.IoT.HttpApi.csproj", "{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IOT.HttpApi", "src\JiShe.IOT.HttpApi\JiShe.IOT.HttpApi.csproj", "{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.HttpApi.Client", "src\JiShe.IoT.HttpApi.Client\JiShe.IoT.HttpApi.Client.csproj", "{3B5A0094-670D-4BB1-BFDD-61B88A8773DC}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IOT.HttpApi.Client", "src\JiShe.IOT.HttpApi.Client\JiShe.IOT.HttpApi.Client.csproj", "{3B5A0094-670D-4BB1-BFDD-61B88A8773DC}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.EntityFrameworkCore.Tests", "test\JiShe.IoT.EntityFrameworkCore.Tests\JiShe.IoT.EntityFrameworkCore.Tests.csproj", "{1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IOT.EntityFrameworkCore.Tests", "test\JiShe.IOT.EntityFrameworkCore.Tests\JiShe.IOT.EntityFrameworkCore.Tests.csproj", "{1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.TestBase", "test\JiShe.IoT.TestBase\JiShe.IoT.TestBase.csproj", "{91853F21-9CD9-4132-BC29-A7D5D84FFFE7}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IOT.TestBase", "test\JiShe.IOT.TestBase\JiShe.IOT.TestBase.csproj", "{91853F21-9CD9-4132-BC29-A7D5D84FFFE7}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.Domain.Tests", "test\JiShe.IoT.Domain.Tests\JiShe.IoT.Domain.Tests.csproj", "{E512F4D9-9375-480F-A2F6-A46509F9D824}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IOT.Domain.Tests", "test\JiShe.IOT.Domain.Tests\JiShe.IOT.Domain.Tests.csproj", "{E512F4D9-9375-480F-A2F6-A46509F9D824}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.HttpApi.Client.ConsoleTestApp", "test\JiShe.IoT.HttpApi.Client.ConsoleTestApp\JiShe.IoT.HttpApi.Client.ConsoleTestApp.csproj", "{EF480016-9127-4916-8735-D2466BDBC582}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IOT.HttpApi.Client.ConsoleTestApp", "test\JiShe.IOT.HttpApi.Client.ConsoleTestApp\JiShe.IOT.HttpApi.Client.ConsoleTestApp.csproj", "{EF480016-9127-4916-8735-D2466BDBC582}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IoT.DbMigrator", "src\JiShe.IoT.DbMigrator\JiShe.IoT.DbMigrator.csproj", "{AA94D832-1CCC-4715-95A9-A483F23A1A5D}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IOT.DbMigrator", "src\JiShe.IOT.DbMigrator\JiShe.IOT.DbMigrator.csproj", "{AA94D832-1CCC-4715-95A9-A483F23A1A5D}"
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
Directory.Build.JiShe.targets = Directory.Build.JiShe.targets NuGet.Config = NuGet.Config
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
Dockerfile = Dockerfile Directory.Build.Lion.targets = Directory.Build.Lion.targets
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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gateways", "gateways", "{81A8FF2E-DE2E-479D-A209-EDA81C2AF08A}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.IOT.FreeSqlRepository", "src\JiShe.IOT.FreeSqlRepository\JiShe.IOT.FreeSqlRepository.csproj", "{27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}"
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", "host\JiShe.IOT.WebGateway\JiShe.IOT.WebGateway.csproj", "{9C009501-0ED2-4930-B020-C8D06FE28E44}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -112,10 +111,14 @@ 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
{F1D46EE1-13D5-4227-80DC-066DEB0E4FD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F1D46EE1-13D5-4227-80DC-066DEB0E4FD1}.Debug|Any CPU.Build.0 = Debug|Any CPU {27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F1D46EE1-13D5-4227-80DC-066DEB0E4FD1}.Release|Any CPU.ActiveCfg = Release|Any CPU {27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F1D46EE1-13D5-4227-80DC-066DEB0E4FD1}.Release|Any CPU.Build.0 = Release|Any CPU {27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}.Release|Any CPU.Build.0 = Release|Any CPU
{9C009501-0ED2-4930-B020-C8D06FE28E44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9C009501-0ED2-4930-B020-C8D06FE28E44}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9C009501-0ED2-4930-B020-C8D06FE28E44}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9C009501-0ED2-4930-B020-C8D06FE28E44}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -135,7 +138,8 @@ 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}
{F1D46EE1-13D5-4227-80DC-066DEB0E4FD1} = {81A8FF2E-DE2E-479D-A209-EDA81C2AF08A} {27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
{9C009501-0ED2-4930-B020-C8D06FE28E44} = {8C1B8C6C-C518-4290-B070-622CCA6004DA}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F}

3
NuGet.Config
View File

@ -2,7 +2,6 @@
<configuration> <configuration>
<packageSources> <packageSources>
<add key="localnuget" value="D:\CodeBase\DiyPackage" />
<add key="nuget" value="https://api.nuget.org/v3/index.json" /> <add key="nuget" value="https://api.nuget.org/v3/index.json" />
</packageSources> </packageSources>
</configuration> </configuration>

2
host/JiShe.IoT.HttpApi.Host/Controllers/HomeController.cs → host/JiShe.IOT.HttpApi.Host/Controllers/HomeController.cs
View File

@ -1,4 +1,4 @@
namespace JiShe.IoT.Controllers namespace JiShe.IOT.Controllers
{ {
public class HomeController : AbpController public class HomeController : AbpController
{ {

2
host/JiShe.IoT.HttpApi.Host/Extensions/Hangfire/AutoDeleteAfterSuccessAttributer.cs → host/JiShe.IOT.HttpApi.Host/Extensions/Hangfire/AutoDeleteAfterSuccessAttributer.cs
View File

@ -1,4 +1,4 @@
namespace JiShe.IoT.Extensions.Hangfire; namespace JiShe.IOT.Extensions.Hangfire;
public class AutoDeleteAfterSuccessAttributer : JobFilterAttribute, IApplyStateFilter public class AutoDeleteAfterSuccessAttributer : JobFilterAttribute, IApplyStateFilter
{ {

2
host/JiShe.IoT.HttpApi.Host/Extensions/Hangfire/CronType.cs → host/JiShe.IOT.HttpApi.Host/Extensions/Hangfire/CronType.cs
View File

@ -1,4 +1,4 @@
namespace JiShe.IoT.Extensions.Hangfire namespace JiShe.IOT.Extensions.Hangfire
{ {
/// <summary> /// <summary>
/// Cron类型 /// Cron类型

2
host/JiShe.IoT.HttpApi.Host/Extensions/Hangfire/CustomHangfireAuthorizeFilter.cs → host/JiShe.IOT.HttpApi.Host/Extensions/Hangfire/CustomHangfireAuthorizeFilter.cs
View File

@ -1,4 +1,4 @@
namespace JiShe.IoT.Extensions.Hangfire namespace JiShe.IOT.Extensions.Hangfire
{ {
public class CustomHangfireAuthorizeFilter : IDashboardAuthorizationFilter public class CustomHangfireAuthorizeFilter : IDashboardAuthorizationFilter
{ {

2
host/JiShe.IoT.HttpApi.Host/Extensions/Hangfire/JobRetryLastFilter.cs → host/JiShe.IOT.HttpApi.Host/Extensions/Hangfire/JobRetryLastFilter.cs
View File

@ -1,4 +1,4 @@
namespace JiShe.IoT.Extensions.Hangfire; namespace JiShe.IOT.Extensions.Hangfire;
/// <summary> /// <summary>
/// 重试最后一次 /// 重试最后一次

4
host/JiShe.IoT.HttpApi.Host/Extensions/Hangfire/RecurringJobsExtensions.cs → host/JiShe.IOT.HttpApi.Host/Extensions/Hangfire/RecurringJobsExtensions.cs
View File

@ -1,6 +1,6 @@
using JiShe.IoT.Jobs; using JiShe.IOT.Jobs;
namespace JiShe.IoT.Extensions.Hangfire namespace JiShe.IOT.Extensions.Hangfire
{ {
public static class RecurringJobsExtensions public static class RecurringJobsExtensions
{ {

14
host/JiShe.IoT.HttpApi.Host/GlobalUsings.cs → host/JiShe.IOT.HttpApi.Host/GlobalUsings.cs
View File

@ -12,13 +12,11 @@ global using Hangfire.Common;
global using Hangfire.Dashboard; global using Hangfire.Dashboard;
global using Hangfire.States; global using Hangfire.States;
global using Hangfire.Storage; global using Hangfire.Storage;
global using JiShe.ServicePro; global using Lion.AbpPro;
global using JiShe.ServicePro.CAP; global using JiShe.IOT.EntityFrameworkCore;
global using JiShe.ServicePro.CAP.EntityFrameworkCore; global using JiShe.IOT.Extensions;
global using JiShe.IoT.EntityFrameworkCore; global using JiShe.IOT.Extensions.Hangfire;
global using JiShe.IoT.Extensions; global using JiShe.IOT.MultiTenancy;
global using JiShe.IoT.Extensions.Hangfire;
global using JiShe.IoT.MultiTenancy;
global using Microsoft.AspNetCore.Authentication.JwtBearer; global using Microsoft.AspNetCore.Authentication.JwtBearer;
global using Microsoft.AspNetCore.Builder; global using Microsoft.AspNetCore.Builder;
global using Microsoft.AspNetCore.DataProtection; global using Microsoft.AspNetCore.DataProtection;
@ -37,7 +35,6 @@ global using Microsoft.Extensions.Logging.Abstractions;
global using Microsoft.Extensions.Options; global using Microsoft.Extensions.Options;
global using Microsoft.IdentityModel.Tokens; global using Microsoft.IdentityModel.Tokens;
global using Microsoft.OpenApi.Models; global using Microsoft.OpenApi.Models;
global using JiShe.IoT;
global using Serilog; global using Serilog;
global using StackExchange.Redis; global using StackExchange.Redis;
global using Swagger; global using Swagger;
@ -58,7 +55,6 @@ global using Volo.Abp.BackgroundJobs.Hangfire;
global using Volo.Abp.Caching; global using Volo.Abp.Caching;
global using Volo.Abp.Caching.StackExchangeRedis; global using Volo.Abp.Caching.StackExchangeRedis;
global using Volo.Abp.DependencyInjection; global using Volo.Abp.DependencyInjection;
global using Volo.Abp.DistributedLocking;
global using Volo.Abp.Domain.Entities; global using Volo.Abp.Domain.Entities;
global using Volo.Abp.ExceptionHandling; global using Volo.Abp.ExceptionHandling;
global using Volo.Abp.Http; global using Volo.Abp.Http;

6
host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostConst.cs → host/JiShe.IOT.HttpApi.Host/IOTHttpApiHostConst.cs
View File

@ -1,6 +1,6 @@
namespace JiShe.IoT namespace JiShe.IOT
{ {
public static class IoTHttpApiHostConst public static class IOTHttpApiHostConst
{ {
/// <summary> /// <summary>
/// 跨域策略名 /// 跨域策略名
@ -10,7 +10,7 @@ namespace JiShe.IoT
/// <summary> /// <summary>
/// Cookies名称 /// Cookies名称
/// </summary> /// </summary>
public const string DefaultCookieName = "JiShe.IoT.Http.Api"; public const string DefaultCookieName = "JiShe.IOT.Http.Api";
/// <summary> /// <summary>
/// SwaggerUi 端点 /// SwaggerUi 端点

290
host/JiShe.IOT.HttpApi.Host/IOTHttpApiHostModule.cs Normal file
View File

@ -0,0 +1,290 @@
namespace JiShe.IOT
{
[DependsOn(
typeof(IOTHttpApiModule),
typeof(AbpProSharedHostingMicroserviceModule),
typeof(AbpAspNetCoreMvcUiMultiTenancyModule),
typeof(IOTEntityFrameworkCoreModule),
typeof(AbpAspNetCoreAuthenticationJwtBearerModule),
typeof(AbpAspNetCoreSerilogModule),
typeof(AbpAccountWebModule),
typeof(IOTApplicationModule),
typeof(AbpAspNetCoreMvcUiBasicThemeModule),
typeof(AbpCachingStackExchangeRedisModule)
)]
public class IOTHttpApiHostModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
var configuration = context.Services.GetConfiguration();
ConfigureCache(context);
ConfigureSwaggerServices(context);
ConfigureJwtAuthentication(context, configuration);
ConfigureMiniProfiler(context);
ConfigureIdentity(context);
ConfigureAuditLog(context);
ConfigurationSignalR(context);
ConfigurationMultiTenancy();
}
public override void OnApplicationInitialization(ApplicationInitializationContext context)
{
var app = context.GetApplicationBuilder();
var configuration = context.GetConfiguration();
app.UseAbpProRequestLocalization();
app.UseCorrelationId();
app.UseStaticFiles();
app.UseMiniProfiler();
app.UseRouting();
app.UseCors(IOTHttpApiHostConst.DefaultCorsPolicyName);
app.UseAuthentication();
if (MultiTenancyConsts.IsEnabled)
{
app.UseMultiTenancy();
}
app.UseAuthorization();
app.UseSwagger();
app.UseAbpSwaggerUI(options =>
{
options.SwaggerEndpoint("/swagger/IOT/swagger.json", "IOT API");
options.DocExpansion(DocExpansion.None);
options.DefaultModelsExpandDepth(-1);
});
app.UseAuditing();
app.UseAbpSerilogEnrichers();
app.UseUnitOfWork();
app.UseConfiguredEndpoints(endpoints =>
{
endpoints.MapHealthChecks("/health");
// endpoints.MapHangfireDashboard("/hangfire", new DashboardOptions()
// {
// Authorization = new[] { new CustomHangfireAuthorizeFilter() },
// IgnoreAntiforgeryToken = true
// });
});
if (configuration.GetValue("Consul:Enabled", false))
{
app.UseConsul();
}
}
private void ConfigurationSignalR(ServiceConfigurationContext context)
{
var redisConnection = context.Services.GetConfiguration().GetValue<string>("Redis:Configuration");
if (redisConnection.IsNullOrWhiteSpace())
{
throw new UserFriendlyException(message: "Redis连接字符串未配置.");
}
context.Services.AddSignalR().AddStackExchangeRedis(redisConnection, options => { options.Configuration.ChannelPrefix = "Lion.AbpPro"; });
}
/// <summary>
/// 配置MiniProfiler
/// </summary>
private void ConfigureMiniProfiler(ServiceConfigurationContext context)
{
context.Services.AddMiniProfiler(options => options.RouteBasePath = "/profiler").AddEntityFramework();
}
/// <summary>
/// 配置JWT
/// </summary>
private void ConfigureJwtAuthentication(ServiceConfigurationContext context,
IConfiguration configuration)
{
context.Services.AddAuthentication(options =>
{
options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
})
.AddJwtBearer(options =>
{
options.TokenValidationParameters =
new TokenValidationParameters()
{
// 是否开启签名认证
ValidateIssuerSigningKey = true,
ValidateIssuer = true,
ValidateAudience = true,
ValidateLifetime = true,
//ClockSkew = TimeSpan.Zero,
ValidIssuer = configuration["Jwt:Issuer"],
ValidAudience = configuration["Jwt:Audience"],
IssuerSigningKey =
new SymmetricSecurityKey(
Encoding.ASCII.GetBytes(configuration["Jwt:SecurityKey"]))
};
options.Events = new JwtBearerEvents
{
OnMessageReceived = currentContext =>
{
var path = currentContext.HttpContext.Request.Path;
if (path.StartsWithSegments("/login"))
{
return Task.CompletedTask;
}
var accessToken = string.Empty;
if (currentContext.HttpContext.Request.Headers.ContainsKey("Authorization"))
{
accessToken = currentContext.HttpContext.Request.Headers["Authorization"];
if (!string.IsNullOrWhiteSpace(accessToken))
{
accessToken = accessToken.Split(" ").LastOrDefault();
}
}
if (accessToken.IsNullOrWhiteSpace())
{
accessToken = currentContext.Request.Query["access_token"].FirstOrDefault();
}
if (accessToken.IsNullOrWhiteSpace())
{
accessToken = currentContext.Request.Cookies[IOTHttpApiHostConst.DefaultCookieName];
}
currentContext.Token = accessToken;
currentContext.Request.Headers.Remove("Authorization");
currentContext.Request.Headers.Add("Authorization", $"Bearer {accessToken}");
return Task.CompletedTask;
}
};
});
}
/// <summary>
/// Redis缓存
/// </summary>
private void ConfigureCache(ServiceConfigurationContext context)
{
Configure<AbpDistributedCacheOptions>(
options => { options.KeyPrefix = "IOT:"; });
var configuration = context.Services.GetConfiguration();
var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]);
context.Services
.AddDataProtection()
.PersistKeysToStackExchangeRedis(redis, "IOT-Protection-Keys");
}
/// <summary>
/// 配置Identity
/// </summary>
private void ConfigureIdentity(ServiceConfigurationContext context)
{
context.Services.Configure<IdentityOptions>(options => { options.Lockout = new LockoutOptions() { AllowedForNewUsers = false }; });
}
private static void ConfigureSwaggerServices(ServiceConfigurationContext context)
{
context.Services.AddSwaggerGen(
options =>
{
// 文件下载类型
options.MapType<FileContentResult>(() => new OpenApiSchema() { Type = "file" });
options.SwaggerDoc("IOT",
new OpenApiInfo { Title = "JiSheIOT API", Version = "v1" });
options.DocInclusionPredicate((docName, description) => true);
options.EnableAnnotations(); // 启用注解
options.DocumentFilter<HiddenAbpDefaultApiFilter>();
options.SchemaFilter<EnumSchemaFilter>();
// 加载所有xml注释，这里会导致swagger加载有点缓慢
var xmlPaths = Directory.GetFiles(AppContext.BaseDirectory, "*.xml");
foreach (var xml in xmlPaths)
{
options.IncludeXmlComments(xml, true);
}
options.AddSecurityDefinition(JwtBearerDefaults.AuthenticationScheme,
new OpenApiSecurityScheme()
{
Description = "直接在下框输入JWT生成的Token",
Name = "Authorization",
In = ParameterLocation.Header,
Type = SecuritySchemeType.Http,
Scheme = JwtBearerDefaults.AuthenticationScheme,
BearerFormat = "JWT"
});
options.AddSecurityRequirement(new OpenApiSecurityRequirement
{
{
new OpenApiSecurityScheme
{
Reference = new OpenApiReference
{
Type = ReferenceType.SecurityScheme, Id = "Bearer"
}
},
new List<string>()
}
});
options.AddSecurityDefinition("ApiKey", new OpenApiSecurityScheme()
{
Type = SecuritySchemeType.ApiKey,
In = ParameterLocation.Header,
Name = "Accept-Language",
Description = "多语言设置，系统预设语言有zh-Hans、en，默认为zh-Hans",
});
options.AddSecurityRequirement(new OpenApiSecurityRequirement
{
{
new OpenApiSecurityScheme
{
Reference = new OpenApiReference
{ Type = ReferenceType.SecurityScheme, Id = "ApiKey" }
},
Array.Empty<string>()
}
});
});
}
/// <summary>
/// 审计日志
/// </summary>
private void ConfigureAuditLog(ServiceConfigurationContext context)
{
Configure<AbpAuditingOptions>
(
options =>
{
options.IsEnabled = true;
options.EntityHistorySelectors.AddAllEntities();
options.ApplicationName = "JiShe.IOT";
}
);
Configure<AbpAspNetCoreAuditingOptions>(
options =>
{
options.IgnoredUrls.Add("/AuditLogs/page");
options.IgnoredUrls.Add("/hangfire/stats");
options.IgnoredUrls.Add("/cap");
});
}
private void ConfigurationMultiTenancy()
{
Configure<AbpMultiTenancyOptions>(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; });
}
}
}

65
host/JiShe.IOT.HttpApi.Host/JiShe.IOT.HttpApi.Host.csproj Normal file
View File

@ -0,0 +1,65 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>JiShe.IOT</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>JiShe.IOT-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer"/>
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis"/>
<PackageReference Include="Volo.Abp.Account.Web"/>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy"/>
<PackageReference Include="Volo.Abp.Autofac"/>
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis"/>
<PackageReference Include="Volo.Abp.AspNetCore.Serilog"/>
<PackageReference Include="Volo.Abp.Swashbuckle"/>
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer"/>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic"/>
<PackageReference Include="Serilog"/>
<PackageReference Include="Serilog.AspNetCore"/>
<PackageReference Include="Serilog.Exceptions"/>
<PackageReference Include="Serilog.Extensions.Logging"/>
<PackageReference Include="Serilog.Settings.Configuration"/>
<PackageReference Include="Serilog.Sinks.Console"/>
<PackageReference Include="Serilog.Sinks.Elasticsearch"/>
<PackageReference Include="Serilog.Sinks.File"/>
<PackageReference Include="Serilog.Sinks.Async"/>
<PackageReference Include="Hangfire.Redis.StackExchange"/>
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks"/>
<PackageReference Include="MiniProfiler.AspNetCore.Mvc"/>
<PackageReference Include="DotNetCore.CAP.MySql"/>
<PackageReference Include="DotNetCore.CAP.RabbitMQ"/>
<PackageReference Include="DotNetCore.CAP.Dashboard"/>
<PackageReference Include="DotNetCore.CAP.InMemoryStorage"/>
<PackageReference Include="Savorboard.CAP.InMemoryMessageQueue"/>
<PackageReference Include="MiniProfiler.AspNetCore.Mvc"/>
<PackageReference Include="MiniProfiler.EntityFrameworkCore"/>
<PackageReference Include="MiniProfiler.Shared"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\JiShe.IOT.Application\JiShe.IOT.Application.csproj"/>
<ProjectReference Include="..\..\src\JiShe.IOT.EntityFrameworkCore\JiShe.IOT.EntityFrameworkCore.csproj"/>
<ProjectReference Include="..\..\src\JiShe.IOT.HttpApi\JiShe.IOT.HttpApi.csproj"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Lion.AbpPro.Shared.Hosting.Microservices"/>
</ItemGroup>
<ItemGroup>
<Compile Remove="Logs\**"/>
<Content Remove="Logs\**"/>
<EmbeddedResource Remove="Logs\**"/>
<None Remove="Logs\**"/>
</ItemGroup>
<ItemGroup>
<Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\*\*.abppkg*.json"/>
</ItemGroup>
</Project>

2
host/JiShe.IoT.HttpApi.Host/Pages/Login.cshtml → host/JiShe.IOT.HttpApi.Host/Pages/Login.cshtml
View File

@ -1,5 +1,5 @@
@page @page
@model JiShe.IoT.Pages.Login @model JiShe.IOT.Pages.Login
@{ @{
Layout = null; Layout = null;

12
host/JiShe.IoT.HttpApi.Host/Pages/Login.cshtml.cs → host/JiShe.IOT.HttpApi.Host/Pages/Login.cshtml.cs
View File

@ -1,11 +1,11 @@
using JiShe.ServicePro.BasicManagement.ConfigurationOptions; using Lion.AbpPro.BasicManagement.ConfigurationOptions;
using JiShe.ServicePro.BasicManagement.Users; using Lion.AbpPro.BasicManagement.Users;
using JiShe.ServicePro.BasicManagement.Users.Dtos; using Lion.AbpPro.BasicManagement.Users.Dtos;
using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.RazorPages;
namespace JiShe.IoT.Pages namespace JiShe.IOT.Pages
{ {
public class Login : PageModel public class Login : PageModel
{ {
@ -48,12 +48,12 @@ namespace JiShe.IoT.Pages
// 设置cookies domain // 设置cookies domain
//options.Domain = "IoT.cn"; //options.Domain = "IOT.cn";
var result = await _accountAppService.LoginAsync(new LoginInput() var result = await _accountAppService.LoginAsync(new LoginInput()
{ Name = userName, Password = password }); { Name = userName, Password = password });
Response.Cookies.Append(IoTHttpApiHostConst.DefaultCookieName, Response.Cookies.Append(IOTHttpApiHostConst.DefaultCookieName,
result.Token, options); result.Token, options);
} }
catch (Exception e) catch (Exception e)

20
host/JiShe.IoT.HttpApi.Host/Pages/Monitor.cshtml → host/JiShe.IOT.HttpApi.Host/Pages/Monitor.cshtml
View File

@ -1,6 +1,6 @@
@page @page
@using JiShe.IoT @using JiShe.IOT
@model JiShe.IoT.Pages.Monitor @model JiShe.IOT.Pages.Monitor
@{ @{
@ -27,12 +27,12 @@
<div class="row"> <div class="row">
<div class="col-sm-6 col-md-4 col-lg-3"> <div class="col-sm-6 col-md-4 col-lg-3">
<div class="thumbnail" style="height: 180px"> <div class="thumbnail" style="height: 180px">
<a href="@IoTHttpApiHostConst.SwaggerUiEndPoint" target="_blank"> <a href="@IOTHttpApiHostConst.SwaggerUiEndPoint" target="_blank">
<img class="lazy" src="/images/swagger.png" width="300" height="150"/> <img class="lazy" src="/images/swagger.png" width="300" height="150"/>
</a> </a>
<div class="caption"> <div class="caption">
<h3> <h3>
<a href="@IoTHttpApiHostConst.SwaggerUiEndPoint" target="_blank">SwaggerUI</a> <a href="@IOTHttpApiHostConst.SwaggerUiEndPoint" target="_blank">SwaggerUI</a>
</h3> </h3>
</div> </div>
</div> </div>
@ -40,36 +40,36 @@
@* <div class="col-sm-6 col-md-4 col-lg-3"> *@ @* <div class="col-sm-6 col-md-4 col-lg-3"> *@
@* <div class="thumbnail" style="height: 180px"> *@ @* <div class="thumbnail" style="height: 180px"> *@
@* <a href="@IoTHttpApiHostConst.HangfireDashboardEndPoint" target="_blank"> *@ @* <a href="@IOTHttpApiHostConst.HangfireDashboardEndPoint" target="_blank"> *@
@* <img class="lazy" src="/images/hangfire.png" width="300" height="150"/> *@ @* <img class="lazy" src="/images/hangfire.png" width="300" height="150"/> *@
@* </a> *@ @* </a> *@
@* <div class="caption"> *@ @* <div class="caption"> *@
@* <h3> *@ @* <h3> *@
@* <a href="@IoTHttpApiHostConst.HangfireDashboardEndPoint" target="_blank">Hangfire面板</a> *@ @* <a href="@IOTHttpApiHostConst.HangfireDashboardEndPoint" target="_blank">Hangfire面板</a> *@
@* </h3> *@ @* </h3> *@
@* </div> *@ @* </div> *@
@* </div> *@ @* </div> *@
@* </div> *@ @* </div> *@
<div class="col-sm-6 col-md-4 col-lg-3"> <div class="col-sm-6 col-md-4 col-lg-3">
<div class="thumbnail" style="height: 180px"> <div class="thumbnail" style="height: 180px">
<a href="@IoTHttpApiHostConst.MiniprofilerEndPoint" target="_blank"> <a href="@IOTHttpApiHostConst.MiniprofilerEndPoint" target="_blank">
<img class="lazy" src="/images/miniprofiler.png" width="300" height="150"/> <img class="lazy" src="/images/miniprofiler.png" width="300" height="150"/>
</a> </a>
<div class="caption"> <div class="caption">
<h3> <h3>
<a href="@IoTHttpApiHostConst.MiniprofilerEndPoint" target="_blank">Miniprofiler</a> <a href="@IOTHttpApiHostConst.MiniprofilerEndPoint" target="_blank">Miniprofiler</a>
</h3> </h3>
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-6 col-md-4 col-lg-3"> <div class="col-sm-6 col-md-4 col-lg-3">
<div class="thumbnail" style="height: 180px"> <div class="thumbnail" style="height: 180px">
<a href="@IoTHttpApiHostConst.MoreEndPoint" target="_blank"> <a href="@IOTHttpApiHostConst.MoreEndPoint" target="_blank">
<img class="lazy" src="/images/more.png" width="300" height="150"/> <img class="lazy" src="/images/more.png" width="300" height="150"/>
</a> </a>
<div class="caption"> <div class="caption">
<h3> <h3>
<a href="@IoTHttpApiHostConst.MoreEndPoint" target="_blank">了解更多...</a> <a href="@IOTHttpApiHostConst.MoreEndPoint" target="_blank">了解更多...</a>
</h3> </h3>
</div> </div>
</div> </div>

2
host/JiShe.IoT.HttpApi.Host/Pages/Monitor.cshtml.cs → host/JiShe.IOT.HttpApi.Host/Pages/Monitor.cshtml.cs
View File

@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.RazorPages;
namespace JiShe.IoT.Pages namespace JiShe.IOT.Pages
{ {
public class Monitor : PageModel public class Monitor : PageModel
{ {

25
host/JiShe.IOT.HttpApi.Host/Program.cs Normal file
View File

@ -0,0 +1,25 @@
namespace JiShe.IOT
{
public class Program
{
public static void Main(string[] args)
{
CreateHostBuilder(args).Build().Run();
}
private static IHostBuilder CreateHostBuilder(string[] args) =>
Host.CreateDefaultBuilder(args)
.ConfigureWebHostDefaults(webBuilder =>
{
webBuilder.ConfigureKestrel((context, options) => { options.Limits.MaxRequestBodySize = 1024 * 50; });
webBuilder.UseStartup<Startup>();
})
.UseSerilog((context, loggerConfiguration) =>
{
SerilogToEsExtensions.SetSerilogConfiguration(
loggerConfiguration,
context.Configuration);
}).UseAutofac();
}
}

2
host/JiShe.IoT.HttpApi.Host/Properties/launchSettings.json → host/JiShe.IOT.HttpApi.Host/Properties/launchSettings.json
View File

@ -1,6 +1,6 @@
{ {
"profiles": { "profiles": {
"JiShe.IoT.HttpApi.Host": { "JiShe.IOT.HttpApi.Host": {
"commandName": "Project", "commandName": "Project",
"launchBrowser": true, "launchBrowser": true,
"applicationUrl": "http://localhost:44315", "applicationUrl": "http://localhost:44315",

16
host/JiShe.IOT.HttpApi.Host/Startup.cs Normal file
View File

@ -0,0 +1,16 @@
namespace JiShe.IOT
{
public class Startup
{
public void ConfigureServices(IServiceCollection services)
{
services.AddApplication<IOTHttpApiHostModule>();
}
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
{
app.InitializeApplication();
}
}
}

3
host/JiShe.IOT.HttpApi.Host/appsettings.Production.json Normal file
View File

@ -0,0 +1,3 @@
{
}

61
host/JiShe.IOT.HttpApi.Host/appsettings.json Normal file
View File

@ -0,0 +1,61 @@
{
"Serilog": {
"Using": [
"Serilog.Sinks.Console",
"Serilog.Sinks.File"
],
"MinimumLevel": {
"Default": "Debug",
"Override": {
"Microsoft": "Information",
"Volo.Abp": "Information",
"Hangfire": "Information",
"DotNetCore.CAP": "Information",
"Serilog.AspNetCore": "Information",
"Microsoft.EntityFrameworkCore": "Warning",
"Microsoft.AspNetCore": "Information"
}
},
"WriteTo": [
{
"Name": "Console"
},
{
"Name": "File",
"Args": {
"path": "logs/logs-.txt",
"rollingInterval": "Day"
}
}
]
},
"App": {
"SelfUrl": "http://localhost:44315",
"CorsOrigins": "https://*.IOT.com,http://localhost:4200,http://localhost:3100,http://118.190.144.92:9111"
},
"ConnectionStrings": {
"Default": "Data Source=118.190.144.92;Port=33306;Database=JiSheIOTDB;uid=root;pwd=admin123;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
},
"Redis": {
"Configuration": "118.190.144.92:6379,defaultdatabase=14"
},
"Jwt": {
"Audience": "JiShe.IOT",
"SecurityKey": "dzehzRz9a8asdfasfdadfasdfasdfafsdadfasbasdf=",
"Issuer": "JiShe.IOT",
"ExpirationTime": 2
},
"ElasticSearch": {
"Enabled": "false",
"Url": "http://es.cn",
"IndexFormat": "JiShe.IOT.development.{0:yyyy.MM.dd}",
"UserName": "elastic",
"Password": "aVVhjQ95RP7nbwNy",
"SearchIndexFormat": "JiShe.IOT.development*"
},
"Consul": {
"Enabled": false,
"Host": "http://localhost:8500",
"Service": "Project-Service"
}
}

0
host/JiShe.IoT.HttpApi.Host/tempkey.jwk → host/JiShe.IOT.HttpApi.Host/tempkey.jwk
View File

0
host/JiShe.IoT.HttpApi.Host/tempkey.rsa → host/JiShe.IOT.HttpApi.Host/tempkey.rsa
View File

0
host/JiShe.IoT.HttpApi.Host/wwwroot/images/cap.png → host/JiShe.IOT.HttpApi.Host/wwwroot/images/cap.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
host/JiShe.IoT.HttpApi.Host/wwwroot/images/hangfire.png → host/JiShe.IOT.HttpApi.Host/wwwroot/images/hangfire.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

0
host/JiShe.IoT.HttpApi.Host/wwwroot/images/miniprofiler.png → host/JiShe.IOT.HttpApi.Host/wwwroot/images/miniprofiler.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

0
host/JiShe.IoT.HttpApi.Host/wwwroot/images/more.png → host/JiShe.IOT.HttpApi.Host/wwwroot/images/more.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

0
host/JiShe.IoT.HttpApi.Host/wwwroot/images/swagger.png → host/JiShe.IOT.HttpApi.Host/wwwroot/images/swagger.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

0
host/JiShe.IoT.HttpApi.Host/wwwroot/libs/bootstrap/css/bootstrap.min.css → host/JiShe.IOT.HttpApi.Host/wwwroot/libs/bootstrap/css/bootstrap.min.css vendored
View File

4
gateways/JiShe.IoT.WebGateway/AbpProWebGatewayModule.cs → host/JiShe.IOT.WebGateway/AbpProWebGatewayModule.cs
View File

@ -1,7 +1,7 @@
namespace JiShe.ServicePro.WebGateway namespace Lion.AbpPro.WebGateway
{ {
[DependsOn( [DependsOn(
typeof(ServiceProSharedHostingGatewayModule))] typeof(AbpProSharedHostingGatewayModule))]
public class AbpProWebGatewayModule : AbpModule public class AbpProWebGatewayModule : AbpModule
{ {
private const string DefaultCorsPolicyName = "Default"; private const string DefaultCorsPolicyName = "Default";

2
gateways/JiShe.IoT.WebGateway/Dockerfile → host/JiShe.IOT.WebGateway/Dockerfile
View File

@ -17,6 +17,6 @@ ENV TZ=Asia/Shanghai
# 设置环境变量 # 设置环境变量
ENV ASPNETCORE_ENVIRONMENT=Production ENV ASPNETCORE_ENVIRONMENT=Production
ENTRYPOINT ["dotnet", "JiShe.IoT.WebGateway.dll"] ENTRYPOINT ["dotnet", "JiShe.IOT.WebGateway.dll"]

2
gateways/JiShe.IoT.WebGateway/GlobalUsings.cs → host/JiShe.IOT.WebGateway/GlobalUsings.cs
View File

@ -4,7 +4,7 @@ global using System;
global using System.Collections.Generic; global using System.Collections.Generic;
global using System.Linq; global using System.Linq;
global using System.Threading.Tasks; global using System.Threading.Tasks;
global using JiShe.ServicePro; global using Lion.AbpPro;
global using Microsoft.AspNetCore.Builder; global using Microsoft.AspNetCore.Builder;
global using Microsoft.AspNetCore.Cors; global using Microsoft.AspNetCore.Cors;
global using Microsoft.AspNetCore.Hosting; global using Microsoft.AspNetCore.Hosting;

2
gateways/JiShe.IoT.WebGateway/JiShe.IoT.WebGateway.csproj → host/JiShe.IOT.WebGateway/JiShe.IOT.WebGateway.csproj
View File

@ -5,6 +5,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="JiShe.ServicePro.Shared.Hosting.Gateways"/> <PackageReference Include="Lion.AbpPro.Shared.Hosting.Gateways"/>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
gateways/JiShe.IoT.WebGateway/Program.cs → host/JiShe.IOT.WebGateway/Program.cs
View File

@ -1,4 +1,4 @@
namespace JiShe.ServicePro.WebGateway namespace Lion.AbpPro.WebGateway
{ {
public class Program public class Program
{ {

2
gateways/JiShe.IoT.WebGateway/Properties/launchSettings.json → host/JiShe.IOT.WebGateway/Properties/launchSettings.json
View File

@ -1,7 +1,7 @@
{ {
"$schema": "http://json.schemastore.org/launchsettings.json", "$schema": "http://json.schemastore.org/launchsettings.json",
"profiles": { "profiles": {
"JiShe.IoT.WebGateway": { "JiShe.IOT.WebGateway": {
"commandName": "Project", "commandName": "Project",
"launchBrowser": false, "launchBrowser": false,
"launchUrl": "swagger", "launchUrl": "swagger",

4
gateways/JiShe.IoT.WebGateway/appsettings.Consul.json → host/JiShe.IOT.WebGateway/appsettings.Consul.json
View File

@ -17,7 +17,7 @@
{ {
"DownstreamPathTemplate": "/{url}", "DownstreamPathTemplate": "/{url}",
"DownstreamScheme": "http", "DownstreamScheme": "http",
"ServiceName": "IoT-Service", "ServiceName": "IOT-Service",
"LoadBalancerOptions": { "LoadBalancerOptions": {
"Type": "LeastConnection" "Type": "LeastConnection"
}, },
@ -32,7 +32,7 @@
{ {
"DownstreamPathTemplate": "/{url}", "DownstreamPathTemplate": "/{url}",
"DownstreamScheme": "ws", "DownstreamScheme": "ws",
"ServiceName": "IoT-Service", "ServiceName": "IOT-Service",
"LoadBalancerOptions": { "LoadBalancerOptions": {
"Type": "LeastConnection" "Type": "LeastConnection"
}, },

0
gateways/JiShe.IoT.WebGateway/appsettings.Production.json → host/JiShe.IOT.WebGateway/appsettings.Production.json
View File

0
gateways/JiShe.IoT.WebGateway/appsettings.json → host/JiShe.IOT.WebGateway/appsettings.json
View File

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

@ -1,274 +0,0 @@
using Hangfire.Redis.StackExchange;
using Medallion.Threading;
using Medallion.Threading.Redis;
namespace JiShe.IoT;
public partial class IoTHttpApiHostModule
{
private void ConfigureHangfire(ServiceConfigurationContext context)
{
var redisStorageOptions = new RedisStorageOptions()
{
Db = context.Services.GetConfiguration().GetValue<int>("Hangfire:Redis:DB")
};
Configure<AbpBackgroundJobOptions>(options => { options.IsJobExecutionEnabled = true; });
context.Services.AddHangfire(config =>
{
config.UseRedisStorage(
context.Services.GetConfiguration().GetValue<string>("Hangfire:Redis:Host"), redisStorageOptions)
.WithJobExpirationTimeout(TimeSpan.FromDays(7));
var delaysInSeconds = new[] { 10, 60, 60 * 3 }; // 重试时间间隔
const int Attempts = 3; // 重试次数
config.UseFilter(new AutomaticRetryAttribute() { Attempts = Attempts, DelaysInSeconds = delaysInSeconds });
//config.UseFilter(new AutoDeleteAfterSuccessAttribute(TimeSpan.FromDays(7)));
config.UseFilter(new JobRetryLastFilter(Attempts));
});
}
/// <summary>
/// 配置MiniProfiler
/// </summary>
private void ConfigureMiniProfiler(ServiceConfigurationContext context)
{
if (context.Services.GetConfiguration().GetValue("MiniProfiler:Enabled", false))
{
context.Services.AddMiniProfiler(options => options.RouteBasePath = "/profiler").AddEntityFramework();
}
}
/// <summary>
/// 配置JWT
/// </summary>
private void ConfigureJwtAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
{
context.Services.AddAuthentication(options =>
{
options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
})
.AddJwtBearer(options =>
{
options.TokenValidationParameters =
new TokenValidationParameters()
{
// 是否开启签名认证
ValidateIssuerSigningKey = true,
ValidateIssuer = true,
ValidateAudience = true,
ValidateLifetime = true,
ClockSkew = TimeSpan.Zero,
ValidIssuer = configuration["Jwt:Issuer"],
ValidAudience = configuration["Jwt:Audience"],
IssuerSigningKey =
new SymmetricSecurityKey(
Encoding.ASCII.GetBytes(configuration["Jwt:SecurityKey"]))
};
options.Events = new JwtBearerEvents
{
OnMessageReceived = currentContext =>
{
var path = currentContext.HttpContext.Request.Path;
if (path.StartsWithSegments("/login"))
{
return Task.CompletedTask;
}
var accessToken = string.Empty;
if (currentContext.HttpContext.Request.Headers.ContainsKey("Authorization"))
{
accessToken = currentContext.HttpContext.Request.Headers["Authorization"];
if (!string.IsNullOrWhiteSpace(accessToken))
{
accessToken = accessToken.Split(" ").LastOrDefault();
}
}
if (accessToken.IsNullOrWhiteSpace())
{
accessToken = currentContext.Request.Query["access_token"].FirstOrDefault();
}
if (accessToken.IsNullOrWhiteSpace())
{
accessToken = currentContext.Request.Cookies[IoTHttpApiHostConst.DefaultCookieName];
}
currentContext.Token = accessToken;
currentContext.Request.Headers.Remove("Authorization");
currentContext.Request.Headers.Append("Authorization", $"Bearer {accessToken}");
return Task.CompletedTask;
}
};
});
}
/// <summary>
/// Redis缓存
/// </summary>
private void ConfigureCache(ServiceConfigurationContext context)
{
Configure<AbpDistributedCacheOptions>(
options => { options.KeyPrefix = "AbpPro:"; });
var configuration = context.Services.GetConfiguration();
var redis = ConnectionMultiplexer.Connect(configuration.GetValue<string>("Redis:Configuration"));
context.Services
.AddDataProtection()
.PersistKeysToStackExchangeRedis(redis, "AbpPro-Protection-Keys");
}
/// <summary>
/// 配置Identity
/// </summary>
private void ConfigureIdentity(ServiceConfigurationContext context)
{
context.Services.Configure<IdentityOptions>(options => { options.Lockout = new LockoutOptions() { AllowedForNewUsers = false }; });
}
private void ConfigurationSignalR(ServiceConfigurationContext context)
{
context.Services
.AddSignalR()
.AddStackExchangeRedis(context.Services.GetConfiguration().GetValue<string>("Redis:Configuration"),
options => { options.Configuration.ChannelPrefix = "JiShe.ServicePro"; });
}
private void ConfigureSwaggerServices(ServiceConfigurationContext context)
{
context.Services.AddSwaggerGen(
options =>
{
// 文件下载类型
options.MapType<FileContentResult>(() => new OpenApiSchema() { Type = "file" });
options.SwaggerDoc("AbpPro",
new OpenApiInfo { Title = "AbpPro API", Version = "v1" });
options.DocInclusionPredicate((docName, description) => true);
options.EnableAnnotations(); // 启用注解
options.DocumentFilter<HiddenAbpDefaultApiFilter>();
options.SchemaFilter<EnumSchemaFilter>();
// 加载所有xml注释，这里会导致swagger加载有点缓慢
var xmlPaths = Directory.GetFiles(AppContext.BaseDirectory, "*.xml");
foreach (var xml in xmlPaths)
{
options.IncludeXmlComments(xml, true);
}
options.AddSecurityDefinition(JwtBearerDefaults.AuthenticationScheme,
new OpenApiSecurityScheme()
{
Description = "直接在下框输入JWT生成的Token",
Name = "Authorization",
In = ParameterLocation.Header,
Type = SecuritySchemeType.Http,
Scheme = JwtBearerDefaults.AuthenticationScheme,
BearerFormat = "JWT"
});
options.AddSecurityRequirement(new OpenApiSecurityRequirement
{
{
new OpenApiSecurityScheme
{
Reference = new OpenApiReference
{
Type = ReferenceType.SecurityScheme, Id = "Bearer"
}
},
new List<string>()
}
});
options.AddSecurityDefinition("ApiKey", new OpenApiSecurityScheme()
{
Type = SecuritySchemeType.ApiKey,
In = ParameterLocation.Header,
Name = "Accept-Language",
Description = "多语言设置，系统预设语言有zh-Hans、en，默认为zh-Hans",
});
options.AddSecurityRequirement(new OpenApiSecurityRequirement
{
{
new OpenApiSecurityScheme
{
Reference = new OpenApiReference
{ Type = ReferenceType.SecurityScheme, Id = "ApiKey" }
},
Array.Empty<string>()
}
});
});
}
private void ConfigureCap(ServiceConfigurationContext context)
{
var configuration = context.Services.GetConfiguration();
context.AddAbpCap(capOptions =>
{
capOptions.SetCapDbConnectionString(configuration["ConnectionStrings:Default"]);
capOptions.UseEntityFramework<IoTDbContext>();
capOptions.UseRabbitMQ(option =>
{
option.HostName = configuration.GetValue<string>("Cap:RabbitMq:HostName");
option.UserName = configuration.GetValue<string>("Cap:RabbitMq:UserName");
option.Password = configuration.GetValue<string>("Cap:RabbitMq:Password");
option.Port = configuration.GetValue<int>("Cap:RabbitMq:Port");
});
capOptions.UseDashboard(options =>
{
options.AuthorizationPolicy = ServiceProCapPermissions.CapManagement.Cap;
});
});
}
/// <summary>
/// 审计日志
/// </summary>
private void ConfigureAuditLog(ServiceConfigurationContext context)
{
Configure<AbpAuditingOptions>
(
options =>
{
options.IsEnabled = true;
EntityHistorySelectorListExtensions.AddAllEntities(options.EntityHistorySelectors);
options.ApplicationName = "JiShe.ServicePro";
}
);
Configure<AbpAspNetCoreAuditingOptions>(
options =>
{
options.IgnoredUrls.Add("/AuditLogs/page");
options.IgnoredUrls.Add("/hangfire/stats");
options.IgnoredUrls.Add("/hangfire/recurring/trigger");
options.IgnoredUrls.Add("/cap");
options.IgnoredUrls.Add("/");
});
}
private void ConfigurationMultiTenancy()
{
Configure<AbpMultiTenancyOptions>(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; });
}
/// <summary>
/// 配置redis分布式锁
/// </summary>
private void ConfigurationDistributedLocking(ServiceConfigurationContext context)
{
var configuration = context.Services.GetConfiguration();
var connectionString = configuration.GetValue<string>("Redis:Configuration");
context.Services.AddSingleton<IDistributedLockProvider>(sp =>
{
var connection = ConnectionMultiplexer.Connect(connectionString);
return new RedisDistributedSynchronizationProvider(connection.GetDatabase());
});
}
}

96
host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs
View File

@ -1,96 +0,0 @@
namespace JiShe.IoT
{
[DependsOn(
typeof(IoTHttpApiModule),
typeof(ServiceProSharedHostingMicroserviceModule),
typeof(AbpAspNetCoreMvcUiMultiTenancyModule),
typeof(IoTEntityFrameworkCoreModule),
typeof(AbpAspNetCoreAuthenticationJwtBearerModule),
typeof(AbpAspNetCoreSerilogModule),
typeof(AbpAccountWebModule),
typeof(IoTApplicationModule),
// typeof(AbpProCapModule),
// typeof(AbpProCapEntityFrameworkCoreModule),
typeof(AbpAspNetCoreMvcUiBasicThemeModule),
typeof(AbpCachingStackExchangeRedisModule),
typeof(AbpDistributedLockingModule)
//typeof(AbpBackgroundJobsHangfireModule)
)]
public partial class IoTHttpApiHostModule : AbpModule
{
public override void OnPostApplicationInitialization(ApplicationInitializationContext context)
{
// 应用程序初始化的时候注册hangfire
//context.CreateRecurringJob();
base.OnPostApplicationInitialization(context);
}
public override void ConfigureServices(ServiceConfigurationContext context)
{
var configuration = context.Services.GetConfiguration();
ConfigureCache(context);
ConfigurationDistributedLocking(context);
ConfigureSwaggerServices(context);
ConfigureJwtAuthentication(context, configuration);
//ConfigureHangfire(context);
ConfigureMiniProfiler(context);
ConfigureIdentity(context);
//ConfigureCap(context);
ConfigureAuditLog(context);
ConfigurationSignalR(context);
ConfigurationMultiTenancy();
}
public override void OnApplicationInitialization(ApplicationInitializationContext context)
{
var app = context.GetApplicationBuilder();
var configuration = context.GetConfiguration();
app.UseServiceProRequestLocalization();
app.UseCorrelationId();
app.MapAbpStaticAssets();
if (configuration.GetValue("MiniProfiler:Enabled", false))
{
app.UseMiniProfiler();
}
app.UseRouting();
app.UseCors(IoTHttpApiHostConst.DefaultCorsPolicyName);
app.UseAuthentication();
if (MultiTenancyConsts.IsEnabled)
{
app.UseMultiTenancy();
}
app.UseAuthorization();
app.UseSwagger();
app.UseAbpSwaggerUI(options =>
{
options.SwaggerEndpoint("/swagger/AbpPro/swagger.json", "AbpPro API");
options.DocExpansion(DocExpansion.None);
options.DefaultModelsExpandDepth(-1);
});
app.UseAuditing();
app.UseAbpSerilogEnrichers();
app.UseUnitOfWork();
app.UseConfiguredEndpoints(endpoints =>
{
endpoints.MapHealthChecks("/health");
// endpoints.MapHangfireDashboard("/hangfire", new DashboardOptions()
// {
// Authorization = new[] { new CustomHangfireAuthorizeFilter() },
// IgnoreAntiforgeryToken = true
// });
});
if (configuration.GetValue("Consul:Enabled", false))
{
app.UseConsul();
}
}
}
}

68
host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj
View File

@ -1,68 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>JiShe.IoT</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>JiShe.IoT-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" />
<PackageReference Include="Volo.Abp.Account.Web" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" />
<PackageReference Include="Volo.Abp.Autofac" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" />
<PackageReference Include="Volo.Abp.Swashbuckle" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" />
<PackageReference Include="Serilog" />
<PackageReference Include="Serilog.AspNetCore" />
<PackageReference Include="Serilog.Exceptions" />
<PackageReference Include="Serilog.Extensions.Logging" />
<PackageReference Include="Serilog.Settings.Configuration" />
<PackageReference Include="Serilog.Sinks.Console" />
<PackageReference Include="Serilog.Sinks.Elasticsearch" />
<PackageReference Include="Serilog.Sinks.File" />
<PackageReference Include="Serilog.Sinks.Async" />
<PackageReference Include="Hangfire.Redis.StackExchange" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" />
<PackageReference Include="JiShe.ServicePro.CAP" />
<PackageReference Include="JiShe.ServicePro.CAP.EntityFrameworkCore" />
<PackageReference Include="DotNetCore.CAP.MySql" />
<PackageReference Include="DotNetCore.CAP.RabbitMQ" />
<PackageReference Include="DotNetCore.CAP.Dashboard" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" />
<PackageReference Include="MiniProfiler.EntityFrameworkCore" />
<PackageReference Include="MiniProfiler.Shared" />
<PackageReference Include="Volo.Abp.BackgroundJobs.HangFire" />
<PackageReference Include="Volo.Abp.DistributedLocking"/>
<PackageReference Include="DistributedLock.Redis"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\JiShe.IoT.Application\JiShe.IoT.Application.csproj"/>
<ProjectReference Include="..\..\src\JiShe.IoT.EntityFrameworkCore\JiShe.IoT.EntityFrameworkCore.csproj"/>
<ProjectReference Include="..\..\src\JiShe.IoT.HttpApi\JiShe.IoT.HttpApi.csproj"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="JiShe.ServicePro.Shared.Hosting.Microservices"/>
</ItemGroup>
<ItemGroup>
<Compile Remove="Logs\**"/>
<Content Remove="Logs\**"/>
<EmbeddedResource Remove="Logs\**"/>
<None Remove="Logs\**"/>
</ItemGroup>
<ItemGroup>
<Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\*\*.abppkg*.json"/>
</ItemGroup>
</Project>

48
host/JiShe.IoT.HttpApi.Host/Program.cs
View File

@ -1,48 +0,0 @@
using Serilog.Events;
namespace JiShe.IoT;
public class Program
{
public static async Task<int> Main(string[] args)
{
Log.Logger = new LoggerConfiguration()
.WriteTo.Async(c => c.File("Logs/logs.txt"))
.WriteTo.Async(c => c.Console())
.CreateBootstrapLogger();
try
{
Log.Information("JiShe.ServicePro.HttpApi.Host.");
var builder = WebApplication.CreateBuilder(args);
builder.Host
.AddAppSettingsSecretsJson()
.UseAutofac()
.UseSerilog((context, loggerConfiguration) =>
{
SerilogToEsExtensions.SetSerilogConfiguration(
loggerConfiguration,
context.Configuration);
});
await builder.AddApplicationAsync<JiShe.IoT.IoTHttpApiHostModule>();
var app = builder.Build();
await app.InitializeApplicationAsync();
await app.RunAsync();
return 0;
}
catch (Exception ex)
{
if (ex is HostAbortedException)
{
throw;
}
Log.Fatal(ex, "Host terminated unexpectedly!");
return 1;
}
finally
{
await Log.CloseAndFlushAsync();
}
}
}

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

@ -1,63 +0,0 @@
{
"App": {
"SelfUrl": "http://localhost:44315",
"CorsOrigins": "https://*.IoT.com,http://localhost:4200,http://localhost:3100,http://localhost:80,http://localhost"
},
"ConnectionStrings": {
"Default": "Data Source=118.190.144.92;Port=33306;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": {
"Redis": {
"Host": "192.168.5.9:6380,password=1q2w3e!@#",
"DB": "2"
}
},
"Redis": {
"Configuration": "192.168.5.9:6380,password=1q2w3e!@#,defaultdatabase=5"
},
"Kafka": {
"BootstrapServers": "192.168.5.9:29092,192.168.5.9:39092,192.168.5.9:49092",
"EnableFilter": true,
"EnableAuthorization": false,
"SaslUserName": "lixiao",
"SaslPassword": "lixiao1980",
"KafkaReplicationFactor": 3,
"NumPartitions": 30,
"TaskThreadCount": -1,
"FirstCollectionTime": "2025-04-22 16:07:00"
},
"IoTDBOptions": {
"UserName": "root",
"Password": "root",
"ClusterList": [ "121.42.175.177:16667" ],
"PoolSize": 32,
"DataBaseName": "energy",
"OpenDebugMode": true,
"UseTableSessionPoolByDefault": false
},
"Jwt": {
"Audience": "JiShe.IoT",
"SecurityKey": "dzehzRz9a8asdfasfdadfasdfasdfafsdadfasbasdf=",
"Issuer": "JiShe.IoT",
"ExpirationTime": 2
},
"Cap": {
"RabbitMq": {
"HostName": "localhost",
"UserName": "admin",
"Password": "1q2w3E*",
"Port": 5672
}
},
"FreeRedisOptions": {
"ConnectionString": "192.168.5.9:6380,password=1q2w3e!@#,defaultdatabase=1",
"UseDistributedCache": true
},
"FreeSqlProviderOptions": {
"UsePrepayDB": true,
"UseEnergyDB": false,
"PrintLog": false
}
}

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

@ -1,32 +0,0 @@
{
"App": {
"SelfUrl": "http://localhost:44315",
"CorsOrigins": "https://*.IoT.com,http://localhost:4200,http://localhost:3100,http://localhost:80,http://localhost"
},
"ConnectionStrings": {
"Default": "Data Source=localhost;Port=3306;Database=JiSheIoTProDB;uid=root;pwd=IFKy!Cufe3V9sYcz;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
},
"Redis": {
"Configuration": "localhost,password=1q2w3E*,defaultdatabase=1"
},
"Jwt": {
"Audience": "JiShe.IoT",
"SecurityKey": "dzehzRz9a8asdfasfdadfasdfasdfafsdadfasbasdf=",
"Issuer": "JiShe.IoT",
"ExpirationTime": 2
},
"Cap": {
"RabbitMq": {
"HostName": "localhost",
"UserName": "admin",
"Password": "1q2w3E*",
"Port": 5672
}
},
"Hangfire": {
"Redis": {
"Host": "localhost,password=1q2w3E*",
"DB": "2"
}
}
}

36
host/JiShe.IoT.HttpApi.Host/appsettings.json
View File

@ -1,36 +0,0 @@
{
"Serilog": {
"Using": [
"Serilog.Sinks.Console",
"Serilog.Sinks.File"
],
"MinimumLevel": {
"Default": "Debug",
"Override": {
"Microsoft": "Information",
"Volo.Abp": "Information",
"Hangfire": "Information",
"DotNetCore.CAP": "Information",
"Serilog.AspNetCore": "Information",
"Microsoft.EntityFrameworkCore": "Warning",
"Microsoft.AspNetCore": "Information"
}
},
"WriteTo": [
{
"Name": "Console"
},
{
"Name": "File",
"Args": {
"path": "logs/logs-.txt",
"rollingInterval": "Day"
}
}
]
},
"App": {
"SelfUrl": "http://localhost:44315",
"CorsOrigins": "https://*.IoT.com,http://localhost:4200,http://localhost:3100"
}
}

BIN
icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.1 KiB

8
src/JiShe.IoT.Application.Contracts/GlobalUsings.cs → src/JiShe.IOT.Application.Contracts/GlobalUsings.cs
View File

@ -2,10 +2,10 @@
global using System; global using System;
global using System.Threading.Tasks; global using System.Threading.Tasks;
global using JiShe.ServicePro.BasicManagement; global using Lion.AbpPro.BasicManagement;
global using JiShe.ServicePro.DataDictionaryManagement; global using Lion.AbpPro.DataDictionaryManagement;
global using JiShe.ServicePro.LanguageManagement; global using Lion.AbpPro.LanguageManagement;
global using JiShe.ServicePro.NotificationManagement; global using Lion.AbpPro.NotificationManagement;
global using Volo.Abp.Application.Services; global using Volo.Abp.Application.Services;
global using Volo.Abp.Authorization.Permissions; global using Volo.Abp.Authorization.Permissions;
global using Volo.Abp.DependencyInjection; global using Volo.Abp.DependencyInjection;

18
src/JiShe.IOT.Application.Contracts/IOTApplicationContractsModule.cs Normal file
View File

@ -0,0 +1,18 @@
namespace JiShe.IOT
{
[DependsOn(
typeof(IOTDomainSharedModule),
typeof(AbpObjectExtendingModule),
typeof(BasicManagementApplicationContractsModule),
typeof(NotificationManagementApplicationContractsModule),
typeof(DataDictionaryManagementApplicationContractsModule),
typeof(LanguageManagementApplicationContractsModule)
)]
public class IOTApplicationContractsModule : AbpModule
{
public override void PreConfigureServices(ServiceConfigurationContext context)
{
IOTDtoExtensions.Configure();
}
}
}

4
src/JiShe.IoT.Application.Contracts/IoTDtoExtensions.cs → src/JiShe.IOT.Application.Contracts/IOTDtoExtensions.cs
View File

@ -1,6 +1,6 @@
namespace JiShe.IoT namespace JiShe.IOT
{ {
public static class IoTDtoExtensions public static class IOTDtoExtensions
{ {
private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();

23
src/JiShe.IOT.Application.Contracts/JiShe.IOT.Application.Contracts.csproj Normal file
View File

@ -0,0 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>JiShe.IOT</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\JiShe.IOT.Domain.Shared\JiShe.IOT.Domain.Shared.csproj"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.ObjectExtending"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Lion.AbpPro.BasicManagement.Application.Contracts"/>
<PackageReference Include="Lion.AbpPro.NotificationManagement.Application.Contracts"/>
<PackageReference Include="Lion.AbpPro.DataDictionaryManagement.Application.Contracts"/>
<PackageReference Include="Lion.AbpPro.LanguageManagement.Application.Contracts"/>
</ItemGroup>
</Project>

2
src/JiShe.IoT.Application.Contracts/Jobs/IRecurringJob.cs → src/JiShe.IOT.Application.Contracts/Jobs/IRecurringJob.cs
View File

@ -1,4 +1,4 @@
namespace JiShe.IoT.Jobs namespace JiShe.IOT.Jobs
{ {
public interface IRecurringJob : ITransientDependency public interface IRecurringJob : ITransientDependency
{ {

6
src/JiShe.IoT.Application.Contracts/Permissions/IoTPermissionDefinitionProvider.cs → src/JiShe.IOT.Application.Contracts/Permissions/IOTPermissionDefinitionProvider.cs
View File

@ -1,6 +1,6 @@
namespace JiShe.IoT.Permissions namespace JiShe.IOT.Permissions
{ {
public class IoTPermissionDefinitionProvider : PermissionDefinitionProvider public class IOTPermissionDefinitionProvider : PermissionDefinitionProvider
{ {
public override void Define(IPermissionDefinitionContext context) public override void Define(IPermissionDefinitionContext context)
{ {
@ -11,7 +11,7 @@ namespace JiShe.IoT.Permissions
private static LocalizableString L(string name) private static LocalizableString L(string name)
{ {
return LocalizableString.Create<IoTResource>(name); return LocalizableString.Create<IOTResource>(name);
} }
} }
} }

7
src/JiShe.IOT.Application.Contracts/Permissions/IOTPermissions.cs Normal file
View File

@ -0,0 +1,7 @@
namespace JiShe.IOT.Permissions
{
public static class IOTPermissions
{
}
}

11
src/JiShe.IoT.Application/GlobalUsings.cs → src/JiShe.IOT.Application/GlobalUsings.cs
View File

@ -4,11 +4,12 @@ global using System;
global using System.Collections.Generic; global using System.Collections.Generic;
global using System.Linq; global using System.Linq;
global using System.Threading.Tasks; global using System.Threading.Tasks;
global using JiShe.ServicePro.BasicManagement; global using Lion.AbpPro.BasicManagement;
global using JiShe.ServicePro.DataDictionaryManagement; global using Lion.AbpPro.DataDictionaryManagement;
global using JiShe.ServicePro.LanguageManagement; global using Lion.AbpPro.LanguageManagement;
global using JiShe.ServicePro.NotificationManagement; global using Lion.AbpPro.NotificationManagement;
global using JiShe.IoT.Permissions; global using JiShe.IOT.FreeSqlRepository;
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;
global using Volo.Abp.Application.Services; global using Volo.Abp.Application.Services;

12
src/JiShe.IOT.Application/IOTAppService.cs Normal file
View File

@ -0,0 +1,12 @@
namespace JiShe.IOT
{
/* Inherit your application services from this class.
*/
public abstract class IOTAppService : ApplicationService
{
protected IOTAppService()
{
LocalizationResource = typeof(IOTResource);
}
}
}

10
src/JiShe.IOT.Application/IOTApplicationAutoMapperProfile.cs Normal file
View File

@ -0,0 +1,10 @@
namespace JiShe.IOT
{
public class IOTApplicationAutoMapperProfile : Profile
{
public IOTApplicationAutoMapperProfile()
{
}
}
}

23
src/JiShe.IOT.Application/IOTApplicationModule.cs Normal file
View File

@ -0,0 +1,23 @@
namespace JiShe.IOT
{
[DependsOn(
typeof(IOTDomainModule),
typeof(IOTApplicationContractsModule),
typeof(BasicManagementApplicationModule),
typeof(NotificationManagementApplicationModule),
typeof(DataDictionaryManagementApplicationModule),
typeof(LanguageManagementApplicationModule),
typeof(IOTFreeSqlModule)
)]
public class IOTApplicationModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
Configure<AbpAutoMapperOptions>(options =>
{
options.AddMaps<IOTApplicationModule>();
});
}
}
}

26
src/JiShe.IOT.Application/JiShe.IOT.Application.csproj Normal file
View File

@ -0,0 +1,26 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>JiShe.IOT</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\JiShe.IOT.Domain\JiShe.IOT.Domain.csproj"/>
<ProjectReference Include="..\JiShe.IOT.Application.Contracts\JiShe.IOT.Application.Contracts.csproj"/>
<ProjectReference Include="..\JiShe.IOT.FreeSqlRepository\JiShe.IOT.FreeSqlRepository.csproj"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Lion.AbpPro.BasicManagement.Application"/>
<PackageReference Include="Lion.AbpPro.NotificationManagement.Application"/>
<PackageReference Include="Lion.AbpPro.DataDictionaryManagement.Application"/>
<PackageReference Include="Lion.AbpPro.LanguageManagement.Application"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.BackgroundJobs.HangFire"/>
</ItemGroup>
</Project>

2
src/JiShe.IoT.Application/Jobs/TestJob.cs → src/JiShe.IOT.Application/Jobs/TestJob.cs
View File

@ -1,4 +1,4 @@
namespace JiShe.IoT.Jobs namespace JiShe.IOT.Jobs
{ {
public class TestJob : IRecurringJob public class TestJob : IRecurringJob
{ {

2
src/JiShe.IOT.Application/Properties/AssemblyInfo.cs Normal file
View File

@ -0,0 +1,2 @@
using System.Runtime.CompilerServices;
[assembly:InternalsVisibleToAttribute("JiShe.IOT.Application.Tests")]

6
src/JiShe.IoT.DbMigrator/DbMigratorHostedService.cs → src/JiShe.IOT.DbMigrator/DbMigratorHostedService.cs
View File

@ -1,6 +1,6 @@
using Volo.Abp.Data; using Volo.Abp.Data;
namespace JiShe.IoT.DbMigrator namespace JiShe.IOT.DbMigrator
{ {
public class DbMigratorHostedService : IHostedService public class DbMigratorHostedService : IHostedService
{ {
@ -15,7 +15,7 @@ namespace JiShe.IoT.DbMigrator
public async Task StartAsync(CancellationToken cancellationToken) public async Task StartAsync(CancellationToken cancellationToken)
{ {
using (var application = await AbpApplicationFactory.CreateAsync<IoTDbMigratorModule>(options => using (var application = await AbpApplicationFactory.CreateAsync<IOTDbMigratorModule>(options =>
{ {
options.Services.ReplaceConfiguration(_configuration); options.Services.ReplaceConfiguration(_configuration);
options.UseAutofac(); options.UseAutofac();
@ -28,7 +28,7 @@ namespace JiShe.IoT.DbMigrator
await application await application
.ServiceProvider .ServiceProvider
.GetRequiredService<IoTDbMigrationService>() .GetRequiredService<IOTDbMigrationService>()
.MigrateAsync(); .MigrateAsync();
await application.ShutdownAsync(); await application.ShutdownAsync();

19
src/JiShe.IOT.DbMigrator/Dockerfile Normal file
View File

@ -0,0 +1,19 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0
# 创建目录
RUN mkdir /app
COPY publish /app
# 设置工作目录
WORKDIR /app
# 设置时区 .net6 才有这个问题
ENV TZ=Asia/Shanghai
# 设置环境变量
ENV ASPNETCORE_ENVIRONMENT=Production
ENTRYPOINT ["dotnet", "JiShe.IOT.DbMigrator.dll"]

4
src/JiShe.IoT.DbMigrator/GlobalUsings.cs → src/JiShe.IOT.DbMigrator/GlobalUsings.cs
View File

@ -4,8 +4,8 @@ global using System;
global using System.IO; global using System.IO;
global using System.Threading; global using System.Threading;
global using System.Threading.Tasks; global using System.Threading.Tasks;
global using JiShe.IoT.Data; global using JiShe.IOT.Data;
global using JiShe.IoT.EntityFrameworkCore; global using JiShe.IOT.EntityFrameworkCore;
global using Microsoft.Extensions.Configuration; global using Microsoft.Extensions.Configuration;
global using Microsoft.Extensions.DependencyInjection; global using Microsoft.Extensions.DependencyInjection;
global using Microsoft.Extensions.Hosting; global using Microsoft.Extensions.Hosting;

8
src/JiShe.IoT.DbMigrator/IoTDbMigratorModule.cs → src/JiShe.IOT.DbMigrator/IOTDbMigratorModule.cs
View File

@ -1,13 +1,13 @@
using Volo.Abp.Localization; using Volo.Abp.Localization;
namespace JiShe.IoT.DbMigrator namespace JiShe.IOT.DbMigrator
{ {
[DependsOn( [DependsOn(
typeof(AbpAutofacModule), typeof(AbpAutofacModule),
typeof(IoTEntityFrameworkCoreModule), typeof(IOTEntityFrameworkCoreModule),
typeof(IoTApplicationContractsModule) typeof(IOTApplicationContractsModule)
)] )]
public class IoTDbMigratorModule : AbpModule public class IOTDbMigratorModule : AbpModule
{ {
public override void ConfigureServices(ServiceConfigurationContext context) public override void ConfigureServices(ServiceConfigurationContext context)
{ {

4
src/JiShe.IoT.DbMigrator/JiShe.IoT.DbMigrator.csproj → src/JiShe.IOT.DbMigrator/JiShe.IOT.DbMigrator.csproj
View File

@ -16,8 +16,8 @@
<ItemGroup> <ItemGroup>
<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.EntityFrameworkCore\JiShe.IoT.EntityFrameworkCore.csproj"/> <ProjectReference Include="..\JiShe.IOT.EntityFrameworkCore\JiShe.IOT.EntityFrameworkCore.csproj"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
src/JiShe.IoT.DbMigrator/Program.cs → src/JiShe.IOT.DbMigrator/Program.cs
View File

@ -1,4 +1,4 @@
namespace JiShe.IoT.DbMigrator namespace JiShe.IOT.DbMigrator
{ {
class Program class Program
{ {
@ -9,9 +9,9 @@ namespace JiShe.IoT.DbMigrator
.MinimumLevel.Override("Microsoft", LogEventLevel.Warning) .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
.MinimumLevel.Override("Volo.Abp", LogEventLevel.Warning) .MinimumLevel.Override("Volo.Abp", LogEventLevel.Warning)
#if DEBUG #if DEBUG
.MinimumLevel.Override("JiShe.IoT", LogEventLevel.Debug) .MinimumLevel.Override("JiShe.IOT", LogEventLevel.Debug)
#else #else
.MinimumLevel.Override("JiShe.IoT", LogEventLevel.Information) .MinimumLevel.Override("JiShe.IOT", LogEventLevel.Information)
#endif #endif
.Enrich.FromLogContext() .Enrich.FromLogContext()
.WriteTo.Async(c => c.File("Logs/logs.txt")) .WriteTo.Async(c => c.File("Logs/logs.txt"))

5
src/JiShe.IOT.DbMigrator/appsettings.json Normal file
View File

@ -0,0 +1,5 @@
{
"ConnectionStrings": {
"Default": "Data Source=118.190.144.92;Port=33306;Database=JiSheIOTDB;uid=root;pwd=admin123;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
}
}

0
src/JiShe.IoT.DbMigrator/tempkey.rsa → src/JiShe.IOT.DbMigrator/tempkey.rsa
View File

12
src/JiShe.IoT.Domain.Shared/GlobalUsings.cs → src/JiShe.IOT.Domain.Shared/GlobalUsings.cs
View File

@ -7,12 +7,12 @@ global using System.Linq;
global using System.Reflection; global using System.Reflection;
global using System.Text; global using System.Text;
global using System.Threading.Tasks; global using System.Threading.Tasks;
global using JiShe.ServicePro.BasicManagement; global using Lion.AbpPro.BasicManagement;
global using JiShe.ServicePro.BasicManagement.Localization; global using Lion.AbpPro.BasicManagement.Localization;
global using JiShe.ServicePro.Core; global using Lion.AbpPro.Core;
global using JiShe.ServicePro.DataDictionaryManagement; global using Lion.AbpPro.DataDictionaryManagement;
global using JiShe.ServicePro.LanguageManagement; global using Lion.AbpPro.LanguageManagement;
global using JiShe.ServicePro.NotificationManagement; global using Lion.AbpPro.NotificationManagement;
global using Microsoft.Extensions.DependencyInjection; global using Microsoft.Extensions.DependencyInjection;
global using Microsoft.Extensions.Localization; global using Microsoft.Extensions.Localization;
global using Volo.Abp; global using Volo.Abp;

7
src/JiShe.IOT.Domain.Shared/IOTDomainErrorCodes.cs Normal file
View File

@ -0,0 +1,7 @@
namespace JiShe.IOT
{
public static class IOTDomainErrorCodes
{
}
}

6
src/JiShe.IoT.Domain.Shared/IoTDomainSharedConsts.cs → src/JiShe.IOT.Domain.Shared/IOTDomainSharedConsts.cs
View File

@ -1,9 +1,9 @@
namespace JiShe.IoT; namespace JiShe.IOT;
public class IoTDomainSharedConsts public class IOTDomainSharedConsts
{ {
/// <summary>名称空间</summary> /// <summary>名称空间</summary>
public const string NameSpace = "JiShe.IoT"; public const string NameSpace = "JiShe.IOT";
/// <summary>默认语言</summary> /// <summary>默认语言</summary>
public const string DefaultCultureName = "zh-Hans"; public const string DefaultCultureName = "zh-Hans";
} }

44
src/JiShe.IOT.Domain.Shared/IOTDomainSharedModule.cs Normal file
View File

@ -0,0 +1,44 @@
namespace JiShe.IOT
{
[DependsOn(
typeof(BasicManagementDomainSharedModule),
typeof(NotificationManagementDomainSharedModule),
typeof(DataDictionaryManagementDomainSharedModule),
typeof(LanguageManagementDomainSharedModule),
typeof(AbpProCoreModule)
)]
public class IOTDomainSharedModule : AbpModule
{
public override void PreConfigureServices(ServiceConfigurationContext context)
{
IOTGlobalFeatureConfigurator.Configure();
IOTModuleExtensionConfigurator.Configure();
}
public override void ConfigureServices(ServiceConfigurationContext context)
{
Configure<AbpVirtualFileSystemOptions>(options =>
{
options.FileSets.AddEmbedded<IOTDomainSharedModule>(IOTDomainSharedConsts.NameSpace);
});
Configure<AbpLocalizationOptions>(options =>
{
options.Resources
.Add<IOTResource>(IOTDomainSharedConsts.DefaultCultureName)
.AddVirtualJson("/Localization/IOT")
.AddBaseTypes(typeof(BasicManagementResource))
.AddBaseTypes(typeof(AbpTimingResource));
options.DefaultResourceType = typeof(IOTResource);
});
Configure<AbpExceptionLocalizationOptions>(options =>
{
options.MapCodeNamespace(IOTDomainSharedConsts.NameSpace, typeof(IOTResource));
});
}
}
}

4
src/JiShe.IoT.Domain.Shared/IoTGlobalFeatureConfigurator.cs → src/JiShe.IOT.Domain.Shared/IOTGlobalFeatureConfigurator.cs
View File

@ -1,6 +1,6 @@
namespace JiShe.IoT namespace JiShe.IOT
{ {
public static class IoTGlobalFeatureConfigurator public static class IOTGlobalFeatureConfigurator
{ {
private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();

4
src/JiShe.IoT.Domain.Shared/IoTModuleExtensionConfigurator.cs → src/JiShe.IOT.Domain.Shared/IOTModuleExtensionConfigurator.cs
View File

@ -1,6 +1,6 @@
namespace JiShe.IoT namespace JiShe.IOT
{ {
public static class IoTModuleExtensionConfigurator public static class IOTModuleExtensionConfigurator
{ {
private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();

22
src/JiShe.IOT.Domain.Shared/JiShe.IOT.Domain.Shared.csproj Normal file
View File

@ -0,0 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>JiShe.IOT</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="Localization\IOT\*.json"/>
<Content Remove="Localization\IOT\*.json"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Lion.AbpPro.Core"/>
<PackageReference Include="Lion.AbpPro.BasicManagement.Domain.Shared"/>
<PackageReference Include="Lion.AbpPro.NotificationManagement.Domain.Shared"/>
<PackageReference Include="Lion.AbpPro.DataDictionaryManagement.Domain.Shared"/>
<PackageReference Include="Lion.AbpPro.LanguageManagement.Domain.Shared"/>
</ItemGroup>
</Project>

0
src/JiShe.IoT.Domain.Shared/Localization/IoT/ar.json → src/JiShe.IOT.Domain.Shared/Localization/IOT/ar.json
View File

0
src/JiShe.IoT.Domain.Shared/Localization/IoT/cs.json → src/JiShe.IOT.Domain.Shared/Localization/IOT/cs.json
View File

0
src/JiShe.IoT.Domain.Shared/Localization/IoT/de-DE.json → src/JiShe.IOT.Domain.Shared/Localization/IOT/de-DE.json
View File

0
src/JiShe.IoT.Domain.Shared/Localization/IoT/en-GB.json → src/JiShe.IOT.Domain.Shared/Localization/IOT/en-GB.json
View File

0
src/JiShe.IoT.Domain.Shared/Localization/IoT/en.json → src/JiShe.IOT.Domain.Shared/Localization/IOT/en.json
View File

0
src/JiShe.IoT.Domain.Shared/Localization/IoT/es.json → src/JiShe.IOT.Domain.Shared/Localization/IOT/es.json
View File

0
src/JiShe.IoT.Domain.Shared/Localization/IoT/fr.json → src/JiShe.IOT.Domain.Shared/Localization/IOT/fr.json
View File

0
src/JiShe.IoT.Domain.Shared/Localization/IoT/hu.json → src/JiShe.IOT.Domain.Shared/Localization/IOT/hu.json
View File

0
src/JiShe.IoT.Domain.Shared/Localization/IoT/nl.json → src/JiShe.IOT.Domain.Shared/Localization/IOT/nl.json
View File

0
src/JiShe.IoT.Domain.Shared/Localization/IoT/pl-PL.json → src/JiShe.IOT.Domain.Shared/Localization/IOT/pl-PL.json
View File

0
src/JiShe.IoT.Domain.Shared/Localization/IoT/pt-BR.json → src/JiShe.IOT.Domain.Shared/Localization/IOT/pt-BR.json
View File

0
src/JiShe.IoT.Domain.Shared/Localization/IoT/ru.json → src/JiShe.IOT.Domain.Shared/Localization/IOT/ru.json
View File

0
src/JiShe.IoT.Domain.Shared/Localization/IoT/sl.json → src/JiShe.IOT.Domain.Shared/Localization/IOT/sl.json
View File

0
src/JiShe.IoT.Domain.Shared/Localization/IoT/tr.json → src/JiShe.IOT.Domain.Shared/Localization/IOT/tr.json
View File

0
src/JiShe.IoT.Domain.Shared/Localization/IoT/vi.json → src/JiShe.IOT.Domain.Shared/Localization/IOT/vi.json
View File

0
src/JiShe.IoT.Domain.Shared/Localization/IoT/zh-Hans.json → src/JiShe.IOT.Domain.Shared/Localization/IOT/zh-Hans.json
View File

0
src/JiShe.IoT.Domain.Shared/Localization/IoT/zh-Hant.json → src/JiShe.IOT.Domain.Shared/Localization/IOT/zh-Hant.json
View File

8
src/JiShe.IOT.Domain.Shared/Localization/IOTResource.cs Normal file
View File

@ -0,0 +1,8 @@
namespace JiShe.IOT
{
[LocalizationResourceName("IOT")]
public class IOTResource
{
}
}

2
src/JiShe.IoT.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs → src/JiShe.IOT.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs
View File

@ -1,4 +1,4 @@
namespace JiShe.IoT.MultiTenancy namespace JiShe.IOT.MultiTenancy
{ {
public static class MultiTenancyConsts public static class MultiTenancyConsts
{ {

Some files were not shown because too many files have changed in this diff Show More