From eeb1019e42abc3fc0e4b10b181b46c02b6e58843 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期四, 09 十月 2025 15:16:21 +0800
Subject: [PATCH] feat:开发

---
 ApiTools.Core/Utils/SmsUtils/SmsUtils.cs |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/ApiTools.Core/Utils/SmsUtils/SmsUtils.cs b/ApiTools.Core/Utils/SmsUtils/SmsUtils.cs
index 9c1aece..ead1784 100644
--- a/ApiTools.Core/Utils/SmsUtils/SmsUtils.cs
+++ b/ApiTools.Core/Utils/SmsUtils/SmsUtils.cs
@@ -165,18 +165,17 @@
         /// <param name="setting"></param>
         /// <param name="fromEntity"></param>
         /// <returns></returns>
-        private EnumSmsAccess? GetSmsAccess(SmsSetting setting, SmsLog fromEntity)
+        private SmsSettingAccess GetSmsAccess(SmsSetting setting, SmsLog fromEntity)
         {
             var accesses = setting.Accesses
                     .OrderBy(it => it.Sort)
                     .Where(it => !it.IsDisabled)
                     .ToList();
-            EnumSmsAccess? access = null;
+            SmsSettingAccess? access = null;
             if (fromEntity == null)
             {
                 access = accesses
-                    .FirstOrDefault()
-                    ?.Access;
+                    .FirstOrDefault();
             }
             else
             {
@@ -187,8 +186,7 @@
                 {
                     access = accesses
                         .Where(it => it.Sort > sort)
-                        .FirstOrDefault()
-                        ?.Access;
+                        .FirstOrDefault();
                 }
             }
             return access;
@@ -256,14 +254,14 @@
             else
             {
                 var access = GetSmsAccess(setting, fromEntity);
-                if (access.HasValue)
+                if (access != null)
                 {
-                    var smsService = GetSmsService(access.Value);
+                    var smsService = GetSmsService(access.Access);
                     var entity = new SmsLog
                     {
                         ChannelId = setting.ChannelId,
                         ChannelCreatedUserId = model.ChannelCreatedUserId,
-                        Access = access.Value,
+                        Access = access.Access,
                         PhoneNumber = model.PhoneNumber,
                         TemplateCode = model.TemplateCode.ToString(),
                         TemplateParam = templateParam.ToJson(),
@@ -271,7 +269,7 @@
                         Status = EnumSmsStatus.Wait
                     };
                     await rep.InsertNowAsync(entity);
-                    var response = await smsService.SendAsync(model.PhoneNumber, model.TemplateCode, templateParam, cancellationToken);
+                    var response = await smsService.SendAsync(access.SignName, model.PhoneNumber, model.TemplateCode, templateParam, cancellationToken);
                     if (response != null)
                     {
                         entity.Status = response.Status;

--
Gitblit v1.9.1