From d9c99e0480b4910cdb134778dd5c314b35ec4cf2 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 29 九月 2025 10:05:23 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs"
index b96a532..337a8c8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs"
@@ -41,8 +41,21 @@
try
{
//BaseDal.QueryFirst(x => x.UserName == loginInfo.UserName);
-
string msg = string.Empty;
+ if (App.ExpDateTime != null)
+ {
+ if ((DateTime.Now - App.ExpDateTime.GetValueOrDefault()).TotalSeconds > 0)
+ return WebResponseContent.Instance.Error("鎺堟潈宸插埌鏈燂紝璇疯仈绯荤鐞嗗憳");
+ var span = App.ExpDateTime.GetValueOrDefault() - DateTime.Now;
+ var Days = span.TotalDays;
+ var Hours = span.TotalHours;
+ var Minutes = span.TotalMinutes;
+ var Seconds = span.TotalSeconds;
+ if (Minutes < 1) msg = $"绯荤粺灏嗗湪 {Math.Ceiling(Seconds)} 绉掗挓鍚庡埌鏈燂紝鍒版湡鏃堕棿锛歿App.ExpDateTime.GetValueOrDefault():yyyy-MM-dd HH:mm:ss}銆傝鑱旂郴绠＄悊鍛樼画鏈熴��";
+ else if (Hours < 1) msg = $"绯荤粺灏嗗湪 {Math.Ceiling(Minutes)} 鍒嗛挓鍚庡埌鏈燂紝鍒版湡鏃堕棿锛歿App.ExpDateTime.GetValueOrDefault():yyyy-MM-dd HH:mm:ss}銆傝鑱旂郴绠＄悊鍛樼画鏈熴��";
+ else if (Hours < 72) msg = $"绯荤粺灏嗗湪 {Math.Ceiling(Hours)} 灏忔椂鍚庡埌鏈燂紝鍒版湡鏃堕棿锛歿App.ExpDateTime.GetValueOrDefault():yyyy-MM-dd HH:mm:ss}銆傝鑱旂郴绠＄悊鍛樼画鏈熴��";
+ else if (Days < 7) msg = $"绯荤粺灏嗗湪 {Math.Ceiling(Days)} 澶╁悗鍒版湡锛屽埌鏈熸椂闂达細{App.ExpDateTime.GetValueOrDefault():yyyy-MM-dd HH:mm:ss}銆傝鑱旂郴绠＄悊鍛樼画鏈熴��";
+ }
#region 涓存椂浣跨敤
try
@@ -78,7 +91,7 @@
_cacheService.AddOrUpdate(user.UserId.ToString(), token);
- content = WebResponseContent.Instance.OK(data: new { token, userName = user.UserTrueName, img = user.HeadImageUrl });
+ content = WebResponseContent.Instance.OK(msg, data: new { token, userName = user.UserTrueName, img = user.HeadImageUrl });
}
else
{
@@ -128,7 +141,7 @@
int RoleId = saveModel.MainData[nameof(Sys_User.Role_Id).FirstLetterToLower()].ObjToInt();
var user = BaseDal.QueryFirst(x => x.User_Id == userId);
if (User.User_Id == user.User_Id && User.Role_Id != RoleId) return WebResponseContent.Instance.Error("涓嶅彲淇敼鑷繁鐨勮鑹�");
- if(User.User_Id != user.User_Id && User.Role_Id >= RoleId) return WebResponseContent.Instance.Error("鏉冮檺绛夌骇涓嶈冻");
+ if (User.User_Id != user.User_Id && User.Role_Id >= RoleId) return WebResponseContent.Instance.Error("鏉冮檺绛夌骇涓嶈冻");
if (User.Role_Id > user.Role_Id || User.Role_Id == user.Role_Id && User.User_Id != userId) return WebResponseContent.Instance.Error("鏆傛棤淇敼鏉冮檺");
//if (User.User_Id != userId) return WebResponseContent.Instance.Error("鏆傛棤淇敼鏉冮檺");鍙檺褰撳墠鐢ㄦ埛淇敼
#endregion
--
Gitblit v1.9.3