qq27800734/taoyao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] BUG修复

Browse Source
This commit is contained in:
acgist
2023-06-09 09:35:26 +08:00
parent 6e3138f95b
commit 6749339162
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/control/ControlServerRecordProtocol.java
View File

@@ -11,6 +11,7 @@ import com.acgist.taoyao.boot.annotation.Protocol;
import com.acgist.taoyao.boot.config.Constant; import com.acgist.taoyao.boot.config.Constant;
import com.acgist.taoyao.boot.config.FfmpegProperties; import com.acgist.taoyao.boot.config.FfmpegProperties;
import com.acgist.taoyao.boot.model.Message; import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.boot.model.MessageCodeException;
import com.acgist.taoyao.boot.utils.MapUtils; import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client; import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType; import com.acgist.taoyao.signal.client.ClientType;
@@ -71,9 +72,9 @@ public class ControlServerRecordProtocol extends ProtocolControlAdapter implemen
final Boolean enabled = MapUtils.get(body, Constant.ENABLED, Boolean.TRUE); final Boolean enabled = MapUtils.get(body, Constant.ENABLED, Boolean.TRUE);
final Room room = this.roomManager.room(roomId); final Room room = this.roomManager.room(roomId);
if(enabled) { if(enabled) {
filepath = this.start(room, room.clientWrapper(client)); filepath = this.start(room, room.clientWrapper(targetClient));
} else { } else {
filepath = this.stop(room, room.clientWrapper(client)); filepath = this.stop(room, room.clientWrapper(targetClient));
} }
body.put(Constant.FILEPATH, filepath); body.put(Constant.FILEPATH, filepath);
body.put(Constant.CLIENT_ID, clientId); body.put(Constant.CLIENT_ID, clientId);
@@ -114,6 +115,9 @@ public class ControlServerRecordProtocol extends ProtocolControlAdapter implemen
* @return 文件地址 * @return 文件地址
*/ */
private String start(Room room, ClientWrapper clientWrapper) { private String start(Room room, ClientWrapper clientWrapper) {
if(clientWrapper == null) {
throw MessageCodeException.of("终端没有进入房间");
}
synchronized (clientWrapper) { synchronized (clientWrapper) {
final Recorder recorder = clientWrapper.getRecorder(); final Recorder recorder = clientWrapper.getRecorder();
if(recorder != null) { if(recorder != null) {