From 42b40fbd35ab9086aa4c4fe22860342d2790ec87 Mon Sep 17 00:00:00 2001 From: youngq Date: Thu, 10 Oct 2024 11:16:19 +0800 Subject: [PATCH] 1 --- WGShare.API/AntDeploy.json | 4 ++-- WGShare.API/Controllers/Frontend/RoomController.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WGShare.API/AntDeploy.json b/WGShare.API/AntDeploy.json index 20d2005..83bbf8a 100644 --- a/WGShare.API/AntDeploy.json +++ b/WGShare.API/AntDeploy.json @@ -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", diff --git a/WGShare.API/Controllers/Frontend/RoomController.cs b/WGShare.API/Controllers/Frontend/RoomController.cs index b936679..356630a 100644 --- a/WGShare.API/Controllers/Frontend/RoomController.cs +++ b/WGShare.API/Controllers/Frontend/RoomController.cs @@ -65,7 +65,7 @@ namespace WGShare.API.Controllers.Frontend var users = RedisHelper.Instance.HVals(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 /// /// [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(RedisKeyConstant.SessionManage.GetChannelUserKey(TenantId, roomNum)); if (channelUsers.IsNullOrEmpty())