懒得勤快 3 tahun lalu
induk
melakukan
538bdda783

+ 1 - 1
src/Masuit.MyBlogs.Core/Controllers/BaseController.cs

@@ -86,7 +86,7 @@ namespace Masuit.MyBlogs.Core.Controllers
             }
 
             var location = Request.Location();
-            var template = Template.Create(text).Set("clientip", ClientIP).Set("location", location.Address).Set("network", location.Network);
+            var template = Template.Create(text).Set("clientip", ClientIP).Set("location", location.Address).Set("network", location.Network).Set("domain", Request.Host.Host).Set("path", Request.Path.ToUriComponent());
             if (text.Contains("{{browser}}") || text.Contains("{{os}}"))
             {
                 var agent = UserAgent.Parse(Request.Headers[HeaderNames.UserAgent] + "");

+ 2 - 1
src/Masuit.MyBlogs.Core/Controllers/LinksController.cs

@@ -28,7 +28,8 @@ namespace Masuit.MyBlogs.Core.Controllers
         public async Task<ActionResult> Index([FromServices] IWebHostEnvironment hostEnvironment)
         {
             var list = await LinksService.GetQueryFromCacheAsync<bool, LinksDto>(l => l.Status == Status.Available, l => l.Recommend, false);
-            ViewBag.Html = await new FileInfo(Path.Combine(hostEnvironment.WebRootPath, "template", "links.html")).ShareReadWrite().ReadAllTextAsync(Encoding.UTF8);
+            var html = await new FileInfo(Path.Combine(hostEnvironment.WebRootPath, "template", "links.html")).ShareReadWrite().ReadAllTextAsync(Encoding.UTF8);
+            ViewBag.Html = ReplaceVariables(html);
             ViewBag.Ads = AdsService.GetByWeightedPrice(AdvertiseType.InPage, Request.Location());
             return CurrentUser.IsAdmin ? View("Index_Admin", list) : View(list);
         }

+ 1 - 1
src/Masuit.MyBlogs.Core/Masuit.MyBlogs.Core.csproj

@@ -69,7 +69,7 @@
         <PackageReference Include="OpenXmlPowerTools-NetStandard" Version="4.6.23-alpha4" />
         <PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.2.22" />
         <PackageReference Include="PanGu.HighLight" Version="1.0.0" />
-        <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
+        <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.2" />
         <PackageReference Include="SixLabors.ImageSharp.Web" Version="2.0.2" />
         <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.19" />
         <PackageReference Include="TimeZoneConverter" Version="5.0.0" />