Pre Merge pull request !41 from 阿斌/N/A

还有以下一处需要修改web\src\layout\components\dialog\changePassword.vue

Signed-off-by: 阿斌 <38912748@qq.com>

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java

@@ -2,7 +2,6 @@ package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;
 
 import com.genersoft.iot.vmp.common.InviteSessionType;
 import com.genersoft.iot.vmp.common.VideoManagerConstants;
-import com.genersoft.iot.vmp.common.enums.ChannelDataType;
 import com.genersoft.iot.vmp.conf.DynamicTask;
 import com.genersoft.iot.vmp.conf.SipConfig;
 import com.genersoft.iot.vmp.conf.UserSetting;
@@ -40,6 +39,7 @@ import javax.sip.RequestEvent;
 import javax.sip.SipException;
 import javax.sip.header.CallIdHeader;
 import javax.sip.message.Response;
+import java.security.SecureRandom;
 import java.text.ParseException;
 import java.util.List;
 import java.util.Vector;
@@ -481,6 +481,13 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
         try {
             Gb28181Sdp gb28181Sdp = SipUtils.parseSDP(contentString);
             SessionDescription sdp = gb28181Sdp.getBaseSdb();
+
+            if (ObjectUtils.isEmpty(gb28181Sdp.getSsrc()) ) {
+                String ssrc =  Integer.toUnsignedString(new SecureRandom().nextInt());
+                log.warn("来自设备的Invite请求，未携带SSRC，生成随机ssrc: {}，requesterId： {}/{}", ssrc, inviteInfo.getRequesterId(), inviteInfo.getSourceChannelId());
+                gb28181Sdp.setSsrc(ssrc);
+            }
+
             //  获取支持的格式
             Vector mediaDescriptions = sdp.getMediaDescriptions(true);
 
@@ -622,7 +629,9 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
                     content.append("a=setup:passive\r\n");
                 }
             }
-            content.append("y=" + ssrc + "\r\n");
+            if (ssrc != null) {
+                content.append("y=" + ssrc + "\r\n");
+            }
             content.append("f=v/////a/1/8/1\r\n");
 
             Platform parentPlatform = new Platform();

web/src/views/dialog/changePasswordForAdmin.vue

@@ -13,10 +13,10 @@
       <div id="shared" style="margin-right: 20px;">
         <el-form ref="passwordForm" :rules="rules" status-icon label-width="80px">
           <el-form-item label="新密码" prop="newPassword">
-            <el-input v-model="newPassword" autocomplete="off" />
+            <el-input v-model="newPassword" autocomplete="off" type="password" />
           </el-form-item>
           <el-form-item label="确认密码" prop="confirmPassword">
-            <el-input v-model="confirmPassword" autocomplete="off" />
+            <el-input v-model="confirmPassword" autocomplete="off" type="password" />
           </el-form-item>
 
           <el-form-item>
@@ -88,6 +88,14 @@ export default {
       }
     },
     onSubmit: function() {
+      if (this.newPassword !== this.confirmPassword) {
+        this.$message({
+          showClose: true,
+          message: '两次输入密码不一致！',
+          type: 'error'
+        })
+        return
+      }
       this.$store.dispatch('user/changePasswordForAdmin', {
         password: this.newPassword,
         userId: this.form.id