This commit is contained in:
parent
520aaac302
commit
42b40fbd35
|
|
@ -115,11 +115,11 @@
|
|||
"DockerConfig": {
|
||||
"Prot": "5192:5192",
|
||||
"AspNetCoreEnv": "",
|
||||
"LastEnvName": "29dev",
|
||||
"LastEnvName": "marking001",
|
||||
"RemoveDaysFromPublished": "10",
|
||||
"WorkDir": "",
|
||||
"Volume": "",
|
||||
"Other": "--name wgshare-api -e ASPNETCORE_ENVIRONMENT=Development -e TZ=Asia/Shanghai",
|
||||
"Other": "--name wgshare-api -e ASPNETCORE_ENVIRONMENT=Production -e TZ=Asia/Shanghai",
|
||||
"EnvPairList": [
|
||||
{
|
||||
"EnvName": "29dev",
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ namespace WGShare.API.Controllers.Frontend
|
|||
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()) >= 12)
|
||||
{
|
||||
throw Oops.Oh("房间已达到12个发言人限制。请移除一位发言人");
|
||||
throw Oops.Oh("房间已达到12个发言人限制,请先移除一位发言人");
|
||||
}
|
||||
var user = users.FirstOrDefault(x => x.UID == inputDTO.UserId);
|
||||
if (user == null)
|
||||
|
|
@ -553,7 +553,7 @@ namespace WGShare.API.Controllers.Frontend
|
|||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpGet("apply-speak")]
|
||||
public async Task ApplySpeak([FromQuery] string roomNum)
|
||||
public async Task ApplySpeak([FromQuery] string roomNum, [FromQuery] int type)
|
||||
{
|
||||
var channelUsers = RedisHelper.Instance.HVals<ChannelUserInfo>(RedisKeyConstant.SessionManage.GetChannelUserKey(TenantId, roomNum));
|
||||
if (channelUsers.IsNullOrEmpty())
|
||||
|
|
|
|||
Loading…
Reference in New Issue