修复相关BUG
This commit is contained in:
@@ -636,8 +636,16 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService {
|
|||||||
param.put("callId", callId);
|
param.put("callId", callId);
|
||||||
}
|
}
|
||||||
if (mediaInfo != null && !ObjectUtils.isEmpty(mediaInfo.getOriginTypeStr())) {
|
if (mediaInfo != null && !ObjectUtils.isEmpty(mediaInfo.getOriginTypeStr())) {
|
||||||
|
if (!ObjectUtils.isEmpty(mediaInfo.getOriginTypeStr())) {
|
||||||
param.put("originTypeStr", mediaInfo.getOriginTypeStr());
|
param.put("originTypeStr", mediaInfo.getOriginTypeStr());
|
||||||
}
|
}
|
||||||
|
if (!ObjectUtils.isEmpty(mediaInfo.getVideoCodec())) {
|
||||||
|
param.put("videoCodec", mediaInfo.getVideoCodec());
|
||||||
|
}
|
||||||
|
if (!ObjectUtils.isEmpty(mediaInfo.getAudioCodec())) {
|
||||||
|
param.put("audioCodec", mediaInfo.getAudioCodec());
|
||||||
|
}
|
||||||
|
}
|
||||||
StringBuilder callIdParamBuilder = new StringBuilder();
|
StringBuilder callIdParamBuilder = new StringBuilder();
|
||||||
if (!param.isEmpty()) {
|
if (!param.isEmpty()) {
|
||||||
callIdParamBuilder.append("?");
|
callIdParamBuilder.append("?");
|
||||||
|
|||||||
@@ -56,7 +56,8 @@ service.interceptors.response.use(
|
|||||||
},
|
},
|
||||||
error => {
|
error => {
|
||||||
console.log(error) // for debug
|
console.log(error) // for debug
|
||||||
if (error.response.status === 401 && !showLoginConfirm && store.getters.showConfirmBoxForLoginLose) {
|
if (error.response.status === 401) {
|
||||||
|
if (!showLoginConfirm && store.getters.showConfirmBoxForLoginLose) {
|
||||||
// to re-login
|
// to re-login
|
||||||
showLoginConfirm = true
|
showLoginConfirm = true
|
||||||
MessageBox.confirm('登录已经到期, 是否重新登录', '登录确认', {
|
MessageBox.confirm('登录已经到期, 是否重新登录', '登录确认', {
|
||||||
@@ -76,7 +77,8 @@ service.interceptors.response.use(
|
|||||||
// 清除token, 后续请求不再继续
|
// 清除token, 后续请求不再继续
|
||||||
|
|
||||||
})
|
})
|
||||||
} else {
|
}
|
||||||
|
}else {
|
||||||
if (!store.getters.showConfirmBoxForLoginLose) {
|
if (!store.getters.showConfirmBoxForLoginLose) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user