From 66da0f6808fa8496a3216c94973a552389ab96ba Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 02 九月 2024 13:27:25 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/Configuration/Database.json | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/WCS.Application/Configuration/Database.json b/Admin.NET/WCS.Application/Configuration/Database.json
index 7f1fb9f..a17735f 100644
--- a/Admin.NET/WCS.Application/Configuration/Database.json
+++ b/Admin.NET/WCS.Application/Configuration/Database.json
@@ -2,7 +2,7 @@
// 璇︾粏鏁版嵁搴撻厤缃SqlSugar瀹樼綉锛堢涓�涓负榛樿搴擄級锛屾瀬鍔涙帹鑽� PostgreSQL 鏁版嵁搴�
// 鏁版嵁搴撹繛鎺ュ瓧绗︿覆鍙傝�冨湴鍧�锛歨ttps://www.connectionstrings.com/
"DbConnection": {
- "EnableConsoleSql": false, // 鍚敤鎺у埗鍙版墦鍗癝QL
+ "EnableConsoleSql": true, // 鍚敤鎺у埗鍙版墦鍗癝QL
"ConnectionConfigs": [
{
//"ConfigId": "1300000000001", // 榛樿搴撴爣璇�-绂佹淇敼
@@ -11,7 +11,7 @@
//"ConnectionString": "PORT=5432;DATABASE=xxx;HOST=localhost;PASSWORD=xxx;USER ID=xxx", // PostgreSQL 搴撹繛鎺ュ瓧绗︿覆
//"ConnectionString": "Server=localhost;Database=xxx;Uid=xxx;Pwd=xxx;SslMode=None;", // MySql 搴撹繛鎺ュ瓧绗︿覆",
//"ConnectionString": "User Id=xxx; Password=xxx; Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL)))", // Oracle 搴撹繛鎺ュ瓧绗︿覆
- "ConnectionString": "Server=localhost;Database=WCS_JC26;User Id=sa;Password=******;", // SqlServer 搴撹繛鎺ュ瓧绗︿覆
+ "ConnectionString": "Server=192.168.62.200;Database=WCSnet6;User Id=sa;Password=sql2019;", // SqlServer 搴撹繛鎺ュ瓧绗︿覆
//"SlaveConnectionConfigs": [ // 璇诲啓鍒嗙/涓讳粠
// {
--
Gitblit v1.8.0