Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -2,7 +2,7 @@
 using FluentValidation;
 using Microsoft.AspNetCore.SignalR;
 using OASystem.API.OAMethodLib;
-using OASystem.API.OAMethodLib.APNs;
+using OASystem.API.OAMethodLib.APNsLib;
 using OASystem.API.OAMethodLib.Hub.HubClients;
 using OASystem.API.OAMethodLib.Hub.Hubs;
 using OASystem.API.OAMethodLib.QiYeWeChatAPI;

OASystem/OASystem.Api/OAMethodLib/APNs/APNsLib.cs

@@ -1,5 +1,5 @@
 
-namespace OASystem.API.OAMethodLib.APNs
+namespace OASystem.API.OAMethodLib.APNsLib
 {
     public static class APNsLib
     {

OASystem/OASystem.Api/OAMethodLib/APNs/APNsService.cs

@@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration;
 using NPOI.SS.Formula.Functions;
 using Serilog;
 
-namespace OASystem.API.OAMethodLib.APNs
+namespace OASystem.API.OAMethodLib.APNsLib
 {
     public enum NotificationType : int
     {

OASystem/OASystem.Api/OAMethodLib/APNs/IAPNsService.cs

@@ -1,4 +1,4 @@
-namespace OASystem.API.OAMethodLib.APNs
+namespace OASystem.API.OAMethodLib.APNsLib
 {
     public interface IAPNsService
     {

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -5,7 +5,7 @@ using Aspose.Words.Layout;
 using Aspose.Words.Saving;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.International.Converters.PinYinConverter;
-using OASystem.API.OAMethodLib.APNs;
+using OASystem.API.OAMethodLib.APNsLib;
 using OASystem.API.OAMethodLib.File;
 using OASystem.API.OAMethodLib.Hub.HubClients;
 using OASystem.API.OAMethodLib.Hub.Hubs;
@@ -4450,7 +4450,7 @@ namespace OASystem.API.OAMethodLib
             var rst = await _deviceTokenRep.Query(s => s.Number == Numbers).SingleAsync();
             Result rst2 = new Result() { Code = -1, Msg = "" };
             if (rst != null) {
-                rst2 = await APNsLib.pushMsg("com.panamerican.oa2024", rst.DeviceToken, NotificationType.Alert, title, subtitle, body);
+                rst2 = await APNsLib.APNsLib.pushMsg("com.panamerican.oa2024", rst.DeviceToken, NotificationType.Alert, title, subtitle, body);
             }
             return rst2;
         }

OASystem/OASystem.Api/Program.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using OASystem.API.Middlewares;
 using OASystem.API.OAMethodLib;
-using OASystem.API.OAMethodLib.APNs;
+using OASystem.API.OAMethodLib.APNsLib;
 using OASystem.API.OAMethodLib.Hub.Hubs;
 using OASystem.API.OAMethodLib.JuHeAPI;
 using OASystem.API.OAMethodLib.QiYeWeChatAPI;