marking
/
WGShare.API
19
0
Fork 0
Code Pull Requests Actions Releases 3 Activity

1

This commit is contained in:
youngq 2024-10-10 11:16:19 +08:00
parent 520aaac302
commit 42b40fbd35
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WGShare.API/AntDeploy.json
View File

@ -115,11 +115,11 @@
"DockerConfig": { "DockerConfig": {
"Prot": "5192:5192", "Prot": "5192:5192",
"AspNetCoreEnv": "", "AspNetCoreEnv": "",
"LastEnvName": "29dev", "LastEnvName": "marking001",
"RemoveDaysFromPublished": "10", "RemoveDaysFromPublished": "10",
"WorkDir": "", "WorkDir": "",
"Volume": "", "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": [ "EnvPairList": [
{ {
"EnvName": "29dev", "EnvName": "29dev",

4
WGShare.API/Controllers/Frontend/RoomController.cs
View File

@ -65,7 +65,7 @@ namespace WGShare.API.Controllers.Frontend
var users = RedisHelper.Instance.HVals<ChannelUserInfo>(RedisKeyConstant.SessionManage.GetChannelUserKey(TenantId, inputDTO.RoomNum)); 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) 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); var user = users.FirstOrDefault(x => x.UID == inputDTO.UserId);
if (user == null) if (user == null)
@ -553,7 +553,7 @@ namespace WGShare.API.Controllers.Frontend
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("apply-speak")] [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)); var channelUsers = RedisHelper.Instance.HVals<ChannelUserInfo>(RedisKeyConstant.SessionManage.GetChannelUserKey(TenantId, roomNum));
if (channelUsers.IsNullOrEmpty()) if (channelUsers.IsNullOrEmpty())