From eae09a150ea9a5079d1a7a03ffcec89dc3467690 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: Mon, 22 Nov 2021 11:16:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4iis=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/Properties/launchSettings.json | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/ZR.Admin.WebApi/Properties/launchSettings.json b/ZR.Admin.WebApi/Properties/launchSettings.json
index 365059a..d3473a5 100644
--- a/ZR.Admin.WebApi/Properties/launchSettings.json
+++ b/ZR.Admin.WebApi/Properties/launchSettings.json
@@ -1,20 +1,5 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:50509/",
-      "sslPort": 44365
-    }
-  },
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
     "ZRAdmin": {
       "commandName": "Project",
       "launchBrowser": true,

From 741d68ec59a5d2d27c6e63e35079b3834b9bc45c Mon Sep 17 00:00:00 2001
From: samisgod <21gh@163.com>
Date: Tue, 23 Nov 2021 09:55:37 +0800
Subject: [PATCH 2/2] fix DateTime Parsing

---
 .../Framework/JsonConverterUtil.cs            | 37 +++++++++++++++++++
 ZR.Admin.WebApi/Startup.cs                    |  8 +++-
 .../wwwroot/CodeGenTemplate/VueTemplate.txt   |  8 ++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 ZR.Admin.WebApi/Framework/JsonConverterUtil.cs

diff --git a/ZR.Admin.WebApi/Framework/JsonConverterUtil.cs b/ZR.Admin.WebApi/Framework/JsonConverterUtil.cs
new file mode 100644
index 0000000..cd22dec
--- /dev/null
+++ b/ZR.Admin.WebApi/Framework/JsonConverterUtil.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace ZR.Admin.WebApi.Framework
+{
+    public class JsonConverterUtil
+    {
+        public class DateTimeNullConverter : JsonConverter<DateTime?>
+        {
+            public override DateTime? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+                => string.IsNullOrEmpty(reader.GetString()) ? default(DateTime?) : ParseDateTime(reader.GetString());
+
+            public override void Write(Utf8JsonWriter writer, DateTime? value, JsonSerializerOptions options)
+                => writer.WriteStringValue(value?.ToString("yyyy-MM-dd HH:mm:ss"));
+        }
+
+        public class DateTimeConverter : JsonConverter<DateTime>
+        {
+            public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+            {
+                var dateTime = ParseDateTime(reader.GetString());
+                return dateTime == null ? DateTime.MinValue : dateTime.Value;
+            }
+
+            public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
+                => writer.WriteStringValue(value.ToString("yyyy-MM-dd HH:mm:ss"));
+        }
+
+        public static DateTime? ParseDateTime(string dateStr)
+        {
+            if (System.Text.RegularExpressions.Regex.IsMatch(dateStr, @"^\d{4}[/-]") && DateTime.TryParse(dateStr, null,System.Globalization.DateTimeStyles.AssumeLocal, out var dateVal))
+                return dateVal;
+            return null;
+        }
+    }
+}
diff --git a/ZR.Admin.WebApi/Startup.cs b/ZR.Admin.WebApi/Startup.cs
index 918fc54..aa0e1ce 100644
--- a/ZR.Admin.WebApi/Startup.cs
+++ b/ZR.Admin.WebApi/Startup.cs
@@ -18,6 +18,7 @@ using System.IO;
 using System.Linq;
 using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
+using ZR.Admin.WebApi.Framework;
 using ZR.Admin.WebApi.Middleware;
 
 namespace ZR.Admin.WebApi
@@ -67,7 +68,12 @@ namespace ZR.Admin.WebApi
                 options.Filters.Add(typeof(GlobalActionMonitor));//ȫ��ע���쳣
             })
             .AddMvcLocalization()
-            .AddViewLocalization(LanguageViewLocationExpanderFormat.Suffix);
+            .AddViewLocalization(LanguageViewLocationExpanderFormat.Suffix)
+            .AddJsonOptions(options =>
+            {
+                options.JsonSerializerOptions.Converters.Add(new JsonConverterUtil.DateTimeConverter());
+                options.JsonSerializerOptions.Converters.Add(new JsonConverterUtil.DateTimeNullConverter());
+            });
 
             services.AddSwaggerGen(c =>
             {
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt
index 432f3fb..122f94a 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt
@@ -186,12 +186,20 @@ export default {
           
           if (this.form.{PrimaryKey} != undefined || this.title === '修改数据') {
             update{ModelTypeName}(this.form).then((res) => {
+                if (!res.data) {
+                    this.msgError("修改失败");
+                    return;
+                }
                 this.msgSuccess("修改成功");
                 this.open = false;
                 this.getList();
             });
           } else {
             add{ModelTypeName}(this.form).then((res) => {
+                if (!res.data) {
+                    this.msgError("新增失败");
+                    return;
+                }
                 this.msgSuccess("新增成功");
                 this.open = false;
                 this.getList();