From 20a717b2e63915fb88af871cdec595e76aa4d8e7 Mon Sep 17 00:00:00 2001 From: yubaolee Date: Sun, 27 Dec 2020 00:00:28 +0800 Subject: [PATCH] sync with OpenAuth.Core --- Infrastructure/Extensions/EntityProperties.cs | 420 ++++++++++++------ Infrastructure/log4net.config | 2 +- OpenAuth.App/FileApp.cs | 5 + OpenAuth.App/Request/UpdateUserReq.cs | 8 +- OpenAuth.App/RevelanceManagerApp.cs | 48 +- OpenAuth.App/RoleApp.cs | 44 +- OpenAuth.App/Test/TestAccessObjs.cs | 29 +- OpenAuth.App/Test/TestAsync.cs | 2 +- OpenAuth.App/Test/TestFileApp.cs | 2 +- OpenAuth.App/Test/TestUserApp.cs | 23 +- OpenAuth.App/UserManagerApp.cs | 3 + OpenAuth.Identity/Quickstart/TestUsers.cs | 3 +- OpenAuth.Repository/OpenAuthDBContext.cs | 22 +- .../Controllers/AccessObjsController.cs | 6 +- .../Controllers/FilesController.cs | 1 - .../Controllers/RolesController.cs | 14 +- OpenAuth.WebApi/Program.cs | 2 - OpenAuth.WebApi/Startup.cs | 11 +- OpenAuth.WebApi/appsettings.Development.json | 5 +- 19 files changed, 451 insertions(+), 199 deletions(-) diff --git a/Infrastructure/Extensions/EntityProperties.cs b/Infrastructure/Extensions/EntityProperties.cs index 72f7619e..e359a417 100644 --- a/Infrastructure/Extensions/EntityProperties.cs +++ b/Infrastructure/Extensions/EntityProperties.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; @@ -14,7 +14,6 @@ namespace Infrastructure.Extensions { public static class EntityProperties { - public static string GetExpressionPropertyFirst(this Expression> properties) { string[] arr = properties.GetExpressionProperty(); @@ -22,6 +21,7 @@ namespace Infrastructure.Extensions return arr[0]; return ""; } + /// /// 获取对象里指定成员名称 /// @@ -33,13 +33,14 @@ namespace Infrastructure.Extensions if (properties == null) return new string[] { }; if (properties.Body is NewExpression) - return ((NewExpression)properties.Body).Members.Select(x => x.Name).ToArray(); + return ((NewExpression) properties.Body).Members.Select(x => x.Name).ToArray(); if (properties.Body is MemberExpression) - return new string[] { ((MemberExpression)properties.Body).Member.Name }; + return new string[] {((MemberExpression) properties.Body).Member.Name}; if (properties.Body is UnaryExpression) - return new string[] { ((properties.Body as UnaryExpression).Operand as MemberExpression).Member.Name }; + return new string[] {((properties.Body as UnaryExpression).Operand as MemberExpression).Member.Name}; throw new Exception("未实现的表达式"); } + public static string ValidateHashInEntity(this Type typeinfo, Dictionary dic) { return typeinfo.ValidateDicInEntity(dic, false); @@ -47,7 +48,6 @@ namespace Infrastructure.Extensions public static void RemoveNotExistColumns(this Type typeinfo, List cols) { - } /// @@ -59,14 +59,16 @@ namespace Infrastructure.Extensions { return typeinfo.GetProperties().Select(c => c.Name).ToList(); } + public static void IsExistColumns(this Type typeinfo) { - } + public static Dictionary GetColumType(this PropertyInfo[] properties) { return properties.GetColumType(false); } + public static Dictionary GetColumType(this PropertyInfo[] properties, bool containsKey) { Dictionary dictionary = new Dictionary(); @@ -76,29 +78,33 @@ namespace Infrastructure.Extensions { continue; } + var keyVal = GetColumnType(property, true); dictionary.Add(keyVal.Key, keyVal.Value); } + return dictionary; } - private static readonly Dictionary entityMapDbColumnType = new Dictionary() { - {typeof(int),SqlDbTypeName.Int }, - {typeof(int?),SqlDbTypeName.Int }, - {typeof(long),SqlDbTypeName.BigInt }, - {typeof(long?),SqlDbTypeName.BigInt }, - {typeof(decimal),"decimal(18, 5)" }, - {typeof(decimal?),"decimal(18, 5)" }, - {typeof(double),"decimal(18, 5)" }, - {typeof(double?),"decimal(18, 5)" }, - {typeof(float),"decimal(18, 5)" }, - {typeof(float?),"decimal(18, 5)" }, - {typeof(Guid),"UniqueIdentifier" }, - {typeof(Guid?),"UniqueIdentifier" }, - {typeof(byte),"tinyint" }, - {typeof(byte?),"tinyint" }, - {typeof(string),"nvarchar" } + private static readonly Dictionary entityMapDbColumnType = new Dictionary() + { + {typeof(int), SqlDbTypeName.Int}, + {typeof(int?), SqlDbTypeName.Int}, + {typeof(long), SqlDbTypeName.BigInt}, + {typeof(long?), SqlDbTypeName.BigInt}, + {typeof(decimal), "decimal(18, 5)"}, + {typeof(decimal?), "decimal(18, 5)"}, + {typeof(double), "decimal(18, 5)"}, + {typeof(double?), "decimal(18, 5)"}, + {typeof(float), "decimal(18, 5)"}, + {typeof(float?), "decimal(18, 5)"}, + {typeof(Guid), "UniqueIdentifier"}, + {typeof(Guid?), "UniqueIdentifier"}, + {typeof(byte), "tinyint"}, + {typeof(byte?), "tinyint"}, + {typeof(string), "nvarchar"} }; + /// /// 返回属性的字段及数据库类型 /// @@ -111,7 +117,7 @@ namespace Infrastructure.Extensions object objAtrr = property.GetTypeCustomAttributes(typeof(ColumnAttribute), out bool asType); if (asType) { - colType = ((ColumnAttribute)objAtrr).TypeName.ToLower(); + colType = ((ColumnAttribute) objAtrr).TypeName.ToLower(); if (!string.IsNullOrEmpty(colType)) { //不需要具体长度直接返回 @@ -119,12 +125,13 @@ namespace Infrastructure.Extensions { return new KeyValuePair(property.Name, colType); } + if (colType == "decimal" || colType == "double" || colType == "float") { objAtrr = property.GetTypeCustomAttributes(typeof(DisplayFormatAttribute), out asType); - colType += "(" + (asType ? ((DisplayFormatAttribute)objAtrr).DataFormatString : "18,5") + ")"; - + colType += "(" + (asType ? ((DisplayFormatAttribute) objAtrr).DataFormatString : "18,5") + ")"; } + ///如果是string,根据 varchar或nvarchar判断最大长度 if (property.PropertyType.ToString() == "System.String") { @@ -132,17 +139,21 @@ namespace Infrastructure.Extensions objAtrr = property.GetTypeCustomAttributes(typeof(MaxLengthAttribute), out asType); if (asType) { - int length = ((MaxLengthAttribute)objAtrr).Length; - colType += "(" + (length < 1 || length > (colType.StartsWith("n") ? 8000 : 4000) ? "max" : length.ToString()) + ")"; + int length = ((MaxLengthAttribute) objAtrr).Length; + colType += "(" + (length < 1 || length > (colType.StartsWith("n") ? 8000 : 4000) + ? "max" + : length.ToString()) + ")"; } else { colType += "(max)"; } } + return new KeyValuePair(property.Name, colType); } } + if (entityMapDbColumnType.TryGetValue(property.PropertyType, out string value)) { colType = value; @@ -151,10 +162,12 @@ namespace Infrastructure.Extensions { colType = SqlDbTypeName.NVarChar; } + if (lenght && colType == SqlDbTypeName.NVarChar) { colType = "nvarchar(max)"; } + return new KeyValuePair(property.Name, colType); } @@ -171,10 +184,12 @@ namespace Infrastructure.Extensions { return string.Empty; } + string columnType = string.Empty; - List arrrayEntityList = array.Select(x => new ArrayEntity { column1 = x.ToString() }).ToList(); + List arrrayEntityList = array.Select(x => new ArrayEntity {column1 = x.ToString()}).ToList(); return arrrayEntityList.GetEntitySql(false, null, null, null, fieldType); } + /// ///要执行的sql语句如：通过EntityToSqlTempName.Temp_Insert0.ToString()字符串占位，生成的的sql语句会把EntityToSqlTempName.Temp_Insert0.ToString()替换成生成的sql临时表数据 /// string sql = " ;DELETE FROM " + typeEntity.Name + " where " + typeEntity.GetKeyName() + @@ -191,14 +206,17 @@ namespace Infrastructure.Extensions { return string.Empty; } + string columnType = string.Empty; - List arrrayEntityList = array.Select(x => new ArrayEntity { column1 = x.ToString() }).ToList(); + List arrrayEntityList = array.Select(x => new ArrayEntity {column1 = x.ToString()}).ToList(); return arrrayEntityList.GetEntitySql(false, sql, null, null, fieldType); } + public static string GetArraySql(this object[] array, string sql) { return array.GetArraySql(typeof(T).GetFieldType(), sql); } + /// /// 根据实体获取key的类型，用于update或del操作 /// @@ -207,32 +225,45 @@ namespace Infrastructure.Extensions public static FieldType GetFieldType(this Type typeEntity) { FieldType fieldType; - string columnType = typeEntity.GetProperties().Where(x => x.Name == typeEntity.GetKeyName()).ToList()[0].GetColumnType(false).Value; + string columnType = typeEntity.GetProperties().Where(x => x.Name == typeEntity.GetKeyName()).ToList()[0] + .GetColumnType(false).Value; switch (columnType) { - case SqlDbTypeName.Int: fieldType = FieldType.Int; break; - case SqlDbTypeName.BigInt: fieldType = FieldType.BigInt; break; - case SqlDbTypeName.VarChar: fieldType = FieldType.VarChar; break; - case SqlDbTypeName.UniqueIdentifier: fieldType = FieldType.UniqueIdentifier; break; - default: fieldType = FieldType.NvarChar; break; + case SqlDbTypeName.Int: + fieldType = FieldType.Int; + break; + case SqlDbTypeName.BigInt: + fieldType = FieldType.BigInt; + break; + case SqlDbTypeName.VarChar: + fieldType = FieldType.VarChar; + break; + case SqlDbTypeName.UniqueIdentifier: + fieldType = FieldType.UniqueIdentifier; + break; + default: + fieldType = FieldType.NvarChar; + break; } + return fieldType; } - public static string GetEntitySql(this IEnumerable entityList, - bool containsKey = false, - string sql = null, - Expression> ignoreFileds = null, - Expression> fixedColumns = null, - FieldType? fieldType = null - ) - { + public static string GetEntitySql(this IEnumerable entityList, + bool containsKey = false, + string sql = null, + Expression> ignoreFileds = null, + Expression> fixedColumns = null, + FieldType? fieldType = null + ) + { if (entityList == null || entityList.Count() == 0) return ""; PropertyInfo[] propertyInfo = typeof(T).GetProperties().ToArray(); if (propertyInfo.Count() == 0) { propertyInfo = entityList.ToArray()[0].GetType().GetGenericProperties().ToArray(); } + propertyInfo = propertyInfo.GetGenericProperties().ToArray(); string[] arr = null; @@ -240,8 +271,10 @@ namespace Infrastructure.Extensions { arr = fixedColumns.GetExpressionToArray(); PropertyInfo keyProperty = typeof(T).GetKeyProperty(); - propertyInfo = propertyInfo.Where(x => (containsKey && x.Name == keyProperty.Name) || arr.Contains(x.Name)).ToArray(); + propertyInfo = propertyInfo + .Where(x => (containsKey && x.Name == keyProperty.Name) || arr.Contains(x.Name)).ToArray(); } + if (ignoreFileds != null) { arr = ignoreFileds.GetExpressionToArray(); @@ -252,12 +285,15 @@ namespace Infrastructure.Extensions if (fieldType != null) { string realType = fieldType.ToString(); - if ((int)fieldType == 0 || (int)fieldType == 1) + if ((int) fieldType == 0 || (int) fieldType == 1) { realType += "(max)"; } - dictProperties = new Dictionary { { dictProperties.Select(x => x.Key).ToList()[0], realType } }; + + dictProperties = new Dictionary + {{dictProperties.Select(x => x.Key).ToList()[0], realType}}; } + if (dictProperties.Keys.Count * entityList.Count() > 50 * 3000) { throw new Exception("写入数据太多,请分开写入。"); @@ -299,19 +335,27 @@ namespace Infrastructure.Extensions stringCenter.Remove(stringCenter.Length - 1, 1).Append("',").ToString() + stringRight.Remove(stringRight.Length - 1, 1).ToString()); - stringLeft.Clear(); stringCenter.Clear(); stringRight.Clear(); + stringLeft.Clear(); + stringCenter.Clear(); + stringRight.Clear(); } stringLeft.AppendLine("exec sp_executesql N'SET NOCOUNT ON;"); stringCenter.Append("N'"); - index = 0; count = 0; + index = 0; + count = 0; } + stringLeft.Append(index == 0 ? "; INSERT INTO " + tempTablbe + " values (" : " "); index++; foreach (PropertyInfo property in propertyInfo) { - if (!containsKey && property.IsKey()) { continue; } + if (!containsKey && property.IsKey()) + { + continue; + } + string par = "@v" + count; stringLeft.Append(par + ","); stringCenter.Append(par + " " + dictProperties[property.Name] + ","); @@ -324,8 +368,10 @@ namespace Infrastructure.Extensions { stringRight.Append(par + "='" + val.ToString().Replace("'", "''''") + "',"); } + count++; } + stringLeft.Remove(stringLeft.Length - 1, 1); stringLeft.Append("),("); } @@ -337,8 +383,11 @@ namespace Infrastructure.Extensions stringCenter.Remove(stringCenter.Length - 1, 1).Append("',").ToString() + stringRight.Remove(stringRight.Length - 1, 1).ToString()); - stringLeft.Clear(); stringCenter.Clear(); stringRight.Clear(); + stringLeft.Clear(); + stringCenter.Clear(); + stringRight.Clear(); } + if (!string.IsNullOrEmpty(sql)) { sql = sql.Replace(EntityToSqlTempName.TempInsert.ToString(), tempTablbe); @@ -346,7 +395,9 @@ namespace Infrastructure.Extensions } else { - declareTable.AppendLine(" SELECT " + (string.Join(",", fixedColumns?.GetExpressionToArray() ?? new string[] { "*" })) + " FROM " + tempTablbe); + declareTable.AppendLine(" SELECT " + + (string.Join(",", fixedColumns?.GetExpressionToArray() ?? new string[] {"*"})) + + " FROM " + tempTablbe); } @@ -354,6 +405,7 @@ namespace Infrastructure.Extensions { declareTable.AppendLine("; drop table " + tempTablbe); } + return declareTable.ToString(); } @@ -414,14 +466,19 @@ namespace Infrastructure.Extensions stringCenter.Remove(stringCenter.Length - 1, 1).Append("',").ToString() + stringRight.Remove(stringRight.Length - 1, 1).ToString()); - stringLeft.Clear(); stringCenter.Clear(); stringRight.Clear(); + stringLeft.Clear(); + stringCenter.Clear(); + stringRight.Clear(); } + // sbLeft.AppendLine(" INSERT INTO @toInsert0"); stringLeft.AppendLine("exec sp_executesql N'SET NOCOUNT ON;"); stringCenter.Append("N'"); - index = 0; count = 0; + index = 0; + count = 0; } + stringLeft.Append(index == 0 ? "; INSERT INTO " + tempTablbe + " values (" : " "); index++; foreach (KeyValuePair keyValue in dictCloumn) @@ -438,39 +495,42 @@ namespace Infrastructure.Extensions { stringRight.Append(par + "='" + val.ToString().Replace("'", "''''") + "',"); } + count++; } + stringLeft.Remove(stringLeft.Length - 1, 1); stringLeft.Append("),("); } - - if (stringLeft.Length > 0) { - declareTable.AppendLine( stringLeft.Remove(stringLeft.Length - 2, 2).Append("',").ToString() + stringCenter.Remove(stringCenter.Length - 1, 1).Append("',").ToString() + stringRight.Remove(stringRight.Length - 1, 1).ToString()); - stringLeft.Clear(); stringCenter.Clear(); stringRight.Clear(); + stringLeft.Clear(); + stringCenter.Clear(); + stringRight.Clear(); } + declareTable.AppendLine(" SELECT * FROM " + tempTablbe); if (tempTablbe.Substring(0, 1) == "#") { declareTable.AppendLine("; drop table " + tempTablbe); } + return declareTable.ToString(); } - public static string GetKeyName(this Type typeinfo) { return typeinfo.GetProperties().GetKeyName(); } + public static string GetKeyType(this Type typeinfo) { string keyType = typeinfo.GetProperties().GetKeyName(true); @@ -487,10 +547,12 @@ namespace Infrastructure.Extensions return "nvarchar(max)"; } } + public static string GetKeyName(this PropertyInfo[] properties) { return properties.GetKeyName(false); } + /// /// 获取key列名 /// @@ -509,10 +571,11 @@ namespace Infrastructure.Extensions var attributes = propertyInfo.GetCustomAttributes(typeof(ColumnAttribute), false); //如果没有ColumnAttribute的需要单独再验证，下面只验证有属性的 if (attributes.Length > 0) - return ((ColumnAttribute)attributes[0]).TypeName.ToLower(); + return ((ColumnAttribute) attributes[0]).TypeName.ToLower(); else - return GetColumType(new PropertyInfo[] { propertyInfo }, true)[propertyInfo.Name]; + return GetColumType(new PropertyInfo[] {propertyInfo}, true)[propertyInfo.Name]; } + return keyName; } @@ -525,10 +588,12 @@ namespace Infrastructure.Extensions { return entity.GetProperties().GetKeyProperty(); } + public static PropertyInfo GetKeyProperty(this PropertyInfo[] properties) { return properties.Where(c => c.IsKey()).FirstOrDefault(); } + public static bool IsKey(this PropertyInfo propertyInfo) { object[] keyAttributes = propertyInfo.GetCustomAttributes(typeof(KeyAttribute), false); @@ -539,8 +604,6 @@ namespace Infrastructure.Extensions private static string[] _userEditFields { get; set; } - - /// @@ -567,6 +630,7 @@ namespace Infrastructure.Extensions proList.Add(pro); } } + return proList; } @@ -584,6 +648,7 @@ namespace Infrastructure.Extensions asType = false; return new string[0]; } + asType = true; return attributes[0]; } @@ -595,20 +660,16 @@ namespace Infrastructure.Extensions /// /// /// - public static WebResponseContent ValidationEntityList(this List entityList, Expression> expression = null) + public static void ValidationEntityList(this List entityList, + Expression> expression = null) { WebResponseContent responseData = new WebResponseContent(); foreach (T entity in entityList) { - responseData = entity.ValidationEntity(expression); - if (!responseData.Status) - { - return responseData; - } + entity.ValidationEntity(expression); } - responseData.Status = true; - return responseData; } + /// /// 指定需要验证的字段 /// @@ -616,10 +677,13 @@ namespace Infrastructure.Extensions /// /// 对指定属性进行验证x=>{x.Name,x.Size} /// - public static WebResponseContent ValidationEntity(this T entity, Expression> expression = null, Expression> validateProperties = null) + public static void ValidationEntity(this T entity, Expression> expression = null, + Expression> validateProperties = null) { - return ValidationEntity(entity, expression?.GetExpressionProperty(), validateProperties?.GetExpressionProperty()); + ValidationEntity(entity, expression?.GetExpressionProperty(), + validateProperties?.GetExpressionProperty()); } + /// /// specificProperties=null并且validateProperties=null，对所有属性验证，只验证其是否合法，不验证是否为空(除属性标识指定了不能为空外) /// specificProperties!=null，对指定属性校验，并且都必须有值 @@ -630,10 +694,13 @@ namespace Infrastructure.Extensions /// 验证指定的属性，并且非空判断 /// 验证指定属性，只对字段合法性判断，不验证是否为空 /// - public static WebResponseContent ValidationEntity(this T entity, string[] specificProperties, string[] validateProperties = null) + public static void ValidationEntity(this T entity, string[] specificProperties, + string[] validateProperties = null) { - WebResponseContent responseData = new WebResponseContent(); - if (entity == null) return responseData.Error("对象不能为null"); + if (entity == null) + { + throw new Exception("对象不能为null"); + } PropertyInfo[] propertyArray = typeof(T).GetProperties(); //若T为object取不到属性 @@ -641,6 +708,7 @@ namespace Infrastructure.Extensions { propertyArray = entity.GetType().GetProperties(); } + List compareProper = new List(); //只验证数据合法性，验证非空 @@ -654,15 +722,17 @@ namespace Infrastructure.Extensions { compareProper.AddRange(propertyArray.Where(x => validateProperties.Contains(x.Name))); } + if (compareProper.Count() > 0) { propertyArray = compareProper.ToArray(); } + foreach (PropertyInfo propertyInfo in propertyArray) { object value = propertyInfo.GetValue(entity); //设置默认状态的值 - if (propertyInfo.Name == "Enable" || propertyInfo.Name == "AuditStatus") + if (propertyInfo.Name == "Enable") { if (value == null) { @@ -670,14 +740,16 @@ namespace Infrastructure.Extensions continue; } } + //若存在specificProperties并且属性为数组specificProperties中的值，校验时就需要判断是否为空 var reslut = propertyInfo.ValidationProperty(value, specificProperties != null && specificProperties.Contains(propertyInfo.Name) ? true : false - ); + ); if (!reslut.Item1) - return responseData.Error(reslut.Item2); + { + throw new Exception(reslut.Item2); + } } - return responseData.OK(); } /// @@ -687,12 +759,13 @@ namespace Infrastructure.Extensions /// public static string GetSqlDbType(this PropertyInfo propertyInfo) { - string dbType = propertyInfo.GetTypeCustomValue(x => new { x.TypeName }); + string dbType = propertyInfo.GetTypeCustomValue(x => new {x.TypeName}); if (string.IsNullOrEmpty(dbType)) { return dbType; } + dbType = dbType.ToLower(); if (dbType.Contains(SqlDbTypeName.NVarChar)) { @@ -723,7 +796,8 @@ namespace Infrastructure.Extensions /// /// /// IEnumerable<(bool, string, object)> bool成否校验成功,string校验失败信息,object,当前校验的值 - public static IEnumerable<(bool, string, object)> ValidationValueForDbType(this PropertyInfo propertyInfo, params object[] values) + public static IEnumerable<(bool, string, object)> ValidationValueForDbType(this PropertyInfo propertyInfo, + params object[] values) { string dbTypeName = propertyInfo.GetTypeCustomValue(c => c.TypeName); foreach (object value in values) @@ -732,29 +806,33 @@ namespace Infrastructure.Extensions } } - public static bool ValidationRquiredValueForDbType(this PropertyInfo propertyInfo, object value, out string message) + public static bool ValidationRquiredValueForDbType(this PropertyInfo propertyInfo, object value, + out string message) { if (value == null || value?.ToString()?.Trim() == "") { message = $"{propertyInfo.GetDisplayName()}不能为空"; return false; } + var result = propertyInfo.GetProperWithDbType().ValidationVal(value, propertyInfo); message = result.Item2; return result.Item1; } - private static readonly Dictionary ProperWithDbType = new Dictionary() { - { typeof(string),SqlDbTypeName.NVarChar }, - { typeof(DateTime),SqlDbTypeName.DateTime}, - {typeof(long),SqlDbTypeName.BigInt }, - {typeof(int),SqlDbTypeName.Int}, - { typeof(decimal),SqlDbTypeName.Decimal }, - { typeof(float),SqlDbTypeName.Float }, - { typeof(double),SqlDbTypeName.Double }, - { typeof(byte),SqlDbTypeName.Int },//类型待完 - { typeof(Guid),SqlDbTypeName.UniqueIdentifier} + private static readonly Dictionary ProperWithDbType = new Dictionary() + { + {typeof(string), SqlDbTypeName.NVarChar}, + {typeof(DateTime), SqlDbTypeName.DateTime}, + {typeof(long), SqlDbTypeName.BigInt}, + {typeof(int), SqlDbTypeName.Int}, + {typeof(decimal), SqlDbTypeName.Decimal}, + {typeof(float), SqlDbTypeName.Float}, + {typeof(double), SqlDbTypeName.Double}, + {typeof(byte), SqlDbTypeName.Int}, //类型待完 + {typeof(Guid), SqlDbTypeName.UniqueIdentifier} }; + public static string GetProperWithDbType(this PropertyInfo propertyInfo) { bool result = ProperWithDbType.TryGetValue(propertyInfo.PropertyType, out string value); @@ -762,6 +840,7 @@ namespace Infrastructure.Extensions { return value; } + return SqlDbTypeName.NVarChar; } @@ -772,12 +851,14 @@ namespace Infrastructure.Extensions /// 值 /// 要验证的类的属性，若不为null，则会判断字符串的长度是否正确 /// (bool, string, object)bool成否校验成功,string校验失败信息,object,当前校验的值 - public static (bool, string, object) ValidationVal(this string dbType, object value, PropertyInfo propertyInfo = null) + public static (bool, string, object) ValidationVal(this string dbType, object value, + PropertyInfo propertyInfo = null) { if (string.IsNullOrEmpty(dbType)) { dbType = propertyInfo != null ? propertyInfo.GetProperWithDbType() : SqlDbTypeName.NVarChar; } + dbType = dbType.ToLower(); string val = value?.ToString(); //验证长度 @@ -788,10 +869,10 @@ namespace Infrastructure.Extensions reslutMsg = "只能为有效整数"; } else if (dbType == SqlDbTypeName.DateTime - || dbType == SqlDbTypeName.Date - || dbType == SqlDbTypeName.SmallDateTime - || dbType == SqlDbTypeName.SmallDate - ) + || dbType == SqlDbTypeName.Date + || dbType == SqlDbTypeName.SmallDateTime + || dbType == SqlDbTypeName.SmallDate + ) { if (!StringExtension.IsDate(value)) reslutMsg = "必须为日期格式"; @@ -818,13 +899,12 @@ namespace Infrastructure.Extensions } } else if (propertyInfo != null - && (dbType == SqlDbTypeName.VarChar - || dbType == SqlDbTypeName.NVarChar - || dbType == SqlDbTypeName.NChar - || dbType == SqlDbTypeName.Char - || dbType == SqlDbTypeName.Text)) + && (dbType == SqlDbTypeName.VarChar + || dbType == SqlDbTypeName.NVarChar + || dbType == SqlDbTypeName.NChar + || dbType == SqlDbTypeName.Char + || dbType == SqlDbTypeName.Text)) { - //默认nvarchar(max) 、text 长度不能超过20000 if (val.Length > 20000) { @@ -832,33 +912,41 @@ namespace Infrastructure.Extensions } else { - int length = StringExtension.GetInt(propertyInfo.GetTypeCustomValue(x => new { x.Length })); - if (length == 0) { return (true, null, null); } + int length = + StringExtension.GetInt( + propertyInfo.GetTypeCustomValue(x => new {x.Length})); + if (length == 0) + { + return (true, null, null); + } //判断双字节与单字段 else if (length < 8000 && - ((dbType.Substring(0, 1) != "n" - && Encoding.UTF8.GetBytes(val.ToCharArray()).Length > length) - || val.Length > length) - ) + ((dbType.Substring(0, 1) != "n" + && Encoding.UTF8.GetBytes(val.ToCharArray()).Length > length) + || val.Length > length) + ) { reslutMsg = $"最多只能【{length}】个字符。"; } } } + if (!string.IsNullOrEmpty(reslutMsg) && propertyInfo != null) { reslutMsg = propertyInfo.GetDisplayName() + reslutMsg; } + return (reslutMsg == "" ? true : false, reslutMsg, value); } public static string GetDisplayName(this PropertyInfo property) { - string displayName = property.GetTypeCustomValue(x => new { x.Name }); + string displayName = property.GetTypeCustomValue(x => new {x.Name}); if (string.IsNullOrEmpty(displayName)) { return property.Name; } + return displayName; } @@ -869,22 +957,28 @@ namespace Infrastructure.Extensions /// 属性的值 /// 是否指定当前属性必须有值 /// - public static (bool, string, object) ValidationProperty(this PropertyInfo propertyInfo, object objectVal, bool required) + public static (bool, string, object) ValidationProperty(this PropertyInfo propertyInfo, object objectVal, + bool required) { - if (propertyInfo.IsKey()) { return (true, null, objectVal); } + if (propertyInfo.IsKey()) + { + return (true, null, objectVal); + } string val = objectVal == null ? "" : objectVal.ToString().Trim(); string requiredMsg = string.Empty; - if (!required) + if (required) { - var reuireVal = propertyInfo.GetTypeCustomValues(x => new { x.AllowEmptyStrings, x.ErrorMessage }); + var reuireVal = + propertyInfo.GetTypeCustomValues(x => new {x.AllowEmptyStrings, x.ErrorMessage}); if (reuireVal != null && !Convert.ToBoolean(reuireVal["AllowEmptyStrings"])) { required = true; requiredMsg = reuireVal["ErrorMessage"]; } } + //如果不要求为必填项并且值为空，直接返回 if (!required && string.IsNullOrEmpty(val)) return (true, null, objectVal); @@ -892,17 +986,25 @@ namespace Infrastructure.Extensions if ((required && val == string.Empty)) { if (requiredMsg != "") return (false, requiredMsg, objectVal); - string propertyName = propertyInfo.GetTypeCustomValue(x => new { x.Name }); - return (false, requiredMsg + (string.IsNullOrEmpty(propertyName) ? propertyInfo.Name : propertyName) + "不能为空", objectVal); + string propertyName = propertyInfo.GetTypeCustomValue(x => new {x.Name}); + return (false, + requiredMsg + (string.IsNullOrEmpty(propertyName) ? propertyInfo.Name : propertyName) + "不能为空", + objectVal); } + //列名 string typeName = propertyInfo.GetSqlDbType(); //如果没有ColumnAttribute的需要单独再验证，下面只验证有属性的 - if (typeName == null) { return (true, null, objectVal); } + if (typeName == null) + { + return (true, null, objectVal); + } + //验证长度 return typeName.ValidationVal(val, propertyInfo); } + /// /// 获取属性的指定属性 /// @@ -928,6 +1030,7 @@ namespace Infrastructure.Extensions if (obj.Length == 0) return null; return obj[0]; } + /// /// 获取类的多个指定属性的值 /// @@ -935,7 +1038,8 @@ namespace Infrastructure.Extensions /// 指定的类 /// 指定属性的值 格式 Expression> exp = x => new { x.字段1, x.字段2 }; /// 返回的是字段+value - public static Dictionary GetTypeCustomValues(this MemberInfo member, Expression> expression) + public static Dictionary GetTypeCustomValues(this MemberInfo member, + Expression> expression) { var attr = member.GetTypeCustomAttributes(typeof(TEntity)); if (attr == null) @@ -953,6 +1057,7 @@ namespace Infrastructure.Extensions propertyKeyValues[property.Name] = (property.GetValue(attr) ?? string.Empty).ToString(); } } + return propertyKeyValues; } @@ -963,15 +1068,18 @@ namespace Infrastructure.Extensions /// 指定的类 /// 指定属性的值 格式 Expression> exp = x => new { x.字段1, x.字段2 }; /// - public static string GetTypeCustomValue(this MemberInfo member, Expression> expression) + public static string GetTypeCustomValue(this MemberInfo member, + Expression> expression) { var propertyKeyValues = member.GetTypeCustomValues(expression); if (propertyKeyValues == null || propertyKeyValues.Count == 0) { return null; } + return propertyKeyValues.First().Value ?? ""; } + /// /// 判断hash的列是否为对应的实体，并且值是否有效 /// @@ -979,12 +1087,14 @@ namespace Infrastructure.Extensions /// /// 移除不存在字段 /// - public static string ValidateDicInEntity(this Type typeinfo, Dictionary dic, bool removeNotContains, string[] ignoreFields = null) + public static string ValidateDicInEntity(this Type typeinfo, Dictionary dic, + bool removeNotContains, string[] ignoreFields = null) { return typeinfo.ValidateDicInEntity(dic, removeNotContains, true, ignoreFields); } - public static string ValidateDicInEntity(this Type type, List> dicList, bool removeNotContains, bool removerKey, string[] ignoreFields = null) + public static string ValidateDicInEntity(this Type type, List> dicList, + bool removeNotContains, bool removerKey, string[] ignoreFields = null) { PropertyInfo[] propertyInfo = type.GetProperties(); string reslutMsg = string.Empty; @@ -994,12 +1104,16 @@ namespace Infrastructure.Extensions if (!string.IsNullOrEmpty(reslutMsg)) return reslutMsg; } + return reslutMsg; } - public static string ValidateDicInEntity(this Type type, Dictionary dic, bool removeNotContains, bool removerKey, string[] ignoreFields = null) + + public static string ValidateDicInEntity(this Type type, Dictionary dic, bool removeNotContains, + bool removerKey, string[] ignoreFields = null) { return type.ValidateDicInEntity(dic, null, removeNotContains, removerKey, ignoreFields); } + /// /// 判断hash的列是否为对应的实体，并且值是否有效 /// @@ -1008,9 +1122,14 @@ namespace Infrastructure.Extensions /// 移除不存在字段 /// 移除主键 /// - private static string ValidateDicInEntity(this Type typeinfo, Dictionary dic, PropertyInfo[] propertyInfo, bool removeNotContains, bool removerKey, string[] ignoreFields = null) + private static string ValidateDicInEntity(this Type typeinfo, Dictionary dic, + PropertyInfo[] propertyInfo, bool removeNotContains, bool removerKey, string[] ignoreFields = null) { - if (dic == null || dic.Count == 0) { return "参数无效"; } + if (dic == null || dic.Count == 0) + { + return "参数无效"; + } + if (propertyInfo == null) propertyInfo = typeinfo.GetProperties().Where(x => x.PropertyType.Name != "List`1").ToArray(); @@ -1025,6 +1144,7 @@ namespace Infrastructure.Extensions { dic.Remove(keyName); } + foreach (PropertyInfo property in propertyInfo) { //忽略与主键的字段不做验证 @@ -1041,12 +1161,14 @@ namespace Infrastructure.Extensions && property.PropertyType != typeof(long) && property.PropertyType != typeof(byte) && property.PropertyType != typeof(decimal) - ) + ) { return property.GetTypeCustomValue(x => x.Name) + "为必须提交项"; } + continue; } + bool isEdit = property.ContainsCustomAttributes(typeof(EditableAttribute)); //不是编辑列的直接移除,并且不是主键 //removerKey=true，不保留主键，直接移除 @@ -1058,9 +1180,11 @@ namespace Infrastructure.Extensions { return property.GetTypeCustomValue(x => x.Name) + "没有配置好Model为编辑列"; } + dic.Remove(property.Name); continue; } + ////移除忽略的不保存的数据 //if (property.ContainsCustomAttributes(typeof(JsonIgnoreAttribute))) //{ @@ -1076,20 +1200,24 @@ namespace Infrastructure.Extensions if (dic[property.Name] != null && dic[property.Name].ToString() == string.Empty) dic[property.Name] = null; } + return string.Empty; } - - private static object MapToInstance(this Type reslutType, object sourceEntity, PropertyInfo[] sourcePro, PropertyInfo[] reslutPro, string[] sourceFilterField, string[] reslutFilterField, string mapType = null) + + private static object MapToInstance(this Type reslutType, object sourceEntity, PropertyInfo[] sourcePro, + PropertyInfo[] reslutPro, string[] sourceFilterField, string[] reslutFilterField, string mapType = null) { mapType = mapType ?? GetMapType(reslutType); if (sourcePro == null) { sourcePro = sourceEntity.GetType().GetProperties(); } + if (reslutPro == null) { - reslutPro = reslutType.GetProperties(); ; + reslutPro = reslutType.GetProperties(); + ; } object newObj = Activator.CreateInstance(reslutType); @@ -1100,10 +1228,12 @@ namespace Infrastructure.Extensions { sourcePro = sourcePro.Where(x => sourceFilterField.Contains(x.Name)).ToArray(); } + foreach (var property in sourcePro) { (newObj as System.Collections.IDictionary).Add(property.Name, property.GetValue(sourceEntity)); } + return newObj; } @@ -1119,8 +1249,10 @@ namespace Infrastructure.Extensions continue; property.SetValue(newObj, info.GetValue(sourceEntity)); } + return newObj; } + private static string GetMapType(Type type) { return typeof(Dictionary<,>) == type ? "Dictionary" : "entity"; @@ -1136,16 +1268,20 @@ namespace Infrastructure.Extensions /// 只映射返回对象的指定字段,若为null则默认为全部字段 /// 只映射数据源对象的指定字段,若为null则默认为全部字段 /// - public static TResult MapToObject(this TSource source, Expression> resultExpression, + public static TResult MapToObject(this TSource source, + Expression> resultExpression, Expression> sourceExpression = null - ) where TResult : class + ) where TResult : class { if (source == null) return null; - string[] sourceFilterField = sourceExpression == null ? typeof(TSource).GetProperties().Select(x => x.Name).ToArray() : sourceExpression.GetExpressionProperty(); + string[] sourceFilterField = sourceExpression == null + ? typeof(TSource).GetProperties().Select(x => x.Name).ToArray() + : sourceExpression.GetExpressionProperty(); string[] reslutFilterField = resultExpression?.GetExpressionProperty(); if (!(source is System.Collections.IList)) - return MapToInstance(typeof(TResult), source, null, null, sourceFilterField, reslutFilterField) as TResult; + return MapToInstance(typeof(TResult), source, null, null, sourceFilterField, reslutFilterField) as + TResult; Type sourceType = null; Type resultType = null; @@ -1160,9 +1296,11 @@ namespace Infrastructure.Extensions string mapType = GetMapType(resultType); for (int i = 0; i < sourceList.Count; i++) { - var reslutobj = MapToInstance(resultType, sourceList[i], sourcePro, resultPro, sourceFilterField, reslutFilterField, mapType); + var reslutobj = MapToInstance(resultType, sourceList[i], sourcePro, resultPro, sourceFilterField, + reslutFilterField, mapType); reslutList.Add(reslutobj); } + return reslutList as TResult; } @@ -1175,12 +1313,15 @@ namespace Infrastructure.Extensions /// /// /// 指定对需要的字段赋值,格式x=>new {x.Name,x.P},返回的结果只会对Name与P赋值 - public static void MapValueToEntity(this TSource source, TResult result, Expression> expression = null) where TResult : class + public static void MapValueToEntity(this TSource source, TResult result, + Expression> expression = null) where TResult : class { if (source == null) return; string[] fields = expression?.GetExpressionToArray(); - PropertyInfo[] reslutPro = fields == null ? result.GetType().GetProperties() : result.GetType().GetProperties().Where(x => fields.Contains(x.Name)).ToArray(); + PropertyInfo[] reslutPro = fields == null + ? result.GetType().GetProperties() + : result.GetType().GetProperties().Where(x => fields.Contains(x.Name)).ToArray(); PropertyInfo[] sourcePro = source.GetType().GetProperties(); foreach (var property in reslutPro) { @@ -1191,11 +1332,6 @@ namespace Infrastructure.Extensions } } } - - - - - } public class ArrayEntity @@ -1216,4 +1352,4 @@ namespace Infrastructure.Extensions { TempInsert = 0 } -} +} \ No newline at end of file diff --git a/Infrastructure/log4net.config b/Infrastructure/log4net.config index 63c299df..82565e0f 100644 --- a/Infrastructure/log4net.config +++ b/Infrastructure/log4net.config @@ -1,7 +1,7 @@  - + diff --git a/OpenAuth.App/FileApp.cs b/OpenAuth.App/FileApp.cs index 6c2b937c..50776e18 100644 --- a/OpenAuth.App/FileApp.cs +++ b/OpenAuth.App/FileApp.cs @@ -65,6 +65,11 @@ namespace OpenAuth.App /// public List Add(IFormFileCollection files) { + if (!_auth.CheckLogin()) + { + throw new Exception("必需登录才能上传附件"); + } + var result = new List(); foreach (var file in files) { diff --git a/OpenAuth.App/Request/UpdateUserReq.cs b/OpenAuth.App/Request/UpdateUserReq.cs index 9e9029ce..11a8eb37 100644 --- a/OpenAuth.App/Request/UpdateUserReq.cs +++ b/OpenAuth.App/Request/UpdateUserReq.cs @@ -1,4 +1,5 @@ -using Infrastructure; +using System.ComponentModel.DataAnnotations; +using Infrastructure; using OpenAuth.Repository.Domain; namespace OpenAuth.App.Request @@ -18,6 +19,7 @@ namespace OpenAuth.App.Request /// /// /// + [Required(ErrorMessage = "账号肯定不能为空啊~~")] public string Account { get; set; } /// @@ -27,9 +29,10 @@ namespace OpenAuth.App.Request /// - /// 组织名称 + /// 用户姓名 /// /// + [Required(ErrorMessage="姓名不能为空")] public string Name { get; set; } @@ -50,6 +53,7 @@ namespace OpenAuth.App.Request /// 所属组织Id，多个可用，分隔 /// /// The organizations. + [Required(ErrorMessage = "请为用户分配机构")] public string OrganizationIds { get; set; } public static implicit operator UpdateUserReq(User user) diff --git a/OpenAuth.App/RevelanceManagerApp.cs b/OpenAuth.App/RevelanceManagerApp.cs index 49fef5f6..e1940104 100644 --- a/OpenAuth.App/RevelanceManagerApp.cs +++ b/OpenAuth.App/RevelanceManagerApp.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using Microsoft.Extensions.Logging; using OpenAuth.App.Interface; using OpenAuth.App.Request; using OpenAuth.Repository.Domain; @@ -8,10 +9,13 @@ using OpenAuth.Repository.Interface; namespace OpenAuth.App { - public class RevelanceManagerApp :BaseApp + public class RevelanceManagerApp : BaseApp { - public RevelanceManagerApp(IUnitWork unitWork, IRepository repository,IAuth auth) : base(unitWork, repository, auth) + private readonly ILogger _logger; + public RevelanceManagerApp(IUnitWork unitWork, IRepository repository, IAuth auth, ILogger logger) : base(unitWork, + repository, auth) { + _logger = logger; } /// @@ -57,7 +61,7 @@ namespace OpenAuth.App } else { - DeleteBy(req.type, req.secIds.ToLookup(u => req.firstId)); + DeleteBy(req.type, req.secIds.ToLookup(u => req.firstId)); } } @@ -72,16 +76,23 @@ namespace OpenAuth.App { foreach (var value in sameVals) { - UnitWork.Delete(u => u.Key == key && u.FirstId == sameVals.Key && u.SecondId == value); + _logger.LogInformation($"start=> delete {key} {sameVals.Key} {value}"); + try + { + UnitWork.Delete(u => u.Key == key && u.FirstId == sameVals.Key && u.SecondId == value); + } + catch (Exception e) + { + _logger.LogError(e,e.Message); + } + _logger.LogInformation($"end=> {key} {sameVals.Key} {value}"); } } - UnitWork.Save(); } public void DeleteBy(string key, params string[] firstIds) { UnitWork.Delete(u => firstIds.Contains(u.FirstId) && u.Key == key); - UnitWork.Save(); } @@ -97,12 +108,12 @@ namespace OpenAuth.App if (returnSecondIds) { return Repository.Find(u => u.Key == key - && ids.Contains(u.FirstId)).Select(u => u.SecondId).ToList(); + && ids.Contains(u.FirstId)).Select(u => u.SecondId).ToList(); } else { return Repository.Find(u => u.Key == key - && ids.Contains(u.SecondId)).Select(u => u.FirstId).ToList(); + && ids.Contains(u.SecondId)).Select(u => u.FirstId).ToList(); } } @@ -125,6 +136,11 @@ namespace OpenAuth.App /// public void AssignData(AssignDataReq request) { + if (!request.Properties.Any()) + { + return; + } + var relevances = new List(); foreach (var requestProperty in request.Properties) { @@ -137,6 +153,7 @@ namespace OpenAuth.App OperateTime = DateTime.Now }); } + UnitWork.BatchAdd(relevances.ToArray()); UnitWork.Save(); } @@ -149,25 +166,24 @@ namespace OpenAuth.App { if (request.Properties == null || request.Properties.Length == 0) { - if (string.IsNullOrEmpty(request.ModuleCode)) //模块为空，直接把角色的所有授权删除 + if (string.IsNullOrEmpty(request.ModuleCode)) //模块为空，直接把角色的所有授权删除 { DeleteBy(Define.ROLEDATAPROPERTY, request.RoleId); } - else //把角色的某一个模块权限全部删除 + else //把角色的某一个模块权限全部删除 { - DeleteBy(Define.ROLEDATAPROPERTY, new []{ request.ModuleCode }.ToLookup(u =>request.RoleId)); + DeleteBy(Define.ROLEDATAPROPERTY, new[] {request.ModuleCode}.ToLookup(u => request.RoleId)); } } - else //按具体的id删除 + else //按具体的id删除 { foreach (var property in request.Properties) { UnitWork.Delete(u => u.Key == Define.ROLEDATAPROPERTY - && u.FirstId == request.RoleId - && u.SecondId == request.ModuleCode - && u.ThirdId == property); + && u.FirstId == request.RoleId + && u.SecondId == request.ModuleCode + && u.ThirdId == property); } - UnitWork.Save(); } } diff --git a/OpenAuth.App/RoleApp.cs b/OpenAuth.App/RoleApp.cs index e7b23f18..557985e8 100644 --- a/OpenAuth.App/RoleApp.cs +++ b/OpenAuth.App/RoleApp.cs @@ -29,29 +29,37 @@ namespace OpenAuth.App } + /// + /// 添加角色，如果当前登录用户不是System，则直接把新角色分配给当前登录用户 + /// public void Add(RoleView obj) { - - Role role = obj; - role.CreateTime = DateTime.Now; - Repository.Add(role); - obj.Id = role.Id; //要把保存后的ID存入view + UnitWork.ExecuteWithTransaction(() => + { + Role role = obj; + role.CreateTime = DateTime.Now; + UnitWork.Add(role); + UnitWork.Save(); + obj.Id = role.Id; //要把保存后的ID存入view - //如果当前账号不是SYSTEM，则直接分配 - var loginUser = _auth.GetCurrentUser(); - if (loginUser.User.Account != Define.SYSTEM_USERNAME) - { - _revelanceApp.Assign(new AssignReq - { - type = Define.USERROLE, - firstId = loginUser.User.Id, - secIds = new[] {role.Id} - }); - } - - + //如果当前账号不是SYSTEM，则直接分配 + var loginUser = _auth.GetCurrentUser(); + if (loginUser.User.Account != Define.SYSTEM_USERNAME) + { + _revelanceApp.Assign(new AssignReq + { + type = Define.USERROLE, + firstId = loginUser.User.Id, + secIds = new[] {role.Id} + }); + } + }); } + /// + /// 更新角色属性 + /// + /// public void Update(RoleView obj) { Role role = obj; diff --git a/OpenAuth.App/Test/TestAccessObjs.cs b/OpenAuth.App/Test/TestAccessObjs.cs index f2c78fbb..2c4513a2 100644 --- a/OpenAuth.App/Test/TestAccessObjs.cs +++ b/OpenAuth.App/Test/TestAccessObjs.cs @@ -22,7 +22,7 @@ namespace OpenAuth.App.Test var cachemock = new Mock(); cachemock.Setup(x => x.Get("tokentest")) - .Returns(new UserAuthSession { Account = "System" }); + .Returns(new UserAuthSession { Account = Define.SYSTEM_USERNAME }); services.AddScoped(x => cachemock.Object); var httpContextAccessorMock = new Mock(); @@ -56,5 +56,32 @@ namespace OpenAuth.App.Test Console.WriteLine(JsonHelper.Instance.Serialize(result)); } + + [Test] + public void UnAssign() + { + var app = _autofacServiceProvider.GetService(); + app.UnAssignData(new AssignDataReq + { + ModuleCode = "WmsInboundOrderTbl", + Properties = new string[]{}, + RoleId = "09ee2ffa-7463-4938-ae0b-1cb4e80c7c13" + }); + app.UnAssignData(new AssignDataReq + { + ModuleCode = "Category", + Properties = new string[]{}, + RoleId = "09ee2ffa-7463-4938-ae0b-1cb4e80c7c13" + }); + + app.UnAssignData(new AssignDataReq + { + ModuleCode = "Resource", + Properties = new string[]{}, + RoleId = "09ee2ffa-7463-4938-ae0b-1cb4e80c7c13" + }); + + + } } } diff --git a/OpenAuth.App/Test/TestAsync.cs b/OpenAuth.App/Test/TestAsync.cs index 59f31665..3eb0e335 100644 --- a/OpenAuth.App/Test/TestAsync.cs +++ b/OpenAuth.App/Test/TestAsync.cs @@ -21,7 +21,7 @@ namespace OpenAuth.App.Test var cachemock = new Mock(); cachemock.Setup(x => x.Get("tokentest")) - .Returns(new UserAuthSession { Account = "System" }); + .Returns(new UserAuthSession { Account = Define.SYSTEM_USERNAME }); services.AddScoped(x => cachemock.Object); var httpContextAccessorMock = new Mock(); diff --git a/OpenAuth.App/Test/TestFileApp.cs b/OpenAuth.App/Test/TestFileApp.cs index c251430b..40cc576e 100644 --- a/OpenAuth.App/Test/TestFileApp.cs +++ b/OpenAuth.App/Test/TestFileApp.cs @@ -20,7 +20,7 @@ namespace OpenAuth.App.Test var services = new ServiceCollection(); var cachemock = new Mock(); - cachemock.Setup(x => x.Get("tokentest")).Returns(new UserAuthSession { Account = "System" }); + cachemock.Setup(x => x.Get("tokentest")).Returns(new UserAuthSession { Account = Define.SYSTEM_USERNAME }); services.AddScoped(x => cachemock.Object); var httpContextAccessorMock = new Mock(); diff --git a/OpenAuth.App/Test/TestUserApp.cs b/OpenAuth.App/Test/TestUserApp.cs index 9a242c23..4a27ff6d 100644 --- a/OpenAuth.App/Test/TestUserApp.cs +++ b/OpenAuth.App/Test/TestUserApp.cs @@ -17,7 +17,7 @@ namespace OpenAuth.App.Test var services = new ServiceCollection(); var cachemock = new Mock(); - cachemock.Setup(x => x.Get("tokentest")).Returns(new UserAuthSession { Account = "System" }); + cachemock.Setup(x => x.Get("tokentest")).Returns(new UserAuthSession { Account = Define.SYSTEM_USERNAME}); services.AddScoped(x => cachemock.Object); var httpContextAccessorMock = new Mock(); @@ -28,6 +28,27 @@ namespace OpenAuth.App.Test return services; } + /// + /// 测试添加用户时，数据校验。 + /// 因为请求数据没有Account，Name等，该测试会提示异常 + /// + [Test] + public void TestValidation() + { + var app = _autofacServiceProvider.GetService(); + try + { + app.AddOrUpdate(new UpdateUserReq + { + OrganizationIds = "08f41bf6-4388-4b1e-bd3e-2ff538b44b1b", + }); + } + catch (Exception e) + { + Console.WriteLine(e.Message); + } + } + [Test] public void TestAdd() { diff --git a/OpenAuth.App/UserManagerApp.cs b/OpenAuth.App/UserManagerApp.cs index ccd13f70..33a5bd51 100644 --- a/OpenAuth.App/UserManagerApp.cs +++ b/OpenAuth.App/UserManagerApp.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Castle.Core.Internal; +using Infrastructure.Extensions; using OpenAuth.App.Interface; using OpenAuth.App.Request; using OpenAuth.App.Response; @@ -115,6 +116,8 @@ namespace OpenAuth.App public void AddOrUpdate(UpdateUserReq request) { + request.ValidationEntity(u => new {u.Account,u.Name, u.OrganizationIds}); + if (string.IsNullOrEmpty(request.OrganizationIds)) throw new Exception("请为用户分配机构"); User requser = request; diff --git a/OpenAuth.Identity/Quickstart/TestUsers.cs b/OpenAuth.Identity/Quickstart/TestUsers.cs index d6569a71..59c163fe 100644 --- a/OpenAuth.Identity/Quickstart/TestUsers.cs +++ b/OpenAuth.Identity/Quickstart/TestUsers.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Security.Claims; using IdentityModel; using IdentityServer4.Test; +using OpenAuth.App; namespace OpenAuth.IdentityServer.Quickstart { @@ -13,7 +14,7 @@ namespace OpenAuth.IdentityServer.Quickstart { public static List Users = new List { - new TestUser{SubjectId = "System", Username = "System", Password = "123456", + new TestUser{SubjectId = "System", Username = Define.SYSTEM_USERNAME, Password = Define.SYSTEM_USERPWD, Claims = { new Claim(JwtClaimTypes.Name, "System"), diff --git a/OpenAuth.Repository/OpenAuthDBContext.cs b/OpenAuth.Repository/OpenAuthDBContext.cs index 8dc9a1ec..46405a7e 100644 --- a/OpenAuth.Repository/OpenAuthDBContext.cs +++ b/OpenAuth.Repository/OpenAuthDBContext.cs @@ -1,15 +1,31 @@ -using Microsoft.EntityFrameworkCore; +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Console; using OpenAuth.Repository.Domain; using OpenAuth.Repository.QueryObj; namespace OpenAuth.Repository { + public partial class OpenAuthDBContext : DbContext { - public OpenAuthDBContext(DbContextOptions options) + private ILoggerFactory _LoggerFactory; + + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + optionsBuilder.EnableSensitiveDataLogging (true); //允许打印参数 + optionsBuilder.UseLoggerFactory (_LoggerFactory); + + base.OnConfiguring (optionsBuilder); + } + + public OpenAuthDBContext(DbContextOptions options, ILoggerFactory loggerFactory) : base(options) - {} + { + _LoggerFactory = loggerFactory; + } protected override void OnModelCreating(ModelBuilder modelBuilder) { diff --git a/OpenAuth.WebApi/Controllers/AccessObjsController.cs b/OpenAuth.WebApi/Controllers/AccessObjsController.cs index c41c5919..31f05081 100644 --- a/OpenAuth.WebApi/Controllers/AccessObjsController.cs +++ b/OpenAuth.WebApi/Controllers/AccessObjsController.cs @@ -91,13 +91,17 @@ namespace OpenAuth.WebApi.Controllers /// /// /// + private static string lockobj = "lock"; [HttpPost] public Response UnAssignDataProperty(AssignDataReq request) { var result = new Response(); try { - _app.UnAssignData(request); + lock (lockobj) + { + _app.UnAssignData(request); + } } catch (Exception ex) { diff --git a/OpenAuth.WebApi/Controllers/FilesController.cs b/OpenAuth.WebApi/Controllers/FilesController.cs index 21ea8ca3..0efcc459 100644 --- a/OpenAuth.WebApi/Controllers/FilesController.cs +++ b/OpenAuth.WebApi/Controllers/FilesController.cs @@ -67,7 +67,6 @@ namespace OpenAuth.WebApi.Controllers /// /// 服务器存储的文件信息 [HttpPost] - [AllowAnonymous] public Response> Upload(IFormFileCollection files) { var result = new Response>(); diff --git a/OpenAuth.WebApi/Controllers/RolesController.cs b/OpenAuth.WebApi/Controllers/RolesController.cs index 314dfeaa..a7bc5d94 100644 --- a/OpenAuth.WebApi/Controllers/RolesController.cs +++ b/OpenAuth.WebApi/Controllers/RolesController.cs @@ -41,8 +41,10 @@ namespace OpenAuth.WebApi.Controllers return result; } - //添加或修改 - [HttpPost] + /// + /// 添加角色，如果当前登录用户不是System，则直接把新角色分配给当前登录用户 + /// + [HttpPost] public Response Add(RoleView obj) { var result = new Response(); @@ -60,8 +62,12 @@ namespace OpenAuth.WebApi.Controllers return result; } - - //添加或修改 + + /// + /// 更新角色属性 + /// + /// + /// [HttpPost] public Response Update(RoleView obj) { diff --git a/OpenAuth.WebApi/Program.cs b/OpenAuth.WebApi/Program.cs index 50594d54..bc0a438f 100644 --- a/OpenAuth.WebApi/Program.cs +++ b/OpenAuth.WebApi/Program.cs @@ -17,8 +17,6 @@ namespace OpenAuth.WebApi .ConfigureLogging((hostingContext, logging) => { logging.ClearProviders(); //去掉默认的日志 - logging.AddFilter("System", LogLevel.Error); - logging.AddFilter("Microsoft", LogLevel.Error); logging.AddLog4Net(); }) .UseServiceProviderFactory( diff --git a/OpenAuth.WebApi/Startup.cs b/OpenAuth.WebApi/Startup.cs index 1cc39d6f..12898399 100644 --- a/OpenAuth.WebApi/Startup.cs +++ b/OpenAuth.WebApi/Startup.cs @@ -4,10 +4,10 @@ using System.IO; using System.Linq; using Autofac; using IdentityServer4.AccessTokenValidation; -using Infrastructure.Extensions; using Infrastructure.Extensions.AutofacManager; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.DataProtection; +using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -38,6 +38,11 @@ namespace OpenAuth.WebApi // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { + services.Configure(options => + { + options.SuppressModelStateInvalidFilter = true; + }); + services.AddSingleton(provider => { var service = provider.GetRequiredService>(); @@ -161,8 +166,10 @@ namespace OpenAuth.WebApi } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostEnvironment env) + public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFactory loggerFactory) { + loggerFactory.AddLog4Net(); + if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); diff --git a/OpenAuth.WebApi/appsettings.Development.json b/OpenAuth.WebApi/appsettings.Development.json index e203e940..93a15c0f 100644 --- a/OpenAuth.WebApi/appsettings.Development.json +++ b/OpenAuth.WebApi/appsettings.Development.json @@ -2,8 +2,9 @@ "Logging": { "LogLevel": { "Default": "Debug", - "System": "Information", - "Microsoft": "Information" + "System": "Error", + "Microsoft": "Error", + "Microsoft.EntityFrameworkCore.Database.Command": "Information" } } }