From 461ccbda1d9d3fef42f250771c2fd30702755c16 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 24 四月 2025 17:18:35 +0800
Subject: [PATCH] PLC
---
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_SystemServices/Sys_UserService.cs | 205 +++++++++++++--------------------------------------
1 files changed, 52 insertions(+), 153 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_SystemServices/Sys_UserService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_SystemServices/Sys_UserService.cs"
index f959724..97a36ef 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_SystemServices/Sys_UserService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_SystemServices/Sys_UserService.cs"
@@ -22,6 +22,8 @@
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using System.Security.Policy;
+using System.Runtime.InteropServices;
+using System;
namespace WIDESEAWCS_SystemServices
{
@@ -51,110 +53,7 @@
}
- //#region 鍘熸湰鐧诲叆
- //public WebResponseContent Login(LoginInfo loginInfo)
- //{
- // WebResponseContent content = new WebResponseContent();
- // try
- // {
- // // BaseDal.QueryFirst(x => x.UserName == loginInfo.UserName);
-
- // string msg = string.Empty;
-
- // #region 涓存椂浣跨敤
- // try
- // {
- // loginInfo.Password = loginInfo.Password.EncryptDES(AppSecret.User);
- // }
- // catch
- // {
-
- // }
- // #endregion
- // if (!string.IsNullOrEmpty(loginInfo.path))
- // {
- // var gruoid = _faceRecognitionRepository.QueryData().Select(x => x.GroupID).FirstOrDefault();
- // if (gruoid == null)
- // {
- // return new WebResponseContent { Status = false, Message = "娌℃壘鍒拌缁�" };
-
- // }
- // var faceResult = BaiDuFaceHelper.FaceSearch(loginInfo.path, gruoid);
-
- // if (faceResult != null && faceResult.error_code == 0)
- // {
- // // 鑾峰彇鏈�楂樺尮閰嶅害鐨勭敤鎴�
- // var bestMatch = faceResult.result.user_list.OrderByDescending(u => u.score).FirstOrDefault();//鎷跨涓�涓渶楂樼殑
-
- // if (bestMatch != null && double.TryParse(bestMatch.score, out double score) && score > 80) // 璁惧畾80鍒嗕负鍙俊搴﹂槇鍊�
- // {
- // //return new WebResponseContent {Status=true,Data = true,Message="璇嗗埆鐧诲叆鎴愬姛" };
-
- // }
- // }
-
- // return WebResponseContent.Instance.Error("浜鸿劯璇嗗埆澶辫触锛岃閲嶈瘯");
- // }
-
- // UserInfo user = BaseDal.GetUserInfo(loginInfo.UserName, loginInfo.Password);
-
-
- // var disbled = BaseDal.QueryFirst(x => x.UserName == loginInfo.UserName);//鏍规嵁杩欎釜鐢ㄦ埛鍚嶆潵鏌ョ湅鐢ㄦ埛
- // if (user != null)
- // {
- // object obj = _menuService.GetMenuActionList(user.RoleId);
- // if (obj is not IEnumerable<object> list)
- // {
- // return WebResponseContent.Instance.Error("鏃犵櫥褰曟潈闄�");
- // }
- // if (!list.Any())
- // {
- // return WebResponseContent.Instance.Error("鏃犵櫥褰曟潈闄�");
- // }
- // if (disbled.Enable != 1)
- // {
- // return WebResponseContent.Instance.Error("浣犵殑璐﹀彿宸茶绂佺敤锛岃鑱旂郴绠＄悊鍛�");
- // }
-
- // string token = JwtHelper.IssueJwt(new TokenModelJwt()
- // {
- // UserId = user.UserId,
- // RoleId = user.RoleId,
- // UserName = user.UserName,
- // TenantId = user.TenantId,
- // });
- // //鐧诲叆鍘嗗彶璁板綍
- // var loghis = new Dt_LoginHistory
- // {
- // Account = user.UserName,
- // TrurName = user.UserTrueName,
- // CreateDate = DateTime.Now
-
- // };
-
-
- // _cacheService.AddOrUpdate(user.UserId.ToString(), token);
- // _loginHistoryRepository.AddData(loghis);
-
- // content = WebResponseContent.Instance.OK(data: new { token, userName = user.UserTrueName, img = user.HeadImageUrl, ID = user.UserId, RoleId = user.RoleId });
- // }
- // else
- // {
- // content = WebResponseContent.Instance.Error("璐﹀彿鎴栧瘑鐮侀敊璇�");
- // }
-
- // }
-
- // catch (Exception ex)
- // {
- // content = WebResponseContent.Instance.Error(ex.Message);
- // }
-
- // return content;
- //}
- //#endregion
-
-
+ #region 浜鸿劯璇嗗埆鐧诲叆鎺ュ彛
/// <summary>
/// 浜鸿劯璇嗗埆鐧诲叆鎺ュ彛
/// </summary>
@@ -225,58 +124,58 @@
user = BaseDal.GetUserInfo(loginInfo.UserName, loginInfo.Password);
}
- // 濡傛灉鎵惧埌鐢ㄦ埛
- if (user != null)
+ // 濡傛灉鎵惧埌鐢ㄦ埛
+ if (user != null)
+ {
+
+ var disbled = BaseDal.QueryFirst(x => x.UserName == loginInfo.UserName);
+ if (disbled.Enable != 1)
{
-
- var disbled = BaseDal.QueryFirst(x => x.UserName == loginInfo.UserName);
- if (disbled.Enable != 1)
- {
- return WebResponseContent.Instance.Error("浣犵殑璐﹀彿宸茶绂佺敤锛岃鑱旂郴绠＄悊鍛�");
- }
-
- // 鑾峰彇瑙掕壊鏉冮檺
- object obj = _menuService.GetMenuActionList(user.RoleId);
- if (obj is not IEnumerable<object> list || !list.Any())
- {
- return WebResponseContent.Instance.Error("鏃犵櫥褰曟潈闄�");
- }
-
- // 鐢熸垚 JWT Token
- string token = JwtHelper.IssueJwt(new TokenModelJwt()
- {
- UserId = user.UserId,
- RoleId = user.RoleId,
- UserName = user.UserName,
- TenantId = user.TenantId,
- });
-
- // 璁板綍鐧诲綍鍘嗗彶
- var loghis = new Dt_LoginHistory
- {
- Account = user.UserName,
- TrurName = user.UserTrueName,
- CreateDate = DateTime.Now
- };
-
- // 淇濆瓨鐢ㄦ埛鐧诲綍淇℃伅
- _cacheService.AddOrUpdate(user.UserId.ToString(), token);
- _loginHistoryRepository.AddData(loghis);
-
- // 杩斿洖鍝嶅簲
- content = WebResponseContent.Instance.OK(data: new
- {
- token,
- userName = user.UserTrueName,
- img = user.HeadImageUrl,
- ID = user.UserId,
- RoleId = user.RoleId
- });
+ return WebResponseContent.Instance.Error("浣犵殑璐﹀彿宸茶绂佺敤锛岃鑱旂郴绠＄悊鍛�");
}
- else
+
+ // 鑾峰彇瑙掕壊鏉冮檺
+ object obj = _menuService.GetMenuActionList(user.RoleId);
+ if (obj is not IEnumerable<object> list || !list.Any())
{
- content = WebResponseContent.Instance.Error("璐﹀彿鎴栧瘑鐮侀敊璇�");
+ return WebResponseContent.Instance.Error("鏃犵櫥褰曟潈闄�");
}
+
+ // 鐢熸垚 JWT Token
+ string token = JwtHelper.IssueJwt(new TokenModelJwt()
+ {
+ UserId = user.UserId,
+ RoleId = user.RoleId,
+ UserName = user.UserName,
+ TenantId = user.TenantId,
+ });
+
+ // 璁板綍鐧诲綍鍘嗗彶
+ var loghis = new Dt_LoginHistory
+ {
+ Account = user.UserName,
+ TrurName = user.UserTrueName,
+ CreateDate = DateTime.Now
+ };
+
+ // 淇濆瓨鐢ㄦ埛鐧诲綍淇℃伅
+ _cacheService.AddOrUpdate(user.UserId.ToString(), token);
+ _loginHistoryRepository.AddData(loghis);
+
+ // 杩斿洖鍝嶅簲
+ content = WebResponseContent.Instance.OK(data: new
+ {
+ token,
+ userName = user.UserTrueName,
+ img = user.HeadImageUrl,
+ ID = user.UserId,
+ RoleId = user.RoleId
+ });
+ }
+ else
+ {
+ content = WebResponseContent.Instance.Error("璐﹀彿鎴栧瘑鐮侀敊璇�");
+ }
}
catch (Exception ex)
{
@@ -285,8 +184,8 @@
return content;
}
+ #endregion
-
public override WebResponseContent UpdateData(SaveModel saveModel)
--
Gitblit v1.9.3