非www跳转的bug修复

ldqk · May 2, 2019 · a3555a7 · a3555a7
1 parent 490bacb
commit a3555a7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/src/Masuit.MyBlogs.Core/Controllers/CommentController.cs b/src/Masuit.MyBlogs.Core/Controllers/CommentController.cs
@@ -17,7 +17,6 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Web;
 
 namespace Masuit.MyBlogs.Core.Controllers
 {
@@ -118,7 +117,7 @@ public ActionResult Put(CommentInputDto comment)
                         //新评论，只通知博主和楼主
                         foreach (var s in emails.Distinct())
                         {
-                            BackgroundJob.Enqueue(() => CommonHelper.SendMail(HttpUtility.UrlDecode(Request.Headers[HeaderNames.Referer]) + "|博客文章新评论：", content.Replace("{{link}}", Url.Action("Details", "Post", new { id = com.PostId, cid = com.Id }, Request.Scheme) + "#comment"), s));
+                            BackgroundJob.Enqueue(() => CommonHelper.SendMail(CommonHelper.SystemSettings["Domain"] + "|博客文章新评论：", content.Replace("{{link}}", Url.Action("Details", "Post", new { id = com.PostId, cid = com.Id }, Request.Scheme) + "#comment"), s));
                         }
                     }
                     else
@@ -129,15 +128,15 @@ public ActionResult Put(CommentInputDto comment)
                         string link = Url.Action("Details", "Post", new { id = com.PostId, cid = com.Id }, Request.Scheme) + "#comment";
                         foreach (var s in emails)
                         {
-                            BackgroundJob.Enqueue(() => CommonHelper.SendMail($"{HttpUtility.UrlDecode(Request.Headers[HeaderNames.Referer])}{CommonHelper.SystemSettings["Title"]}文章评论回复：", content.Replace("{{link}}", link), s));
+                            BackgroundJob.Enqueue(() => CommonHelper.SendMail($"{CommonHelper.SystemSettings["Domain"]}{CommonHelper.SystemSettings["Title"]}文章评论回复：", content.Replace("{{link}}", link), s));
                         }
                     }
 #endif
                     return ResultData(null, true, "评论发表成功，服务器正在后台处理中，这会有一定的延迟，稍后将显示到评论列表中");
                 }
                 foreach (var s in emails.Distinct())
                 {
-                    BackgroundJob.Enqueue(() => CommonHelper.SendMail(HttpUtility.UrlDecode(Request.Headers[HeaderNames.Referer]) + "|博客文章新评论(待审核)：", content.Replace("{{link}}", Url.Action("Details", "Post", new { id = com.PostId, cid = com.Id }, Request.Scheme) + "#comment") + "<p style='color:red;'>(待审核)</p>", s));
+                    BackgroundJob.Enqueue(() => CommonHelper.SendMail(CommonHelper.SystemSettings["Domain"] + "|博客文章新评论(待审核)：", content.Replace("{{link}}", Url.Action("Details", "Post", new { id = com.PostId, cid = com.Id }, Request.Scheme) + "#comment") + "<p style='color:red;'>(待审核)</p>", s));
                 }
                 return ResultData(null, true, "评论成功，待站长审核通过以后将显示");
             }

diff --git a/src/Masuit.MyBlogs.Core/Controllers/MsgController.cs b/src/Masuit.MyBlogs.Core/Controllers/MsgController.cs
@@ -16,7 +16,6 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Web;
 
 namespace Masuit.MyBlogs.Core.Controllers
 {
@@ -176,7 +175,7 @@ public ActionResult Put(LeaveMessageInputDto msg)
                     if (msg.ParentId == 0)
                     {
                         //新评论，只通知博主
-                        BackgroundJob.Enqueue(() => CommonHelper.SendMail(HttpUtility.UrlDecode(Request.Headers[HeaderNames.Referer]) + "|博客新留言：", content.Replace("{{link}}", Url.Action("Index", "Msg", new { cid = msg2.Id }, Request.Scheme)), email));
+                        BackgroundJob.Enqueue(() => CommonHelper.SendMail(CommonHelper.SystemSettings["Domain"] + "|博客新留言：", content.Replace("{{link}}", Url.Action("Index", "Msg", new { cid = msg2.Id }, Request.Scheme)), email));
                     }
                     else
                     {
@@ -187,13 +186,13 @@ public ActionResult Put(LeaveMessageInputDto msg)
                         string link = Url.Action("Index", "Msg", new { cid = msg2.Id }, Request.Scheme);
                         foreach (var s in emails.Distinct().Except(new[] { msg2.Email }))
                         {
-                            BackgroundJob.Enqueue(() => CommonHelper.SendMail($"{HttpUtility.UrlDecode(Request.Headers[HeaderNames.Referer])}{CommonHelper.SystemSettings["Title"]} 留言回复：", content.Replace("{{link}}", link), s));
+                            BackgroundJob.Enqueue(() => CommonHelper.SendMail($"{CommonHelper.SystemSettings["Domain"]}{CommonHelper.SystemSettings["Title"]} 留言回复：", content.Replace("{{link}}", link), s));
                         }
                     }
 #endif
                     return ResultData(null, true, "留言发表成功，服务器正在后台处理中，这会有一定的延迟，稍后将会显示到列表中！");
                 }
-                BackgroundJob.Enqueue(() => CommonHelper.SendMail(HttpUtility.UrlDecode(Request.Headers[HeaderNames.Referer]) + "|博客新留言(待审核)：", content.Replace("{{link}}", Url.Action("Index", "Msg", new
+                BackgroundJob.Enqueue(() => CommonHelper.SendMail(CommonHelper.SystemSettings["Domain"] + "|博客新留言(待审核)：", content.Replace("{{link}}", Url.Action("Index", "Msg", new
                 {
                     cid = msg2.Id
                 }, Request.Scheme)) + "<p style='color:red;'>(待审核)</p>", email));

diff --git a/src/Masuit.MyBlogs.Core/Extensions/NonWwwRule.cs b/src/Masuit.MyBlogs.Core/Extensions/NonWwwRule.cs
@@ -15,9 +15,9 @@ public void ApplyRule(RewriteContext context)
                 return;
             }
 
-            if (req.Scheme.Equals("http"))
+            if (req.Scheme.Equals("http") || currentHost.Host.Contains("www."))
             {
-                context.HttpContext.Response.Redirect("https://" + currentHost.Host + req.PathBase + req.Path + req.QueryString);
+                context.HttpContext.Response.Redirect("https://" + currentHost.Host.Replace("www.", string.Empty) + req.PathBase + req.Path + req.QueryString);
                 context.Result = RuleResult.EndResponse;
             }
         }

diff --git a/src/Masuit.MyBlogs.Core/Masuit.MyBlogs.Core.xml b/src/Masuit.MyBlogs.Core/Masuit.MyBlogs.Core.xml