#升级到.NET8#

Author: liaozb

Diff for: APIJSON.NET/APIJSONCommon/ApiJson.Common.csproj renamed to APIJSON.NET/APIJSON.Data/APIJSON.Data.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+	 <TargetFramework>net8.0</TargetFramework>
     <Version>0.0.11</Version>
     <Description>
 		0.0.11 升级sqlSugarCore版本 解决如果查找字段是关键字(例如:key)时出错的问题
@@ -20,13 +20,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-    <PackageReference Include="sqlSugarCore" Version="5.0.9.1" />
+    <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
+    <PackageReference Include="sqlSugarCore" Version="5.1.4.140" />
+	<PackageReference Include="Volo.Abp.Autofac" Version="8.0.2" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
+
 
 </Project>

Diff for: APIJSON.NET/APIJSON.Data/ApiJsonNetDataModule.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Volo.Abp.Autofac;
+using Volo.Abp.Modularity;
+
+namespace APIJSON.Data;
+[DependsOn(
+    typeof(AbpAutofacModule))]
+public class ApiJsonNetDataModule : AbpModule
+{
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+
+    }
+}

Diff for: APIJSON.NET/APIJSON.Data/Data/DbContext.cs

@@ -0,0 +1,41 @@
+using APIJSON.Data.Models;
+using Microsoft.Extensions.Configuration;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using Volo.Abp.DependencyInjection;
+namespace APIJSON.Data;
+
+public class DbContext:ISingletonDependency
+{
+    public DbContext(IConfiguration options)
+    {
+        Db = new SqlSugarClient(new ConnectionConfig()
+        {
+            ConnectionString = options.GetConnectionString("ConnectionString"),
+            DbType = (DbType)Enum.Parse(typeof(DbType), options.GetConnectionString("DbType")), InitKeyType= InitKeyType.Attribute,
+            IsAutoCloseConnection = true
+        });
+        Db.Aop.OnLogExecuted = (sql, pars) => //SQL执行完事件
+        {
+             
+        };
+        Db.Aop.OnLogExecuting = (sql, pars) => //SQL执行前事件
+        {
+
+        };
+    }
+    public SqlSugarClient Db;
+    public DbSet<Login> LoginDb { get { return new DbSet<Login>(Db); } }
+}
+public class DbSet<T> : SimpleClient<T> where T : class, new()
+{
+    public DbSet(SqlSugarClient context) : base(context)
+    {
+
+    }
+    public List<T> GetByIds(dynamic[] ids)
+    {
+        return Context.Queryable<T>().In(ids).ToList(); ;
+    }
+}

Diff for: APIJSON.NET/APIJSON.Data/FuncList.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Linq;
+
+namespace APIJSON.Data;
+
+/// <summary>
+/// 自定义方法
+/// </summary>
+public class FuncList
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="a"></param>
+    /// <param name="b"></param>
+    /// <returns></returns>
+    public string Merge(object a, object b)
+    {
+        return a.ToString() + b.ToString();
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="a"></param>
+    /// <param name="b"></param>
+    /// <returns></returns>
+    public object MergeObj(object a, object b)
+    {
+        return new { a, b };
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="a"></param>
+    /// <param name="b"></param>
+    /// <returns></returns>
+    public bool isContain(object a, object b)
+    {
+        return a.ToString().Split(',').Contains(b);
+    }
+}

Diff for: APIJSON.NET/APIJSON.Data/Infrastructure/SimpleStringCipher.cs

@@ -0,0 +1,134 @@
+using System;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace APIJSON.Data;
+
+public class SimpleStringCipher
+{
+    public static SimpleStringCipher Instance { get; }
+
+    /// <summary>
+    /// This constant string is used as a "salt" value for the PasswordDeriveBytes function calls.
+    /// This size of the IV (in bytes) must = (keysize / 8).  Default keysize is 256, so the IV must be
+    /// 32 bytes long.  Using a 16 character string here gives us 32 bytes when converted to a byte array.
+    /// </summary>
+    public byte[] InitVectorBytes;
+
+    /// <summary>
+    /// Default password to encrypt/decrypt texts.
+    /// It's recommented to set to another value for security.
+    /// Default value: "gsKnGZ041HLL4IM8"
+    /// </summary>
+    public static string DefaultPassPhrase { get; set; }
+
+    /// <summary>
+    /// Default value: Encoding.ASCII.GetBytes("jkE49230Tf093b42")
+    /// </summary>
+    public static byte[] DefaultInitVectorBytes { get; set; }
+
+    /// <summary>
+    /// Default value: Encoding.ASCII.GetBytes("hgt!16kl")
+    /// </summary>
+    public static byte[] DefaultSalt { get; set; }
+
+    /// <summary>
+    /// This constant is used to determine the keysize of the encryption algorithm.
+    /// </summary>
+    public const int Keysize = 256;
+
+    static SimpleStringCipher()
+    {
+        DefaultPassPhrase = "gsKnGZ041HLL4IM9";
+        DefaultInitVectorBytes = Encoding.ASCII.GetBytes("jkE49230Tf093b42");
+        DefaultSalt = Encoding.ASCII.GetBytes("hgt!11kl");
+        Instance = new SimpleStringCipher();
+    }
+
+    public SimpleStringCipher()
+    {
+        InitVectorBytes = DefaultInitVectorBytes;
+    }
+
+    public string Encrypt(string plainText, string passPhrase = null, byte[] salt = null)
+    {
+        if (plainText == null)
+        {
+            return null;
+        }
+
+        if (passPhrase == null)
+        {
+            passPhrase = DefaultPassPhrase;
+        }
+
+        if (salt == null)
+        {
+            salt = DefaultSalt;
+        }
+
+        var plainTextBytes = Encoding.UTF8.GetBytes(plainText);
+        using (var password = new Rfc2898DeriveBytes(passPhrase, salt))
+        {
+            var keyBytes = password.GetBytes(Keysize / 8);
+            using (var symmetricKey = Aes.Create())
+            {
+                symmetricKey.Mode = CipherMode.CBC;
+                using (var encryptor = symmetricKey.CreateEncryptor(keyBytes, InitVectorBytes))
+                {
+                    using (var memoryStream = new MemoryStream())
+                    {
+                        using (var cryptoStream = new CryptoStream(memoryStream, encryptor, CryptoStreamMode.Write))
+                        {
+                            cryptoStream.Write(plainTextBytes, 0, plainTextBytes.Length);
+                            cryptoStream.FlushFinalBlock();
+                            var cipherTextBytes = memoryStream.ToArray();
+                            return Convert.ToBase64String(cipherTextBytes);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public string Decrypt(string cipherText, string passPhrase = null, byte[] salt = null)
+    {
+        if (string.IsNullOrEmpty(cipherText))
+        {
+            return null;
+        }
+
+        if (passPhrase == null)
+        {
+            passPhrase = DefaultPassPhrase;
+        }
+
+        if (salt == null)
+        {
+            salt = DefaultSalt;
+        }
+
+        var cipherTextBytes = Convert.FromBase64String(cipherText);
+        using (var password = new Rfc2898DeriveBytes(passPhrase, salt))
+        {
+            var keyBytes = password.GetBytes(Keysize / 8);
+            using (var symmetricKey = Aes.Create())
+            {
+                symmetricKey.Mode = CipherMode.CBC;
+                using (var decryptor = symmetricKey.CreateDecryptor(keyBytes, InitVectorBytes))
+                {
+                    using (var memoryStream = new MemoryStream(cipherTextBytes))
+                    {
+                        using (var cryptoStream = new CryptoStream(memoryStream, decryptor, CryptoStreamMode.Read))
+                        {
+                            var plainTextBytes = new byte[cipherTextBytes.Length];
+                            var decryptedByteCount = cryptoStream.Read(plainTextBytes, 0, plainTextBytes.Length);
+                            return Encoding.UTF8.GetString(plainTextBytes, 0, decryptedByteCount);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

Diff for: APIJSON.NET/APIJSON.Data/Infrastructure/StringExtensions.cs

@@ -0,0 +1,28 @@
+namespace APIJSON.Data;
+
+using System;
+using System.Text.RegularExpressions;
+public static class StringExtensions
+{
+   
+    /// <summary>
+    /// 是否有值
+    /// </summary>
+    /// <param name="str"></param>
+    /// <returns></returns>
+    public static bool IsValue(this object str)
+    {
+        return str != null && !string.IsNullOrEmpty(str.ToString());
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="param"></param>
+    /// <returns></returns>
+    public static string GetParamName(this string param)
+    {
+        return param + new Random().Next(1, 100);
+    }
+ 
+}

Diff for: APIJSON.NET/APIJSON.Data/Models/DbOptions.cs

@@ -0,0 +1,15 @@
+namespace APIJSON.Data;
+
+using global::SqlSugar;
+public class DbOptions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public DbType DbType { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ConnectionString { get; set; }
+}

Diff for: APIJSON.NET/APIJSON.Data/Models/Login.cs

@@ -0,0 +1,19 @@
+using SqlSugar;
+using System;
+
+namespace APIJSON.Data.Models;
+
+public class Login
+{
+    [SugarColumn(IsNullable = false, IsPrimaryKey = true)]
+    public int userId { get; set; }
+    [SugarColumn(Length = 100, ColumnDescription = "用户名")]
+    public string userName { get; set; }
+    [SugarColumn(Length = 200, ColumnDescription = "密码")]
+    public string passWord { get; set; }
+    [SugarColumn(Length = 100, ColumnDescription = "密码盐")]
+    public string passWordSalt { get; set; }
+    [SugarColumn(Length = 100, ColumnDescription = "权限组")]
+    public string roleCode { get; set; }
+
+}

Diff for: APIJSON.NET/APIJSON.Data/Models/RoleItem.cs

@@ -0,0 +1,18 @@
+namespace APIJSON.Data.Models;
+
+public class RoleItem
+{
+    public string[] Table { get; set; }
+    public string[] Column { get; set; }
+    public string[] Filter { get; set; }
+}
+public class Role
+{
+    public string Name { get; set; }
+    public RoleItem Select { get; set; }
+    public RoleItem Update { get; set; }
+    public RoleItem Insert { get; set; }
+    public RoleItem Delete { get; set; }
+
+}
+