Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

.gitignore

@@ -34,3 +34,4 @@ bin-release/
 /Myshipping.Report/ReportFiles
 /packages
 /Myshipping.Report/*.user
+/Myshipping.Report/logs

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>

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;sslmode=none;CharSet=utf8mb4;Convert Zero Datetime=True;Allow Zero Datetime=True;",
     "DbConfigs": [
       {
         "DbNumber": "1",