1 EnumHelper允许DisplayName返回""值

2 QueryFilterHelper修改

Jc.Base/EnumHelper.cs

@@ -285,7 +285,7 @@ public static string GetDisplayName(Type type)
             {
                 result = attr.DisplayName;
             }
-            if(string.IsNullOrEmpty(result))
+            if(result == null)
             {
                 result = type.Name;
             }
@@ -305,7 +305,7 @@ public static string GetDisplayName(FieldInfo fieldInfo)
             {
                 result = attr.DisplayName;
             }
-            if(string.IsNullOrEmpty(result))
+            if(result == null)
             {
                 result = fieldInfo.Name;
             }

Jc.Base/Jc.Base.csproj

@@ -6,7 +6,7 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Description>简单好用的.net开源Orm框架
 https://github.com/279328316/JcCore</Description>
-    <Version>1.2.1.1</Version>
+    <Version>1.2.1.2</Version>
     <RootNamespace>Jc</RootNamespace>
     <RepositoryUrl>https://github.com/279328316/JcCore</RepositoryUrl>
     <PackageProjectUrl>https://github.com/279328316/JcCore</PackageProjectUrl>

Jc.Cache/Jc.Cache.csproj

@@ -5,7 +5,7 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Description>简单好用的.net开源Orm框架
 https://github.com/279328316/JcCore</Description>
-    <Version>1.2.1.1</Version>
+    <Version>1.2.1.2</Version>
     <Authors>Jc.Core</Authors>
     <Copyright>MIT</Copyright>
     <PackageProjectUrl>https://github.com/279328316/JcCore</PackageProjectUrl>

Jc.Core.Database/Data/Query/QueryFilterHelper.cs

@@ -442,7 +442,14 @@ private object MemberExpressionProvider(Expression exp)
                 {
                     if (me.Expression != null && !me.Expression.Type.IsValueType)
                     {
-                        result = dtoDbMapping.FieldMappings[memberName].FieldName;
+                        if (me.Expression.Type == dtoDbMapping.EntityType && dtoDbMapping.FieldMappings.ContainsKey(memberName))
+                        {
+                            result = dtoDbMapping.FieldMappings[memberName].FieldName;
+                        }
+                        else
+                        {
+                            result = Expression.Lambda(exp).Compile().DynamicInvoke();
+                        }
                     }
                     else
                     {   // me.Expression == null DateTime.Now Guid.Empty

Jc.Core.Database/Jc.Core.Database.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.2.1.1</Version>
+    <Version>1.2.1.2</Version>
     <Authors>Jc.Core</Authors>
     <Description>简单好用的.net开源Orm框架 https://github.com/279328316/JcCore</Description>
     <Copyright>MIT</Copyright>

Jc.Core.MsSql/Jc.Core.MsSql.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.2.1.1</Version>
+    <Version>1.2.1.2</Version>
     <Authors>Jc.Core</Authors>
     <Copyright>MIT</Copyright>
     <Description>简单好用的.net开源Orm框架

Jc.Core.MySql/Jc.Core.MySql.csproj

@@ -9,7 +9,7 @@ https://github.com/279328316/JcCore</Description>
     <Copyright>MIT</Copyright>
     <PackageProjectUrl>https://github.com/279328316/JcCore</PackageProjectUrl>
     <RepositoryUrl>https://github.com/279328316/JcCore</RepositoryUrl>
-    <Version>1.2.1.1</Version>
+    <Version>1.2.1.2</Version>
     <PackageTags>Jc;JcCore;Orm</PackageTags>
   </PropertyGroup>
 

Jc.Core.PostgreSql/Jc.Core.PostgreSql.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.2.1.1</Version>
+    <Version>1.2.1.2</Version>
     <Authors>Jc.Core</Authors>
     <Description>简单好用的.net开源Orm框架
 https://github.com/279328316/JcCore</Description>

Jc.Core.Sqlite/Jc.Core.Sqlite.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.2.1.1</Version>
+    <Version>1.2.1.2</Version>
     <Authors>Jc.Core</Authors>
     <Description>简单好用的.net开源Orm框架
 https://github.com/279328316/JcCore</Description>

Jc.Core/Jc.Core.csproj

@@ -7,7 +7,7 @@ author:[email protected]</PackageReleaseNotes>
     <PackageTags>Jc;JcCore;Orm</PackageTags>
     <Description>简单好用的.net开源Orm框架
 https://github.com/279328316/JcCore</Description>
-    <Version>1.2.1.1</Version>
+    <Version>1.2.1.2</Version>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <RootNamespace>Jc</RootNamespace>
     <Authors>Jc.Core</Authors>

Jc.Core/Security/AesHelper.cs

@@ -0,0 +1,289 @@
+using System;
+using System.Text;
+using System.Security.Cryptography;
+using System.IO;
+
+namespace Jc.Security
+{
+    /// <summary>
+    /// AesHelper
+    /// </summary>
+    public class AesHelper
+    {
+        //默认密钥向量
+        private static byte[] Keys = { 0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF };
+        /// <summary>
+        /// 加密字符串
+        /// </summary>
+        /// <param name="encryptString">待加密的字符串</param>
+        /// <param name="encryptKey">加密密钥,要求为8位</param>
+        /// <returns>加密成功返回加密后的字符串，失败返回源串</returns>
+        public static string Encrypt(string encryptString, string encryptKey)
+        {
+            try
+            {
+                if (encryptKey.Length > 8)
+                {
+                    encryptKey = encryptKey.Substring(0, 8);
+                }
+                else if (encryptKey.Length < 8)
+                {
+                    encryptKey = encryptKey.PadRight(8, '1');
+                }
+                byte[] rgbKey = Encoding.UTF8.GetBytes(encryptKey);
+                byte[] rgbIV = Keys;
+                byte[] inputByteArray = Encoding.UTF8.GetBytes(encryptString);
+                AesCryptoServiceProvider provider = new AesCryptoServiceProvider();
+                MemoryStream mStream = new MemoryStream();
+                CryptoStream cStream = new CryptoStream(mStream, provider.CreateEncryptor(rgbKey, rgbIV), CryptoStreamMode.Write);
+                cStream.Write(inputByteArray, 0, inputByteArray.Length);
+                cStream.FlushFinalBlock();
+                return Convert.ToBase64String(mStream.ToArray());
+            }
+            catch
+            {
+                return encryptString;
+            }
+        }
+
+        /// <summary>
+        /// DES解密字符串
+        /// </summary>
+        /// <param name="decryptString">待解密的字符串</param>
+        /// <param name="decryptKey">解密密钥,要求为8位,和加密密钥相同</param>
+        /// <returns>解密成功返回解密后的字符串，失败返源串</returns>
+        public static string DecryptDES(string decryptString, string decryptKey)
+        {
+            try
+            {
+                if (decryptKey.Length > 8)
+                {
+                    decryptKey = decryptKey.Substring(0, 8);
+                }
+                else if (decryptKey.Length < 8)
+                {
+                    decryptKey = decryptKey.PadRight(8, '1');
+                }
+                byte[] rgbKey = Encoding.UTF8.GetBytes(decryptKey);
+                byte[] rgbIV = Keys;
+                byte[] inputByteArray = Convert.FromBase64String(decryptString);
+                AesCryptoServiceProvider DCSP = new AesCryptoServiceProvider();
+                MemoryStream mStream = new MemoryStream();
+                CryptoStream cStream = new CryptoStream(mStream, DCSP.CreateDecryptor(rgbKey, rgbIV), CryptoStreamMode.Write);
+                cStream.Write(inputByteArray, 0, inputByteArray.Length);
+                cStream.FlushFinalBlock();
+                return Encoding.UTF8.GetString(mStream.ToArray());
+            }
+            catch
+            {
+                return decryptString;
+            }
+        }
+
+        private const ulong FC_TAG = 0xFC010203040506CF;
+
+        private const int BUFFER_SIZE = 128 * 1024;
+
+        /// <summary>
+        /// 检验两个Byte数组是否相同
+        /// </summary>
+        /// <param name="b1">Byte数组</param>
+        /// <param name="b2">Byte数组</param>
+        /// <returns>true－相等</returns>
+        private static bool CheckByteArrays(byte[] b1, byte[] b2)
+        {
+            if (b1.Length == b2.Length)
+            {
+                for (int i = 0; i < b1.Length; ++i)
+                {
+                    if (b1[i] != b2[i])
+                        return false;
+                }
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 创建Rijndael SymmetricAlgorithm
+        /// </summary>
+        /// <param name="password">密码</param>
+        /// <param name="salt"></param>
+        /// <returns>加密对象</returns>
+        private static SymmetricAlgorithm CreateRijndael(string password, byte[] salt)
+        {
+            PasswordDeriveBytes pdb = new PasswordDeriveBytes(password, salt, "SHA256", 1000);
+
+            SymmetricAlgorithm sma = Rijndael.Create();
+            sma.KeySize = 256;
+            sma.Key = pdb.GetBytes(32);
+            sma.Padding = PaddingMode.PKCS7;
+            return sma;
+        }
+
+        /// <summary>
+        /// 加密文件随机数生成
+        /// </summary>
+        private static RandomNumberGenerator rand = new RNGCryptoServiceProvider();
+
+        /// <summary>
+        /// 生成指定长度的随机Byte数组
+        /// </summary>
+        /// <param name="count">Byte数组长度</param>
+        /// <returns>随机Byte数组</returns>
+        private static byte[] GenerateRandomBytes(int count)
+        {
+            byte[] bytes = new byte[count];
+            rand.GetBytes(bytes);
+            return bytes;
+        }
+
+        /// <summary>
+        /// 加密文件
+        /// </summary>
+        /// <param name="inFile">待加密文件</param>
+        /// <param name="outFile">加密后输入文件</param>
+        /// <param name="password">加密密码</param>
+        public static void EncryptFile(string inFile, string outFile, string password)
+        {
+            using (FileStream fin = File.OpenRead(inFile),
+                fout = File.OpenWrite(outFile))
+            {
+                long lSize = fin.Length; // 输入文件长度
+                int size = (int)lSize;
+                byte[] bytes = new byte[BUFFER_SIZE]; // 缓存
+                int read = -1; // 输入文件读取数量
+                int value = 0;
+
+                // 获取IV和salt
+                byte[] IV = GenerateRandomBytes(16);
+                byte[] salt = GenerateRandomBytes(16);
+
+                // 创建加密对象
+                SymmetricAlgorithm sma = AesHelper.CreateRijndael(password, salt);
+                sma.IV = IV;
+
+                // 在输出文件开始部分写入IV和salt
+                fout.Write(IV, 0, IV.Length);
+                fout.Write(salt, 0, salt.Length);
+
+                // 创建散列加密
+                HashAlgorithm hasher = SHA256.Create();
+                using (CryptoStream cout = new CryptoStream(fout, sma.CreateEncryptor(), CryptoStreamMode.Write),
+                    chash = new CryptoStream(Stream.Null, hasher, CryptoStreamMode.Write))
+                {
+                    BinaryWriter bw = new BinaryWriter(cout);
+                    bw.Write(lSize);
+
+                    bw.Write(FC_TAG);
+
+                    // 读写字节块到加密流缓冲区
+                    while ((read = fin.Read(bytes, 0, bytes.Length)) != 0)
+                    {
+                        cout.Write(bytes, 0, read);
+                        chash.Write(bytes, 0, read);
+                        value += read;
+                    }
+                    // 关闭加密流
+                    chash.Flush();
+                    chash.Close();
+
+                    // 读取散列
+                    byte[] hash = hasher.Hash;
+
+                    // 输入文件写入散列
+                    cout.Write(hash, 0, hash.Length);
+
+                    // 关闭文件流
+                    cout.Flush();
+                    cout.Close();
+                }
+            }
+        }
+
+        /// <summary>
+        /// 解密文件
+        /// </summary>
+        /// <param name="inFile">待解密文件</param>
+        /// <param name="outFile">解密后输出文件</param>
+        /// <param name="password">解密密码</param>
+        public static void DecryptFile(string inFile, string outFile, string password)
+        {
+            // 创建打开文件流
+            using (FileStream fin = File.OpenRead(inFile),
+                fout = File.OpenWrite(outFile))
+            {
+                int size = (int)fin.Length;
+                byte[] bytes = new byte[BUFFER_SIZE];
+                int read = -1;
+                int value = 0;
+                int outValue = 0;
+
+                byte[] IV = new byte[16];
+                fin.Read(IV, 0, 16);
+                byte[] salt = new byte[16];
+                fin.Read(salt, 0, 16);
+
+                SymmetricAlgorithm sma = AesHelper.CreateRijndael(password, salt);
+                sma.IV = IV;
+
+                value = 32;
+                long lSize = -1;
+
+                // 创建散列对象, 校验文件
+                HashAlgorithm hasher = SHA256.Create();
+
+                using (CryptoStream cin = new CryptoStream(fin, sma.CreateDecryptor(), CryptoStreamMode.Read),
+                    chash = new CryptoStream(Stream.Null, hasher, CryptoStreamMode.Write))
+                {
+                    // 读取文件长度
+                    BinaryReader br = new BinaryReader(cin);
+                    lSize = br.ReadInt64();
+                    ulong tag = br.ReadUInt64();
+
+                    if (FC_TAG != tag)
+                        throw new System.Exception("文件被破坏");
+
+                    long numReads = lSize / BUFFER_SIZE;
+
+                    long slack = (long)lSize % BUFFER_SIZE;
+
+                    for (int i = 0; i < numReads; ++i)
+                    {
+                        read = cin.Read(bytes, 0, bytes.Length);
+                        fout.Write(bytes, 0, read);
+                        chash.Write(bytes, 0, read);
+                        value += read;
+                        outValue += read;
+                    }
+
+                    if (slack > 0)
+                    {
+                        read = cin.Read(bytes, 0, (int)slack);
+                        fout.Write(bytes, 0, read);
+                        chash.Write(bytes, 0, read);
+                        value += read;
+                        outValue += read;
+                    }
+
+                    chash.Flush();
+                    chash.Close();
+
+                    fout.Flush();
+                    fout.Close();
+
+                    byte[] curHash = hasher.Hash;
+
+                    // 获取比较和旧的散列对象
+                    byte[] oldHash = new byte[hasher.HashSize / 8];
+                    read = cin.Read(oldHash, 0, oldHash.Length);
+                    if ((oldHash.Length != read) || (!CheckByteArrays(oldHash, curHash)))
+                        throw new System.Exception("文件被破坏");
+                }
+
+                if (outValue != lSize)
+                    throw new System.Exception("文件大小不匹配");
+            }
+        }
+    }
+}