From 0464969366317154fdbb51e106ca778b855bdd08 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 17 八月 2024 15:45:28 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Wms/Wms/Controllers/WeatherForecastController.cs | 124 ++++++++++++++++++-----------------------
1 files changed, 55 insertions(+), 69 deletions(-)
diff --git a/Wms/Wms/Controllers/WeatherForecastController.cs b/Wms/Wms/Controllers/WeatherForecastController.cs
index 549f15e..2ef1ab4 100644
--- a/Wms/Wms/Controllers/WeatherForecastController.cs
+++ b/Wms/Wms/Controllers/WeatherForecastController.cs
@@ -12,13 +12,14 @@
using WMS.Entity.Context;
using WMS.IBLL.ISysServer;
using Wms.Tools;
+using Utility;
namespace Wms.Controllers
{
[Route("api/[controller]/[action]")]
[ApiController]
- [Authorize]
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
public class WeatherForecastController : ControllerBase
{
private static readonly string[] Summaries = new[]
@@ -37,105 +38,90 @@
_userMan = userMan;
}
- [AllowAnonymous]
- [HttpGet]
- public IEnumerable<WeatherForecast> Get()
- {
- var rng = new Random();
- //Db.Init();
- _logger.LogError("杩欐槸璁板綍鐨勪俊鎭�");
-
-
- var data = Enumerable.Range(1, 5).Select(index => new WeatherForecast
- {
- Date = DateTime.Now.AddDays(index),
- TemperatureC = rng.Next(-20, 55),
- Summary = Summaries[rng.Next(Summaries.Length)]
- })
- .ToArray();
- var list = JsonConvert.SerializeObject(data);
- string LogAddress = @".\log\CreatMesTask鐗╂枡杞Щ" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
- LogFile.SaveLogToFile("鎺ユ敹鐗╂枡杞Щ浠诲姟锛�(" + list + "),", LogAddress);
- return data;
- }
+ //[HttpGet]
+ //public IEnumerable<WeatherForecast> Get()
+ //{
+ // var rng = new Random();
+ // var data = Enumerable.Range(1, 5).Select(index => new WeatherForecast
+ // {
+ // Date = DateTime.Now.AddDays(index),
+ // TemperatureC = rng.Next(-20, 55),
+ // Summary = Summaries[rng.Next(Summaries.Length)]
+ // })
+ // .ToArray();
+ // var list = JsonConvert.SerializeObject(data);
+ // _logger.LogWarning("鎺ユ敹鐗╂枡杞Щ浠诲姟锛�(" + list + "),");
+ // return data;
+ //}
/// <summary>
/// 鐧诲綍
/// </summary>
/// <param name="model">鐧诲綍鍚�</param>
/// <returns></returns>
- [AllowAnonymous]
[HttpPost]
- public IActionResult Login(LoginVm model)
+ public async Task<string> Login(LoginVm model)
{
if (ModelState.IsValid)
{
- try
- {
- var bolls = _userMan.LoginAdmin(model.LoginName, model.LoginPwd, out int userId);
+ var userId = await _userMan.LoginAdmin(model.LoginName, model.LoginPwd);
- if (bolls) //
+ if (userId != -1) //
+ {
+ if (userId != 0) //姝ｇ‘杩斿洖
{
- if (userId != 0) //姝ｇ‘杩斿洖
- {
- Dictionary<string, string> keyValuePairs = new Dictionary<string, string>
+ Dictionary<string, string> keyValuePairs = new Dictionary<string, string>
{
{"loginID", userId.ToString()},
{"LoginName", model.LoginName}
};
- var tnToken = tokenHelper.CreateToken(keyValuePairs);
- return Ok(new { code = 200, ToKen = tnToken });
- }
- else //褰撳墠璐﹀彿琚鐢�
- {
- //return this.ErrorData($"褰撳墠璐﹀彿宸茶绂佺敤");
- return Ok(new { code = 400, ErrorMsg = "褰撳墠璐﹀彿宸茶绂佺敤" });
- }
+ var tnToken = tokenHelper.CreateToken(keyValuePairs);
+ return tnToken.TokenStr;
}
- else //璐﹀彿瀵嗙爜閿欒
+ else //褰撳墠璐﹀彿琚鐢�
{
- return Ok(new { code = 400, ErrorMsg = "褰撳墠璐﹀彿鎴栧瘑鐮侀敊璇�" });
+ //return this.ErrorData($"褰撳墠璐﹀彿宸茶绂佺敤");
+ throw Oops.Bah("褰撳墠璐﹀彿宸茶绂佺敤");
}
}
- catch (Exception e)
+ else //璐﹀彿瀵嗙爜閿欒
{
- return Ok(new { code = 400, ErrorMsg = "璇疯仈绯荤鐞嗗憳/" + e.Message });
+ throw Oops.Bah("褰撳墠璐﹀彿鎴栧瘑鐮侀敊璇�");
}
}
else //鏁版嵁鏍煎紡閿欒
{
- return Ok(new { code = 400, ErrorMsg = "鏁版嵁鏍煎紡閿欒" });
+ throw Oops.Bah("鏁版嵁鏍煎紡閿欒");
}
}
/// <summary>
/// 鐧诲綍
/// </summary>
/// <returns></returns>
- [AllowAnonymous]
- [HttpPost]
- public IActionResult ceshi()
- {
- //if (ModelState.IsValid)
- //{
- try
- {
- //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- var bolls = _userMan.CeShi();
+ //[HttpPost]
+ //public IActionResult ceshi()
+ //{
+ // //if (ModelState.IsValid)
+ // //{
+ // try
+ // {
+ // //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ // var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ // var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ // var bolls = _userMan.CeShi();
- return Ok(new { code = 200, data = bolls });
-
- }
- catch (Exception e)
- {
- return Ok(new { code = 400, ErrorMsg = "璇疯仈绯荤鐞嗗憳/" + e.Message });
- }
- //}
- //else //鏁版嵁鏍煎紡閿欒
- //{
- // return Ok(new { code = 400, ErrorMsg = "鏁版嵁鏍煎紡閿欒" });
- //}
- }
+ // return Ok(new { code = 200, data = bolls });
+
+ // }
+ // catch (Exception e)
+ // {
+ // return Ok(new { code = 400, ErrorMsg = "璇疯仈绯荤鐞嗗憳/" + e.Message });
+ // }
+ // //}
+ // //else //鏁版嵁鏍煎紡閿欒
+ // //{
+ // // return Ok(new { code = 400, ErrorMsg = "鏁版嵁鏍煎紡閿欒" });
+ // //}
+ //}
}
}
--
Gitblit v1.8.0