所有消息的子界面方法提炼到共享控制器，消息提示新增提交id显示

dathlin · dathlin · commit b0f81c4a7c04 · 2017-08-27T08:41:16.000+08:00
diff --git a/软件系统浏览器模版/Controllers/AccountController.cs b/软件系统浏览器模版/Controllers/AccountController.cs
@@ -302,14 +302,7 @@ public ActionResult RegisterAccount(FormCollection fc)
 
         private ActionResult PartialViewMessage(MessageBoxStyle style, string message)
         {
-            ViewData["alertMessage"] = message;
-            switch(style)
-            {
-                case MessageBoxStyle.success:return PartialView("_MessageSuccessPartial");
-                case MessageBoxStyle.info: return PartialView("_MessageInfoPartial");
-                case MessageBoxStyle.warning: return PartialView("_MessageWarningPartial");
-                default: return PartialView("_MessageDangerPartial");
-            }
+            return RedirectToAction("Message", "Share", new { style = style, message = message });
         }
     }
 }
diff --git a/软件系统浏览器模版/Controllers/HomeController.cs b/软件系统浏览器模版/Controllers/HomeController.cs
@@ -108,16 +108,16 @@ public ActionResult AdviceFeedback(string advice)
                 HslCommunication.OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.意见反馈, UserClient.UserAccount.UserName + ":" + advice);
                 if (result.IsSuccess)
                 {
-                    return Content("<div class=\"alert alert-success\" role=\"alert\">成功提交数据</div><script>alert('建议提交成功！')</script>", "text/html");
+                    return PartialViewMessage(MessageBoxStyle.success, "建议提交成功！");
                 }
                 else
                 {
-                    return Content("<div class=\"alert alert-danger\" role=\"alert\">建议提交失败，请稍后再试！错误信息：" + result.Message + "</div>", "text/html");
+                    return PartialViewMessage(MessageBoxStyle.danger, result.Message);
                 }
             }
             else
             {
-                return Content("<div class=\"alert alert-danger\" role=\"alert\">这是一个错误的请求！</div>", "text/html");
+                return PartialViewMessage(MessageBoxStyle.danger, "请求无效！");
             }
         }
 
@@ -150,28 +150,24 @@ public ActionResult SetAnnouncement(FormCollection fc)
 
                 if (announcement.Length > 1000)
                 {
-                    ViewData["alertMessage"] = "公告的字数超过了1000字！";
-                    return PartialView("_MessageDangerPartial");
+                    return PartialViewMessage(MessageBoxStyle.warning, "公告的字数超过了1000字！");
                 }
 
 
                 OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.更新公告, announcement);
                 if (result.IsSuccess)
                 {
-                    ViewData["alertMessage"] = "公告更改成功！";
                     UserClient.Announcement = announcement;
-                    return PartialView("_MessageSuccessPartial");
+                    return PartialViewMessage(MessageBoxStyle.success, "公告更改成功！");
                 }
                 else
                 {
-                    ViewData["alertMessage"] = result.Message;
-                    return PartialView("_MessageDangerPartial");
+                    return PartialViewMessage(MessageBoxStyle.danger, result.Message);
                 }
             }
             else
             {
-                ViewData["alertMessage"] = "请求无效！";
-                return PartialView("_MessageDangerPartial");
+                return PartialViewMessage(MessageBoxStyle.danger, "请求无效！");
             }
         }
 
@@ -217,19 +213,16 @@ public ActionResult SetManagementAccount(FormCollection fc)
                 OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.更细账户, Accounts);
                 if (result.IsSuccess)
                 {
-                    ViewData["alertMessage"] = "账户更改成功！";
-                    return PartialView("_MessageSuccessPartial");
+                    return PartialViewMessage(MessageBoxStyle.success, "账户更改成功！");
                 }
                 else
                 {
-                    ViewData["alertMessage"] = result.Message;
-                    return PartialView("_MessageDangerPartial");
+                    return PartialViewMessage(MessageBoxStyle.danger, result.Message);
                 }
             }
             else
             {
-                ViewData["alertMessage"] = "请求无效！";
-                return PartialView("_MessageDangerPartial");
+                return PartialViewMessage(MessageBoxStyle.danger, "请求无效！");
             }
         }
 
@@ -263,32 +256,33 @@ public ActionResult SendMessage(FormCollection fc)
 
                 if (SendMessage.Length > 1000)
                 {
-                    ViewData["alertMessage"] = "需要发送的字数超过了1000字！";
-                    return PartialView("_MessageDangerPartial");
+                    return PartialViewMessage(MessageBoxStyle.warning, "需要发送的字数超过了1000字！");
                 }
 
 
                 OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.群发消息, SendMessage);
                 if (result.IsSuccess)
                 {
-                    ViewData["alertMessage"] = "消息群发成功！";
                     UserClient.Announcement = SendMessage;
-                    return PartialView("_MessageSuccessPartial");
+                    return PartialViewMessage(MessageBoxStyle.success, "消息群发成功！");
                 }
                 else
                 {
-                    ViewData["alertMessage"] = result.Message;
-                    return PartialView("_MessageDangerPartial");
+                    return PartialViewMessage(MessageBoxStyle.danger, result.Message);
                 }
             }
             else
             {
-                ViewData["alertMessage"] = "请求无效！";
-                return PartialView("_MessageDangerPartial");
+                return PartialViewMessage(MessageBoxStyle.danger, "请求无效！");
             }
         }
 
 
 
+        private ActionResult PartialViewMessage(MessageBoxStyle style, string message)
+        {
+            return RedirectToAction("Message", "Share", new { style = style, message = message });
+        }
+
     }
 }
diff --git a/软件系统浏览器模版/Controllers/ShareController.cs b/软件系统浏览器模版/Controllers/ShareController.cs
@@ -26,6 +26,7 @@ public class ShareController : Controller
         public ActionResult Message(MessageBoxStyle style, string message)
         {
             ViewData["alertMessage"] = message;
+            ViewData["Guid"] = Guid.NewGuid().ToString("N");
             switch (style)
             {
                 case MessageBoxStyle.success: return PartialView("_MessageSuccessPartial");
diff --git a/软件系统浏览器模版/Views/Shared/_MessageDangerPartial.cshtml b/软件系统浏览器模版/Views/Shared/_MessageDangerPartial.cshtml
@@ -1,6 +1,6 @@
 ﻿
 <div class="alert alert-dismissible alert-danger" style="margin:15px 15px">
     <button type="button" class="close" data-dismiss="alert">&times;</button>
-    <h4>错误信息</h4>
+    <h4>错误信息<small><small style="margin-left:10px;">请求ID：@ViewData["GUID"]</small></small></h4>
     <p>@ViewData["alertMessage"]</p>
 </div>
diff --git a/软件系统浏览器模版/Views/Shared/_MessageInfoPartial.cshtml b/软件系统浏览器模版/Views/Shared/_MessageInfoPartial.cshtml
@@ -2,6 +2,6 @@
 
 <div class="alert alert-dismissible alert-info" style="margin:15px 15px">
     <button type="button" class="close" data-dismiss="alert">&times;</button>
-    <h4>一般信息</h4>
+    <h4>一般信息<small><small style="margin-left:10px;">请求ID：@ViewData["GUID"]</small></small></h4>
     <p>@ViewData["alertMessage"]</p>
 </div>
diff --git a/软件系统浏览器模版/Views/Shared/_MessageSuccessPartial.cshtml b/软件系统浏览器模版/Views/Shared/_MessageSuccessPartial.cshtml
@@ -2,6 +2,6 @@
 
 <div class="alert alert-dismissible alert-success" style="margin:15px 15px">
     <button type="button" class="close" data-dismiss="alert">&times;</button>
-    <h4>成功信息</h4>
+    <h4>成功信息<small><small style="margin-left:10px;">请求ID：@ViewData["GUID"]</small></small></h4>
     <p>@ViewData["alertMessage"]</p>
 </div>
diff --git a/软件系统浏览器模版/Views/Shared/_MessageWarningPartial.cshtml b/软件系统浏览器模版/Views/Shared/_MessageWarningPartial.cshtml
@@ -2,6 +2,6 @@
 
 <div class="alert alert-dismissible alert-warning" style="margin:15px 15px">
     <button type="button" class="close" data-dismiss="alert">&times;</button>
-    <h4>警告信息</h4>
+    <h4>警告信息<small><small style="margin-left:10px;">请求ID：@ViewData["GUID"]</small></small></h4>
     <p>@ViewData["alertMessage"]</p>
 </div>

Original file line number	Diff line number	Diff line change
`@@ -302,14 +302,7 @@ public ActionResult RegisterAccount(FormCollection fc)`
`302`	`302`
`303`	`303`	`private ActionResult PartialViewMessage(MessageBoxStyle style, string message)`
`304`	`304`	`{`
`305`		`- ViewData["alertMessage"] = message;`
`306`		`- switch(style)`
`307`		`- {`
`308`		`- case MessageBoxStyle.success:return PartialView("_MessageSuccessPartial");`
`309`		`- case MessageBoxStyle.info: return PartialView("_MessageInfoPartial");`
`310`		`- case MessageBoxStyle.warning: return PartialView("_MessageWarningPartial");`
`311`		`- default: return PartialView("_MessageDangerPartial");`
`312`		`- }`
	`305`	`+ return RedirectToAction("Message", "Share", new { style = style, message = message });`
`313`	`306`	`}`
`314`	`307`	`}`
`315`	`308`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,16 +108,16 @@ public ActionResult AdviceFeedback(string advice)`
`108`	`108`	`HslCommunication.OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.意见反馈, UserClient.UserAccount.UserName + ":" + advice);`
`109`	`109`	`if (result.IsSuccess)`
`110`	`110`	`{`
`111`		`- return Content("<div class=\"alert alert-success\" role=\"alert\">成功提交数据</div><script>alert('建议提交成功！')</script>", "text/html");`
	`111`	`+ return PartialViewMessage(MessageBoxStyle.success, "建议提交成功！");`
`112`	`112`	`}`
`113`	`113`	`else`
`114`	`114`	`{`
`115`		`- return Content("<div class=\"alert alert-danger\" role=\"alert\">建议提交失败，请稍后再试！错误信息：" + result.Message + "</div>", "text/html");`
	`115`	`+ return PartialViewMessage(MessageBoxStyle.danger, result.Message);`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`else`
`119`	`119`	`{`
`120`		`- return Content("<div class=\"alert alert-danger\" role=\"alert\">这是一个错误的请求！</div>", "text/html");`
	`120`	`+ return PartialViewMessage(MessageBoxStyle.danger, "请求无效！");`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
`@@ -150,28 +150,24 @@ public ActionResult SetAnnouncement(FormCollection fc)`
`150`	`150`
`151`	`151`	`if (announcement.Length > 1000)`
`152`	`152`	`{`
`153`		`- ViewData["alertMessage"] = "公告的字数超过了1000字！";`
`154`		`- return PartialView("_MessageDangerPartial");`
	`153`	`+ return PartialViewMessage(MessageBoxStyle.warning, "公告的字数超过了1000字！");`
`155`	`154`	`}`
`156`	`155`
`157`	`156`
`158`	`157`	`OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.更新公告, announcement);`
`159`	`158`	`if (result.IsSuccess)`
`160`	`159`	`{`
`161`		`- ViewData["alertMessage"] = "公告更改成功！";`
`162`	`160`	`UserClient.Announcement = announcement;`
`163`		`- return PartialView("_MessageSuccessPartial");`
	`161`	`+ return PartialViewMessage(MessageBoxStyle.success, "公告更改成功！");`
`164`	`162`	`}`
`165`	`163`	`else`
`166`	`164`	`{`
`167`		`- ViewData["alertMessage"] = result.Message;`
`168`		`- return PartialView("_MessageDangerPartial");`
	`165`	`+ return PartialViewMessage(MessageBoxStyle.danger, result.Message);`
`169`	`166`	`}`
`170`	`167`	`}`
`171`	`168`	`else`
`172`	`169`	`{`
`173`		`- ViewData["alertMessage"] = "请求无效！";`
`174`		`- return PartialView("_MessageDangerPartial");`
	`170`	`+ return PartialViewMessage(MessageBoxStyle.danger, "请求无效！");`
`175`	`171`	`}`
`176`	`172`	`}`
`177`	`173`
`@@ -217,19 +213,16 @@ public ActionResult SetManagementAccount(FormCollection fc)`
`217`	`213`	`OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.更细账户, Accounts);`
`218`	`214`	`if (result.IsSuccess)`
`219`	`215`	`{`
`220`		`- ViewData["alertMessage"] = "账户更改成功！";`
`221`		`- return PartialView("_MessageSuccessPartial");`
	`216`	`+ return PartialViewMessage(MessageBoxStyle.success, "账户更改成功！");`
`222`	`217`	`}`
`223`	`218`	`else`
`224`	`219`	`{`
`225`		`- ViewData["alertMessage"] = result.Message;`
`226`		`- return PartialView("_MessageDangerPartial");`
	`220`	`+ return PartialViewMessage(MessageBoxStyle.danger, result.Message);`
`227`	`221`	`}`
`228`	`222`	`}`
`229`	`223`	`else`
`230`	`224`	`{`
`231`		`- ViewData["alertMessage"] = "请求无效！";`
`232`		`- return PartialView("_MessageDangerPartial");`
	`225`	`+ return PartialViewMessage(MessageBoxStyle.danger, "请求无效！");`
`233`	`226`	`}`
`234`	`227`	`}`
`235`	`228`
`@@ -263,32 +256,33 @@ public ActionResult SendMessage(FormCollection fc)`
`263`	`256`
`264`	`257`	`if (SendMessage.Length > 1000)`
`265`	`258`	`{`
`266`		`- ViewData["alertMessage"] = "需要发送的字数超过了1000字！";`
`267`		`- return PartialView("_MessageDangerPartial");`
	`259`	`+ return PartialViewMessage(MessageBoxStyle.warning, "需要发送的字数超过了1000字！");`
`268`	`260`	`}`
`269`	`261`
`270`	`262`
`271`	`263`	`OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.群发消息, SendMessage);`
`272`	`264`	`if (result.IsSuccess)`
`273`	`265`	`{`
`274`		`- ViewData["alertMessage"] = "消息群发成功！";`
`275`	`266`	`UserClient.Announcement = SendMessage;`
`276`		`- return PartialView("_MessageSuccessPartial");`
	`267`	`+ return PartialViewMessage(MessageBoxStyle.success, "消息群发成功！");`
`277`	`268`	`}`
`278`	`269`	`else`
`279`	`270`	`{`
`280`		`- ViewData["alertMessage"] = result.Message;`
`281`		`- return PartialView("_MessageDangerPartial");`
	`271`	`+ return PartialViewMessage(MessageBoxStyle.danger, result.Message);`
`282`	`272`	`}`
`283`	`273`	`}`
`284`	`274`	`else`
`285`	`275`	`{`
`286`		`- ViewData["alertMessage"] = "请求无效！";`
`287`		`- return PartialView("_MessageDangerPartial");`
	`276`	`+ return PartialViewMessage(MessageBoxStyle.danger, "请求无效！");`
`288`	`277`	`}`
`289`	`278`	`}`
`290`	`279`
`291`	`280`
`292`	`281`
	`282`	`+ private ActionResult PartialViewMessage(MessageBoxStyle style, string message)`
	`283`	`+ {`
	`284`	`+ return RedirectToAction("Message", "Share", new { style = style, message = message });`
	`285`	`+ }`
	`286`	`+`
`293`	`287`	`}`
`294`	`288`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public class ShareController : Controller`
`26`	`26`	`public ActionResult Message(MessageBoxStyle style, string message)`
`27`	`27`	`{`
`28`	`28`	`ViewData["alertMessage"] = message;`
	`29`	`+ ViewData["Guid"] = Guid.NewGuid().ToString("N");`
`29`	`30`	`switch (style)`
`30`	`31`	`{`
`31`	`32`	`case MessageBoxStyle.success: return PartialView("_MessageSuccessPartial");`