Skip to content

Commit 8aa04d5

Browse files
author
Vicente.Yu
committed
优化集合表达式
1 parent cc01f03 commit 8aa04d5

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

src/Extensions/DtoExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ public static Im.Dtos.TableElement SetRows(this Im.Dtos.TableElement Dto, IEnume
428428
if (Dto.Columns.Length > 0)
429429
{
430430
var columns = Dto.Columns.Select(p => p.Name);
431-
data = data.Select(p => p.Where(k => columns.Contains(k.Key)).ToDictionary(k => k.Key, v => v.Value)).ToArray();
431+
data = [.. data.Select(p => p.Where(k => columns.Contains(k.Key)).ToDictionary(k => k.Key, v => v.Value))];
432432
}
433433

434434
Dto.Rows = data;

src/Services/AesCipher.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public static string DecryptString(string encryptString, string encryptKey)
3232
var rijndaelManaged = Aes.Create();
3333
rijndaelManaged.Key = SHA256Hash(encryptKey);
3434
rijndaelManaged.Mode = CipherMode.CBC;
35-
rijndaelManaged.IV = encBytes.Take(BlockSize).ToArray();
35+
rijndaelManaged.IV = [.. encBytes.Take(BlockSize)];
3636
ICryptoTransform transform = rijndaelManaged.CreateDecryptor();
3737
byte[] blockBytes = transform.TransformFinalBlock(encBytes, BlockSize, encBytes.Length - BlockSize);
3838
return Encoding.UTF8.GetString(blockBytes);

src/Services/EventCallbackServiceProvider.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public IEnumerable<EventHandlerDescriptor> FindAllHandlers()
4444
var baseType = typeof(IEventCallbackHandler<,>);
4545
var types = ReflectionHelper.GetFinalSubTypes(baseType);
4646

47-
_cache = types
47+
_cache = [.. types
4848
.Select(typeInfo =>
4949
{
5050
var firstArgumentType = GetArgumentTypes(typeInfo, baseType);
@@ -56,8 +56,7 @@ public IEnumerable<EventHandlerDescriptor> FindAllHandlers()
5656
EventType = firstArgumentType,
5757
NotAllowRepeat = firstArgumentType.IsAssignableTo(typeof(IAmCallbackDto))
5858
};
59-
})
60-
.ToArray();
59+
})];
6160

6261
var check_repeated = _cache.Where(p => p.NotAllowRepeat)
6362
.GroupBy(p => p.EventType)

src/Services/ReflectionHelper.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ public static List<Assembly> GetReferredAssemblies(Type type, DependencyContext?
8989
/// <returns></returns>
9090
public static List<TypeInfo> GetFinalSubTypes(Type baseType, Assembly assembly)
9191
{
92-
return assembly.DefinedTypes.Where(r =>
93-
!r.IsAbstract && r.IsClass && (r.IsSubTypeOrEqualsOf(baseType) || r.IsSubTypeOfGenericType(baseType))).ToList();
92+
return [.. assembly.DefinedTypes.Where(r =>
93+
!r.IsAbstract && r.IsClass && (r.IsSubTypeOrEqualsOf(baseType) || r.IsSubTypeOfGenericType(baseType)))];
9494
}
9595

9696
/// <summary>
@@ -140,10 +140,9 @@ public static List<TypeInfo> GetFinalSubTypes<TBaseType>(DependencyContext? depe
140140
/// <returns></returns>
141141
public static List<TypeInfo> GetSubTypes(Type baseType, Assembly assembly)
142142
{
143-
return assembly
143+
return [.. assembly
144144
.DefinedTypes
145-
.Where(r => r.IsSubTypeOrEqualsOf(baseType) || r.IsSubTypeOfGenericType(baseType))
146-
.ToList();
145+
.Where(r => r.IsSubTypeOrEqualsOf(baseType) || r.IsSubTypeOfGenericType(baseType))];
147146
}
148147

149148
/// <summary>

0 commit comments

Comments
 (0)