1.兼容.net7.0，

2.移除对MongoDB的支持 3.HttpRequestHelper标识为已过时，请用HttpClient
VictorTzeng · Nov 20, 2022 · 6489bb9 · 6489bb9
1 parent de40091
commit 6489bb9
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 170 deletions.
diff --git a/Zxw.Framework.NetCore/DbContextCore/MongoDbContext.cs b/Zxw.Framework.NetCore/DbContextCore/MongoDbContext.cs
diff --git a/Zxw.Framework.NetCore/Extensions/EntityFrameworkCoreExtensions.cs b/Zxw.Framework.NetCore/Extensions/EntityFrameworkCoreExtensions.cs
@@ -142,23 +142,6 @@ public static IList<DbTable> GetCurrentDatabaseTableList(this IDbContextCore con
         {
             var tables = context.GetCurrentDatabaseAllTables().ToList<DbTable>();
             var db = context.GetDatabase();
-            DatabaseType dbType;
-            if (db.IsSqlServer())
-                dbType = DatabaseType.MSSQL;
-            else if (db.IsMySql())
-                dbType = DatabaseType.MySQL;
-            else if (db.IsNpgsql())
-            {
-                dbType = DatabaseType.PostgreSQL;
-            }
-            else if(db.IsOracle())
-            {
-                dbType = DatabaseType.Oracle;
-            }
-            else
-            {
-                throw new NotImplementedException("This method does not support current database yet.");
-            }
             var columns = context.GetTableColumns(tables.Select(m=>m.TableName).ToArray()).ToList<DbTableColumn>();
             tables.Each(item =>
             {

diff --git a/Zxw.Framework.NetCore/Helpers/HttpRequestHelper.cs b/Zxw.Framework.NetCore/Helpers/HttpRequestHelper.cs
@@ -2,11 +2,13 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
+using System.Net.Http;
 using System.Text;
 using Newtonsoft.Json;
 
 namespace Zxw.Framework.NetCore.Helpers
 {
+    [Obsolete("请使用HttpClient")]
     public static class HttpRequestHelper
     {
         #region 同步方法

diff --git a/Zxw.Framework.NetCore/IDbContext/IDbContextCore.cs b/Zxw.Framework.NetCore/IDbContext/IDbContextCore.cs
@@ -30,9 +30,7 @@ public interface IDbContextCore: IDisposable
         int Delete<T,TKey>(TKey key) where T : BaseModel<TKey>;
         bool EnsureCreated();
         Task<bool> EnsureCreatedAsync();
-        [Obsolete("请使用SqlOperatorUtility类提供对应的方法")]
         int ExecuteSqlWithNonQuery(string sql, params object[] parameters);
-        [Obsolete("请使用SqlOperatorUtility类提供对应的方法")]
         Task<int> ExecuteSqlWithNonQueryAsync(string sql, params object[] parameters);
         int Edit<T>(T entity) where T : class;
         int EditRange<T>(ICollection<T> entities) where T : class;
@@ -56,25 +54,19 @@ Task<int> UpdateAsync<T>(Expression<Func<T, bool>> @where, Expression<Func<T, T>
         Task<int> DeleteAsync<T>(Expression<Func<T, bool>> @where) where T : class;
         void BulkInsert<T>(IList<T> entities, string destinationTableName = null)
             where T : class ;
-        [Obsolete("请使用SqlOperatorUtility类提供对应的方法")]
         List<TView> SqlQuery<T, TView>(string sql, params object[] parameters)
             where T : class;
-        [Obsolete("请使用SqlOperatorUtility类提供对应的方法")]
         List<TView> SqlQuery<TView>(string sql, int cmdTimeout = 30, params object[] parameters);
-        [Obsolete("请使用SqlOperatorUtility类提供对应的方法")]
         PaginationResult SqlQueryByPagination<T, TView>(string sql, string[] orderBys, int pageIndex, int pageSize, Action<TView> eachAction = null)
             where T : class
             where TView : class;
         int SaveChanges();
         int SaveChanges(bool acceptAllChangesOnSuccess);
         Task<int> SaveChangesAsync(CancellationToken cancellationToken = default(CancellationToken));
         Task<int> SaveChangesAsync(bool acceptAllChangesOnSuccess,CancellationToken cancellationToken = default(CancellationToken));
-        [Obsolete("请使用SqlOperatorUtility类提供对应的方法")]
         DataTable GetDataTable(string sql, int cmdTimeout = 30, params DbParameter[] parameters);
-        [Obsolete("请使用SqlOperatorUtility类提供对应的方法")]
         PaginationResult SqlQueryByPagination<T>(string sql, string[] orderBys, int pageIndex, int pageSize,
             params DbParameter[] parameters) where T : class, new();
-        [Obsolete("请使用SqlOperatorUtility类提供对应的方法")]
         List<DataTable> GetDataTables(string sql, int cmdTimeout=30, params DbParameter[] parameters);
         T GetByCompileQuery<T,TKey>(TKey id) where T : BaseModel<TKey>;
         Task<T> GetByCompileQueryAsync<T, TKey>(TKey id) where T : BaseModel<TKey>;

diff --git a/Zxw.Framework.NetCore/Zxw.Framework.NetCore.csproj b/Zxw.Framework.NetCore/Zxw.Framework.NetCore.csproj
@@ -4,14 +4,14 @@
     <TargetFrameworks>net6.0;net7.0;</TargetFrameworks>
     <Authors>victor.tzeng</Authors>
     <NeutralLanguage></NeutralLanguage>
-    <Version>5.0.0.0</Version>
-    <AssemblyVersion>5.0.0.0</AssemblyVersion>
-    <FileVersion>5.0.0.0</FileVersion>
+    <Version>6.1.0.0</Version>
+    <AssemblyVersion>6.1.0.0</AssemblyVersion>
+    <FileVersion>6.1.0.0</FileVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Copyright>[email protected]</Copyright>
     <PackageProjectUrl>https://github.com/VictorTzeng/Zxw.Framework.NetCore</PackageProjectUrl>
     <Description>基于EF Core的Code First模式的DotNetCore快速开发框架</Description>
-    <PackageReleaseNotes>升级至.net5.0，如遇任何问题请至https://github.com/VictorTzeng/Zxw.Framework.NetCore/issues反馈，感谢支持。</PackageReleaseNotes>
+    <PackageReleaseNotes>兼容.net7.0，并移除对MongoDB的支持，如遇任何问题请至https://github.com/VictorTzeng/Zxw.Framework.NetCore/issues反馈，感谢支持。</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
@@ -56,14 +56,14 @@
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="AutoMapper" Version="12.0.0" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
-    <PackageReference Include="Blueshift.EntityFrameworkCore.MongoDB-aleksamagicka" Version="2.2.0-rtm-1" />
     <PackageReference Include="Caching.CSRedis" Version="3.8.669" />
     <PackageReference Include="DotNetCore.NPOI" Version="1.2.0" />
     <PackageReference Include="CSRedisCore" Version="3.8.669" />
     <PackageReference Include="DotNetCore.NPOI" Version="1.2.3" />
     <PackageReference Include="Exceptionless" Version="4.8.0" />
     <PackageReference Include="Jil" Version="2.17.0" />
     <PackageReference Include="log4net" Version="2.0.15" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.2.0" />
@@ -85,6 +85,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.0" />
     <PackageReference Include="Oracle.EntityFrameworkCore" Version="6.21.61" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.2" />

diff --git a/Zxw.Framework.UnitTest/TestModels/IMongoRepository.cs b/Zxw.Framework.UnitTest/TestModels/IMongoRepository.cs
diff --git a/Zxw.Framework.UnitTest/TestModels/MongoModel.cs b/Zxw.Framework.UnitTest/TestModels/MongoModel.cs
diff --git a/Zxw.Framework.UnitTest/TestRepository.cs b/Zxw.Framework.UnitTest/TestRepository.cs
diff --git a/Zxw.Framework.UnitTest/UnitTest1.cs b/Zxw.Framework.UnitTest/UnitTest1.cs
@@ -63,9 +63,6 @@ public void TestGenerateEntitiesForOracle()
         public void TestGetDataTableForPostgreSql()
         {
             BuildServiceForPostgreSql();
-            var test = ServiceLocator.Resolve<IMongoRepository>();
-
-            test.Run();
 
             var dbContext = ServiceLocator.Resolve<IDbContextCore>();
             var dt1 = dbContext.GetCurrentDatabaseAllTables();
@@ -186,22 +183,6 @@ public void TestCsRedisClient()
 
         #endregion
 
-        [TestMethod]
-        public void TestForMongoDb()
-        {
-            BuildServiceForMongoDB();
-            var context = ServiceLocator.Resolve<IDbContextCore>();
-            Assert.IsTrue(context.Add(new MongoModel()
-            {
-                Age = 28,
-                Birthday = Convert.ToDateTime("1999-01-22"),
-                IsBitch = false,
-                UserName = "帝王蟹",
-                Wage = 100000000
-            }) > 0);
-            context.Dispose();
-        }
-
         #region public methods
 
         public void BuildServiceForPostgreSql()
@@ -278,15 +259,7 @@ public void BuildServiceForSqLite()
             services.AddOptions();
             services.BuildAspectCoreServiceProvider(); 
         }
-        public void BuildServiceForMongoDB()
-        {
-            IServiceCollection services = new ServiceCollection();
 
-            //在这里注册EF上下文
-            services = RegisterMongoDbContext(services);
-            services.AddOptions();
-            services.BuildAspectCoreServiceProvider(); 
-        }
         public void BuildServiceForOracle()
         {
             IServiceCollection services = new ServiceCollection();
@@ -361,7 +334,6 @@ public IServiceCollection RegisterPostgreSqlContext(IServiceCollection services)
             });
 
             services.AddScoped<IDbContextCore, PostgreSQLDbContext>(); //注入EF上下文
-            services.AddScoped<IMongoRepository,TestRepository>();
             return services;
         }
 
@@ -381,22 +353,6 @@ public IServiceCollection RegisterSqLiteContext(IServiceCollection services)
             return services;
         }
 
-        /// <summary>
-        /// 注册SQLite上下文
-        /// </summary>
-        /// <param name="services"></param>
-        /// <returns></returns>
-        public IServiceCollection RegisterMongoDbContext(IServiceCollection services)
-        {
-            services.Configure<DbContextOption>(options =>
-            {
-                options.ConnectionString = "mongodb://localhost";
-                options.ModelAssemblyName = "Zxw.Framework.UnitTest";
-            });
-            services.AddScoped<IDbContextCore, MongoDbContext>(); //注入EF上下文
-            return services;
-        }
-
         /// <summary>
         /// 注册Oracle上下文
         /// </summary>