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

优化字典

Browse Source
This commit is contained in:
ChenYi 2026-03-31 16:36:11 +08:00
parent a49912ec48
commit 562edc3792
6 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dev.Dockerfile
View File

@ -1,12 +1,12 @@
# FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base # FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
FROM registry.cn-qingdao.aliyuncs.com/jisheyun/aspnetcore:10.0.02_basic_ub24_dmpv35 AS base FROM registry.cn-qingdao.aliyuncs.com/jisheyun/aspnetcore:10.0.05_basic_ub24_dmpv35 AS base
WORKDIR /app WORKDIR /app
EXPOSE 10500 EXPOSE 10500
EXPOSE 443 EXPOSE 443
ENV TZ=Asia/Shanghai ENV TZ=Asia/Shanghai
ENV ASPNETCORE_ENVIRONMENT=Development ENV ASPNETCORE_ENVIRONMENT=Development
FROM mcr.microsoft.com/dotnet/sdk:10.0.102 AS build FROM registry.cn-qingdao.aliyuncs.com/jisheyun/netsdk:10.0.201-noble AS build
COPY ["JiShe.IoT.Admin.sln", "."] COPY ["JiShe.IoT.Admin.sln", "."]
COPY ["Directory.Build.JiShe.targets", "."] COPY ["Directory.Build.JiShe.targets", "."]
COPY ["Directory.Build.Microsoft.targets", "."] COPY ["Directory.Build.Microsoft.targets", "."]

2
Directory.Build.targets
View File

@ -111,7 +111,7 @@
<!-- Humanizer 中文格式包--> <!-- Humanizer 中文格式包-->
<PackageReference Update="Humanizer.Core.zh-Hans" Version="2.14.1"/> <PackageReference Update="Humanizer.Core.zh-Hans" Version="2.14.1"/>
<PackageReference Update="Scriban" Version="6.6.0" /> <PackageReference Update="Scriban" Version="7.0.6" />
<PackageReference Update="Otp.NET" Version="1.4.0" /> <PackageReference Update="Otp.NET" Version="1.4.0" />
<PackageReference Update="QRCoder" Version="1.6.0" /> <PackageReference Update="QRCoder" Version="1.6.0" />

16
Dockerfile
View File

@ -1,12 +1,12 @@
#FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base # FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
FROM registry.cn-qingdao.aliyuncs.com/jisheyun/aspnetcore:9.0.6_ub24_simsun_pdp_v341 AS base FROM registry.cn-qingdao.aliyuncs.com/jisheyun/aspnetcore:10.0.05_basic_ub24_dmpv35 AS base
WORKDIR /app WORKDIR /app
EXPOSE 10500 EXPOSE 10500
EXPOSE 443 EXPOSE 443
ENV TZ=Asia/Shanghai ENV TZ=Asia/Shanghai
ENV ASPNETCORE_ENVIRONMENT=Production ENV ASPNETCORE_ENVIRONMENT=Development
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build FROM registry.cn-qingdao.aliyuncs.com/jisheyun/netsdk:10.0.201-noble AS build
COPY ["JiShe.IoT.Admin.sln", "."] COPY ["JiShe.IoT.Admin.sln", "."]
COPY ["Directory.Build.JiShe.targets", "."] COPY ["Directory.Build.JiShe.targets", "."]
COPY ["Directory.Build.Microsoft.targets", "."] COPY ["Directory.Build.Microsoft.targets", "."]
@ -16,16 +16,14 @@ COPY ["Directory.Build.Volo.targets", "."]
COPY ["NuGet.Config", "."] COPY ["NuGet.Config", "."]
COPY ["host/", "host/"] COPY ["host/", "host/"]
COPY ["src/", "src/"] COPY ["src/", "src/"]
COPY ["JiShe.ServicePro/", "JiShe.ServicePro/"]
WORKDIR /host/JiShe.IoT.HttpApi.Host WORKDIR /host/JiShe.IoT.HttpApi.Host
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"]

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

@ -47,7 +47,7 @@ public class Program
//options.Limits.MaxConcurrentConnections = 1000;//限制并发连接数，默认无限制 //options.Limits.MaxConcurrentConnections = 1000;//限制并发连接数，默认无限制
}); });
builder.WebHost.UseUrls($"http://+:20500"); builder.WebHost.UseUrls($"http://+:10500");
var app = builder.Build(); var app = builder.Build();
await app.InitializeApplicationAsync(); await app.InitializeApplicationAsync();
await app.RunAsync(); await app.RunAsync();

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

@ -5,7 +5,7 @@
}, },
"ConnectionStrings": { "ConnectionStrings": {
//"Default": "Data Source=192.168.111.174;Port=13306;Database=JiSheIoTProDB386;uid=root;pwd=JiShe!aqG#5kGgh&0;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;TreatTinyAsBoolean=false;SslMode=None;Pooling=true;" //"Default": "Data Source=192.168.111.174;Port=13306;Database=JiSheIoTProDB386;uid=root;pwd=JiShe!aqG#5kGgh&0;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;TreatTinyAsBoolean=false;SslMode=None;Pooling=true;"
"Default": "Host=192.168.111.174;Port=5432;Database=jisheiotprodb68;Username=postgres;Password=JiShe!aqG#5kGgh&0;Encoding=UTF8;Pooling=true;Pooling=true;Minimum Pool Size=5;Maximum Pool Size=100;" "Default": "Host=192.168.111.174;Port=5432;Database=jisheiotprodb58;Username=postgres;Password=JiShe!aqG#5kGgh&0;Encoding=UTF8;Pooling=true;Pooling=true;Minimum Pool Size=5;Maximum Pool Size=100;"
}, },
"Hangfire": { "Hangfire": {
"Redis": { "Redis": {

18
src/JiShe.IoT.Application/IoTPlatformAggregation/IoTPlatformAggregationService.cs
View File

@ -237,6 +237,15 @@ namespace JiShe.IoT.IoTPlatformAggregation
} }
} }
if (!string.IsNullOrWhiteSpace(input.FiledType) && input.FiledType.ToLowerInvariant().Contains("service"))
{
var tempServiceResult = OneNETAllThingModel.GetAllServicesSelectResult(oneNETAllThingModel.Services);
if (tempServiceResult != null)
{
selectResults.AddRange(tempServiceResult);
}
}
var tempPropertyCacheResult = OneNETAllThingModel.GetAllPropertiesSelectResult(oneNETAllThingModel.Properties); var tempPropertyCacheResult = OneNETAllThingModel.GetAllPropertiesSelectResult(oneNETAllThingModel.Properties);
if (tempPropertyCacheResult != null) if (tempPropertyCacheResult != null)
{ {
@ -272,6 +281,15 @@ namespace JiShe.IoT.IoTPlatformAggregation
} }
} }
if (!string.IsNullOrWhiteSpace(input.FiledType) && input.FiledType.ToLowerInvariant().Contains("service"))
{
var tempEventResult = OneNETAllThingModel.GetAllServicesSelectResult(oneNETAllThingModel.Services);
if (tempEventResult != null)
{
selectResults.AddRange(tempEventResult);
}
}
var tempPropertyResult = OneNETAllThingModel.GetAllPropertiesSelectResult(oneNETAllThingModel.Properties); var tempPropertyResult = OneNETAllThingModel.GetAllPropertiesSelectResult(oneNETAllThingModel.Properties);
if (tempPropertyResult != null) if (tempPropertyResult != null)
{ {