diff --git a/Dev.Dockerfile b/Dev.Dockerfile
index c5da1ac..c1592ce 100644
--- a/Dev.Dockerfile
+++ b/Dev.Dockerfile
@@ -1,12 +1,12 @@
# 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
EXPOSE 10500
EXPOSE 443
ENV TZ=Asia/Shanghai
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 ["Directory.Build.JiShe.targets", "."]
COPY ["Directory.Build.Microsoft.targets", "."]
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 6b4bf6b..4cd3b93 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -111,7 +111,7 @@
-
+
diff --git a/Dockerfile b/Dockerfile
index 41dab49..46f1671 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
-#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 mcr.microsoft.com/dotnet/aspnet:9.0 AS base
+FROM registry.cn-qingdao.aliyuncs.com/jisheyun/aspnetcore:10.0.05_basic_ub24_dmpv35 AS base
WORKDIR /app
EXPOSE 10500
EXPOSE 443
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 ["Directory.Build.JiShe.targets", "."]
COPY ["Directory.Build.Microsoft.targets", "."]
@@ -16,16 +16,14 @@ COPY ["Directory.Build.Volo.targets", "."]
COPY ["NuGet.Config", "."]
COPY ["host/", "host/"]
COPY ["src/", "src/"]
+COPY ["JiShe.ServicePro/", "JiShe.ServicePro/"]
WORKDIR /host/JiShe.IoT.HttpApi.Host
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
WORKDIR /app
COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "JiShe.IoT.HttpApi.Host.dll"]
-
-
-
+ENTRYPOINT ["dotnet", "JiShe.IoT.HttpApi.Host.dll"]
\ No newline at end of file
diff --git a/host/JiShe.IoT.HttpApi.Host/Program.cs b/host/JiShe.IoT.HttpApi.Host/Program.cs
index 262203b..2dfccae 100644
--- a/host/JiShe.IoT.HttpApi.Host/Program.cs
+++ b/host/JiShe.IoT.HttpApi.Host/Program.cs
@@ -47,7 +47,7 @@ public class Program
//options.Limits.MaxConcurrentConnections = 1000;//限制并发连接数，默认无限制
});
- builder.WebHost.UseUrls($"http://+:20500");
+ builder.WebHost.UseUrls($"http://+:10500");
var app = builder.Build();
await app.InitializeApplicationAsync();
await app.RunAsync();
diff --git a/host/JiShe.IoT.HttpApi.Host/configs/appsettings.Development.json b/host/JiShe.IoT.HttpApi.Host/configs/appsettings.Development.json
index 344bab8..4b33ccb 100644
--- a/host/JiShe.IoT.HttpApi.Host/configs/appsettings.Development.json
+++ b/host/JiShe.IoT.HttpApi.Host/configs/appsettings.Development.json
@@ -5,7 +5,7 @@
},
"ConnectionStrings": {
//"Default": "Data Source=192.168.111.174;Port=13306;Database=JiSheIoTProDB386;uid=root;pwd=JiShe!aqG#5kGgh&0;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;TreatTinyAsBoolean=false;SslMode=None;Pooling=true;"
- "Default": "Host=192.168.111.174;Port=5432;Database=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": {
"Redis": {
diff --git a/src/JiShe.IoT.Application/IoTPlatformAggregation/IoTPlatformAggregationService.cs b/src/JiShe.IoT.Application/IoTPlatformAggregation/IoTPlatformAggregationService.cs
index 8f8ac46..0bd4dd4 100644
--- a/src/JiShe.IoT.Application/IoTPlatformAggregation/IoTPlatformAggregationService.cs
+++ b/src/JiShe.IoT.Application/IoTPlatformAggregation/IoTPlatformAggregationService.cs
@@ -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);
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);
if (tempPropertyResult != null)
{