角色列表接口调整； 密码验证调整

CallCenterApi/CallCenterApi.Common/CallCenterApi.Common.csproj

@@ -51,6 +51,7 @@
     <Compile Include="DESEncrypt.cs" />
     <Compile Include="DTRequest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RegexHelper.cs" />
     <Compile Include="SysConfigHelper.cs" />
     <Compile Include="Utils.cs" />
     <Compile Include="XmlFormatHelper.cs" />

CallCenterApi/CallCenterApi.Common/RegexHelper.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace CallCenterApi.Common
+{
+    public class RegexHelper
+    {
+        public static readonly string Reg_Pwd = @"^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{6,16}$";
+        public static bool RegexPwd(string password)
+        {
+            return Regex.IsMatch(password, Reg_Pwd);
+        }
+    }
+}

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/RoleInfoController.cs

@@ -8,6 +8,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
+using System.Text;
 using System.Web;
 using System.Web.Mvc;
 
@@ -23,13 +24,22 @@ namespace CallCenterApi.Interface.Controllers
             ActionResult res = NoToken("未知错误，请重新登录");
             //if (Request.IsAuthenticated)
             //{
+            StringBuilder sb = new StringBuilder();
+            if (!string.IsNullOrWhiteSpace(filter.Name))
+            {
+                sb.Append(" and  F_RoleName like '%" + filter.Name ?? "" + "%' ");
+            }
+            if (!string.IsNullOrWhiteSpace(filter.Code))
+            {
+                sb.Append(" and F_RoleCode like '%" + filter.Code ?? "" + "%'  ");
+            }
             DataTable dt = new DataTable();
             int recordCount = 0;
             dt = BLL.PagerBLL.GetListPager(
                 "T_Sys_RoleInfo",
                 "F_RoleId",
                 "*",
-                " and  F_RoleName like '%" + filter.Name + "%' and F_RoleCode like '%" + filter.Code + "%'  ",
+                sb.ToString(),
                 "",
                 filter.PageSize,
                 filter.PageIndex,

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -172,6 +172,10 @@ namespace CallCenterApi.Interface.Controllers
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
+                if (!RegexHelper.RegexPwd(input.Password.Trim()))
+                    return Error("密码必须为6-16个字符，大、小写字母和数字的组合");
+
+
                 var model = sysUserAccountBll.GetModel(int.Parse(input.Usercode));
                 if (model != null)
                     return Error("当前员工工号存在，请更换！");
@@ -435,8 +439,8 @@ namespace CallCenterApi.Interface.Controllers
             var res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-                if (string.IsNullOrWhiteSpace(pwd))
-                    return Error("请输入密码");
+                if (!RegexHelper.RegexPwd(pwd))
+                    return Error("密码必须为6-16个字符，大、小写字母和数字的组合");
                 var model = sysUserAccountBll.GetModel(usercode);
                 if (model == null) return Error("此用户不存在");
                 model.F_Password = pwd;
@@ -453,8 +457,8 @@ namespace CallCenterApi.Interface.Controllers
             var res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-                if (string.IsNullOrWhiteSpace(pwd))
-                    return Error("请输入密码");
+                if (!RegexHelper.RegexPwd(pwd))
+                    return Error("密码必须为6-16个字符，大、小写字母和数字的组合");
                 if (string.IsNullOrWhiteSpace(usercode))
                     return Error("账号错误");
                 var model = sysUserAccountBll.GetModel(int.Parse(usercode));

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Filter/FilterRole.cs

@@ -8,8 +8,8 @@ namespace CallCenterApi.Interface.Models.Filter
 {
     public class FilterRole : ListBase
     {
-        public string Name { get; set; }
-        public string Code { get; set; }
+        public string Name { get; set; } = "";
+        public string Code { get; set; } = "";
 
     }
 }