修复相关BUG

This commit is contained in:
lin
2025-11-04 11:39:37 +08:00
parent 0eefabd034
commit 6ced304143
2 changed files with 31 additions and 21 deletions

View File

@@ -636,7 +636,15 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService {
param.put("callId", callId);
}
if (mediaInfo != null && !ObjectUtils.isEmpty(mediaInfo.getOriginTypeStr())) {
param.put("originTypeStr", mediaInfo.getOriginTypeStr());
if (!ObjectUtils.isEmpty(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();
if (!param.isEmpty()) {

View File

@@ -56,27 +56,29 @@ service.interceptors.response.use(
},
error => {
console.log(error) // for debug
if (error.response.status === 401 && !showLoginConfirm && store.getters.showConfirmBoxForLoginLose) {
// to re-login
showLoginConfirm = true
MessageBox.confirm('登录已经到期, 是否重新登录', '登录确认', {
confirmButtonText: '重新登录',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
store.dispatch('user/resetToken').then(() => {
location.reload()
})
}).catch(() => {
store.dispatch('user/closeConfirmBoxForLoginLose')
Message.warning({
type: 'warning',
message: '登录过期提示已经关闭,请注销后重新登录'
})
// 清除token 后续请求不再继续
if (error.response.status === 401) {
if (!showLoginConfirm && store.getters.showConfirmBoxForLoginLose) {
// to re-login
showLoginConfirm = true
MessageBox.confirm('登录已经到期, 是否重新登录', '登录确认', {
confirmButtonText: '重新登录',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
store.dispatch('user/resetToken').then(() => {
location.reload()
})
}).catch(() => {
store.dispatch('user/closeConfirmBoxForLoginLose')
Message.warning({
type: 'warning',
message: '登录过期提示已经关闭,请注销后重新登录'
})
// 清除token 后续请求不再继续
})
} else {
})
}
}else {
if (!store.getters.showConfirmBoxForLoginLose) {
return
}