zoulei 1 năm trước cách đây
mục cha
commit
0c1444efd4

+ 4 - 3
XdCxRhDW.App/WebAPI/Controllers/PosController.cs

@@ -20,6 +20,7 @@ using Swashbuckle.Swagger;
 using XdCxRhDw.Dto;
 using XdCxRhDW.App.Api;
 using XdCxRhDW.App.App.Properties;
+using XdCxRhDW.App.Basic;
 using XdCxRhDW.App.EFContext;
 using XdCxRhDW.App.Model;
 using XdCxRhDW.App.WebAPI.DTO;
@@ -61,7 +62,7 @@ namespace XdCxRhDW.App.WebAPI
                 Serilog.Log.Information($"卫星{dto.MainSatID}使用{xlInfo1.TwoLine}进行星历推算");
                 var settings = await db.SysSetings.FirstOrDefaultAsync();
                 var client = new HttpClient();
-                string url = string.Format("http://{0}:{1}/Api/", settings.ServerIp, settings.HttpPort);
+                string url = string.Format("http://{0}:{1}/Api/", IpHelper.GetLocalIp(), settings.HttpPort);
                 url += string.Format("Xl/Calc?tleStr={0}&dt={1}", xlInfo1.TwoLine, dto.SigTime);
                 var response = await client.GetAsync(url);
                 if (!response.IsSuccessStatusCode) // 处理响应失败
@@ -158,7 +159,7 @@ namespace XdCxRhDW.App.WebAPI
                 Serilog.Log.Information($"卫星{dto.AdjaSatID}使用{xlInfo2.TwoLine}进行星历推算");
                 var settings = await db.SysSetings.FirstOrDefaultAsync();
                 var client = new HttpClient();
-                string url = string.Format("http://{0}:{1}/Api/", settings.ServerIp, settings.HttpPort);
+                string url = string.Format("http://{0}:{1}/Api/", IpHelper.GetLocalIp(), settings.HttpPort);
                 var url1 = string.Format(url + "Xl/Calc?tleStr={0}&dt={1}", xlInfo1.TwoLine, dto.SigTime);
                 var response = await client.GetAsync(url1);
                 if (!response.IsSuccessStatusCode) // 处理响应失败
@@ -264,7 +265,7 @@ namespace XdCxRhDW.App.WebAPI
                 Serilog.Log.Information($"卫星{dto.AdjaSatID}使用{xlInfo2.TwoLine}进行星历推算");
                 var settings = await db.SysSetings.FirstOrDefaultAsync();
                 var client = new HttpClient();
-                string url = string.Format("http://{0}:{1}/Api/", settings.ServerIp, settings.HttpPort);
+                string url = string.Format("http://{0}:{1}/Api/", IpHelper.GetLocalIp(), settings.HttpPort);
                 var url1 = string.Format(url + "Xl/Calc?tleStr={0}&dt={1}", xlInfo1.TwoLine, dto.SigTime);
                 var response = await client.GetAsync(url1);
                 if (!response.IsSuccessStatusCode) // 处理响应失败

+ 1 - 1
XdCxRhDW.App/XdCxRhDW.App.csproj

@@ -424,7 +424,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="packages.config" />
-    <EmbeddedResource Include="Properties\licenses.licx" />
+    <None Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>