调整 .NET Core 3.1 Sample

hollyhou · Sep 11, 2021 · 287892d · 287892d
1 parent 32e7910
commit 287892d
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 25 deletions.
diff --git a/Samples/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/HomeController.cs b/Samples/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/HomeController.cs
@@ -15,7 +15,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Senparc.Weixin.Cache;
 using Senparc.Weixin.MP.Containers;//DPBMARK MP DPBMARK_END
-using Senparc.Weixin.MP.Sample.CommonService.Download;
+using Senparc.Weixin.Sample.CommonService.Download;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
@@ -145,7 +145,7 @@ public IActionResult Index()
             }
             catch (Exception)
             {
-                TempData["NewestDocumentVersion"] = new Senparc.Weixin.MP.Sample.CommonService.Download.Config();
+                TempData["NewestDocumentVersion"] = new CommonService.Download.Config();
             }
             #endregion  DPBMARK_END
 

diff --git a/...les/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Tools/DocumentController.cs b/...les/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Tools/DocumentController.cs
@@ -11,10 +11,10 @@
 using Senparc.Weixin.MP.AdvancedAPIs.WiFi;
 using Senparc.Weixin.MP.CommonAPIs;
 using Senparc.Weixin.MP.Containers;
-using Senparc.Weixin.MP.Sample.CommonService.Download;
+using Senparc.Weixin.Sample.CommonService.Download;
 using System.IO;
 using Senparc.Weixin.MP;
-//using Senparc.Weixin.MP.Sample.CommonService.Download;
+//using Senparc.Weixin.Sample.CommonService.Download;
 
 namespace Senparc.Weixin.Sample.NetCore3.Controllers
 {

diff --git a/...ore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Weixin/MP/AsyncMethodsController.cs b/...ore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Weixin/MP/AsyncMethodsController.cs
@@ -6,7 +6,7 @@
 using Senparc.Weixin.MP;
 using Senparc.Weixin.MP.AdvancedAPIs;
 using Senparc.Weixin.MP.AdvancedAPIs.TemplateMessage;
-using Senparc.Weixin.MP.Sample.CommonService.CustomMessageHandler;
+using Senparc.Weixin.Sample.CommonService.CustomMessageHandler;
 using System;
 using System.Threading.Tasks;
 

diff --git a/...core3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Weixin/MP/WeixinAsyncController.cs b/...core3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Weixin/MP/WeixinAsyncController.cs
@@ -34,10 +34,10 @@
 //using Microsoft.AspNetCore.Mvc;
 //using Senparc.Weixin.MP.Entities.Request;
 //using Senparc.Weixin.MP.MvcExtension;
-//using Senparc.Weixin.MP.Sample.CommonService.CustomMessageHandler;
+//using Senparc.Weixin.Sample.CommonService.CustomMessageHandler;
 //using System.IO;
 //using Senparc.Weixin.HttpUtility;
-//using Senparc.Weixin.MP.Sample.CommonService.Utilities;
+//using Senparc.Weixin.Sample.CommonService.Utilities;
 //using Senparc.CO2NET.HttpUtility;
 //using System.Xml.Linq;
 //using System.Threading;

diff --git a/...s/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Weixin/MP/WeixinController.cs b/...s/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Weixin/MP/WeixinController.cs
@@ -41,7 +41,7 @@ namespace Senparc.Weixin.Sample.NetCore3.Controllers
     using Senparc.Weixin.HttpUtility;
     using Senparc.Weixin.MP;
     using Senparc.Weixin.MP.MvcExtension;
-    using Senparc.Weixin.MP.Sample.CommonService.CustomMessageHandler;
+    using Senparc.Weixin.Sample.CommonService.CustomMessageHandler;
     using System.Text;
     using System.Threading;
     using System.Threading.Tasks;

diff --git a/...e3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Weixin/MP/WeixinController_OldPost.cs b/...e3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Weixin/MP/WeixinController_OldPost.cs
@@ -18,7 +18,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Xml.Linq;
 using Senparc.Weixin.MP.MessageHandlers;
-using Senparc.Weixin.MP.Sample.CommonService;
+using Senparc.Weixin.Sample.CommonService;
 
 namespace Senparc.Weixin.Sample.NetCore3.Controllers
 {

diff --git a/...s/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Weixin/Open/OpenController.cs b/...s/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Weixin/Open/OpenController.cs
@@ -10,12 +10,12 @@
 using System.Xml.Linq;
 using Senparc.Weixin.MP.MessageHandlers;
 using Senparc.Weixin.MP.MvcExtension;
-using Senparc.Weixin.MP.Sample.CommonService.CustomMessageHandler;
-using Senparc.Weixin.MP.Sample.CommonService.MessageHandlers.OpenMessageHandler;
-using Senparc.Weixin.MP.Sample.CommonService.OpenTicket;
+using Senparc.Weixin.Sample.CommonService.CustomMessageHandler;
+using Senparc.Weixin.Sample.CommonService.MessageHandlers.OpenMessageHandler;
+using Senparc.Weixin.Sample.CommonService.OpenTicket;
 using Senparc.Weixin.Open;
 using Senparc.Weixin.Open.MessageHandlers;
-using Senparc.Weixin.MP.Sample.CommonService.ThirdPartyMessageHandlers;
+using Senparc.Weixin.Sample.CommonService.ThirdPartyMessageHandlers;
 using Senparc.Weixin.Open.ComponentAPIs;
 using Senparc.Weixin.Open.Containers;
 using Senparc.Weixin.Open.Entities.Request;

diff --git a/...core3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Weixin/Open/OpenOAuthController.cs b/...core3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Weixin/Open/OpenOAuthController.cs
@@ -8,7 +8,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Senparc.Weixin.Exceptions;
 using Senparc.CO2NET.Extensions;
-using Senparc.Weixin.MP.Sample.CommonService.OpenTicket;
+using Senparc.Weixin.Sample.CommonService.OpenTicket;
 using Senparc.Weixin.Open.CommonAPIs;
 using Senparc.Weixin.Open.ComponentAPIs;
 using Senparc.Weixin.Open.Containers;

diff --git a/...ore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Weixin/TenPay/TenPayV3Controller.cs b/...ore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Weixin/TenPay/TenPayV3Controller.cs
@@ -38,7 +38,7 @@
 using ZXing;
 using ZXing.Common;
 using Senparc.Weixin.Exceptions;
-using Senparc.Weixin.MP.Sample.CommonService.TemplateMessage;
+using Senparc.Weixin.Sample.CommonService.TemplateMessage;
 using Microsoft.AspNetCore.Http;
 using Senparc.CO2NET.Extensions;
 using Senparc.CO2NET.Helpers;

diff --git a/...parc.Weixin.Sample.NetCore3/Controllers/Weixin/ThirdPartyAuth/ThirdPartyAuthController.cs b/...parc.Weixin.Sample.NetCore3/Controllers/Weixin/ThirdPartyAuth/ThirdPartyAuthController.cs
@@ -8,9 +8,9 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Xml.Linq;
 using Senparc.Weixin.MP.MvcExtension;
-using Senparc.Weixin.MP.Sample.CommonService.WorkMessageHandler;
+using Senparc.Weixin.Sample.CommonService.WorkMessageHandler;
 using Senparc.Weixin.Work.Entities;
-using Senparc.Weixin.MP.Sample.CommonService.WorkMessageHandlers;
+using Senparc.Weixin.Sample.CommonService.WorkMessageHandlers;
 using Senparc.Weixin.HttpUtility;
 using Senparc.CO2NET.HttpUtility;
 using Senparc.CO2NET.Utilities;

diff --git a/...s/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Weixin/Work/WorkController.cs b/...s/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Weixin/Work/WorkController.cs
@@ -27,7 +27,7 @@ 2. 目前 Senparc.Weixin SDK 已经全面转向异步方法驱动，
 using Senparc.CO2NET.AspNet.HttpUtility;
 using Senparc.CO2NET.Utilities;
 using Senparc.Weixin.MP.MvcExtension;
-using Senparc.Weixin.MP.Sample.CommonService.WorkMessageHandlers;
+using Senparc.Weixin.Sample.CommonService.WorkMessageHandlers;
 using Senparc.Weixin.Work.Entities;
 using System;
 using System.IO;

diff --git a/...tcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Weixin/WxOpen/WxOpenController.cs b/...tcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/Weixin/WxOpen/WxOpenController.cs
@@ -18,7 +18,7 @@ 2. 目前 Senparc.Weixin SDK 已经全面转向异步方法驱动，
 using Senparc.CO2NET.Cache;
 using Senparc.CO2NET.Extensions;
 using Senparc.Weixin.MP.MvcExtension;
-using Senparc.Weixin.MP.Sample.CommonService.WxOpenMessageHandler;
+using Senparc.Weixin.Sample.CommonService.WxOpenMessageHandler;
 using Senparc.Weixin.WxOpen.AdvancedAPIs.Sns;
 using Senparc.Weixin.WxOpen.Containers;
 using Senparc.Weixin.WxOpen.Entities;
@@ -27,7 +27,7 @@ 2. 目前 Senparc.Weixin SDK 已经全面转向异步方法驱动，
 using System;
 using System.IO;
 using Senparc.Weixin.TenPay.V3;//DPBMARK TenPay DPBMARK_END
-using Senparc.Weixin.MP.Sample.CommonService;
+using Senparc.Weixin.Sample.CommonService;
 using Senparc.CO2NET.Utilities;
 using System.Threading.Tasks;
 using Senparc.Weixin.WxOpen.AdvancedAPIs.WxApp;

diff --git a/Samples/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Startup.cs b/Samples/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Startup.cs
@@ -19,10 +19,10 @@
 using Senparc.Weixin.Entities;
 using Senparc.Weixin.MP;//DPBMARK MP DPBMARK_END
 using Senparc.Weixin.MP.MessageHandlers.Middleware;//DPBMARK MP DPBMARK_END
-using Senparc.Weixin.MP.Sample.CommonService.CustomMessageHandler;//DPBMARK MP DPBMARK_END
-using Senparc.Weixin.MP.Sample.CommonService.MessageHandlers.WebSocket;//DPBMARK WebSocket DPBMARK_END
-using Senparc.Weixin.MP.Sample.CommonService.WorkMessageHandlers;//DPBMARK Work DPBMARK_END
-using Senparc.Weixin.MP.Sample.CommonService.WxOpenMessageHandler;//DPBMARK MiniProgram DPBMARK_END
+using Senparc.Weixin.Sample.CommonService.CustomMessageHandler;//DPBMARK MP DPBMARK_END
+using Senparc.Weixin.Sample.CommonService.MessageHandlers.WebSocket;//DPBMARK WebSocket DPBMARK_END
+using Senparc.Weixin.Sample.CommonService.WorkMessageHandlers;//DPBMARK Work DPBMARK_END
+using Senparc.Weixin.Sample.CommonService.WxOpenMessageHandler;//DPBMARK MiniProgram DPBMARK_END
 using Senparc.Weixin.Open;//DPBMARK Open DPBMARK_END
 using Senparc.Weixin.Open.ComponentAPIs;//DPBMARK Open DPBMARK_END
 using Senparc.Weixin.RegisterServices;
@@ -439,7 +439,7 @@ private void ConfigTraceLog()
                 //加入每次触发WeixinExceptionLog后需要执行的代码
 
                 //发送模板消息给管理员                                   -- DPBMARK Redis
-                var eventService = new Senparc.Weixin.MP.Sample.CommonService.EventService();
+                var eventService = new CommonService.EventService();
                 await eventService.ConfigOnWeixinExceptionFunc(ex);      // DPBMARK_END
             };
         }