ak

src/CallCenter.Api/Realtimes/CallCenterHub.cs

@@ -44,22 +44,22 @@ public class CallCenterHub : Hub
     }
 }
 
-public class RealtimeService : IRealtimeService, IScopeDependency
-{
-    private readonly IHubContext<CallCenterHub> _hubContext;
-    private readonly IUserCacheManager _userCacheManager;
+//public class RealtimeService : IRealtimeService, IScopeDependency
+//{
+//    private readonly IHubContext<CallCenterHub> _hubContext;
+//    private readonly IUserCacheManager _userCacheManager;
 
-    public RealtimeService(IHubContext<CallCenterHub> hubContext, IUserCacheManager userCacheManager)
-    {
-        _hubContext = hubContext;
-        _userCacheManager = userCacheManager;
-    }
+//    public RealtimeService(IHubContext<CallCenterHub> hubContext, IUserCacheManager userCacheManager)
+//    {
+//        _hubContext = hubContext;
+//        _userCacheManager = userCacheManager;
+//    }
 
-    public async Task RingAsync(string userId, RingDto dto, CancellationToken cancellationToken)
-    {
-        var work = _userCacheManager.GetWorkByUser(userId);
-        if (string.IsNullOrEmpty(work.SignalRId))
-            throw new UserFriendlyException("无效signalr.connectionId");
-        await _hubContext.Clients.Client(work.SignalRId).SendAsync("Ring", dto, cancellationToken);
-    }
-}
+//    public async Task RingAsync(string userId, RingDto dto, CancellationToken cancellationToken)
+//    {
+//        var work = _userCacheManager.GetWorkByUser(userId);
+//        if (string.IsNullOrEmpty(work.SignalRId))
+//            throw new UserFriendlyException("无效signalr.connectionId");
+//        await _hubContext.Clients.Client(work.SignalRId).SendAsync("Ring", dto, cancellationToken);
+//    }
+//}

src/CallCenter.Api/StartupExtensions.cs

@@ -35,7 +35,7 @@ internal static class StartupExtensions
         services.AddHttpContextAccessor();
 
 #if DEBUG
-        builder.WebHost.UseUrls("http://192.168.100.36:50001", "http://localhost:50001");
+        builder.WebHost.UseUrls("http://192.168.100.62:50001", "http://localhost:50001");
 #endif
 
         services.Configure<DeviceConfigs>(d => configuration.GetSection("DeviceConfigs").Bind(d));
@@ -179,13 +179,13 @@ internal static class StartupExtensions
 
         app.UseCors(CorsOrigins);
 
-        app.UseAuthentication();
+        //app.UseAuthentication();
         app.UseAuthorization();
         //app.MapHub<CallCenterHub>("/hubs/callcenter");
         //app.UseMiddleware<TempTokenMiddleware>();
 
-        app.MapControllers()
-            .RequireAuthorization();
+        app.MapControllers();
+            //.RequireAuthorization();
 
         return app;
     }

src/CallCenter.Api/Token/DefaultSessionContext.cs

@@ -14,7 +14,8 @@ namespace CallCenter.Api.Token
                 throw new ArgumentNullException(nameof(httpContext));
             //var a = Thread.CurrentPrincipal as ClaimsPrincipal;
             var user = httpContext.User;
-            UserId = user.Claims.FirstOrDefault(d => d.Type == "sub")?.Value ?? string.Empty;
+            //UserId = user.Claims.FirstOrDefault(d => d.Type == "sub")?.Value ?? string.Empty;
+            UserId = user.Claims.FirstOrDefault(d => d.Type == "UserId")?.Value ?? string.Empty;
             UserName = user.Claims.FirstOrDefault(d => d.Type == "UserName")?.Value ?? string.Empty;
             var roles = user.Claims.FirstOrDefault(d => d.Type == "role");
         }