diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java index 050a0c5..de9ecd3 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java @@ -95,5 +95,4 @@ public class LogController { response.setStatus(HttpServletResponse.SC_NO_CONTENT); } } - } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 7292ec5..f013e22 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -28,9 +28,11 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver + #url: jdbc:mysql://123.6.102.223:28306/wvprtsp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true url: jdbc:mysql://127.0.0.1:3306/wvprtsp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true username: root - password: 2fbeccb829d05a67 +# password: 2fbeccb829d05a67 + password: 123456 #[可选] WVP监听的HTTP端口, 网页和接口调用都是这个端口 server: port: 18080 @@ -63,9 +65,10 @@ sip: #zlm 默认服务器配置 media: + #这个ID很重要一定配zlmediakit配置文件的mediaServerId的值 id: zlmediakit-local # [必须修改] zlm服务器的内网IP - ip: 127.0.0.1 + ip: 111.7.106.28 # [必须修改] zlm服务器的http.port http-port: 6080 # [必选选] zlm服务器的hook.admin_params=secret @@ -75,9 +78,9 @@ media: # [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输 enable: true # [可选] 在此范围内选择端口用于媒体流传输, 必须提前在zlm上配置该属性，不然自动配置此属性可能不成功 - port-range: 40000,45000 # 端口范围 + port-range: 41000,45000 # 端口范围 # [可选] 国标级联在此范围内选择端口发送媒体流, - send-port-range: 50000,55000 # 端口范围 + send-port-range: 51000,55000 # 端口范围 # [根据业务需求配置] user-settings: # 点播/录像回放 等待超时时间,单位：毫秒 diff --git a/web_src/config/index.js b/web_src/config/index.js index 2da62d9..3d7e4e0 100644 --- a/web_src/config/index.js +++ b/web_src/config/index.js @@ -12,14 +12,18 @@ module.exports = { assetsPublicPath: '/', proxyTable: { '/debug': { - target: 'http://rtsp.api.hebei9.cn', + // target: 'http://111.7.106.28:18080', + // target: 'http://rtsp.api.hebei9.cn', + target: 'http://127.0.0.1:18080', changeOrigin: true, pathRewrite: { '^/debug': '/' } }, '/static/snap': { - target: 'http://rtsp.api.hebei9.cn', + // target: 'http://111.7.106.28:18080', + // target: 'http://rtsp.api.hebei9.cn', + target: 'http://127.0.0.1:18080', changeOrigin: true, // pathRewrite: { // '^/static/snap': '/static/snap' diff --git a/web_src/src/components/CloudRecord.vue b/web_src/src/components/CloudRecord.vue index 4448654..10fa7cd 100644 --- a/web_src/src/components/CloudRecord.vue +++ b/web_src/src/components/CloudRecord.vue @@ -79,9 +79,9 @@ 下载 - - - + 删除 + @@ -265,24 +265,29 @@ export default { console.log(error); }); }, - deleteRecord() { + deleteRecord(row) { // TODO + let msg = "确定删除此录像？" let that = this; - this.$axios({ - method: 'delete', - url: `/record_proxy/api/record/delete`, - params: { - page: that.currentPage, - count: that.count - } - }).then(function (res) { - console.log(res) - if (res.data.code === 0) { - that.total = res.data.data.total; - that.recordList = res.data.data.list; - } - }).catch(function (error) { - console.log(error); + // console.log(row) + this.$confirm(msg, '提示', { + dangerouslyUseHTMLString: true, + confirmButtonText: '确定', + cancelButtonText: '取消', + center: true, + type: 'warning' + }).then(() => { + this.$axios({ + method: 'delete', + url: `/api/cloud/record/${row.id}/delete`, + }).then(function (res) { + // console.log(res) + that.getRecordList() + }).catch(function (error) { + console.log(error); + }); + }).catch(() => { + }); }, formatTime(time) { diff --git a/web_src/src/components/PlatformEdit.vue b/web_src/src/components/PlatformEdit.vue index 246ba86..0fe651b 100644 --- a/web_src/src/components/PlatformEdit.vue +++ b/web_src/src/components/PlatformEdit.vue @@ -10,6 +10,10 @@ + + + +
diff --git a/web_src/src/components/dialog/changePushKey.vue b/web_src/src/components/dialog/changePushKey.vue index 0b9834e..afd3d2c 100644 --- a/web_src/src/components/dialog/changePushKey.vue +++ b/web_src/src/components/dialog/changePushKey.vue @@ -12,10 +12,17 @@
- + + + + + + 生成KEY + + -
+
保存 取消
@@ -47,6 +54,11 @@ export default { showDialog: false, isLoging: false, listChangeCallback: null, + pubKeyconfig: { + prefix: 'JIUMI', // 固定前缀 + length: 24, // 总长度 + excludeChars: 'O0Il1' // 排除易混淆字符 + }, form: {}, rules: { newpushKey: [{ required: true, validator: validatePass1, trigger: "blur" }], @@ -54,6 +66,16 @@ export default { }; }, methods: { + buildCodeEvent:function (){ + // 生成 32 字节随机数（256位） + const array = new Uint8Array(32); + window.crypto.getRandomValues(array); + this.newPushKey = btoa(String.fromCharCode(...array)) + .replace(/\+/g, '-') + .replace(/\//g, '_') + .replace(/=+$/, ''); + }, + openDialog: function (row, callback) { console.log(row) this.showDialog = true; diff --git a/web_src/src/components/dialog/configInfo.vue b/web_src/src/components/dialog/configInfo.vue index dabf139..8fed278 100644 --- a/web_src/src/components/dialog/configInfo.vue +++ b/web_src/src/components/dialog/configInfo.vue @@ -15,6 +15,8 @@ {{configInfoData.sip.domain}} {{configInfoData.sip.showIp}} {{configInfoData.sip.port}} + 123.6.102.223 + 61160 {{configInfoData.sip.password}} diff --git a/web_src/src/components/operationsForHistoryLog.vue b/web_src/src/components/operationsForHistoryLog.vue index 196cf49..49a9541 100644 --- a/web_src/src/components/operationsForHistoryLog.vue +++ b/web_src/src/components/operationsForHistoryLog.vue @@ -61,9 +61,9 @@ 下载 - - - + 删除 +