From 114ffafeeb20ef7066cb2e2882bb58b96f791ab5 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 20 十月 2025 11:33:11 +0800
Subject: [PATCH] 提交数据
---
项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 10 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs"
index d9ddf8c..5b2e79f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs"
@@ -14,6 +14,7 @@
using Microsoft.AspNetCore.Http;
using Newtonsoft.Json;
using WIDESEAWCS_Common;
+
using FaceAI;
using System.Runtime.InteropServices;
using System.IO;
@@ -365,9 +366,26 @@
if (string.IsNullOrEmpty(oldPwd)) return WebResponseContent.Instance.Error("鏃у瘑鐮佷笉鑳戒负绌�");
if (string.IsNullOrEmpty(newPwd)) return WebResponseContent.Instance.Error("鏂板瘑鐮佷笉鑳戒负绌�");
if (newPwd.Length < 6) return WebResponseContent.Instance.Error("瀵嗙爜涓嶈兘灏戜簬6浣�");
+
int userId = App.User.UserId;
string userCurrentPwd = BaseDal.QueryFirst(x => x.User_Id == userId, s => s.UserPwd);
+
+ // 鉁� 瀵嗙爜澶嶆潅搴︽牎楠岋細蹇呴』鍖呭惈瀛楁瘝鍜屾暟瀛�
+ // 鉁� 瀵嗙爜澶嶆潅搴︽牎楠岋細蹇呴』鍖呭惈澶у皬鍐欏瓧姣嶃�佹暟瀛楀拰鐗规畩绗﹀彿
+ if (!global::System.Text.RegularExpressions.Regex.IsMatch(newPwd, @"[a-z]"))
+ return content.Error("鏂板瘑鐮佸繀椤诲寘鍚皬鍐欏瓧姣�");
+
+ if (!global::System.Text.RegularExpressions.Regex.IsMatch(newPwd, @"[A-Z]"))
+ return content.Error("鏂板瘑鐮佸繀椤诲寘鍚ぇ鍐欏瓧姣�");
+
+ if (!global::System.Text.RegularExpressions.Regex.IsMatch(newPwd, @"\d"))
+ return content.Error("鏂板瘑鐮佸繀椤诲寘鍚暟瀛�");
+
+ // 鉁� 瀵嗙爜澶嶆潅搴︽牎楠岋細蹇呴』鍖呭惈鑷冲皯涓�涓壒娈婄鍙凤紙闈炲瓧姣嶆暟瀛楃殑閮界畻锛�
+ if (!global::System.Text.RegularExpressions.Regex.IsMatch(newPwd, @"[^a-zA-Z0-9]"))
+ return content.Error("鏂板瘑鐮佸繀椤诲寘鍚嚦灏戜竴涓壒娈婄鍙�");
+
string _oldPwd = oldPwd.EncryptDES(AppSecret.User);
if (_oldPwd != userCurrentPwd) return WebResponseContent.Instance.Error("鏃у瘑鐮佷笉姝ｇ‘");
@@ -403,7 +421,7 @@
/// <param name="id"></param>
/// <param name="oldPwd"></param>
/// <param name="newPwd"></param>
- /// <returns></returns>
+ /// <returns></returns>
public WebResponseContent UpdatePwd(int id, string oldPwd, string newPwd)
{
WebResponseContent content = new WebResponseContent();
@@ -412,22 +430,44 @@
try
{
- if (string.IsNullOrEmpty(oldPwd)) return content.Error("鏃у瘑鐮佷笉鑳戒负绌�");
- if (string.IsNullOrEmpty(newPwd)) return content.Error("鏂板瘑鐮佷笉鑳戒负绌�");
- if (newPwd.Length < 6) return content.Error("瀵嗙爜涓嶈兘灏戜簬6浣�");
+ if (string.IsNullOrEmpty(oldPwd))
+ return content.Error("鏃у瘑鐮佷笉鑳戒负绌�");
+
+ if (string.IsNullOrEmpty(newPwd))
+ return content.Error("鏂板瘑鐮佷笉鑳戒负绌�");
+
+ if (newPwd.Length < 6)
+ return content.Error("瀵嗙爜涓嶈兘灏戜簬6浣�");
+
+ // 鉁� 瀵嗙爜澶嶆潅搴︽牎楠岋細蹇呴』鍖呭惈澶у皬鍐欏瓧姣嶃�佹暟瀛楀拰鐗规畩绗﹀彿
+ if (!global::System.Text.RegularExpressions.Regex.IsMatch(newPwd, @"[a-z]"))
+ return content.Error("鏂板瘑鐮佸繀椤诲寘鍚皬鍐欏瓧姣�");
+
+ if (!global::System.Text.RegularExpressions.Regex.IsMatch(newPwd, @"[A-Z]"))
+ return content.Error("鏂板瘑鐮佸繀椤诲寘鍚ぇ鍐欏瓧姣�");
+
+ if (!global::System.Text.RegularExpressions.Regex.IsMatch(newPwd, @"\d"))
+ return content.Error("鏂板瘑鐮佸繀椤诲寘鍚暟瀛�");
+
+ // 鉁� 瀵嗙爜澶嶆潅搴︽牎楠岋細蹇呴』鍖呭惈鑷冲皯涓�涓壒娈婄鍙凤紙闈炲瓧姣嶆暟瀛楃殑閮界畻锛�
+ if (!global::System.Text.RegularExpressions.Regex.IsMatch(newPwd, @"[^a-zA-Z0-9]"))
+ return content.Error("鏂板瘑鐮佸繀椤诲寘鍚嚦灏戜竴涓壒娈婄鍙�");
// 鑾峰彇鐢ㄦ埛褰撳墠瀵嗙爜
string userCurrentPwd = BaseDal.QueryFirst(x => x.User_Id == id, s => s.UserPwd) ?? "";
- if (string.IsNullOrEmpty(userCurrentPwd)) return content.Error("鐢ㄦ埛涓嶅瓨鍦ㄦ垨瀵嗙爜鏈缃�");
+ if (string.IsNullOrEmpty(userCurrentPwd))
+ return content.Error("鐢ㄦ埛涓嶅瓨鍦ㄦ垨瀵嗙爜鏈缃�");
- //// 杩涜瀵嗙爜鍔犲瘑瀵规瘮
+ //// 濡傛灉闇�瑕侀獙璇佹棫瀵嗙爜锛屾斁寮�杩欓噷
//string _oldPwd = oldPwd.EncryptDES(AppSecret.User);
- //if (_oldPwd != userCurrentPwd) return content.Error("鏃у瘑鐮佷笉姝ｇ‘");
+ //if (_oldPwd != userCurrentPwd)
+ // return content.Error("鏃у瘑鐮佷笉姝ｇ‘");
// 鐢熸垚鏂板瘑鐮佸姞瀵嗗��
string _newPwd = newPwd.EncryptDES(AppSecret.User);
- if (userCurrentPwd == _newPwd) return content.Error("鏂板瘑鐮佷笉鑳戒笌鏃у瘑鐮佺浉鍚�");
+ if (userCurrentPwd == _newPwd)
+ return content.Error("鏂板瘑鐮佷笉鑳戒笌鏃у瘑鐮佺浉鍚�");
// 鏇存柊瀵嗙爜
bool isUpdated = BaseDal.UpdateData(new Sys_User
@@ -443,7 +483,7 @@
if (!isUpdated)
{
- return content.Error("瀵嗙爜淇敼澶辫触锛岃绋嶅悗閲嶈瘯");
+ return content.Error("瀵嗙爜淇敼澶辫触锛屽瘑鐮佸繀椤诲寘鎷瓧姣嶄互鍙婄壒娈婂瓧绗�");
}
return content.OK("瀵嗙爜淇敼鎴愬姛", id);
@@ -570,7 +610,7 @@
RoleName = addUserDTO.rolename,
Enable = addUserDTO.enable,
Unit=addUserDTO.userunit,
- UserPwd = "j79rYYvCz4vdhcboB1Ausg==",
+ UserPwd = "NgKc7vI5u5jzh115fowV~g==",
Userteam=addUserDTO.userteam,
Dept_Id=addUserDTO.dept_Id,
//CardNumber=addUserDTO.carnuber,
--
Gitblit v1.9.3