Compare commits
No commits in common. "master" and "v0.7.0" have entirely different histories.
|
|
@ -31,16 +31,6 @@
|
|||
"DockerFireUrl": "",
|
||||
"WindowsServiceFireUrl": null,
|
||||
"LinuxServiceFireUrl": null
|
||||
},
|
||||
{
|
||||
"UserName": "marking",
|
||||
"Pwd": "CE09921E2AD09E56095579DF1F7C614B",
|
||||
"Host": "47.109.193.53:10022",
|
||||
"NickName": "meeting",
|
||||
"IIsFireUrl": null,
|
||||
"DockerFireUrl": "",
|
||||
"WindowsServiceFireUrl": null,
|
||||
"LinuxServiceFireUrl": null
|
||||
}
|
||||
],
|
||||
"IgnoreList": [],
|
||||
|
|
|
|||
|
|
@ -51,27 +51,6 @@ namespace WGShare.API.Controllers
|
|||
return await _sqlSugar.Queryable<User>().AnyAsync(x => x.IsDelete == false && x.Account == account && x.IsAnonymous == false);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 检查用户是否在线
|
||||
/// </summary>
|
||||
/// <param name="account"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet("check-online"), AllowAnonymous]
|
||||
public async Task<bool> CheckUserOnline([FromQuery] string account)
|
||||
{
|
||||
var user = await _sqlSugar.Queryable<User>().FirstAsync(x => x.IsDelete == false && x.Account == account && x.IsAnonymous == false);
|
||||
if (user == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
var connectId = RedisHelper.Instance.HGet(RedisKeyConstant.SessionManage.GetOnlineUserKey(user.TenantId), user.Id);
|
||||
if (!string.IsNullOrWhiteSpace(connectId))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 正常账号登录
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -165,18 +165,9 @@ namespace WGShare.API.Controllers.Frontend
|
|||
return;
|
||||
}
|
||||
|
||||
if (existsChannel.TryAdd(eventBody.payload.channelName, 0))
|
||||
if(existsChannel.TryAdd(eventBody.payload.channelName, 0))
|
||||
{
|
||||
var roomInfo = await _sqlSugarClient.Queryable<Room>()
|
||||
.LeftJoin<Tenant>((r, t) => r.TenantId == t.Id)
|
||||
.Where((r, t) => r.RoomNum == eventBody.payload.channelName)
|
||||
.Select((r, t) => new Room
|
||||
{
|
||||
Id = r.Id.SelectAll(),
|
||||
TenantName = t.TenantName
|
||||
})
|
||||
.FirstAsync();
|
||||
ExceptionNotice.JoinAsync(eventBody, roomInfo);
|
||||
ExceptionNotice.JoinAsync(eventBody);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -371,17 +371,5 @@ namespace WGShare.API.Controllers.Frontend
|
|||
await _sqlSugar.Insertable(entity).ExecuteCommandAsync();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 记录用户当前用户版本
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpPost("ver-log")]
|
||||
public async Task RecordVersionLog([FromBody] UserVersionLogDto userVersionLog)
|
||||
{
|
||||
var uvl = userVersionLog.Adapt<UserVersionLog>();
|
||||
uvl.UserId = UId.ToInt64();
|
||||
await _sqlSugar.Insertable(uvl).ExecuteCommandAsync();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,11 +63,10 @@ namespace WGShare.API.Controllers.Frontend
|
|||
[HttpPost("manager")]
|
||||
public async Task SetRoomManager([FromBody] RoomManagerInputDTO inputDTO)
|
||||
{
|
||||
inputDTO.SettingUserId = UId;
|
||||
var users = RedisHelper.Instance.HVals<ChannelUserInfo>(RedisKeyConstant.SessionManage.GetChannelUserKey(TenantId, inputDTO.RoomNum));
|
||||
if (users.Count(x => x.IsRoomManager || x.RoleId == ((int)RoleEnums.Admin).ToString() || x.RoleId == ((int)RoleEnums.RoomManager).ToString()) >= 20)
|
||||
if (users.Count(x => x.IsRoomManager || x.RoleId == ((int)RoleEnums.Admin).ToString() || x.RoleId == ((int)RoleEnums.RoomManager).ToString()) >= 32)
|
||||
{
|
||||
throw Oops.Oh("当前房间已达最大发言人数！");
|
||||
throw Oops.Oh("房间已达到32个发言人限制。请移除一位发言人");
|
||||
}
|
||||
var user = users.FirstOrDefault(x => x.UID == inputDTO.UserId);
|
||||
if (user == null)
|
||||
|
|
@ -75,13 +74,11 @@ namespace WGShare.API.Controllers.Frontend
|
|||
throw Oops.Oh("用户已不在房间内！");
|
||||
}
|
||||
|
||||
await _hubContext.Clients.User(inputDTO.UserId).SetSpeaker(inputDTO);
|
||||
user.IsRoomManager = true;
|
||||
|
||||
//user.IsRoomManager = true;
|
||||
RedisHelper.Instance.HSet(RedisKeyConstant.SessionManage.GetChannelUserKey(TenantId, inputDTO.RoomNum), inputDTO.UserId, user);
|
||||
|
||||
//RedisHelper.Instance.HSet(RedisKeyConstant.SessionManage.GetChannelUserKey(TenantId, inputDTO.RoomNum), inputDTO.UserId, user);
|
||||
|
||||
//await _hubContext.Clients.Group(inputDTO.RoomNum).ManagerRefresh(user, UId);
|
||||
await _hubContext.Clients.Group(inputDTO.RoomNum).ManagerRefresh(user, UId);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -342,7 +339,7 @@ namespace WGShare.API.Controllers.Frontend
|
|||
userInfo.EnableMicr = enableMicr;
|
||||
RedisHelper.Instance.HSet(RedisKeyConstant.SessionManage.GetChannelUserKey(TenantId, roomNum), uid, userInfo);
|
||||
|
||||
//_logger.LogInformation($@"开闭麦克分，推送一次,roomNum:{roomNum},enableMicr:{enableMicr},uid:{uid}");
|
||||
_logger.LogInformation($@"开闭麦克分，推送一次,roomNum:{roomNum},enableMicr:{enableMicr},uid:{uid}");
|
||||
// 通知所有人该用户麦克风状态
|
||||
await _hubContext.Clients.Group(roomNum).OperMicr(userInfo, UId);
|
||||
}
|
||||
|
|
@ -414,8 +411,7 @@ namespace WGShare.API.Controllers.Frontend
|
|||
|
||||
if (RedisHelper.Instance.HGet(RedisKeyConstant.SessionManage.GetChannelShowUserKey(TenantId), roomNum) == uid)
|
||||
{
|
||||
// 如果已经是全员观看他了， 直接通知其他房间用户
|
||||
await _hubContext.Clients.Group(roomNum).ShowUser(uid, uname, UId, UserName);
|
||||
// 如果已经是全员观看他了，则不做处理
|
||||
return;
|
||||
}
|
||||
// 设置房间全员观看用户
|
||||
|
|
@ -628,13 +624,7 @@ namespace WGShare.API.Controllers.Frontend
|
|||
|
||||
if (connectionIds.Any())
|
||||
{
|
||||
var userInfo = RedisHelper.Instance.HGet<ChannelUserInfo>(RedisKeyConstant.SessionManage.GetChannelUserKey(TenantId, roomNum), UId);
|
||||
var userName = UserName;
|
||||
if (userInfo != null)
|
||||
{
|
||||
userName = userInfo.UserName;
|
||||
}
|
||||
await _hubContext.Clients.Clients(connectionIds).ApplyToSpeak(UId, userName);
|
||||
await _hubContext.Clients.Clients(connectionIds).ApplyToSpeak(UId, UserName);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -646,7 +636,7 @@ namespace WGShare.API.Controllers.Frontend
|
|||
public async Task<string> GetSharedScreen([FromQuery] string roomNum)
|
||||
{
|
||||
var showUserId = RedisHelper.Instance.HGet(RedisKeyConstant.SessionManage.GetChannelShowUserKey(TenantId), roomNum);
|
||||
if (!string.IsNullOrWhiteSpace(showUserId) && showUserId.Length == 9)
|
||||
if (showUserId.Length == 9)
|
||||
{
|
||||
// 全员观看userid =9 表示共享屏幕
|
||||
return showUserId;
|
||||
|
|
@ -682,25 +672,6 @@ namespace WGShare.API.Controllers.Frontend
|
|||
await _hubContext.Clients.Group(roomNum).ShowUser(UId, UserName, string.Empty, string.Empty);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 共享人取消共享屏幕
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpPost("stop-shared-screen")]
|
||||
public async Task StopedSharedScreen([FromQuery] string roomNum)
|
||||
{
|
||||
if (RedisHelper.Instance.HGet(RedisKeyConstant.SessionManage.GetChannelShowUserKey(TenantId), roomNum) != ScreenShareId)
|
||||
{
|
||||
// 不是共享屏幕的人，不做处理
|
||||
return;
|
||||
}
|
||||
|
||||
// 设置新的共享屏幕
|
||||
RedisHelper.Instance.HSet(RedisKeyConstant.SessionManage.GetChannelShowUserKey(TenantId), roomNum, UId);
|
||||
|
||||
await _hubContext.Clients.Group(roomNum).StopedSharedScreen(ScreenShareId);
|
||||
}
|
||||
|
||||
#region 文件分享
|
||||
/// <summary>
|
||||
/// 分享上传文件
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
using SignalRSwaggerGen.Attributes;
|
||||
using WGShare.Domain.DTOs.Room;
|
||||
using WGShare.Domain.DTOs.User;
|
||||
using WGShare.Domain.Entities;
|
||||
|
||||
|
|
@ -47,7 +46,7 @@ namespace WGShare.API.Hubs
|
|||
/// </summary>
|
||||
/// <param name="type"></param>
|
||||
/// <returns></returns>
|
||||
Task Operation(string contentString);
|
||||
Task Operation(int type);
|
||||
|
||||
/// <summary>
|
||||
/// 更新视图
|
||||
|
|
@ -61,12 +60,6 @@ namespace WGShare.API.Hubs
|
|||
/// <returns></returns>
|
||||
Task ShowUser(string uid, string uname, string operUid, string operUserName);
|
||||
|
||||
/// <summary>
|
||||
/// 共享人取消共享屏幕
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
Task StopedSharedScreen(string ScreenShareId);
|
||||
|
||||
/// <summary>
|
||||
/// 用户加入频道回调
|
||||
/// </summary>
|
||||
|
|
@ -172,18 +165,5 @@ namespace WGShare.API.Hubs
|
|||
/// 加入频道回调
|
||||
/// </summary>
|
||||
Task JoinChannelCallback(bool isSuccess);
|
||||
|
||||
/// <summary>
|
||||
/// 发送设置发言人指令
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
Task SetSpeaker(RoomManagerInputDTO inputDTO);
|
||||
|
||||
/// <summary>
|
||||
/// 客户端接收到消息
|
||||
/// </summary>
|
||||
/// <param name="contentString"></param>
|
||||
/// <returns></returns>
|
||||
Task ReceivedOperation(string contentString);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
using Masuit.Tools.DateTimeExt;
|
||||
using Masuit.Tools.Maths;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Components.Forms;
|
||||
using Microsoft.AspNetCore.SignalR;
|
||||
using SqlSugar;
|
||||
using SqlSugar.Extensions;
|
||||
|
|
@ -10,11 +9,9 @@ using System;
|
|||
using System.Globalization;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Security.Claims;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using WGShare.API.Helpers;
|
||||
using WGShare.Domain.Constant;
|
||||
using WGShare.Domain.DTOs.Room;
|
||||
using WGShare.Domain.Entities;
|
||||
using WGShare.Domain.Enums;
|
||||
using WGShare.Domain.FriendlyException;
|
||||
|
|
@ -48,7 +45,7 @@ namespace WGShare.API.Hubs
|
|||
Context.Items.Add("uname", uname);
|
||||
Context.Items.Add("roleid", roleId);
|
||||
|
||||
_logger.LogInformation($"{DateTime.Now}连接成功 当前租户：{tenant} account：{account} uid:{uid} connectId:{Context.ConnectionId}");
|
||||
Console.WriteLine($"{DateTime.Now}连接成功 当前租户：{tenant} account：{account} uid:{uid} connectId:{Context.ConnectionId}");
|
||||
|
||||
//await ClearUserChannel(uid, tenant, account, ssid, false);
|
||||
// 存储在线信息
|
||||
|
|
@ -63,11 +60,11 @@ namespace WGShare.API.Hubs
|
|||
var ssid = Context.User?.Claims.FirstOrDefault(x => x.Type == "ssid")?.Value;
|
||||
|
||||
|
||||
_logger.LogInformation($"{DateTime.Now}断开连接 当前租户：{tenant} account：{account} uid:{uid} connectId:{Context.ConnectionId} exception:{exception?.Message} ");
|
||||
Console.WriteLine($"{DateTime.Now}断开连接 当前租户：{tenant} account：{account} uid:{uid} connectId:{Context.ConnectionId} exception:{exception?.Message} ");
|
||||
|
||||
if (Context.ConnectionId == RedisHelper.Instance.HGet(RedisKeyConstant.SessionManage.GetOnlineUserKey(tenant), uid))
|
||||
{
|
||||
_logger.LogInformation($"{DateTime.Now}断开连接 未重连，开始删除用户频道信息");
|
||||
Console.WriteLine($"{DateTime.Now}断开连接 未重连，开始删除用户频道信息");
|
||||
// 断开后未重连则清退频道
|
||||
await ClearUserChannel(uid, tenant, account, ssid, true);
|
||||
|
||||
|
|
@ -77,14 +74,17 @@ namespace WGShare.API.Hubs
|
|||
|
||||
private async Task ClearUserChannel(string uid, string tenant, string account, string ssid, bool isclose)
|
||||
{
|
||||
_logger.LogInformation($"{DateTime.Now} 执行删除开始");
|
||||
Console.WriteLine($"{DateTime.Now} 执行删除开始");
|
||||
// 获取用户参加得频道
|
||||
var roomNum = RedisHelper.Instance.Get(RedisKeyConstant.SessionManage.GetUserJoinChannelKey(uid));
|
||||
using (var pipe = RedisHelper.Instance.StartPipe())
|
||||
{
|
||||
_logger.LogInformation($@"{DateTime.Now} account:{account} 退出以下频道：{string.Join(',', roomNum)}");
|
||||
Console.WriteLine($@"{DateTime.Now} account:{account} 退出以下频道：{string.Join(',', roomNum)}");
|
||||
if (!string.IsNullOrEmpty(roomNum))
|
||||
{
|
||||
// 所有房间移除该用户
|
||||
pipe.HDel(RedisKeyConstant.SessionManage.GetChannelUserKey(tenant, roomNum), uid);
|
||||
|
||||
// 判断是否全员看他,是则移除
|
||||
var script = $@"local value = redis.call('HGET', KEYS[1], ARGV[1])
|
||||
if value == ARGV[2] or value == ARGV[3] then
|
||||
|
|
@ -92,9 +92,6 @@ namespace WGShare.API.Hubs
|
|||
else return -1 end";
|
||||
// 执行 eval 命令
|
||||
pipe.Eval(script, [RedisKeyConstant.SessionManage.GetChannelShowUserKey(tenant)], roomNum, uid, ssid);
|
||||
|
||||
// 房间移除该用户
|
||||
pipe.HDel(RedisKeyConstant.SessionManage.GetChannelUserKey(tenant, roomNum), uid);
|
||||
}
|
||||
|
||||
// 删除用户在线状态
|
||||
|
|
@ -103,31 +100,14 @@ namespace WGShare.API.Hubs
|
|||
// 删除用户已加入频道信息
|
||||
pipe.Del(RedisKeyConstant.SessionManage.GetUserJoinChannelKey(uid));
|
||||
|
||||
var result = pipe.EndPipe();
|
||||
|
||||
if (!result.IsNullOrEmpty() && result[0].ObjToInt() != -1)
|
||||
{
|
||||
// 如果离开的是全员看ta，则重新设置管理员为全员看ta
|
||||
var users = RedisHelper.Instance.HVals<ChannelUserInfo>(RedisKeyConstant.SessionManage.GetChannelUserKey(tenant, roomNum));
|
||||
var showUsers = users.Where(x => x.RoleId == ((int)RoleEnums.Admin).ToString() || x.IsRoomManager || x.RoleId == ((int)RoleEnums.RoomManager).ToString()).ToList();
|
||||
if (!showUsers.IsNullOrEmpty())
|
||||
{
|
||||
var showUser = showUsers.FirstOrDefault(x => x.EnableCamera == true);
|
||||
if (showUser == null)
|
||||
{
|
||||
showUser = showUsers.FirstOrDefault();
|
||||
}
|
||||
// 通知全员看ta
|
||||
await Clients.Group(roomNum).ShowUser(showUser.UID, showUser.UserName, string.Empty, string.Empty);
|
||||
}
|
||||
}
|
||||
pipe.EndPipe();
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(roomNum))
|
||||
// 通知房间其他用户，该用户退出
|
||||
await Clients.Group(roomNum).UserLeave(uid);
|
||||
|
||||
_logger.LogInformation($"{DateTime.Now} 执行删除完成");
|
||||
Console.WriteLine($"{DateTime.Now} 执行删除完成");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -146,10 +126,10 @@ namespace WGShare.API.Hubs
|
|||
var uname = Context.User?.Claims.FirstOrDefault(x => x.Type == "uname")?.Value;
|
||||
var roleId = Context.User?.Claims.FirstOrDefault(x => x.Type == "roleid")?.Value;
|
||||
try
|
||||
{
|
||||
_logger.LogInformation($"{DateTime.Now}加入频道 会议号：" + roomNum);
|
||||
_logger.LogInformation($"{DateTime.Now}加入频道 account：" + account);
|
||||
_logger.LogInformation($"{DateTime.Now}加入频道 tenant：" + tenant);
|
||||
{
|
||||
Console.WriteLine($"{DateTime.Now}加入频道 会议号：" + roomNum);
|
||||
Console.WriteLine($"{DateTime.Now}加入频道 account：" + account);
|
||||
Console.WriteLine($"{DateTime.Now}加入频道 tenant：" + tenant);
|
||||
|
||||
var userInfo = new ChannelUserInfo
|
||||
{
|
||||
|
|
@ -205,7 +185,7 @@ namespace WGShare.API.Hubs
|
|||
|
||||
await Clients.Caller.JoinChannelCallback(false);
|
||||
_logger.LogError(ex, $@"加入频道异常,tenant:{tenant},uid:{uid},ssid:{ssid},uname:{uname} {Environment.NewLine}{ex.Message}");
|
||||
await ExceptionNotice.SendAsync(ex, $@"加入频道异常,tenant:{tenant},uid:{uid},ssid:{ssid},uname:{uname} ");
|
||||
await ExceptionNotice.SendAsync(ex, $@"加入频道异常,tenant:{tenant},uid:{uid},ssid:{ssid},uname:{uname} ");
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
|
|
@ -223,9 +203,9 @@ namespace WGShare.API.Hubs
|
|||
var roleId = Context.User?.Claims.FirstOrDefault(x => x.Type == "roleid")?.Value;
|
||||
|
||||
|
||||
_logger.LogInformation($" {DateTime.Now}离开频道 会议号：" + roomNum);
|
||||
_logger.LogInformation($" {DateTime.Now}离开频道 account：" + account);
|
||||
_logger.LogInformation($" {DateTime.Now}离开频道 tenant：" + tenant);
|
||||
Console.WriteLine($" {DateTime.Now}离开频道 会议号：" + roomNum);
|
||||
Console.WriteLine($" {DateTime.Now}离开频道 account：" + account);
|
||||
Console.WriteLine($" {DateTime.Now}离开频道 tenant：" + tenant);
|
||||
|
||||
using (var pipe = RedisHelper.Instance.StartPipe())
|
||||
{
|
||||
|
|
@ -243,16 +223,10 @@ namespace WGShare.API.Hubs
|
|||
var result = pipe.EndPipe();
|
||||
if (!result.IsNullOrEmpty() && result[0].ObjToInt() != -1)
|
||||
{
|
||||
// 如果离开的是全员看ta，则重新设置管理员为全员看ta
|
||||
var users = RedisHelper.Instance.HVals<ChannelUserInfo>(RedisKeyConstant.SessionManage.GetChannelUserKey(tenant, roomNum));
|
||||
var showUsers = users.Where(x => x.RoleId == ((int)RoleEnums.Admin).ToString() || x.IsRoomManager || x.RoleId == ((int)RoleEnums.RoomManager).ToString()).ToList();
|
||||
if (!showUsers.IsNullOrEmpty())
|
||||
var showUser = users.FirstOrDefault(x => x.RoleId == ((int)RoleEnums.Admin).ToString() || x.IsRoomManager || x.RoleId == ((int)RoleEnums.RoomManager).ToString());
|
||||
if (showUser != null)
|
||||
{
|
||||
var showUser = showUsers.FirstOrDefault(x => x.EnableCamera == true);
|
||||
if (showUser == null)
|
||||
{
|
||||
showUser = showUsers.FirstOrDefault();
|
||||
}
|
||||
// 通知全员看ta
|
||||
await Clients.Group(roomNum).ShowUser(showUser.UID, showUser.UserName, string.Empty, string.Empty);
|
||||
}
|
||||
|
|
@ -274,18 +248,12 @@ namespace WGShare.API.Hubs
|
|||
{
|
||||
var uname = Context.User?.Claims.FirstOrDefault(x => x.Type == "uname")?.Value;
|
||||
var uid = Context.User?.Claims.FirstOrDefault(x => x.Type == ClaimTypes.NameIdentifier)?.Value;
|
||||
var tenant = Context.Items["tenant"].ToString();
|
||||
|
||||
_logger.LogInformation($" {DateTime.Now} 发送消息 uname：{uname} roomNum：{rooNum} msg：{msg}");
|
||||
|
||||
var userInfo = RedisHelper.Instance.HGet<ChannelUserInfo>(RedisKeyConstant.SessionManage.GetChannelUserKey(tenant, rooNum), uid);
|
||||
var userName = uname;
|
||||
if (userInfo != null)
|
||||
{
|
||||
userName = userInfo.UserName;
|
||||
}
|
||||
Console.WriteLine($" {DateTime.Now}发送消息 uname：" + uname);
|
||||
Console.WriteLine($" {DateTime.Now}发送消息 roomNum：" + rooNum);
|
||||
Console.WriteLine($" {DateTime.Now}发送消息 msg：" + msg);
|
||||
|
||||
await Clients.OthersInGroup(rooNum).ReceiveMessage(uid, userName, msg, DateTime.Now.GetTotalMilliseconds()); //await Clients.GroupExcept(rooNum, Context.ConnectionId).ReceiveMessage(uid, uname, msg);
|
||||
await Clients.OthersInGroup(rooNum).ReceiveMessage(uid, uname, msg, DateTime.Now.GetTotalMilliseconds()); //await Clients.GroupExcept(rooNum, Context.ConnectionId).ReceiveMessage(uid, uname, msg);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -293,21 +261,9 @@ namespace WGShare.API.Hubs
|
|||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HubMethodName("sendOper")]
|
||||
public async Task SendOperation(string roomNum, string contentString)
|
||||
public async Task SendOperation(string roomNum, int type)
|
||||
{
|
||||
await Clients.Group(roomNum).Operation(contentString);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 发送客户端指令到指定用户
|
||||
/// </summary>
|
||||
/// <param name="uid"></param>
|
||||
/// <param name="contentString"></param>
|
||||
/// <returns></returns>
|
||||
[HubMethodName("sendOper2User")]
|
||||
public async Task SendOperationToUser(string uid, string contentString)
|
||||
{
|
||||
await Clients.User(uid).ReceivedOperation(contentString);
|
||||
await Clients.Group(roomNum).Operation(type);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -345,32 +301,5 @@ namespace WGShare.API.Hubs
|
|||
{
|
||||
await Clients.User(uid).SaveDriver(driversJsonString);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 发言人设置成功回调
|
||||
/// </summary>
|
||||
/// <param name="inputDTO"></param>
|
||||
/// <returns></returns>
|
||||
[HubMethodName("setSpeakerCallback")]
|
||||
public async Task SetSpeakerCallback(RoomManagerInputDTO inputDTO)
|
||||
{
|
||||
var tenantId = Context.Items["tenant"].ToString();
|
||||
|
||||
var users = RedisHelper.Instance.HVals<ChannelUserInfo>(RedisKeyConstant.SessionManage.GetChannelUserKey(tenantId, inputDTO.RoomNum));
|
||||
//if (users.Count(x => x.IsRoomManager || x.RoleId == ((int)RoleEnums.Admin).ToString() || x.RoleId == ((int)RoleEnums.RoomManager).ToString()) >= 20)
|
||||
//{
|
||||
// throw Oops.Oh("房间已达到20个发言人限制。请移除一位发言人");
|
||||
//}
|
||||
var user = users.FirstOrDefault(x => x.UID == inputDTO.UserId);
|
||||
if (user == null)
|
||||
{
|
||||
throw Oops.Oh("用户已不在房间内！");
|
||||
}
|
||||
user.IsRoomManager = true;
|
||||
RedisHelper.Instance.HSet(RedisKeyConstant.SessionManage.GetChannelUserKey(tenantId, inputDTO.RoomNum), inputDTO.UserId, user);
|
||||
|
||||
await Clients.Group(inputDTO.RoomNum).ManagerRefresh(user, inputDTO.SettingUserId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,13 +11,6 @@
|
|||
<param name="account"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:WGShare.API.Controllers.AuthController.CheckUserOnline(System.String)">
|
||||
<summary>
|
||||
检查用户是否在线
|
||||
</summary>
|
||||
<param name="account"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:WGShare.API.Controllers.AuthController.Login(WGShare.Domain.DTOs.Login.UserLoginDTO)">
|
||||
<summary>
|
||||
正常账号登录
|
||||
|
|
@ -169,12 +162,6 @@
|
|||
</summary>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:WGShare.API.Controllers.Frontend.HomeController.RecordVersionLog(WGShare.Domain.DTOs.Home.UserVersionLogDto)">
|
||||
<summary>
|
||||
记录用户当前用户版本
|
||||
</summary>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="T:WGShare.API.Controllers.Frontend.RoomController">
|
||||
<summary>
|
||||
会议室接口
|
||||
|
|
@ -311,12 +298,6 @@
|
|||
</summary>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:WGShare.API.Controllers.Frontend.RoomController.StopedSharedScreen(System.String)">
|
||||
<summary>
|
||||
共享人取消共享屏幕
|
||||
</summary>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:WGShare.API.Controllers.Frontend.RoomController.AddFile(WGShare.Domain.DTOs.File.ShareFileInputDTO)">
|
||||
<summary>
|
||||
分享上传文件
|
||||
|
|
@ -619,7 +600,7 @@
|
|||
</summary>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:WGShare.API.Hubs.IMessageClient.Operation(System.String)">
|
||||
<member name="M:WGShare.API.Hubs.IMessageClient.Operation(System.Int32)">
|
||||
<summary>
|
||||
客户端操作
|
||||
</summary>
|
||||
|
|
@ -638,12 +619,6 @@
|
|||
</summary>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:WGShare.API.Hubs.IMessageClient.StopedSharedScreen(System.String)">
|
||||
<summary>
|
||||
共享人取消共享屏幕
|
||||
</summary>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:WGShare.API.Hubs.IMessageClient.UserJoined(WGShare.Domain.Entities.ChannelUserInfo)">
|
||||
<summary>
|
||||
用户加入频道回调
|
||||
|
|
@ -750,19 +725,6 @@
|
|||
加入频道回调
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:WGShare.API.Hubs.IMessageClient.SetSpeaker(WGShare.Domain.DTOs.Room.RoomManagerInputDTO)">
|
||||
<summary>
|
||||
发送设置发言人指令
|
||||
</summary>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:WGShare.API.Hubs.IMessageClient.ReceivedOperation(System.String)">
|
||||
<summary>
|
||||
客户端接收到消息
|
||||
</summary>
|
||||
<param name="contentString"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:WGShare.API.Hubs.SessionManageHub.JoinChannel(System.String,System.Boolean,System.Boolean,System.Boolean)">
|
||||
<summary>
|
||||
加入频道
|
||||
|
|
@ -784,20 +746,12 @@
|
|||
<param name="rooNum"></param>
|
||||
<param name="msg"></param>
|
||||
</member>
|
||||
<member name="M:WGShare.API.Hubs.SessionManageHub.SendOperation(System.String,System.String)">
|
||||
<member name="M:WGShare.API.Hubs.SessionManageHub.SendOperation(System.String,System.Int32)">
|
||||
<summary>
|
||||
发送客户端指令
|
||||
</summary>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:WGShare.API.Hubs.SessionManageHub.SendOperationToUser(System.String,System.String)">
|
||||
<summary>
|
||||
发送客户端指令到指定用户
|
||||
</summary>
|
||||
<param name="uid"></param>
|
||||
<param name="contentString"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:WGShare.API.Hubs.SessionManageHub.GetDriversList(System.String)">
|
||||
<summary>
|
||||
获取设备列表
|
||||
|
|
@ -820,13 +774,6 @@
|
|||
<param name="driversJsonString"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:WGShare.API.Hubs.SessionManageHub.SetSpeakerCallback(WGShare.Domain.DTOs.Room.RoomManagerInputDTO)">
|
||||
<summary>
|
||||
发言人设置成功回调
|
||||
</summary>
|
||||
<param name="inputDTO"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:WGShare.API.Program.ResetRedisKey">
|
||||
<summary>
|
||||
程序启动前，删除redis中得数据
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
"Agora": {
|
||||
"appId": "4a4f7be64fa1404ebda74784fe9ac381",
|
||||
"appSecret": "255e05d96c794251b282a0de84242355",
|
||||
"tokenExpireTimeInSecond": 86400,
|
||||
"tokenExpireTimeInSecond": 300,
|
||||
"apiPrefix": "https://api.sd-rtn.com/",
|
||||
"clientId": "80cdc24f7dfa4497a37d98da95a3c4a4",
|
||||
"clientSecret": "8323581d4d464114b1f324b26cc62e09",
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@
|
|||
"Expires": 31104000
|
||||
},
|
||||
"ConnectionStrings": {
|
||||
"metting": "Database=metting;Server=rds-external.23544.com;Port=3306;Uid=marking;Pwd=poiuytPOIUYT098765)(*&^%;AllowZeroDateTime=True;ConvertZeroDateTime=True;",
|
||||
"usercenter": "Database=usercenter;Server=rds-external.23544.com;Port=3306;Uid=marking;Pwd=poiuytPOIUYT098765)(*&^%;AllowZeroDateTime=True;ConvertZeroDateTime=True;"
|
||||
"metting": "Database=metting;Server=rm-2vc20nd3d11g0oh6g.rwlb.cn-chengdu.rds.aliyuncs.com;Port=3306;Uid=marking;Pwd=poiuytPOIUYT098765)(*&^%;AllowZeroDateTime=True;ConvertZeroDateTime=True;",
|
||||
"usercenter": "Database=usercenter;Server=rm-2vc20nd3d11g0oh6g.rwlb.cn-chengdu.rds.aliyuncs.com;Port=3306;Uid=marking;Pwd=poiuytPOIUYT098765)(*&^%;AllowZeroDateTime=True;ConvertZeroDateTime=True;"
|
||||
},
|
||||
"Redis": {
|
||||
"master": "redis-internal.23544.com:16379,password=poiuyt)(*&^%,defaultDatabase=6,prefix=wgshare:"
|
||||
"master": "172.29.33.83:16379,password=poiuyt)(*&^%,defaultDatabase=6,prefix=wgshare:"
|
||||
},
|
||||
"Agora": {
|
||||
"appId": "dcfc466a6ecb4a1f972630065dfb1e75",
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
using SqlSugar;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Yitter.IdGenerator;
|
||||
|
||||
namespace WGShare.Domain.DTOs.Home
|
||||
{
|
||||
public class UserVersionLogDto
|
||||
{
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 使用版本
|
||||
///</summary>
|
||||
public string Version { get; set; }
|
||||
/// <summary>
|
||||
/// 平台类型 1:PC 2:微信小程序
|
||||
///</summary>
|
||||
public int PlatformType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 房间号
|
||||
///</summary>
|
||||
public string RoomNum { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
@ -12,9 +12,5 @@ namespace WGShare.Domain.DTOs.Room
|
|||
public string RoomId { get; set; }
|
||||
public string RoomNum { get; set; }
|
||||
public string UserId { get; set; }
|
||||
/// <summary>
|
||||
/// 设置人Id
|
||||
/// </summary>
|
||||
public string SettingUserId { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,12 +68,5 @@ namespace WGShare.Domain.Entities
|
|||
///</summary>
|
||||
[SugarColumn(ColumnName = "allow_anonymous")]
|
||||
public bool AllowAnonymous { get; set; } = true;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 租户名称
|
||||
/// </summary>
|
||||
[SugarColumn(IsIgnore = true)]
|
||||
public string TenantName { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,52 +0,0 @@
|
|||
using SqlSugar;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Security.Principal;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Yitter.IdGenerator;
|
||||
|
||||
namespace WGShare.Domain.Entities
|
||||
{
|
||||
/// <summary>
|
||||
/// 用户版本记录表
|
||||
/// </summary>
|
||||
[SugarTable("user_version_log")]
|
||||
public class UserVersionLog
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)]
|
||||
public string Id { get; set; } = YitIdHelper.NextId().ToString();
|
||||
/// <summary>
|
||||
/// 用户Id
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "user_id")]
|
||||
public long UserId { get; set; }
|
||||
/// <summary>
|
||||
/// 使用版本
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "version")]
|
||||
public string Version { get; set; }
|
||||
/// <summary>
|
||||
/// 平台类型
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "platform_type")]
|
||||
public int PlatformType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 房间号
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "room_num")]
|
||||
public string RoomNum { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 进房时间
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "join_time", IsOnlyIgnoreInsert = true, IsOnlyIgnoreUpdate = true)]
|
||||
public DateTime JoinTime { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
using System.Net.Http.Json;
|
||||
using WGShare.Domain.DTOs.AgoraCallback;
|
||||
using WGShare.Domain.Entities;
|
||||
|
||||
namespace WGShare.Domain.FriendlyException
|
||||
{
|
||||
|
|
@ -42,7 +41,7 @@ namespace WGShare.Domain.FriendlyException
|
|||
|
||||
}
|
||||
|
||||
public static async Task JoinAsync(EventBody eventBody, Room roomInfo)
|
||||
public static async Task JoinAsync(EventBody eventBody)
|
||||
{
|
||||
// 获取当前的日期
|
||||
DateTime today = DateTime.Today;
|
||||
|
|
@ -70,7 +69,7 @@ namespace WGShare.Domain.FriendlyException
|
|||
markdown = new
|
||||
{
|
||||
title = "有人入会通知",
|
||||
text = $"有人进入会议室了,学校:{roomInfo.TenantName},会议室名称:{roomInfo.RoomName},会议号:{eventBody.payload.channelName}. \r\n 点击查看：https://analytics-lab.agora.io/analytics/call/search?projectId=0tOpVUrmf&fromTs={startTimestamp}&toTs={endTimestamp}"
|
||||
text = $"有人进入会议室了,会议号:{eventBody.payload.channelName}，点击查看：https://analytics-lab.agora.io/analytics/call/search?projectId=0tOpVUrmf&fromTs={startTimestamp}&toTs={endTimestamp}"
|
||||
},
|
||||
}));
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue