Parcourir la source

Merge branch 'test' into release

xf il y a 14 heures
Parent
commit
5309877a58

+ 2 - 3
src/Hotline.Api/Controllers/CorsJobController.cs

@@ -19,16 +19,15 @@ namespace Hotline.Api.Controllers
         private readonly IRealtimeService _realtimeService;
         private readonly ISystemSettingCacheManager _systemSettingCacheManager;
         private readonly ITrClient _trClient;
-        private readonly ILogger _logger;
+        private readonly ILogger<CorsJobController> _logger;
 
-        public CorsJobController(IOrderDomainService orderDomainService, IRepository<TrCallRecord> trcallrecordRepoository, IRealtimeService realtimeService, ISystemSettingCacheManager systemSettingCacheManager, ITrClient trClient, ILogger logger)
+        public CorsJobController(IOrderDomainService orderDomainService, IRepository<TrCallRecord> trcallrecordRepoository, IRealtimeService realtimeService, ISystemSettingCacheManager systemSettingCacheManager, ITrClient trClient, ILogger<CorsJobController> logger)
         {
             _orderDomainService = orderDomainService;
             _trcallrecordRepoository = trcallrecordRepoository;
             _realtimeService = realtimeService;
             _systemSettingCacheManager = systemSettingCacheManager;
             _trClient = trClient;
-            _logger = logger;
         }
 
         /// <summary>

+ 1 - 1
src/Hotline.Api/Controllers/IPPbxController.cs

@@ -988,7 +988,7 @@ namespace Hotline.Api.Controllers
         /// 重置话机状态
         /// </summary>
         /// <returns></returns>
-        [HttpGet("tels-status-refreshservice")]
+        [HttpPost("tels-status-refreshservice")]
         [AllowAnonymous]
         public async Task TelsStatusRefreshService()
         {

+ 2 - 1
src/Hotline.Application/Snapshot/SnapshotApplicationBase.cs

@@ -407,7 +407,8 @@ public abstract class SnapshotApplicationBase
             {
                 NotificationId = m.NotificationId,
                 Title = notify.Title ,
-                CreationTime = m.CreationTime
+                CreationTime = m.CreationTime,
+                IsRead = m.IsRead
             }, true)
             .ToFixedListAsync(dto, requestAborted);
         return items;

+ 5 - 0
src/Hotline.Share/Dtos/Snapshot/NotifyDto.cs

@@ -63,4 +63,9 @@ public class GetNotifyOutDto
     /// 创建时间
     /// </summary>
     public DateTime CreationTime { get; set; }
+
+    /// <summary>
+    /// 是否已读
+    /// </summary>
+    public bool IsRead { get; set; }
 }

+ 5 - 0
src/Hotline.Share/Dtos/Snapshot/SnapshotBulletinDto.cs

@@ -288,6 +288,11 @@ public class AddSnapshotBulletinInDto
     /// </summary>
     public string? VideoPath { get; set; }
 
+    /// <summary>
+    /// 视频名称
+    /// </summary>
+    public string? VideoName { get; set; }
+
     /// <summary>
     /// 视频封面
     /// </summary>

+ 5 - 0
src/Hotline/Snapshot/SnapshotBulletin.cs

@@ -195,5 +195,10 @@ public class SnapshotBulletin : CreationEntity
     [SugarColumn(ColumnDescription = "视频封面")]
     public string? VideoCoverImgUrl { get; set; }
 
+    /// <summary>
+    /// 视频名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "视频封面")]
+    public string? VideoName { get; set; }
 }