修复相关BUG

src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java

@@ -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()) {

web/src/utils/request.js

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