From 10dc69e565b19bbe490932707b2c5161c2c367e0 Mon Sep 17 00:00:00 2001 From: c Date: Sun, 23 Jul 2023 14:39:05 +0800 Subject: [PATCH] 123 --- NetPanel/Controllers/LoginController.cs | 2 +- NetPanel/Help/MyController.cs | 29 +++++++------- NetPanel/Views/Login/Login.cshtml | 50 +++++++++++++------------ 3 files changed, 41 insertions(+), 40 deletions(-) diff --git a/NetPanel/Controllers/LoginController.cs b/NetPanel/Controllers/LoginController.cs index a160a9e..4997fc0 100644 --- a/NetPanel/Controllers/LoginController.cs +++ b/NetPanel/Controllers/LoginController.cs @@ -21,7 +21,7 @@ namespace btApiOrWeb.Controllers } - [HttpPost] + public IActionResult GetUser() { ReturnMsg enReturnMsg = new ReturnMsg(); diff --git a/NetPanel/Help/MyController.cs b/NetPanel/Help/MyController.cs index f0479e7..3acf609 100644 --- a/NetPanel/Help/MyController.cs +++ b/NetPanel/Help/MyController.cs @@ -76,7 +76,7 @@ namespace NetPanel.Help } - + /// /// 获取Get或Post的数据并转换为Json格式。 /// @@ -95,24 +95,19 @@ namespace NetPanel.Help } else if (IsHttpPost) { + string json = ""; + using (var reader = new StreamReader(Request.Body, Encoding.UTF8)) + { + //json = reader.ReadToEnd(); + json = reader.ReadToEndAsync().Result; + } if (Request.ContentType.Contains("application/json")) { - string json = ""; - using (var reader = new StreamReader(Request.Body, Encoding.UTF8)) - { - // json= reader.ReadToEnd(); - json = reader.ReadToEndAsync().Result; - } - return JsonConvert.SerializeObject(GetRequestKeyValue(json)).UrlDecode(); + return json; } else { - StringBuilder sb = new StringBuilder(); - foreach (var item in Request.Form.Keys) - { - sb.Append(item + "=" + Request.Form[item] + "&"); - } - Dictionary keyValue = GetRequestKeyValue(sb.ToString()); + Dictionary keyValue = GetRequestKeyValue(json.UrlDecode()); return JsonConvert.SerializeObject(keyValue); } } @@ -126,7 +121,11 @@ namespace NetPanel.Help public JObject GetJson() { string str = GetJsonStr(); - return JObject.Parse(str); + if (str.IsNotNull()) + { + return JObject.Parse(str); + } + return new JObject(); } diff --git a/NetPanel/Views/Login/Login.cshtml b/NetPanel/Views/Login/Login.cshtml index a5c772a..c686229 100644 --- a/NetPanel/Views/Login/Login.cshtml +++ b/NetPanel/Views/Login/Login.cshtml @@ -9,48 +9,50 @@ - - + +