Merge branch 'master' into 1078

web_src/src/components/dialog/MediaServerEdit.vue

@@ -20,6 +20,12 @@
           <el-form-item label="SECRET" prop="secret">
             <el-input v-model="mediaServerForm.secret" placeholder="媒体服务SECRET"  clearable :disabled="mediaServerForm.defaultServer"></el-input>
           </el-form-item>
+          <el-form-item label="类型" prop="type">
+            <el-select v-model="mediaServerForm.type" style="float: left; width: 100%" >
+              <el-option key="zlm" label="ZLMediaKit" value="zlm"></el-option>
+              <el-option key="abl" label="ABLMediaServer" value="abl"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <div style="float: right;">
               <el-button type="primary" v-if="currentStep === 1 && serverCheck === 1" @click="next" >下一步</el-button>
@@ -170,7 +176,7 @@ export default {
         hookIp: "",
         sdpIp: "",
         streamIp: "",
-        secret: "035c73f7-bb6b-4889-a715-d9eb2d1925cc",
+        secret: "",
         httpPort: "",
         httpSSlPort: "",
         recordAssistPort: "",
@@ -182,6 +188,7 @@ export default {
         rtpProxyPort: "",
         rtspPort: "",
         rtspSSLPort: "",
+        type: "zlm",
       },
       rtpPortRange1:30000,
       rtpPortRange2:30500,
@@ -330,7 +337,7 @@ export default {
         hookIp: "",
         sdpIp: "",
         streamIp: "",
-        secret: "035c73f7-bb6b-4889-a715-d9eb2d1925cc",
+        secret: "",
         httpPort: "",
         httpSSlPort: "",
         recordAssistPort: "",

web_src/src/components/dialog/addUserApiKey.vue

@@ -0,0 +1,139 @@
+<template>
+  <div id="addUserApiKey" v-loading="isLoading">
+    <el-dialog
+      title="添加ApiKey"
+      width="40%"
+      top="2rem"
+      :close-on-click-modal="false"
+      :visible.sync="showDialog"
+      :destroy-on-close="true"
+      @close="close()"
+    >
+      <div id="shared" style="margin-right: 20px;">
+        <el-form ref="formRef" :model="form" :rules="rules" status-icon label-width="80px">
+          <el-form-item label="应用名" prop="app">
+            <el-input
+              v-model="form.app"
+              property="app"
+              autocomplete="off"/>
+          </el-form-item>
+          <el-form-item label="启用状态" prop="enable" style="text-align: left">
+            <el-switch
+              v-model="form.enable"
+              property="enable"
+              active-text="启用"
+              inactive-text="停用"/>
+          </el-form-item>
+          <el-form-item label="过期时间" prop="expiresAt" style="text-align: left">
+            <el-date-picker v-model="form.expiresAt"
+                            style="width: 100%"
+                            property="expiresAt"
+                            type="datetime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            format="yyyy-MM-dd HH:mm:ss"
+                            placeholder="选择过期时间"/>
+          </el-form-item>
+          <el-form-item label="备注信息" prop="remark">
+            <el-input v-model="form.remark"
+                      type="textarea"
+                      property="remark"
+                      autocomplete="off"
+                      :autosize="{ minRows: 5}"
+                      maxlength="255"
+                      show-word-limit/>
+          </el-form-item>
+          <el-form-item>
+            <div style="float: right;">
+              <el-button type="primary" @click="onSubmit">保存</el-button>
+              <el-button @click="close">取消</el-button>
+            </div>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'addUserApiKey',
+  props: {},
+  computed: {},
+  created() {
+  },
+  data() {
+    return {
+      userId: null,
+      form: {
+        app: null,
+        enable: true,
+        expiresAt: null,
+        remark: null
+      },
+      rules: {
+        app: [{required: true, trigger: 'blur', message: '应用名不能为空'}]
+      },
+      listChangeCallback: null,
+      showDialog: false,
+      isLoading: false
+    };
+  },
+  methods: {
+    resetForm() {
+      this.form = {
+        app: null,
+        enable: true,
+        expiresAt: null,
+        remark: null
+      }
+    },
+    openDialog(userId, callback) {
+      this.resetForm()
+      this.userId = userId
+      this.listChangeCallback = callback
+      this.showDialog = true
+    },
+    onSubmit() {
+      this.$refs.formRef.validate((valid) => {
+        if (valid) {
+          this.$axios({
+            method: 'post',
+            url: '/api/userApiKey/add',
+            params: {
+              userId: this.userId,
+              app: this.form.app,
+              enable: this.form.enable,
+              expiresAt: this.form.expiresAt,
+              remark: this.form.remark,
+            }
+          }).then((res) => {
+            if (res.data.code === 0) {
+              this.$message({
+                showClose: true,
+                message: '添加成功',
+                type: 'success'
+              });
+              this.showDialog = false
+              if (this.listChangeCallback) {
+                this.listChangeCallback()
+              }
+            } else {
+              this.$message({
+                showClose: true,
+                message: res.data.msg,
+                type: 'error'
+              });
+            }
+          }).catch((error) => {
+            console.error(error)
+          });
+        }
+      });
+    },
+    close() {
+      this.showDialog = false
+    }
+  },
+};
+</script>

web_src/src/components/dialog/remarkUserApiKey.vue

@@ -0,0 +1,93 @@
+<template>
+  <div id="remarkUserApiKey" v-loading="isLoading">
+    <el-dialog
+      title="ApiKey备注"
+      width="40%"
+      top="2rem"
+      :close-on-click-modal="false"
+      :visible.sync="showDialog"
+      :destroy-on-close="true"
+      @close="close()"
+    >
+      <div id="shared" style="margin-right: 20px;">
+        <el-form ref="form" :rules="rules" status-icon label-width="80px">
+          <el-form-item label="备注" prop="oldPassword">
+            <el-input type="textarea" v-model="form.remark" autocomplete="off" :autosize="{ minRows: 5}" maxlength="255" show-word-limit></el-input>
+          </el-form-item>
+          <el-form-item>
+            <div style="float: right;">
+              <el-button type="primary" @click="onSubmit">保存</el-button>
+              <el-button @click="close">取消</el-button>
+            </div>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "remarkUserApiKey",
+  props: {},
+  computed: {},
+  created() {
+  },
+  data() {
+    return {
+      userApiKeyId: null,
+      form: {
+        remark: null
+      },
+      rules: {},
+      listChangeCallback: null,
+      showDialog: false,
+      isLoading: false
+    };
+  },
+  methods: {
+    resetForm() {
+      this.form = {
+        remark: null
+      }
+    },
+    openDialog(userApiKeyId, callback) {
+      this.resetForm()
+      this.userApiKeyId = userApiKeyId
+      this.listChangeCallback = callback
+      this.showDialog = true
+    },
+    onSubmit() {
+      this.$axios({
+        method: 'post',
+        url: "/api/userApiKey/remark",
+        params: {
+          id: this.userApiKeyId,
+          remark: this.form.remark
+        }
+      }).then((res) => {
+        if (res.data.code === 0) {
+          this.$message({
+            showClose: true,
+            message: '备注修改成功!',
+            type: 'success'
+          });
+          this.showDialog = false;
+          this.listChangeCallback()
+        } else {
+          this.$message({
+            showClose: true,
+            message: '备注修改失败',
+            type: 'error'
+          });
+        }
+      }).catch((error) => {
+        console.error(error)
+      });
+    },
+    close() {
+      this.showDialog = false
+    },
+  },
+};
+</script>

web_src/src/components/dialog/rtcPlayer.vue

@@ -44,6 +44,7 @@ export default {
                 audioEnable: true,
                 videoEnable: true,
                 recvOnly: true,
+                usedatachannel: false,
             })
             webrtcPlayer.on(ZLMRTCClient.Events.WEBRTC_ICE_CANDIDATE_ERROR,(e)=>{// ICE 协商出错
                 console.error('ICE 协商出错')