请求HslServer接口的用户名密码统一写入在api文件

2022-08-23 11:18:12 +08:00
parent a35532f8e7
commit af6e1c1cd4
4 changed files with 25 additions and 47 deletions
--- 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
--- 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");
--- 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({
--- 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) {