From 9b6e753f93671b2715fabf9cf791fe2a6b1c1224 Mon Sep 17 00:00:00 2001
From: wanghaomei <wanghaomei@myshipping.net>
Date: Wed, 30 Nov 2022 12:04:27 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Myshipping.Web.Core/dbsettings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Myshipping.Web.Core/dbsettings.json b/Myshipping.Web.Core/dbsettings.json
index 63f710ba..4e50cb53 100644
--- a/Myshipping.Web.Core/dbsettings.json
+++ b/Myshipping.Web.Core/dbsettings.json
@@ -2,7 +2,7 @@
   "ConnectionStrings": {
     "DefaultDbNumber": "0",
     "DefaultDbType": "MySql",
-    "DefaultDbString": "Data Source=60.209.125.238;Database=booking_hechuan;User ID=djy;Password=123qwe;pooling=true;port=28012;sslmode=none;CharSet=utf8;Convert Zero Datetime=True;Allow Zero Datetime=True;",
+    "DefaultDbString": "Data Source=60.209.125.238;Database=booking_hechuan_dev;User ID=djy;Password=123qwe;pooling=true;port=28012;",
     "DbConfigs": [
       {
         "DbNumber": "1",

From 8c5f8b5d82319463017febc813f9011eee6e7c81 Mon Sep 17 00:00:00 2001
From: wanghaomei <wanghaomei@myshipping.net>
Date: Wed, 30 Nov 2022 12:09:26 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Myshipping.Web.Core/dbsettings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Myshipping.Web.Core/dbsettings.json b/Myshipping.Web.Core/dbsettings.json
index 4e50cb53..e6c4caa4 100644
--- a/Myshipping.Web.Core/dbsettings.json
+++ b/Myshipping.Web.Core/dbsettings.json
@@ -2,7 +2,7 @@
   "ConnectionStrings": {
     "DefaultDbNumber": "0",
     "DefaultDbType": "MySql",
-    "DefaultDbString": "Data Source=60.209.125.238;Database=booking_hechuan_dev;User ID=djy;Password=123qwe;pooling=true;port=28012;",
+    "DefaultDbString": "Data Source=60.209.125.238;Database=booking_hechuan_dev;User ID=djy;Password=123qwe;pooling=true;port=28012;sslmode=none;CharSet=utf8mb4;Convert Zero Datetime=True;Allow Zero Datetime=True;",
     "DbConfigs": [
       {
         "DbNumber": "1",

From 9f8c52afe149c06eeb807e0f998b5648f77951c3 Mon Sep 17 00:00:00 2001
From: wanghaomei <wanghaomei@myshipping.net>
Date: Wed, 30 Nov 2022 12:10:54 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BF=BD=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                    |  1 +
 Myshipping.Report/nlog.config | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 Myshipping.Report/nlog.config

diff --git a/.gitignore b/.gitignore
index 3592c173..bc8fd38a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ bin-release/
 /Myshipping.Report/ReportFiles
 /packages
 /Myshipping.Report/*.user
+/Myshipping.Report/logs
diff --git a/Myshipping.Report/nlog.config b/Myshipping.Report/nlog.config
new file mode 100644
index 00000000..06724f5d
--- /dev/null
+++ b/Myshipping.Report/nlog.config
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       autoReload="true"
+       throwExceptions="true"
+       internalLogLevel="Warning"
+       internalLogFile="Logs/nlog-internal.log">
+
+	<!-- enable asp.net core layout renderers -->
+	<extensions>
+	</extensions>
+
+	<!-- the targets to write to -->
+	<targets>
+		<target name="fileDebug"
+			xsi:type="File"
+			fileName="${basedir}/logs/${shortdate}-debug.log"
+            layout="${longdate} [${uppercase:${level}}] [${callsite}] [${threadid}] | ${message}${newline}" archiveAbovesize="10240000" enableArchiveFileCompression="true" />
+
+		<target name="errorDebug"
+			xsi:type="File"
+			fileName="${basedir}/logs/${shortdate}-error.log"
+            layout="${longdate} [${uppercase:${level}}] [${callsite}] [${threadid}] | ${message}${newline}" archiveAbovesize="10240000" enableArchiveFileCompression="true" />
+	</targets>
+
+	<rules>
+		<logger name="*" minlevel="Debug" maxlevel="Info" writeTo="fileDebug" />
+		<logger name="*" minlevel="Warning" writeTo="errorDebug" />
+	</rules>
+</nlog>