NewLife
/
Stardust
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[fix] 修正星尘中间件学习服务地址ServiceAddress时遗漏端口的问题。星尘文件缓存更新sh脚本时，正确替换服务端地址。

This commit is contained in:
智能大石头 2025-07-28 16:29:52 +08:00
parent ba98e96def
commit a3eef7dea3
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Stardust.Extensions/Caches/CacheFileProvider.cs
View File

@ -163,7 +163,7 @@ class CacheFileProvider : IFileProvider
if (!target.IsNullOrEmpty() && fullPath.EndsWithIgnoreCase(".sh", ".bat"))
{
var txt = File.ReadAllText(fullPath);
var txt2 = txt.Replace(item.EnsureEnd("/"), target.EnsureEnd("/"));
var txt2 = txt.Replace(item.TrimEnd("/"), target.TrimEnd("/"));
if (txt != txt2) File.WriteAllText(fullPath, txt2);
}

20
Stardust.Extensions/TracerMiddleware.cs
View File

@ -237,16 +237,28 @@ public class TracerMiddleware
if (host.StartsWith("127.0.")) return;
var baseAddress = $"{uri.Scheme}://{host}";
if (uri.Scheme == "http" && uri.Port != 80)
baseAddress += ":" + uri.Port;
else if (uri.Scheme == "https" && uri.Port != 443)
baseAddress += ":" + uri.Port;
var set = NewLife.Setting.Current;
var ss = set.ServiceAddress?.Split(",").ToList() ?? [];
if (!ss.Contains(baseAddress))
{
// 过滤掉本机地址
ss = ss.Where(e => !e.EqualIgnoreCase("127.0.0.1", "localhost", "[::1]") && !e.StartsWith("127.0.")).ToList();
var newAddrs = new List<String> { baseAddress };
ss.Insert(0, baseAddress);
set.ServiceAddress = ss.Take(5).Join(",");
// 过滤掉本机地址
foreach (var item in ss)
{
if (!Uri.TryCreate(item, UriKind.Absolute, out var u)) continue;
if (u.Host.EqualIgnoreCase("127.0.0.1", "localhost", "[::1]")) continue;
if (u.Host.StartsWith("127.0.")) continue;
newAddrs.Add(item);
}
set.ServiceAddress = newAddrs.Take(5).Join(",");
set.Save();
}
}