From 1e927a707b68a9e475735fce493da03481f13fc1 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Mon, 15 Nov 2021 11:11:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BA=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/user-expand/user-expand-mapper.xml | 3 +++ src/main/resources/static/assets/js/webrtc/srs.sdk.js | 1 + src/main/resources/static/assets/js/webrtc/srs.sig.js | 1 - src/main/resources/templates/user-expand/update.html | 9 ++++----- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/resources/mybatis/mapper/user-expand/user-expand-mapper.xml b/src/main/resources/mybatis/mapper/user-expand/user-expand-mapper.xml index f43e46a..6c69b6f 100644 --- a/src/main/resources/mybatis/mapper/user-expand/user-expand-mapper.xml +++ b/src/main/resources/mybatis/mapper/user-expand/user-expand-mapper.xml @@ -82,6 +82,9 @@ area_name = #{areaName}, + + + user_level = #{userLevel}, gmt_modified = #{gmtModified}, modifier = #{modifier} diff --git a/src/main/resources/static/assets/js/webrtc/srs.sdk.js b/src/main/resources/static/assets/js/webrtc/srs.sdk.js index 6d4c6a8..c18408c 100644 --- a/src/main/resources/static/assets/js/webrtc/srs.sdk.js +++ b/src/main/resources/static/assets/js/webrtc/srs.sdk.js @@ -323,6 +323,7 @@ function SrsRtcPlayerAsync() { } resolve(data); + }).fail(function(reason){ reject(reason); }); diff --git a/src/main/resources/static/assets/js/webrtc/srs.sig.js b/src/main/resources/static/assets/js/webrtc/srs.sig.js index ccab422..f2fef9a 100644 --- a/src/main/resources/static/assets/js/webrtc/srs.sig.js +++ b/src/main/resources/static/assets/js/webrtc/srs.sig.js @@ -36,7 +36,6 @@ function SrsRtcSignalingAsync() { self.ws.onmessage = function(event) { var r = JSON.parse(event.data); - console.log('r', r); var promise = self._internals.msgs[r.tid]; if (promise) { promise.resolve(r.msg); diff --git a/src/main/resources/templates/user-expand/update.html b/src/main/resources/templates/user-expand/update.html index c340c89..2ac4a83 100644 --- a/src/main/resources/templates/user-expand/update.html +++ b/src/main/resources/templates/user-expand/update.html @@ -25,11 +25,10 @@
- - - - - + + + +