From 8fe1fa1938210e6d7f3faa8edcdb1819637fb378 Mon Sep 17 00:00:00 2001
From: izory <791736813@qq.com>
Date: Mon, 11 Oct 2021 18:05:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E=E6=8E=A5?=
=?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=88=90IOC=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Infrastructure/OptionsSetting.cs | 5 +-
ZR.Admin.WebApi/Startup.cs | 48 ++-
ZR.Admin.WebApi/ZR.Admin.WebApi.csproj | 1 +
ZR.Admin.WebApi/appsettings.json | 6 +-
ZR.Repository/BaseRepository.cs | 319 ++++++++----------
ZR.Repository/IBaseRepository.cs | 54 +--
.../Repositories/GendemoRepository.cs | 4 +
ZR.Repository/ZR.Repository.csproj | 1 +
8 files changed, 229 insertions(+), 209 deletions(-)
diff --git a/Infrastructure/OptionsSetting.cs b/Infrastructure/OptionsSetting.cs
index 84ef25d..7833a53 100644
--- a/Infrastructure/OptionsSetting.cs
+++ b/Infrastructure/OptionsSetting.cs
@@ -7,7 +7,10 @@ namespace Infrastructure
public class OptionsSetting
{
public static string ConnAdmin = "conn_zrAdmin";
- public static string ConnDbType = "conn_zrAdmin_Type";
+ public static string ConnDbType = "conn_zrAdmin_type";
+ public static string ConnBus = "conn_bus";
+ public static string ConnBusDbType = "conn_bus_type";
+
public static string DbKey = "DbKey";
public string Redis { get; set; }
diff --git a/ZR.Admin.WebApi/Startup.cs b/ZR.Admin.WebApi/Startup.cs
index 360469a..29f5d2c 100644
--- a/ZR.Admin.WebApi/Startup.cs
+++ b/ZR.Admin.WebApi/Startup.cs
@@ -11,7 +11,11 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.OpenApi.Models;
+using SqlSugar.IOC;
+using System;
+using System.Collections.Generic;
using System.IO;
+using System.Linq;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Admin.WebApi.Middleware;
@@ -116,12 +120,54 @@ namespace ZR.Admin.WebApi
/// 注册Services服务
///
///
- private static void InjectRepositories(IServiceCollection services)
+ private void InjectRepositories(IServiceCollection services)
{
services.AddAppService();
//开启计划任务
services.AddTaskSchedulers();
+
+ string connStr = Configuration.GetConnectionString(OptionsSetting.ConnAdmin);
+ string connStrBus = Configuration.GetConnectionString(OptionsSetting.ConnBus);
+ string dbKey = Configuration[OptionsSetting.DbKey];
+ int dbType = Convert.ToInt32(Configuration[OptionsSetting.ConnDbType]);
+ int dbType_bus = Convert.ToInt32(Configuration[OptionsSetting.ConnBusDbType]);
+
+ IocConfig db1 = new IocConfig()
+ {
+ ConfigId = "0", //多租户用到
+ ConnectionString = connStr,
+ DbType = (IocDbType)dbType,
+ IsAutoCloseConnection = true//自动释放
+ };
+ IocConfig db2 = new IocConfig()
+ {
+ ConfigId = "1", // 多租户用到
+ ConnectionString = connStrBus,
+ DbType = (IocDbType)dbType_bus,
+ IsAutoCloseConnection = true//自动释放
+ };
+ SugarIocServices.AddSqlSugar(new List() { db1, db2 });
+
+ //调式代码 用来打印SQL
+ DbScoped.SugarScope.GetConnection(0).Aop.OnLogExecuting = (sql, pars) =>
+ {
+ Console.BackgroundColor = ConsoleColor.Yellow;
+ Console.WriteLine("【SQL语句】" + sql.ToLower() + "\r\n"
+ + DbScoped.SugarScope.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value)));
+ };
+ //出错打印日志
+ DbScoped.SugarScope.GetConnection(0).Aop.OnError = (e) =>
+ {
+ Console.WriteLine($"[执行Sql出错]{e.Message},SQL={e.Sql}");
+ Console.WriteLine();
+ };
+ //Bus Db错误日志
+ DbScoped.SugarScope.GetConnection(1).Aop.OnError = (e) =>
+ {
+ Console.WriteLine($"[执行Sql出错Bus]{e.Message},SQL={e.Sql}");
+ Console.WriteLine();
+ };
}
}
}
diff --git a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
index 7b52794..72dcad4 100644
--- a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
+++ b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
@@ -32,6 +32,7 @@
+
diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json
index 3b2e17c..51eede7 100644
--- a/ZR.Admin.WebApi/appsettings.json
+++ b/ZR.Admin.WebApi/appsettings.json
@@ -7,9 +7,11 @@
}
},
"ConnectionStrings": {
- "conn_zrAdmin": "server=127.0.0.1;user=zr;pwd=abc;database=admin"
+ "conn_zrAdmin": "server=127.0.0.1;user=zr;pwd=abc;database=admin",
+ "conn_bus": "server=127.0.0.1;user=zr;pwd=abc;database=admin"
},
- "conn_zrAdmin_Type": 0, //MySql = 0, SqlServer = 1
+ "conn_zrAdmin_type": 0, //MySql = 0, SqlServer = 1
+ "conn_bus_type": 0,
"urls": "http://localhost:8888", //项目启动url
"sysConfig": {
"DBCommandTimeout": 10,
diff --git a/ZR.Repository/BaseRepository.cs b/ZR.Repository/BaseRepository.cs
index a4d0fab..644cb52 100644
--- a/ZR.Repository/BaseRepository.cs
+++ b/ZR.Repository/BaseRepository.cs
@@ -1,6 +1,7 @@
锘縰sing Infrastructure;
using Infrastructure.Model;
using SqlSugar;
+using SqlSugar.IOC;
using System;
using System.Collections.Generic;
using System.Dynamic;
@@ -21,46 +22,8 @@ namespace ZR.Repository
{
if (dbContext == null)
{
- string connStr = ConfigUtils.Instance.GetConnectionStrings(OptionsSetting.ConnAdmin);
- string dbKey = ConfigUtils.Instance.GetAppConfig(OptionsSetting.DbKey);
- int dbType = ConfigUtils.Instance.GetAppConfig(OptionsSetting.ConnDbType);
- if (!string.IsNullOrEmpty(dbKey))
- {
- connStr = NETCore.Encrypt.EncryptProvider.DESDecrypt(connStr, dbKey);
- }
-
- var Db = new SqlSugarClient(new List()
- {
- new ConnectionConfig(){
- ConnectionString = connStr,
- DbType = (DbType)dbType,
- IsAutoCloseConnection = true,//寮鍚嚜鍔ㄩ噴鏀炬ā寮忓拰EF鍘熺悊涓鏍
- InitKeyType = InitKeyType.Attribute,//浠庣壒鎬ц鍙栦富閿拰鑷鍒椾俊鎭
- ConfigId = 0
- },
- new ConnectionConfig(){
- ConnectionString = "",
- DbType = DbType.SqlServer,
- IsAutoCloseConnection = true,
- InitKeyType = InitKeyType.Attribute,//浠庣壒鎬ц鍙栦富閿拰鑷鍒椾俊鎭
- ConfigId = 1
- },
- });
-
- //璋冨紡浠g爜 鐢ㄦ潵鎵撳嵃SQL
- Db.GetConnection(0).Aop.OnLogExecuting = (sql, pars) =>
- {
- Console.BackgroundColor = ConsoleColor.Yellow;
- Console.WriteLine("銆怱QL璇彞銆" + sql.ToLower() + "\r\n" + Db.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value)));
- };
- //鍑洪敊鎵撳嵃鏃ュ織
- Db.GetConnection(0).Aop.OnError = (e) =>
- {
- Console.WriteLine($"[鎵цSql鍑洪敊]{e.Message}锛孲QL={e.Sql}");
- Console.WriteLine();
- };
-
- Context = Db.GetConnection(configId);//鏍规嵁绫讳紶鍏ョ殑ConfigId鑷姩閫夋嫨
+ //Console.WriteLine("configId锛" + configId);
+ base.Context = DbScoped.SugarScope.GetConnection(configId);//鏍规嵁绫讳紶鍏ョ殑ConfigId鑷姩閫夋嫨
}
}
@@ -87,115 +50,115 @@ namespace ZR.Repository
return Context.Insertable(t).ExecuteCommand();
}
- public int InsertIgnoreNullColumn(T t)
- {
- return Context.Insertable(t).IgnoreColumns(true).ExecuteCommand();
- }
+ //public int InsertIgnoreNullColumn(T t)
+ //{
+ // return Context.Insertable(t).IgnoreColumns(true).ExecuteCommand();
+ //}
- public int InsertIgnoreNullColumn(T t, params string[] columns)
- {
- return Context.Insertable(t).IgnoreColumns(columns).ExecuteCommand();
- }
+ //public int InsertIgnoreNullColumn(T t, params string[] columns)
+ //{
+ // return Context.Insertable(t).IgnoreColumns(columns).ExecuteCommand();
+ //}
//public int Insert(SqlSugarClient client, T t)
//{
// return client.Insertable(t).ExecuteCommand();
//}
- public long InsertBigIdentity(T t)
- {
- return base.Context.Insertable(t).ExecuteReturnBigIdentity();
- }
+ //public long InsertBigIdentity(T t)
+ //{
+ // return base.Context.Insertable(t).ExecuteReturnBigIdentity();
+ //}
public int Insert(List t)
{
return base.Context.Insertable(t).ExecuteCommand();
}
- public int InsertIgnoreNullColumn(List t)
- {
- return base.Context.Insertable(t).IgnoreColumns(true).ExecuteCommand();
- }
+ //public int InsertIgnoreNullColumn(List t)
+ //{
+ // return base.Context.Insertable(t).IgnoreColumns(true).ExecuteCommand();
+ //}
- public int InsertIgnoreNullColumn(List t, params string[] columns)
- {
- return base.Context.Insertable(t).IgnoreColumns(columns).ExecuteCommand();
- }
- public int Insert(T parm, Expression> iClumns = null, bool ignoreNull = true)
- {
- return base.Context.Insertable(parm).InsertColumns(iClumns).IgnoreColumns(ignoreNullColumn: ignoreNull).ExecuteCommand();
- }
- public DbResult InsertTran(T t)
- {
- var result = base.Context.Ado.UseTran(() =>
- {
- base.Context.Insertable(t).ExecuteCommand();
- });
- return result;
- }
+ //public int InsertIgnoreNullColumn(List t, params string[] columns)
+ //{
+ // return base.Context.Insertable(t).IgnoreColumns(columns).ExecuteCommand();
+ //}
+ //public int Insert(T parm, Expression> iClumns = null, bool ignoreNull = true)
+ //{
+ // return base.Context.Insertable(parm).InsertColumns(iClumns).IgnoreColumns(ignoreNullColumn: ignoreNull).ExecuteCommand();
+ //}
+ //public DbResult InsertTran(T t)
+ //{
+ // var result = base.Context.Ado.UseTran(() =>
+ // {
+ // base.Context.Insertable(t).ExecuteCommand();
+ // });
+ // return result;
+ //}
- public DbResult InsertTran(List t)
- {
- var result = base.Context.Ado.UseTran(() =>
- {
- base.Context.Insertable(t).ExecuteCommand();
- });
- return result;
- }
+ //public DbResult InsertTran(List t)
+ //{
+ // var result = base.Context.Ado.UseTran(() =>
+ // {
+ // base.Context.Insertable(t).ExecuteCommand();
+ // });
+ // return result;
+ //}
- public T InsertReturnEntity(T t)
- {
- return base.Context.Insertable(t).ExecuteReturnEntity();
- }
+ //public T InsertReturnEntity(T t)
+ //{
+ // return base.Context.Insertable(t).ExecuteReturnEntity();
+ //}
- public T InsertReturnEntity(T t, string sqlWith = SqlWith.UpdLock)
- {
- return base.Context.Insertable(t).With(sqlWith).ExecuteReturnEntity();
- }
+ //public T InsertReturnEntity(T t, string sqlWith = SqlWith.UpdLock)
+ //{
+ // return base.Context.Insertable(t).With(sqlWith).ExecuteReturnEntity();
+ //}
- public bool ExecuteCommand(string sql, object parameters)
- {
- return base.Context.Ado.ExecuteCommand(sql, parameters) > 0;
- }
+ //public bool ExecuteCommand(string sql, object parameters)
+ //{
+ // return base.Context.Ado.ExecuteCommand(sql, parameters) > 0;
+ //}
- public bool ExecuteCommand(string sql, params SugarParameter[] parameters)
- {
- return base.Context.Ado.ExecuteCommand(sql, parameters) > 0;
- }
+ //public bool ExecuteCommand(string sql, params SugarParameter[] parameters)
+ //{
+ // return base.Context.Ado.ExecuteCommand(sql, parameters) > 0;
+ //}
- public bool ExecuteCommand(string sql, List parameters)
- {
- return base.Context.Ado.ExecuteCommand(sql, parameters) > 0;
- }
+ //public bool ExecuteCommand(string sql, List parameters)
+ //{
+ // return base.Context.Ado.ExecuteCommand(sql, parameters) > 0;
+ //}
#endregion add
#region update
- public bool UpdateEntity(T entity, bool ignoreNullColumns = false)
- {
- return base.Context.Updateable(entity).IgnoreColumns(ignoreNullColumns).ExecuteCommand() > 0;
- }
+ //public bool UpdateEntity(T entity, bool ignoreNullColumns = false)
+ //{
+ // return base.Context.Updateable(entity).IgnoreColumns(ignoreNullColumns).ExecuteCommand() > 0;
+ //}
- public bool Update(T entity, Expression> expression)
- {
- return base.Context.Updateable(entity).Where(expression).ExecuteCommand() > 0;
- }
+ //public bool Update(T entity, Expression> expression)
+ //{
+ // return base.Context.Updateable(entity).Where(expression).ExecuteCommand() > 0;
+ //}
- public bool Update(T entity, Expression> expression, bool ignoreAllNull = false)
- {
- return base.Context.Updateable(entity).UpdateColumns(expression).IgnoreColumns(ignoreAllNull).ExecuteCommand() > 0;
- }
+ //public bool Update(T entity, Expression> expression, bool ignoreAllNull = false)
+ //{
+ // return base.Context.Updateable(entity).UpdateColumns(expression).IgnoreColumns(ignoreAllNull).ExecuteCommand() > 0;
+ //}
- public bool Update(T entity, Expression> expression, Expression> where)
- {
- return base.Context.Updateable(entity).UpdateColumns(expression).Where(where).ExecuteCommand() > 0;
- }
+ //public bool Update(T entity, Expression> expression, Expression> where)
+ //{
+ // return base.Context.Updateable(entity).UpdateColumns(expression).Where(where).ExecuteCommand() > 0;
+ //}
- public bool Update(SqlSugarClient client, T entity, Expression> expression, Expression> where)
- {
- return client.Updateable(entity).UpdateColumns(expression).Where(where).ExecuteCommand() > 0;
- }
+ //public bool Update(SqlSugarClient client, T entity, Expression> expression, Expression> where)
+ //{
+ // return client.Updateable(entity).UpdateColumns(expression).Where(where).ExecuteCommand() > 0;
+ //}
///
///
@@ -218,14 +181,14 @@ namespace ZR.Repository
return base.Context.Updateable(entity).IgnoreColumns(isNull).IgnoreColumns(list.ToArray()).ExecuteCommand() > 0;
}
- public bool Update(List entity)
- {
- var result = base.Context.Ado.UseTran(() =>
- {
- base.Context.Updateable(entity).ExecuteCommand();
- });
- return result.IsSuccess;
- }
+ //public bool Update(List entity)
+ //{
+ // var result = base.Context.Ado.UseTran(() =>
+ // {
+ // base.Context.Updateable(entity).ExecuteCommand();
+ // });
+ // return result.IsSuccess;
+ //}
public bool Update(Expression> where, Expression> columns)
{
return base.Context.Updateable().SetColumns(columns).Where(where).RemoveDataCache().ExecuteCommand() > 0;
@@ -252,20 +215,20 @@ namespace ZR.Repository
#region delete
- public bool DeleteExp(Expression> expression)
- {
- return Context.Deleteable().Where(expression).ExecuteCommand() > 0;
- }
+ //public bool DeleteExp(Expression> expression)
+ //{
+ // return Context.Deleteable().Where(expression).ExecuteCommand() > 0;
+ //}
//public bool Delete(PkType[] primaryKeyValues)
//{
// return base.Context.Deleteable().In(primaryKeyValues).ExecuteCommand() > 0;
//}
- public int Delete(object[] obj)
- {
- return Context.Deleteable().In(obj).ExecuteCommand();
- }
+ //public int Delete(object[] obj)
+ //{
+ // return Context.Deleteable().In(obj).ExecuteCommand();
+ //}
public int Delete(object id)
{
return Context.Deleteable(id).ExecuteCommand();
@@ -289,20 +252,20 @@ namespace ZR.Repository
return Context.Queryable();
}
- public ISugarQueryable Queryable(string tableName, string shortName)
- {
- return Context.Queryable(tableName, shortName);
- }
+ //public ISugarQueryable Queryable(string tableName, string shortName)
+ //{
+ // return Context.Queryable(tableName, shortName);
+ //}
public List QueryableToList(Expression> expression)
{
return Context.Queryable().Where(expression).ToList();
}
- public Task> QueryableToListAsync(Expression> expression)
- {
- return Context.Queryable().Where(expression).ToListAsync();
- }
+ //public Task> QueryableToListAsync(Expression> expression)
+ //{
+ // return Context.Queryable().Where(expression).ToListAsync();
+ //}
//public string QueryableToJson(string select, Expression> expressionWhere)
//{
@@ -310,45 +273,45 @@ namespace ZR.Repository
// return query.JilToJson();
//}
- public List QueryableToList(string tableName)
- {
- return Context.Queryable(tableName).ToList();
- }
+ //public List QueryableToList(string tableName)
+ //{
+ // return Context.Queryable(tableName).ToList();
+ //}
- public List QueryableToList(string tableName, Expression> expression)
- {
- return Context.Queryable(tableName).Where(expression).ToList();
- }
+ //public List QueryableToList(string tableName, Expression> expression)
+ //{
+ // return Context.Queryable(tableName).Where(expression).ToList();
+ //}
- public (List, int) QueryableToPage(Expression> expression, int pageIndex = 0, int pageSize = 10)
- {
- int totalNumber = 0;
- var list = Context.Queryable().Where(expression).ToPageList(pageIndex, pageSize, ref totalNumber);
- return (list, totalNumber);
- }
+ //public (List, int) QueryableToPage(Expression> expression, int pageIndex = 0, int pageSize = 10)
+ //{
+ // int totalNumber = 0;
+ // var list = Context.Queryable().Where(expression).ToPageList(pageIndex, pageSize, ref totalNumber);
+ // return (list, totalNumber);
+ //}
- public (List, int) QueryableToPage(Expression> expression, string order, int pageIndex = 0, int pageSize = 10)
- {
- int totalNumber = 0;
- var list = Context.Queryable().Where(expression).OrderBy(order).ToPageList(pageIndex, pageSize, ref totalNumber);
- return (list, totalNumber);
- }
+ //public (List, int) QueryableToPage(Expression> expression, string order, int pageIndex = 0, int pageSize = 10)
+ //{
+ // int totalNumber = 0;
+ // var list = Context.Queryable().Where(expression).OrderBy(order).ToPageList(pageIndex, pageSize, ref totalNumber);
+ // return (list, totalNumber);
+ //}
- public (List, int) QueryableToPage(Expression> expression, Expression> orderFiled, string orderBy, int pageIndex = 0, int pageSize = 10)
- {
- int totalNumber = 0;
+ //public (List, int) QueryableToPage(Expression> expression, Expression> orderFiled, string orderBy, int pageIndex = 0, int pageSize = 10)
+ //{
+ // int totalNumber = 0;
- if (orderBy.Equals("DESC", StringComparison.OrdinalIgnoreCase))
- {
- var list = Context.Queryable().Where(expression).OrderBy(orderFiled, OrderByType.Desc).ToPageList(pageIndex, pageSize, ref totalNumber);
- return (list, totalNumber);
- }
- else
- {
- var list = Context.Queryable().Where(expression).OrderBy(orderFiled, OrderByType.Asc).ToPageList(pageIndex, pageSize, ref totalNumber);
- return (list, totalNumber);
- }
- }
+ // if (orderBy.Equals("DESC", StringComparison.OrdinalIgnoreCase))
+ // {
+ // var list = Context.Queryable().Where(expression).OrderBy(orderFiled, OrderByType.Desc).ToPageList(pageIndex, pageSize, ref totalNumber);
+ // return (list, totalNumber);
+ // }
+ // else
+ // {
+ // var list = Context.Queryable().Where(expression).OrderBy(orderFiled, OrderByType.Asc).ToPageList(pageIndex, pageSize, ref totalNumber);
+ // return (list, totalNumber);
+ // }
+ //}
public List SqlQueryToList(string sql, object obj = null)
{
diff --git a/ZR.Repository/IBaseRepository.cs b/ZR.Repository/IBaseRepository.cs
index 719eda4..343e332 100644
--- a/ZR.Repository/IBaseRepository.cs
+++ b/ZR.Repository/IBaseRepository.cs
@@ -18,42 +18,42 @@ namespace ZR.Repository
int Add(T parm, Expression> iClumns = null, bool ignoreNull = true);
int Add(T t);
- int InsertIgnoreNullColumn(T t);
+ //int InsertIgnoreNullColumn(T t);
- int InsertIgnoreNullColumn(T t, params string[] columns);
+ //int InsertIgnoreNullColumn(T t, params string[] columns);
//int Insert(SqlSugarClient client, T t);
- long InsertBigIdentity(T t);
+ //long InsertBigIdentity(T t);
int Insert(List t);
- int Insert(T parm, Expression> iClumns = null, bool ignoreNull = true);
+ //int Insert(T parm, Expression> iClumns = null, bool ignoreNull = true);
- int InsertIgnoreNullColumn(List t);
+ //int InsertIgnoreNullColumn(List t);
- int InsertIgnoreNullColumn(List t, params string[] columns);
+ //int InsertIgnoreNullColumn(List t, params string[] columns);
- DbResult InsertTran(T t);
+ //DbResult InsertTran(T t);
- DbResult InsertTran(List t);
+ //DbResult InsertTran(List t);
- T InsertReturnEntity(T t);
+ //T InsertReturnEntity(T t);
- T InsertReturnEntity(T t, string sqlWith = SqlWith.UpdLock);
+ //T InsertReturnEntity(T t, string sqlWith = SqlWith.UpdLock);
- bool ExecuteCommand(string sql, object parameters);
+ //bool ExecuteCommand(string sql, object parameters);
- bool ExecuteCommand(string sql, params SugarParameter[] parameters);
+ //bool ExecuteCommand(string sql, params SugarParameter[] parameters);
- bool ExecuteCommand(string sql, List parameters);
+ //bool ExecuteCommand(string sql, List parameters);
#endregion add
#region update
- bool UpdateEntity(T entity, bool ignoreNullColumns = false);
+ //bool UpdateEntity(T entity, bool ignoreNullColumns = false);
- bool Update(T entity, Expression> expression);
+ //bool Update(T entity, Expression> expression);
///
/// 鍙洿鏂拌〃杈惧紡鐨勫
@@ -61,11 +61,11 @@ namespace ZR.Repository
///
///
///
- bool Update(T entity, Expression> expression, bool ignoreAllNull = false);
+ //bool Update(T entity, Expression> expression, bool ignoreAllNull = false);
- bool Update(T entity, Expression> expression, Expression> where);
+ //bool Update(T entity, Expression> expression, Expression> where);
- bool Update(SqlSugarClient client, T entity, Expression> expression, Expression> where);
+ //bool Update(SqlSugarClient client, T entity, Expression> expression, Expression> where);
///
///
@@ -76,7 +76,7 @@ namespace ZR.Repository
///
bool Update(T entity, List list = null, bool isNull = true);
- bool Update(List entity);
+ //bool Update(List entity);
bool Update(Expression> where, Expression> columns);
#endregion update
@@ -89,10 +89,10 @@ namespace ZR.Repository
#region delete
- bool DeleteExp(Expression> expression);
+ //bool DeleteExp(Expression> expression);
//bool Delete(PkType[] primaryKeyValues);
- int Delete(object[] obj);
+ //int Delete(object[] obj);
int Delete(object id);
bool DeleteTable();
@@ -120,19 +120,19 @@ namespace ZR.Repository
List QueryableToList(Expression> expression);
- Task> QueryableToListAsync(Expression> expression);
+ //Task> QueryableToListAsync(Expression> expression);
//string QueryableToJson(string select, Expression> expressionWhere);
- List QueryableToList(string tableName);
+ //List QueryableToList(string tableName);
- List QueryableToList(string tableName, Expression> expression);
+ //List QueryableToList(string tableName, Expression> expression);
- (List, int) QueryableToPage(Expression> expression, int pageIndex = 0, int pageSize = 10);
+ //(List, int) QueryableToPage(Expression> expression, int pageIndex = 0, int pageSize = 10);
- (List, int) QueryableToPage(Expression> expression, string order, int pageIndex = 0, int pageSize = 10);
+ //(List, int) QueryableToPage(Expression> expression, string order, int pageIndex = 0, int pageSize = 10);
- (List, int) QueryableToPage(Expression> expression, Expression> orderFiled, string orderBy, int pageIndex = 0, int pageSize = 10);
+ //(List, int) QueryableToPage(Expression> expression, Expression> orderFiled, string orderBy, int pageIndex = 0, int pageSize = 10);
//(List, int) QueryableToPage(Expression> expression, Bootstrap.BootstrapParams bootstrap);
diff --git a/ZR.Repository/Repositories/GendemoRepository.cs b/ZR.Repository/Repositories/GendemoRepository.cs
index 1d1c8c6..f603632 100644
--- a/ZR.Repository/Repositories/GendemoRepository.cs
+++ b/ZR.Repository/Repositories/GendemoRepository.cs
@@ -14,6 +14,10 @@ namespace ZR.Repository
[AppService(ServiceLifetime = LifeTime.Transient)]
public class GendemoRepository : BaseRepository
{
+ public GendemoRepository() : base(configId: 1)
+ {
+ }
+
#region 涓氬姟閫昏緫浠g爜
#endregion
}
diff --git a/ZR.Repository/ZR.Repository.csproj b/ZR.Repository/ZR.Repository.csproj
index 54c98ed..e91f923 100644
--- a/ZR.Repository/ZR.Repository.csproj
+++ b/ZR.Repository/ZR.Repository.csproj
@@ -13,6 +13,7 @@
+