From b58b6f92ab3f7caee1199d15d118e496122e5849 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期四, 04 十二月 2025 16:42:30 +0800
Subject: [PATCH] 还原代码
---
Wms/Wms/Controllers/WeatherForecastController.cs | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/Wms/Wms/Controllers/WeatherForecastController.cs b/Wms/Wms/Controllers/WeatherForecastController.cs
index 4a055f9..d489ce1 100644
--- a/Wms/Wms/Controllers/WeatherForecastController.cs
+++ b/Wms/Wms/Controllers/WeatherForecastController.cs
@@ -7,6 +7,7 @@
using WMS.IBLL.ISysServer;
using Wms.Tools;
using Utility;
+using Model.ModelDto.SysDto;
namespace Wms.Controllers
{
@@ -53,23 +54,28 @@
/// <param name="model">鐧诲綍鍚�</param>
/// <returns></returns>
[HttpPost]
- public async Task<string> Login(LoginVm model)
+ public async Task<UserDto> Login(LoginVm model)
{
if (ModelState.IsValid)
{
- var userId = await _userMan.LoginAdmin(model.LoginName, model.LoginPwd);
+ var user = await _userMan.LoginAdmin(model.LoginName, model.LoginPwd);
+ UserDto dto = new UserDto();
- if (userId != -1 && userId != -2) //
+ if (user.Id != -1 && user.Id != -2) //
{
- if (userId != 0) //姝ｇ‘杩斿洖
+ if (user.Id != 0) //姝ｇ‘杩斿洖
{
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>
- {
- {"loginID", userId.ToString()},
- {"LoginName", model.LoginName}
- };
+ {
+ {"loginID", user.Id.ToString()},
+ {"LoginName", model.LoginName}
+ };
var tnToken = tokenHelper.CreateToken(keyValuePairs);
- return tnToken.TokenStr;
+
+ dto.Token = tnToken.TokenStr;
+ dto.RealName = user.RealName;
+
+ return dto;
}
else //褰撳墠璐﹀彿琚鐢�
{
@@ -77,7 +83,7 @@
throw Oops.Bah("褰撳墠璐﹀彿宸茶绂佺敤");
}
}
- else if (userId == -1) //璐﹀彿瀵嗙爜閿欒
+ else if (user.Id == -1) //璐﹀彿瀵嗙爜閿欒
{
throw Oops.Bah("褰撳墠璐﹀彿鎴栧瘑鐮侀敊璇�");
}
--
Gitblit v1.8.0