From af6e1c1cd4ae11358aa7435f4fb09aae9518ea0f Mon Sep 17 00:00:00 2001 From: wu <2468489804@qq.com> Date: Tue, 23 Aug 2022 11:18:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E6=B1=82HslServer=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E5=90=8D=E5=AF=86=E7=A0=81=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E5=86=99=E5=85=A5=E5=9C=A8api=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/edgeServer.api.js | 42 +++++++++---------- .../edgeServer/edgeServerConfigure/device.vue | 16 +------ .../edgeServer/edgeServerConfigure/index.vue | 10 +---- .../edgeServer/edgeServerMonitor/index.vue | 4 +- 4 files changed, 25 insertions(+), 47 deletions(-) diff --git a/src/api/modules/edgeServer.api.js b/src/api/modules/edgeServer.api.js index df8c524..c1e5f79 100644 --- a/src/api/modules/edgeServer.api.js +++ b/src/api/modules/edgeServer.api.js @@ -5,22 +5,22 @@ export default ({ service, request, serviceForMock, requestForMock, mock, faker, * @description 方法名称 * @param {Object} data 请求携带的信息 */ - VERIFY_SERVER (url, username, password) { + VERIFY_SERVER (url) { return request({ auth: { - username: username, - password: password + username: 'admin', + password: process.env.VUE_APP_HSLSERVER_PASSWORD }, method: 'post', url: url + '/Admin/ServerSettingsRequest' }) }, - MODIFY_SERVER (url, username, password, data) { + MODIFY_SERVER (url, data) { return request({ auth: { - username: username, - password: password + username: 'admin', + password: process.env.VUE_APP_HSLSERVER_PASSWORD }, data: data, method: 'post', @@ -47,21 +47,21 @@ export default ({ service, request, serviceForMock, requestForMock, mock, faker, }, ADD_DEVICE: (data) => handlePost(request, data), DEL_DEVICE: (data) => handlePost(request, data), - GET_HSLSERVER_CONFIGURE (url, username, password) { + GET_HSLSERVER_CONFIGURE (url) { return request({ auth: { - username: username, - password: password + username: 'admin', + password: process.env.VUE_APP_HSLSERVER_PASSWORD }, method: 'post', url: url + '/Admin/JsonSettingsRequest' }) }, - SET_HSLSERVER_CONFIGURE (url, username, password, data) { + SET_HSLSERVER_CONFIGURE (url, data) { return request({ auth: { - username: username, - password: password + username: 'admin', + password: process.env.VUE_APP_HSLSERVER_PASSWORD }, data: data, method: 'post', @@ -72,11 +72,11 @@ export default ({ service, request, serviceForMock, requestForMock, mock, faker, GET_DEVICE_CONFIGURE (id) { return request({ url: '?query=device&id=' + id }) }, - GET_SERVE_DEVICE_MONITORING (url, username, password) { + GET_SERVE_DEVICE_MONITORING (url) { return request({ auth: { - username: username, - password: password + username: 'admin', + password: process.env.VUE_APP_HSLSERVER_PASSWORD }, url: url + '/Edge/DeviceData?data=/' }) @@ -85,20 +85,20 @@ export default ({ service, request, serviceForMock, requestForMock, mock, faker, return request({ url: '?query=all_devices' }) }, SET_SERVER_EXEC: (data) => handlePost(request, data), - GET_SERVER_DEVICE_STATUS (url, username, password) { + GET_SERVER_DEVICE_STATUS (url) { return request({ auth: { - username: username, - password: password + username: 'admin', + password: process.env.VUE_APP_HSLSERVER_PASSWORD }, url: url + '/Edge/DeviceData?data=__status' }) }, - GET_DEVICE_POINT_VALUE(url, username, password, deviceName, data, type){ + GET_DEVICE_POINT_VALUE(url, deviceName, data, type){ return request({ auth: { - username: username, - password: password + username: 'admin', + password: process.env.VUE_APP_HSLSERVER_PASSWORD }, data: { 'address':data diff --git a/src/views/edgeServer/edgeServerConfigure/device.vue b/src/views/edgeServer/edgeServerConfigure/device.vue index 6cf0f44..5d98650 100644 --- a/src/views/edgeServer/edgeServerConfigure/device.vue +++ b/src/views/edgeServer/edgeServerConfigure/device.vue @@ -641,8 +641,6 @@ export default { async delDevice() { const deviceConfigure = await this.$api.GET_HSLSERVER_CONFIGURE( "http://" + this.serverData.url + ":" + this.serverData.port, - "admin", - process.env.VUE_APP_HSLSERVER_PASSWORD ); let deviceNode = deviceConfigure.Content.Settings.GroupNode[0].DeviceNode; if (deviceNode !== undefined && isArray(deviceNode)) { @@ -659,8 +657,6 @@ export default { try { await this.$api.SET_HSLSERVER_CONFIGURE( "http://" + this.serverData.url + ":" + this.serverData.port, - "admin", - process.env.VUE_APP_HSLSERVER_PASSWORD, { data: deviceConfigure.Content } ); await this.$api.DEL_DEVICE({ @@ -717,8 +713,6 @@ export default { this.$api .GET_DEVICE_POINT_VALUE( "http://" + this.serverData.url + ":" + this.serverData.port, - "admin", - process.env.VUE_APP_HSLSERVER_PASSWORD, this.deviceData[this.deviceActiveStatus].name, item.value, item.type @@ -749,9 +743,7 @@ export default { } }); const deviceConfigure = await this.$api.GET_HSLSERVER_CONFIGURE( - "http://" + this.serverData.url + ":" + this.serverData.port, - "admin", - process.env.VUE_APP_HSLSERVER_PASSWORD + "http://" + this.serverData.url + ":" + this.serverData.port ); const deviceConfigureModelValue = this.$refs.deviceConfigure.deviceConfigureModelValue if (this.devicePointData.length > 0) { @@ -792,8 +784,6 @@ export default { deviceConfigure.Content.Settings.GroupNode[0].DeviceNode = deviceNode; await this.$api.SET_HSLSERVER_CONFIGURE( "http://" + this.serverData.url + ":" + this.serverData.port, - "admin", - process.env.VUE_APP_HSLSERVER_PASSWORD, { data: deviceConfigure.Content } ); deviceConfigureModelValue.DeviceTypeName = @@ -815,9 +805,7 @@ export default { }, async getDeviceStatus() { const res = await this.$api.GET_SERVER_DEVICE_STATUS( - "http://" + this.serverData.url + ":" + this.serverData.port, - "admin", - process.env.VUE_APP_HSLSERVER_PASSWORD + "http://" + this.serverData.url + ":" + this.serverData.port ); if (res) { this.$emit("changeStatus", "online"); diff --git a/src/views/edgeServer/edgeServerConfigure/index.vue b/src/views/edgeServer/edgeServerConfigure/index.vue index 93ef5f8..71ff10c 100644 --- a/src/views/edgeServer/edgeServerConfigure/index.vue +++ b/src/views/edgeServer/edgeServerConfigure/index.vue @@ -240,8 +240,6 @@ export default { if (this.formOptions.saveButtonText === '测试') { this.serverSettings = await this.$api.VERIFY_SERVER( 'http://' + row.url + ':' + row.port, - 'admin', - process.env.VUE_APP_HSLSERVER_PASSWORD ) if (this.serverSettings) { this.$message({ @@ -264,8 +262,6 @@ export default { this.serverSettings.Content.ServerInfoConfig.CaptureURL = row.address this.$api.MODIFY_SERVER( 'http://' + row.url + ':' + row.port, - 'admin', - process.env.VUE_APP_HSLSERVER_PASSWORD, { data: this.serverSettings.Content } ) await this.$api.ADD_SERVER({ @@ -294,15 +290,11 @@ export default { async handleRowEdit ({ index, row }, done) { this.formOptions.saveLoading = true let serverSettings = await this.$api.VERIFY_SERVER( - 'http://' + row.url + ':' + row.port, - 'admin', - process.env.VUE_APP_HSLSERVER_PASSWORD + 'http://' + row.url + ':' + row.port ) serverSettings.Content.ServerInfoConfig.CaptureURL = row.address this.$api.MODIFY_SERVER( 'http://' + row.url + ':' + row.port, - 'admin', - process.env.VUE_APP_HSLSERVER_PASSWORD, { data: serverSettings.Content } ) this.$api.UPDATE_SERVER({ diff --git a/src/views/edgeServer/edgeServerMonitor/index.vue b/src/views/edgeServer/edgeServerMonitor/index.vue index fd18af3..c381716 100644 --- a/src/views/edgeServer/edgeServerMonitor/index.vue +++ b/src/views/edgeServer/edgeServerMonitor/index.vue @@ -177,9 +177,7 @@ export default { this.serverData.forEach((element, index) => { this.$api .GET_SERVE_DEVICE_MONITORING( - 'http://' + element.url + ':' + element.port, - 'admin', - process.env.VUE_APP_HSLSERVER_PASSWORD + 'http://' + element.url + ':' + element.port ) .then((deviceStatus) => { if (deviceStatus.IsSuccess) {