From 166975802b84da8c7606ce2cbcc870c315dc5ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Wed, 16 Mar 2022 19:55:36 +0800
Subject: [PATCH 1/3] v3.7.8
---
ZR.Vue/src/settings.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ZR.Vue/src/settings.js b/ZR.Vue/src/settings.js
index 643618f..ee93a3e 100644
--- a/ZR.Vue/src/settings.js
+++ b/ZR.Vue/src/settings.js
@@ -2,7 +2,7 @@ module.exports = {
/**
* 框架版本号
*/
- version: '3.7.7',
+ version: '3.7.8',
title: 'ZrAdmin.NET-后台管理',
/**
* 主题颜色
From fcd01439b61aaae0f94940822386de359500512b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Wed, 16 Mar 2022 21:58:24 +0800
Subject: [PATCH 2/3] update NLog.config
---
ZR.Admin.WebApi/NLog.config | 110 +++++++++++++++++++-----------------
1 file changed, 57 insertions(+), 53 deletions(-)
diff --git a/ZR.Admin.WebApi/NLog.config b/ZR.Admin.WebApi/NLog.config
index 4fb0fae..dc78b69 100644
--- a/ZR.Admin.WebApi/NLog.config
+++ b/ZR.Admin.WebApi/NLog.config
@@ -6,64 +6,68 @@
internalLogLevel="Info"
internalLogFile="nlog-internal.log">
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 5f0334a999828f4f3cfe13da646c83bf4a37cf23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Wed, 16 Mar 2022 21:58:37 +0800
Subject: [PATCH 3/3] update DbExtension.cs
---
ZR.Admin.WebApi/Extensions/DbExtension.cs | 63 +++++++++++++----------
1 file changed, 35 insertions(+), 28 deletions(-)
diff --git a/ZR.Admin.WebApi/Extensions/DbExtension.cs b/ZR.Admin.WebApi/Extensions/DbExtension.cs
index 27fdec2..d54cd59 100644
--- a/ZR.Admin.WebApi/Extensions/DbExtension.cs
+++ b/ZR.Admin.WebApi/Extensions/DbExtension.cs
@@ -28,7 +28,7 @@ namespace ZR.Admin.WebApi.Extensions
{
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]);
@@ -45,37 +45,44 @@ namespace ZR.Admin.WebApi.Extensions
IsAutoCloseConnection = true
}
});
- //每次Sql执行前事件
- DbScoped.SugarScope.GetConnection(0).Aop.OnLogExecuting = (sql, pars) =>
+ SugarIocServices.ConfigurationSugar(db =>
{
- var param = DbScoped.SugarScope.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value));
+ #region db0
+ db.GetConnection(0).Aop.OnLogExecuting = (sql, pars) =>
+ {
+ var param = DbScoped.SugarScope.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value));
- FilterData();
+ FilterData();
- logger.Info($"{sql}，{param}");
- };
- //出错打印日志
- DbScoped.SugarScope.GetConnection(0).Aop.OnError = (e) =>
- {
- logger.Error(e, $"执行SQL出错：{e.Message}");
- };
- //SQL执行完
- DbScoped.SugarScope.GetConnection(0).Aop.OnLogExecuted = (sql, pars) =>
- {
- //执行完了可以输出SQL执行时间 (OnLogExecutedDelegate)
- };
- //Db1
- DbScoped.SugarScope.GetConnection(1).Aop.OnLogExecuting = (sql, pars) =>
- {
- var param = DbScoped.SugarScope.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value));
+ logger.Info($"{sql}，{param}");
+ };
- logger.Info($"Sql语句：{sql}, {param}");
- };
- //Db1错误日志
- DbScoped.SugarScope.GetConnection(1).Aop.OnError = (e) =>
- {
- logger.Error($"执行Sql语句失败：{e.Sql}，原因：{e.Message}");
- };
+ db.GetConnection(0).Aop.OnError = (e) =>
+ {
+ logger.Error(e, $"执行SQL出错：{e.Message}");
+ };
+ //SQL执行完
+ db.GetConnection(0).Aop.OnLogExecuted = (sql, pars) =>
+ {
+ //执行完了可以输出SQL执行时间 (OnLogExecutedDelegate)
+ };
+ #endregion
+
+ #region db1
+ //Db1
+ db.GetConnection(1).Aop.OnLogExecuting = (sql, pars) =>
+ {
+ var param = DbScoped.SugarScope.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value));
+
+ logger.Info($"Sql语句：{sql}, {param}");
+ };
+ //Db1错误日志
+ db.GetConnection(1).Aop.OnError = (e) =>
+ {
+ logger.Error($"执行Sql语句失败：{e.Sql}，原因：{e.Message}");
+ };
+ #endregion
+ });
}
///