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/bean/SipTransactionInfo.java

@@ -3,6 +3,8 @@ package com.genersoft.iot.vmp.gb28181.bean;
 import gov.nist.javax.sip.message.SIPResponse;
 import lombok.Data;
 
+import javax.sip.header.EventHeader;
+
 @Data
 public class SipTransactionInfo {
 
@@ -12,6 +14,7 @@ public class SipTransactionInfo {
     private String viaBranch;
     private int expires;
     private String user;
+    private String eventId;
 
     // 自己是否媒体流发送者
     private boolean asSender;
@@ -22,6 +25,10 @@ public class SipTransactionInfo {
         this.toTag = response.getToTag();
         this.viaBranch = response.getTopmostViaHeader().getBranch();
         this.asSender = asSender;
+        EventHeader header = (EventHeader)response.getHeader(EventHeader.NAME);
+        if (header != null) {
+            this.eventId = header.getEventId();
+        }
     }
 
     public SipTransactionInfo(SIPResponse response) {
@@ -30,6 +37,10 @@ public class SipTransactionInfo {
         this.toTag = response.getToTag();
         this.viaBranch = response.getTopmostViaHeader().getBranch();
         this.asSender = false;
+        EventHeader header = (EventHeader)response.getHeader(EventHeader.NAME);
+        if (header != null) {
+            this.eventId = header.getEventId();
+        }
     }
 
     public SipTransactionInfo() {

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java

@@ -269,12 +269,15 @@ public class SIPRequestHeaderProvider {
 		ExpiresHeader expireHeader = SipFactory.getInstance().createHeaderFactory().createExpiresHeader(expires);
 		request.addHeader(expireHeader);
 
-		// Event
+        // Event
-		EventHeader eventHeader = SipFactory.getInstance().createHeaderFactory().createEventHeader(event);
+        EventHeader eventHeader = SipFactory.getInstance().createHeaderFactory().createEventHeader(event);
-
+        if (sipTransactionInfo != null && sipTransactionInfo.getEventId() != null) {
-		int random = (int) Math.floor(Math.random() * 10000);
+            eventHeader.setEventId(sipTransactionInfo.getEventId());
-		eventHeader.setEventId(random + "");
+        }else {
-		request.addHeader(eventHeader);
+            int random = (int) Math.floor(Math.random() * 10000);
+            eventHeader.setEventId(random + "");
+        }
+        request.addHeader(eventHeader);
 
 		ContentTypeHeader contentTypeHeader = SipFactory.getInstance().createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");
 		request.setContent(content, contentTypeHeader);

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