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/media/zlm/ZLMMediaNodeServerService.java

@@ -218,9 +218,9 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService {
     public void getSnap(MediaServer mediaServer, String app, String stream, int timeoutSec, int expireSec, String path, String fileName) {
         String streamUrl;
         if (mediaServer.getRtspPort() != 0) {
-            streamUrl = String.format("rtsp://127.0.0.1:%s/%s/%s", mediaServer.getRtspPort(), "rtp", stream);
+            streamUrl = String.format("rtsp://127.0.0.1:%s/%s/%s", mediaServer.getRtspPort(), app, stream);
         } else {
-            streamUrl = String.format("http://127.0.0.1:%s/%s/%s.live.mp4", mediaServer.getHttpPort(), "rtp", stream);
+            streamUrl = String.format("http://127.0.0.1:%s/%s/%s.live.mp4", mediaServer.getHttpPort(), app, stream);
         }
         zlmresTfulUtils.getSnap(mediaServer, streamUrl, timeoutSec, expireSec, path, fileName);
     }

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