From 77eabfec5d29c373d75e4bfd6b7e94604dcfa207 Mon Sep 17 00:00:00 2001
From: Dai Mr <1822802785@qq.com>
Date: Tue, 20 May 2025 16:53:36 +0800
Subject: [PATCH 1/3] update

---
 .../CollectBusApplicationModule.cs                             | 2 +-
 .../EnergySystemScheduledMeterReadingService.cs                | 2 +-
 web/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj         | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/services/JiShe.CollectBus.Application/CollectBusApplicationModule.cs b/services/JiShe.CollectBus.Application/CollectBusApplicationModule.cs
index 69c986a..1d41ad4 100644
--- a/services/JiShe.CollectBus.Application/CollectBusApplicationModule.cs
+++ b/services/JiShe.CollectBus.Application/CollectBusApplicationModule.cs
@@ -94,6 +94,6 @@ public class CollectBusApplicationModule : AbpModule
 
         //默认初始化表计信息
         var dbContext = context.ServiceProvider.GetRequiredService<EnergySystemScheduledMeterReadingService>();
-        await dbContext.InitAmmeterCacheData();
+        await dbContext.InitAmmeterCacheData("V4-Gather-8890");
     }
 }
\ No newline at end of file
diff --git a/services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs b/services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs
index c1fd4e4..7b52c30 100644
--- a/services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs
+++ b/services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs
@@ -257,7 +257,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
 
             #if DEBUG
                             //// sql = $@"{sql} and c.Address in('542410000504','442405000040','442405000039','402410040506')";
-                sql = $@"{sql} and c.Address in('402410040506')";
+                //sql = $@"{sql} and c.Address in('402410040506')";
 #endif
 
                 if (!string.IsNullOrWhiteSpace(gatherCode))
diff --git a/web/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj b/web/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj
index f6cdfbe..96786fe 100644
--- a/web/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj
+++ b/web/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj
@@ -83,9 +83,6 @@
     <None Update="Plugins\JiShe.CollectBus.Protocol.T6452007.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Plugins\JiShe.CollectBus.Protocol.Test.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
 
 </Project>

From 3d83cf0ccb3dc4df7ee5ee867ca0f030f083479d Mon Sep 17 00:00:00 2001
From: Dai Mr <1822802785@qq.com>
Date: Tue, 20 May 2025 17:10:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9docker=20file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a8f5003..8030845 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 WORKDIR /app
-EXPOSE 80
-EXPOSE 443
+EXPOSE 8080
+EXPOSE 10500
 ENV TZ=Asia/Shanghai
 ENV ASPNETCORE_ENVIRONMENT=Production
 
@@ -38,15 +38,7 @@ RUN mkdir -p /app/Plugins
 # 复制发布内容
 COPY --from=publish /app/publish .
 
-# 健康检查
-HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 \
-  CMD curl -f http://localhost:80/health || exit 1
-
 # 设置入口点
 ENTRYPOINT ["dotnet", "JiShe.CollectBus.Host.dll"]
 
-# 启动命令
-# 可选：添加命令行参数
-# CMD ["--urls", "http://+:80"]
-
 

From 469ea285f2a0084199e84f842b90f4fca4785a70 Mon Sep 17 00:00:00 2001
From: Dai Mr <1822802785@qq.com>
Date: Tue, 20 May 2025 17:32:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=98=BE=E7=A4=BASwagger=20UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/JiShe.CollectBus.Host/CollectBusHostModule.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/JiShe.CollectBus.Host/CollectBusHostModule.cs b/web/JiShe.CollectBus.Host/CollectBusHostModule.cs
index e451a1d..1666341 100644
--- a/web/JiShe.CollectBus.Host/CollectBusHostModule.cs
+++ b/web/JiShe.CollectBus.Host/CollectBusHostModule.cs
@@ -76,8 +76,8 @@ namespace JiShe.CollectBus.Host
             app.UseCors(CollectBusHostConst.DefaultCorsPolicyName);
             app.UseAuthentication();
             app.UseAuthorization();
-            if (env.IsDevelopment())
-            {
+            //if (env.IsDevelopment())
+            //{
                 app.UseSwagger();
                 app.UseAbpSwaggerUI(options =>
                 {
@@ -88,7 +88,7 @@ namespace JiShe.CollectBus.Host
                     options.DocExpansion(DocExpansion.None);
                     options.DefaultModelsExpandDepth(-1);
                 });
-            }
+            //}
             app.UseAuditing();
             app.UseAbpSerilogEnrichers();
             app.UseUnitOfWork();